Skip to content

Commit d78fbb8

Browse files
committed
Make area required in missionRun/Definition
1 parent 11970a6 commit d78fbb8

File tree

8 files changed

+1484
-5
lines changed

8 files changed

+1484
-5
lines changed

backend/api.test/Database/DatabaseUtilities.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void Dispose()
4444
public async Task<MissionRun> NewMissionRun(
4545
string installationCode,
4646
Robot robot,
47-
Area? area,
47+
Area area,
4848
bool writeToDatabase = true
4949
)
5050
{

backend/api/Controllers/MissionSchedulingController.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,11 @@ [FromBody] ScheduledMissionQuery scheduledMissionQuery
171171
Area? area = null;
172172
area = missionAreas.GroupBy(i => i).OrderByDescending(grp => grp.Count()).Select(grp => grp.Key).First();
173173

174+
if (area == null)
175+
{
176+
return NotFound($"No area with name {scheduledMissionQuery.AreaName} in installation {scheduledMissionQuery.InstallationCode} was found");
177+
}
178+
174179
var source = await sourceService.CheckForExistingEchoSource(scheduledMissionQuery.EchoMissionId);
175180
MissionDefinition? existingMissionDefinition = null;
176181
if (source == null)
@@ -264,6 +269,7 @@ [FromBody] CustomMissionQuery customMissionQuery
264269
MissionDefinition? customMissionDefinition;
265270
try { customMissionDefinition = await customMissionSchedulingService.FindExistingOrCreateCustomMissionDefinition(customMissionQuery, missionTasks); }
266271
catch (SourceException e) { return StatusCode(StatusCodes.Status502BadGateway, e.Message); }
272+
catch (AreaNotFoundException) { return NotFound($"No area with name {customMissionQuery.AreaName} in installation {customMissionQuery.InstallationCode} was found"); }
267273

268274
try { await localizationService.EnsureRobotIsOnSameInstallationAsMission(robot, customMissionDefinition); }
269275
catch (InstallationNotFoundException e) { return NotFound(e.Message); }

backend/api/Database/Models/MissionDefinition.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public class MissionDefinition : SortableRecord
2828

2929
public virtual MissionRun? LastSuccessfulRun { get; set; }
3030

31-
public Area? Area { get; set; }
31+
[Required]
32+
public Area Area { get; set; }
3233

3334
public bool IsDeprecated { get; set; }
3435
}

backend/api/Database/Models/MissionRun.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ public IList<MissionTask> Tasks
6969
[MaxLength(1000)]
7070
public string? Comment { get; set; }
7171

72-
public Area? Area { get; set; }
72+
[Required]
73+
public Area Area { get; set; }
7374

7475
public bool IsCompleted =>
7576
_status

0 commit comments

Comments
 (0)