Resolved contact_inquiries is violated

Signed-off-by: vimal-java-dev <vimal929@gmail.com>

Author: vimal-java-dev

src/main/java/com/vimaltech/contactapi/enums/InquiryType.java

@@ -25,8 +25,11 @@ public static InquiryType[] list() {
     // ✅ Case-insensitive parsing (already discussed)
     @JsonCreator
     public static InquiryType from(String value) {
-        if (value == null) {
-            return null;
+
+        if (value == null || value.trim().isEmpty()) {
+            throw new IllegalArgumentException(
+                    "Subject must not be null or empty. Allowed values: FRONTEND, BACKEND, FULLSTACK, VPS, OTHER"
+            );
         }
 
         try {

src/main/java/com/vimaltech/contactapi/exception/GlobalExceptionHandler.java

@@ -16,6 +16,7 @@ public class GlobalExceptionHandler {
 
     private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
 
+    // ✅ 1. Bean validation errors (@Valid)
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public ResponseEntity<ApiResponse> handleValidationException(
             MethodArgumentNotValidException ex) {
@@ -38,21 +39,34 @@ public ResponseEntity<ApiResponse> handleValidationException(
         return ResponseEntity.badRequest().body(response);
     }
 
-    // ✅ NEW: Handle enum parsing errors (very important)
+    // ✅ 2. JSON parsing / ENUM errors (UPDATED - precise handling)
     @ExceptionHandler(HttpMessageNotReadableException.class)
-    public ResponseEntity<ApiResponse> handleEnumError(HttpMessageNotReadableException ex) {
+    public ResponseEntity<ApiResponse> handleJsonParseError(HttpMessageNotReadableException ex) {
 
         log.warn("Invalid request format or enum value: {}", ex.getMessage());
 
+        String message = "Invalid request format";
+
+        // 🔥 Extract root cause (THIS is what you asked about)
+        Throwable root = ex.getCause();
+
+        if (root instanceof IllegalArgumentException &&
+                root.getMessage() != null &&
+                root.getMessage().contains("Invalid subject value")) {
+
+            message = root.getMessage(); // use exact enum error
+        }
+
         ApiResponse response = new ApiResponse(
                 false,
-                "Invalid subject value. Allowed: FRONTEND, BACKEND, FULLSTACK, VPS, OTHER",
+                message,
                 LocalDateTime.now()
         );
 
         return ResponseEntity.badRequest().body(response);
     }
 
+    // ✅ 3. Catch-all (fallback)
     @ExceptionHandler(Exception.class)
     public ResponseEntity<ApiResponse> handleGenericException(Exception ex) {
 

src/main/resources/db/migration/V2__normalize_subject_and_enforce_enum.sql

@@ -1,48 +1,46 @@
 -- ============================
--- 1. Normalize existing values
+-- 1. Normalize case
 -- ============================
 
 UPDATE contact_inquiries
 SET subject = UPPER(subject)
 WHERE subject IS NOT NULL;
 
 -- ============================
--- 2. Fix known variations
+-- 2. Map known values
+-- ============================
+
+UPDATE contact_inquiries SET subject = 'BACKEND'   WHERE subject LIKE '%BACKEND%';
+UPDATE contact_inquiries SET subject = 'FULLSTACK' WHERE subject LIKE '%FULLSTACK%';
+UPDATE contact_inquiries SET subject = 'VPS'       WHERE subject LIKE '%VPS%';
+UPDATE contact_inquiries SET subject = 'FRONTEND'  WHERE subject LIKE '%FRONTEND%';
+UPDATE contact_inquiries SET subject = 'OTHER'     WHERE subject LIKE '%OTHER%';
+
+-- ============================
+-- 3. Handle NULL
 -- ============================
 
-UPDATE contact_inquiries
-SET subject = 'BACKEND'
-WHERE subject ILIKE 'backend';
-UPDATE contact_inquiries
-SET subject = 'FULLSTACK'
-WHERE subject ILIKE 'fullstack';
-UPDATE contact_inquiries
-SET subject = 'VPS'
-WHERE subject ILIKE 'vps';
 UPDATE contact_inquiries
 SET subject = 'OTHER'
-WHERE subject ILIKE 'other';
-UPDATE contact_inquiries
-SET subject = 'FRONTEND'
-WHERE subject ILIKE 'frontend';
+WHERE subject IS NULL;
 
 -- ============================
--- 3. Fix NULL values
+-- 4. 🔥 CRITICAL: Catch ALL remaining invalid values
 -- ============================
 
 UPDATE contact_inquiries
 SET subject = 'OTHER'
-WHERE subject IS NULL;
+WHERE subject NOT IN ('FRONTEND', 'BACKEND', 'FULLSTACK', 'VPS', 'OTHER');
 
 -- ============================
--- 4. Enforce NOT NULL
+-- 5. Enforce NOT NULL
 -- ============================
 
 ALTER TABLE contact_inquiries
 ALTER COLUMN subject SET NOT NULL;
 
 -- ============================
--- 5. ADD CHECK CONSTRAINT (LAST STEP)
+-- 6. Add CHECK constraint
 -- ============================
 
 ALTER TABLE contact_inquiries