From 4d4e8c9d920dff20754de2c886e31f9fd12d0e74 Mon Sep 17 00:00:00 2001
From: Lincpay Tech <himanshulincpay@gmail.com>
Date: Mon, 10 Nov 2025 15:03:45 +0530
Subject: [PATCH 1/2] solved duplicated giving internal server

---
 .../bbps/exception/GlobalExceptionHandler.java   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/billpaymentservice/bbps/exception/GlobalExceptionHandler.java b/src/main/java/com/billpaymentservice/bbps/exception/GlobalExceptionHandler.java
index 623c185..f73aa2a 100644
--- a/src/main/java/com/billpaymentservice/bbps/exception/GlobalExceptionHandler.java
+++ b/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) {

From a3b1fba928306e4db1191a754795889864c4d172 Mon Sep 17 00:00:00 2001
From: Lincpay Tech <himanshulincpay@gmail.com>
Date: Mon, 10 Nov 2025 15:13:04 +0530
Subject: [PATCH 2/2] solved the internal server err for dublicate req id

---
 src/main/resources/application.properties | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4f044d5..a03b211 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,11 +20,8 @@ swagger.server.description=Local Development Server
 # DataSource
 spring.datasource.url=jdbc:postgresql://localhost:5432/BBPS
 spring.datasource.username=postgres
-<<<<<<< HEAD
-spring.datasource.password=UAT@DB_2025
-=======
+
 spring.datasource.password=himanshu@123
->>>>>>> 43baedfecdf5e3718ba3e8b932536b3798957d22
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource