Merge branch 'feature1' into develop

src/main/java/com/billpaymentservice/bbps/exception/GlobalExceptionHandler.java

@@ -16,7 +16,8 @@ import com.billpaymentservice.bbps.dto.ResponseModel;
 public class GlobalExceptionHandler {
 
     private static final Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
-
+    
+   
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public ResponseEntity<ResponseModel<?>> handleValidation(MethodArgumentNotValidException ex) {
         List<Map<String, String>> fieldErrors = ex.getBindingResult().getFieldErrors()
@@ -42,6 +43,19 @@ public class GlobalExceptionHandler {
         ResponseModel<?> resp = new ResponseModel<>(ex.getMessage(), ex.getStatus(), ex.getStatusCode(), ex.getData());
         return ResponseEntity.status(HttpStatus.valueOf(ex.getStatusCode())).body(resp);
     }
+    
+    @ExceptionHandler(CustomException.class)
+    public ResponseEntity<ResponseModel<?>> handleCustomException(CustomException ex) {
+        logger.warn("CustomException: {}", ex.getMessage());
+        ResponseModel<?> resp = new ResponseModel<>(
+            ex.getMessage(),
+            "FAILED",
+            HttpStatus.BAD_REQUEST.value(),
+            null
+        );
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resp);
+    }
+
 
     @ExceptionHandler(Exception.class)
     public ResponseEntity<ResponseModel<?>> handleAll(Exception ex) {