Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent "Start server for nearest mission" job failures if there is no nearest mission #95

Merged
merged 2 commits into from
Sep 14, 2024
Merged

Prevent "Start server for nearest mission" job failures if there is no nearest mission #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d7de42
Prevent job if there was no nearest mission
3Mydlo3 Nov 15, 2023
8d8f7dd
Merge branch 'master' into bugfix/prevent-no-nearest-mission-found-er…
3Mydlo3 Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ArmaForces.ArmaServerManager/Features/Missions/Extensions/WebMissionsCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@ namespace ArmaForces.ArmaServerManager.Features.Missions.Extensions
{
internal static class WebMissionsCollectionExtensions
{
public const string NoNearestMissionError = "No nearest mission found.";

public static Result<WebMission> GetNearestMission(this IEnumerable<WebMission> missions)
{
var nearestMission = missions
.OrderBy(x => x.Date)
.FirstOrDefault();

return nearestMission is null
? Result.Failure<WebMission>("No nearest mission found.")
? Result.Failure<WebMission>(NoNearestMissionError)
: Result.Success(nearestMission);
}
}
Expand Down
5 changes: 4 additions & 1 deletion ArmaForces.ArmaServerManager/Services/MissionPreparationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ public async Task<Result> StartServerForNearestMission(CancellationToken cancell
return await _apiMissionsClient
.GetUpcomingMissions()
.Bind(x => x.GetNearestMission())
.Bind(nearestMission => _serverStartupService.StartServer(nearestMission.Modlist, ServerStartRequestDto.DefaultHeadlessClients, cancellationToken));
.Bind(nearestMission => _serverStartupService.StartServer(nearestMission.Modlist, ServerStartRequestDto.DefaultHeadlessClients, cancellationToken))
.OnFailureCompensate(error => error.Contains(WebMissionsCollectionExtensions.NoNearestMissionError)
? Result.Success()
: Result.Failure(error));
}

private async Task<Result<HashSet<Mod>>> GetModsListFromModsets(IReadOnlyCollection<string> modsetsNames)
Expand Down
Loading