fix: Update feature with invalid planningStatus results in 500 #228

src/main/java/com/sivalabs/ft/features/api/GlobalExceptionHandler.java

@@ -2,12 +2,14 @@
 
 import static org.springframework.http.HttpStatus.*;
 
+import com.fasterxml.jackson.databind.exc.InvalidFormatException;
 import com.sivalabs.ft.features.domain.exceptions.BadRequestException;
 import com.sivalabs.ft.features.domain.exceptions.ResourceNotFoundException;
 import java.time.Instant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ProblemDetail;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
@@ -42,4 +44,23 @@ ProblemDetail handle(BadRequestException e) {
         problemDetail.setProperty("timestamp", Instant.now());
         return problemDetail;
     }
+
+    @ExceptionHandler(HttpMessageNotReadableException.class)
+    ProblemDetail handle(HttpMessageNotReadableException ex) {
+        String message = "Invalid request body";
+
+        Throwable cause = ex.getCause();
+        if (cause instanceof InvalidFormatException ife) {
+            if (ife.getTargetType() != null && ife.getTargetType().isEnum()) {
+                String invalidValue = String.valueOf(ife.getValue());
+                String enumName = ife.getTargetType().getSimpleName();
+                message = "Invalid value '%s' for enum %s.".formatted(invalidValue, enumName);
+            }
+        }
+
+        ProblemDetail problemDetail = ProblemDetail.forStatusAndDetail(BAD_REQUEST, message);
+        problemDetail.setTitle("Bad Request");
+        problemDetail.setProperty("timestamp", Instant.now());
+        return problemDetail;
+    }
 }

src/main/java/com/sivalabs/ft/features/api/deserializer/FeaturePlanningStatusDeserializer.java

@@ -0,0 +1,21 @@
+package com.sivalabs.ft.features.api.deserializer;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.sivalabs.ft.features.domain.models.FeaturePlanningStatus;
+import java.io.IOException;
+
+public class FeaturePlanningStatusDeserializer extends JsonDeserializer<FeaturePlanningStatus> {
+
+    @Override
+    public FeaturePlanningStatus deserialize(JsonParser parser, DeserializationContext context) throws IOException {
+        String value = parser.getText();
+        try {
+            return FeaturePlanningStatus.valueOf(value);
+        } catch (IllegalArgumentException e) {
+            throw new JsonMappingException(parser, "Invalid featurePlanningStatus value: '%s'.".formatted(value));
+        }
+    }
+}

src/main/java/com/sivalabs/ft/features/api/models/UpdateFeaturePayload.java

@@ -1,5 +1,7 @@
 package com.sivalabs.ft.features.api.models;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.sivalabs.ft.features.api.deserializer.FeaturePlanningStatusDeserializer;
 import com.sivalabs.ft.features.domain.models.FeaturePlanningStatus;
 import com.sivalabs.ft.features.domain.models.FeatureStatus;
 import jakarta.validation.constraints.NotEmpty;
@@ -14,6 +16,6 @@ public record UpdateFeaturePayload(
         FeatureStatus status,
         Instant plannedCompletionAt,
         Instant actualCompletionAt,
-        FeaturePlanningStatus featurePlanningStatus,
+        @JsonDeserialize(using = FeaturePlanningStatusDeserializer.class) FeaturePlanningStatus featurePlanningStatus,
         String featureOwner,
         String blockageReason) {}

src/test/java/com/sivalabs/ft/features/api/controllers/FeatureControllerTests.java

@@ -206,4 +206,70 @@ void shouldReturnPlanningFieldsInGetFeaturesByRelease() {
                 .asNumber()
                 .isEqualTo(2);
     }
+
+    @Test
+    @WithMockOAuth2User(username = "user")
+    void shouldReturnBadRequestForInvalidFeaturePlanningStatus() {
+        var payload =
+                """
+            {
+                "title": "Feature with Invalid Status",
+                "description": "Feature with non-existent planning status",
+                "status": "NEW",
+                "featurePlanningStatus": "INVALID_STATUS"
+            }
+            """;
+
+        var result = mvc.put()
+                .uri("/api/features/{code}", "IDEA-1")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(payload)
+                .exchange();
+
+        assertThat(result).hasStatus(HttpStatus.BAD_REQUEST);
+    }
+
+    @Test
+    @WithMockOAuth2User(username = "user")
+    void shouldReturnBadRequestForBlankFeaturePlanningStatus() {
+        var payload =
+                """
+            {
+                "title": "Feature with Invalid Status",
+                "description": "Feature with non-existent planning status",
+                "status": "NEW",
+                "featurePlanningStatus": " "
+            }
+            """;
+
+        var result = mvc.put()
+                .uri("/api/features/{code}", "IDEA-1")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(payload)
+                .exchange();
+
+        assertThat(result).hasStatus(HttpStatus.BAD_REQUEST);
+    }
+
+    @Test
+    @WithMockOAuth2User(username = "user")
+    void shouldReturnBadRequestForEmptyFeaturePlanningStatus() {
+        var payload =
+                """
+            {
+                "title": "Feature with Invalid Status",
+                "description": "Feature with non-existent planning status",
+                "status": "NEW",
+                "featurePlanningStatus": ""
+            }
+            """;
+
+        var result = mvc.put()
+                .uri("/api/features/{code}", "IDEA-1")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(payload)
+                .exchange();
+
+        assertThat(result).hasStatus(HttpStatus.BAD_REQUEST);
+    }
 }