Refactor mission definition tasks

Author: andchiind

backend/api.test/Controllers/InspectionAreaControllerTests.cs

@@ -92,7 +92,7 @@ public async Task CheckThatInspectionAreaIsCorrectlyCreatedThroughEndpoint()
         }
 
         [Fact]
-        public async Task CheckThatMissionDefinitionIsCreatedInInspectionAreaWhenSchedulingACustomMissionRun()
+        public async Task CheckThatMissionDefinitionIsCreatedInInspectionAreaUponCreation()
         {
             // Arrange
             var installation = await DatabaseUtilities.NewInstallation();
@@ -107,27 +107,25 @@ public async Task CheckThatMissionDefinitionIsCreatedInInspectionAreaWhenSchedul
                 inspectionArea.Id
             );
 
-            var inspection = new CustomInspectionQuery
-            {
-                InspectionTarget = new Position(),
-                InspectionType = InspectionType.Image,
-            };
-            var tasks = new List<CustomTaskQuery>
+            var testName = Guid.NewGuid().ToString();
+
+            var tasks = new List<TaskQuery>
             {
                 new()
                 {
-                    Inspection = inspection,
                     TagId = "test",
                     RobotPose = new Pose(),
-                    TaskOrder = 0,
+                    TargetPosition = new Position(),
+                    SensorType = SensorType.Image,
+                    AnalysisType = AnalysisType.Fencilla,
+                    Description = "Test description",
                 },
             };
-            var missionQuery = new CustomMissionQuery
+            var missionQuery = new MissionQuery
             {
                 RobotId = robot.Id,
-                CreationTime = DateTime.UtcNow,
                 InstallationCode = installation.InstallationCode,
-                Name = "TestMission",
+                Name = testName,
                 Tasks = tasks,
             };
 
@@ -139,31 +137,23 @@ public async Task CheckThatMissionDefinitionIsCreatedInInspectionAreaWhenSchedul
 
             // Act
             var missionResponse = await Client.PostAsync(
-                "/missions/custom",
+                "/missions/definitions",
                 missionContent,
                 TestContext.Current.CancellationToken
             );
-            var userMissionResponse = await missionResponse.Content.ReadFromJsonAsync<MissionRun>(
-                SerializerOptions,
-                cancellationToken: TestContext.Current.CancellationToken
-            );
             var inspectionAreaMissionResponse = await Client.GetAsync(
                 $"/inspectionAreas/{inspectionArea.Id}/mission-definitions",
                 TestContext.Current.CancellationToken
             );
 
             // Assert
-            var mission = await MissionRunService.ReadById(userMissionResponse!.Id);
             var missionDefinitions = await MissionDefinitionService.ReadByInspectionAreaId(
                 inspectionArea.Id
             );
 
             Assert.True(missionResponse.IsSuccessStatusCode);
+            Assert.NotNull(missionDefinitions.Find((m) => m.Name == testName));
             Assert.True(inspectionAreaMissionResponse.IsSuccessStatusCode);
-            Assert.Single(
-                missionDefinitions,
-                m => m.Id.Equals(mission!.MissionId, StringComparison.Ordinal)
-            );
         }
 
         [Fact]
@@ -214,7 +204,7 @@ public async Task TestUpdatingInspectionAreaPolygon()
         }
 
         [Fact]
-        public async Task ScheduleMissionOutsideInspectionAreaPolygonFails()
+        public async Task CreateMissionDefinitionOutsideInspectionAreaPolygonFails()
         {
             // Arrange
             var installation = await DatabaseUtilities.NewInstallation();
@@ -246,25 +236,20 @@ public async Task ScheduleMissionOutsideInspectionAreaPolygonFails()
 
             var robot = await DatabaseUtilities.NewRobot(RobotStatus.Available, installation);
 
-            var inspection = new CustomInspectionQuery
-            {
-                InspectionTarget = new Position(),
-                InspectionType = InspectionType.Image,
-            };
-            var tasks = new List<CustomTaskQuery>
+            var tasks = new List<TaskQuery>
             {
                 new()
                 {
-                    Inspection = inspection,
                     TagId = "test",
+                    TargetPosition = new Position(),
+                    SensorType = SensorType.Image,
+                    AnalysisType = AnalysisType.Fencilla,
                     RobotPose = new Pose(11, 11, 11, 0, 0, 0, 1), // Position outside polygon
-                    TaskOrder = 0,
                 },
             };
-            var missionQuery = new CustomMissionQuery
+            var missionQuery = new MissionQuery
             {
                 RobotId = robot.Id,
-                CreationTime = DateTime.UtcNow,
                 InstallationCode = installation.InstallationCode,
                 Name = "TestMission",
                 Tasks = tasks,
@@ -278,7 +263,7 @@ public async Task ScheduleMissionOutsideInspectionAreaPolygonFails()
 
             // Act
             var missionResponse = await Client.PostAsync(
-                "/missions/custom",
+                "/missions/definitions",
                 missionContent,
                 TestContext.Current.CancellationToken
             );

backend/api.test/Controllers/MissionDefinitionControllerTests.cs

@@ -22,7 +22,6 @@ public class MissionDefinitionControllerTests : IAsyncLifetime
         public required JsonSerializerOptions SerializerOptions;
 
         public required IMissionDefinitionService MissionDefinitionService;
-        public required ISourceService SourceService;
 
         public async ValueTask InitializeAsync()
         {
@@ -40,7 +39,6 @@ public async ValueTask InitializeAsync()
 
             MissionDefinitionService =
                 serviceProvider.GetRequiredService<IMissionDefinitionService>();
-            SourceService = serviceProvider.GetRequiredService<ISourceService>();
         }
 
         public async ValueTask DisposeAsync()
@@ -60,11 +58,19 @@ public async Task CheckThatListAllMissionDefinitionsEndpointReturnsSuccess()
                 plant.PlantCode
             );
 
-            var source = await SourceService.CreateSourceIfDoesNotExist([]);
-
+            var task = new MissionTaskDefinition(
+                new TaskQuery
+                {
+                    TagId = "test",
+                    TargetPosition = new Position(),
+                    SensorType = SensorType.Image,
+                    AnalysisType = AnalysisType.Fencilla,
+                    RobotPose = new Pose(11, 11, 11, 0, 0, 0, 1),
+                }
+            );
             var missionDefinition = new MissionDefinition
             {
-                Source = source,
+                Tasks = [task],
                 InstallationCode = installation.InstallationCode,
                 Name = "Test Mission Definition",
                 InspectionArea = inspectionArea,
@@ -81,7 +87,7 @@ public async Task CheckThatListAllMissionDefinitionsEndpointReturnsSuccess()
 
             // Assert
             var missionDefinitions = await response.Content.ReadFromJsonAsync<
-                List<MissionDefinitionResponse>
+                IEnumerable<MissionDefinitionResponse>
             >(SerializerOptions, cancellationToken: TestContext.Current.CancellationToken);
 
             Assert.Single(missionDefinitions!);