Add dropdown for analysis mapping POST endpoint (#205)

Author: akustn

api.Tests/AnalysisMappingController.cs

@@ -32,26 +32,12 @@ public AnalysisMappingControllerTest()
             _analysisMappingController = new AnalysisMappingController(_loggerMock.Object, _analysisMappingServiceMock.Object, _plantDataServiceMock.Object, _dbContext);
         }
 
-
-        [Fact]
-        public async Task AddOrCreateAnalysisMapping_ReturnsBadRequest_WhenAnalysisTypeIsInvalid()
-        {
-            //Arrange
-            string tagId = "dummy-tag-id";
-            string analysisType = "InvalidAnalysisType";
-            string inspectionDescription = "Dummy description";
-            //Act
-            var result = await _analysisMappingController.AddOrCreateAnalysisMapping(tagId, analysisType, inspectionDescription);
-            //Assert
-            Assert.IsType<BadRequestObjectResult>(result.Result);
-        }
-
         [Fact]
         public async Task AddOrCreateAnalysisMapping_ReturnsStatusCode500_WhenExceptionIsThrown()
         {
             //Arrange
             string tagId = "dummy-tag-id";
-            string analysisType = "constantleveloiler";
+            AnalysisType analysisType = AnalysisType.ConstantLevelOiler;
             string inspectionDescription = "Dummy description";
 
             _analysisMappingServiceMock
@@ -77,19 +63,18 @@ public async Task AddOrCreateAnalysisMapping_CreatesNewMapping_WhenNoneExists()
             // Arrange
             string tagId = "test-tag";
             string inspectionDescription = "desc";
-            string analysisType = "constantleveloiler";
-            var parsedType = AnalysisType.ConstantLevelOiler;
+            AnalysisType analysisType = AnalysisType.ConstantLevelOiler;
             var newMapping = new AnalysisMapping(tagId, inspectionDescription)
             {
-                AnalysesToBeRun = new List<AnalysisType> { parsedType }
+                AnalysesToBeRun = new List<AnalysisType> { analysisType }
             };
 
             _analysisMappingServiceMock
                 .Setup(s => s.ReadByInspectionDescriptionAndTag(inspectionDescription, tagId))
                 .ReturnsAsync((AnalysisMapping?)null);
 
             _analysisMappingServiceMock
-                .Setup(s => s.CreateAnalysisMapping(tagId, inspectionDescription, parsedType))
+                .Setup(s => s.CreateAnalysisMapping(tagId, inspectionDescription, analysisType))
                 .ReturnsAsync(newMapping);
 
             _plantDataServiceMock
@@ -102,7 +87,7 @@ public async Task AddOrCreateAnalysisMapping_CreatesNewMapping_WhenNoneExists()
             // Assert
             var okResult = Assert.IsType<OkObjectResult>(result.Result);
             Assert.Equal(newMapping, okResult.Value);
-            _analysisMappingServiceMock.Verify(s => s.CreateAnalysisMapping(tagId, inspectionDescription, parsedType), Times.Once);
+            _analysisMappingServiceMock.Verify(s => s.CreateAnalysisMapping(tagId, inspectionDescription, analysisType), Times.Once);
         }
     }
 }

api/Controllers/AnalysisMappingController.cs

@@ -94,16 +94,11 @@ public async Task<ActionResult<AnalysisMapping>> GetAnalysisById([FromRoute] str
     public async Task<ActionResult<AnalysisMapping>> AddOrCreateAnalysisMapping(
         [FromRoute] string tagId,
         [FromRoute] string inspectionDescription,
-        [FromRoute] string analysisType
+        [FromRoute] AnalysisType analysisType
     )
     {
         try
         {
-            var parsedAnalysisType = Analysis.TypeFromString(analysisType);
-            if (parsedAnalysisType == null)
-            {
-                return BadRequest("Invalid analysis type");
-            }
             var analysisMapping = await analysisMappingService.ReadByInspectionDescriptionAndTag(
                 inspectionDescription,
                 tagId
@@ -113,14 +108,14 @@ [FromRoute] string analysisType
                 analysisMapping = await analysisMappingService.CreateAnalysisMapping(
                     tagId,
                     inspectionDescription,
-                    parsedAnalysisType
+                    analysisType
                 );
             }
             else
             {
                 analysisMapping = await analysisMappingService.AddAnalysisTypeToMapping(
                     analysisMapping,
-                    parsedAnalysisType.Value
+                    analysisType
                 );
             }
             var plantData = await plantDataService.ReadByTagIdAndInspectionDescription(