conflict resolved by mohd arham

pom.xml

@@ -29,7 +29,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
-
+   <!-- Validation -->
+<dependency>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-validation</artifactId>
+</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>

src/main/java/com/billpaymentservice/bbps/controller/MasterDataController.java

@@ -14,13 +14,17 @@ import com.billpaymentservice.bbps.dto.ResponseModel;
 import com.billpaymentservice.bbps.dto.request.BillerDetailRequest;
 import com.billpaymentservice.bbps.dto.request.ContactMasterRequest;
 import com.billpaymentservice.bbps.dto.request.CustomParamRequest;
+import com.billpaymentservice.bbps.dto.request.DispositionRequest;
 import com.billpaymentservice.bbps.dto.request.MasterCategoryRequest;
 import com.billpaymentservice.bbps.dto.request.MasterRequest;
 import com.billpaymentservice.bbps.dto.request.PlanRequest;
 import com.billpaymentservice.bbps.service.MasterDataService;
 
+import jakarta.validation.Valid;
+
 @RequestMapping("/masterData")
 @RestController
+@Validated
 public class MasterDataController {
 
 	private static final Logger log = LoggerFactory.getLogger(MasterDataController.class);
@@ -34,7 +38,7 @@ public class MasterDataController {
 	/** Get Details of the biller by billId **/
 	@PostMapping(value = "/getBillerDetails", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<ResponseModel> getBillerDetails(
-			@Validated @RequestBody BillerDetailRequest billerDetailRequest) {
+	        @Valid @RequestBody BillerDetailRequest billerDetailRequest) {
 
 		log.info("Received biller details request for billerId: {}", billerDetailRequest.getBillerId());
 
@@ -51,8 +55,8 @@ public class MasterDataController {
 
 	@PostMapping(value = "/getDispostionDetail", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<ResponseModel> getDispostionDetail(
-			@Validated @RequestBody ContactMasterRequest contactMasterRequest) {
-		return ResponseEntity.ok(masterDataService.getDispositionDetails());
+			@Validated @RequestBody DispositionRequest dispositionDetailRequest) {
+		return ResponseEntity.ok(masterDataService.getDispositionDetails(dispositionDetailRequest));
 	}
 
 	/**

src/main/java/com/billpaymentservice/bbps/dto/DeviceDetail.java

@@ -5,10 +5,12 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 @Getter
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
+@ToString
 public class DeviceDetail {
 	
 	private List<Detail> detail;

src/main/java/com/billpaymentservice/bbps/dto/request/BaseClass.java

@@ -3,59 +3,52 @@ package com.billpaymentservice.bbps.dto.request;
 import com.billpaymentservice.bbps.dto.DeviceDetail;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter 
 @Setter 
 @AllArgsConstructor 
 @NoArgsConstructor
+@ToString
 public abstract class BaseClass {
 
-    // ✅ Request me required, response me hide honge
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+	@NotBlank(message = "MID cannot be null or blank")
     private String mid;
-
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
-    private String secretKey;
-
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+	
+	@NotBlank(message = "Secret key cannot be null or blank")
+	private String secretKey;
+	@NotBlank(message = "Request ID cannot be null or blank")
+	private String reqId;
+    
     private String txnId;
-
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+   
     private DeviceDetail deviceDetial;
 
     // ✅ 10 User Defined Fields (UDF1–UDF10)
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf1;
 
     @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf2;
 
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf3;
 
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf4;
 
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf5;
 
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf6;
-
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+ 
     private String udf7;
 
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf8;
 
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf9;
 
-    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String udf10;
 }
 

src/main/java/com/billpaymentservice/bbps/dto/request/BillerDetailRequest.java

@@ -3,9 +3,11 @@ package com.billpaymentservice.bbps.dto.request;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter
+@ToString(callSuper = true)
 public class BillerDetailRequest extends BaseClass{
      
 	@NotNull

src/main/java/com/billpaymentservice/bbps/entites/InboundTraceLog.java

@@ -0,0 +1,63 @@
+package com.billpaymentservice.bbps.entites;
+
+import java.time.LocalDateTime;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Entity
+@Getter @Setter @NoArgsConstructor @ToString
+public class InboundTraceLog {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    // 🔹 Identifiers
+    @Column(length = 50, unique = true)
+    private String requestId;    // external requestId (from client)
+    @Column(length = 35)
+    private String txnId;        // internally generated transaction id
+
+    // 🔹 Source & API info
+    private String orgId;        // tumhara org code (like ORG001)
+    private String mid;          // merchant id from request
+    private String apiName;      // e.g. getBillerByBillerId
+    private String httpMethod;   // GET / POST
+
+    // 🔹 Request/Response data
+    @Column(columnDefinition = "TEXT")
+    private String requestPayload;   // jo external ne bheja
+    @Column(columnDefinition = "TEXT")
+    private String responsePayload;  // jo tumne wapas bheja
+
+    // 🔹 Status & timing
+    private String status;           // SUCCESS / FAILED
+    private String responseCode;     // like 200, 400 etc.
+    private LocalDateTime requestTime;    // jab request aayi
+    private LocalDateTime responseTime;    // jab response gaya
+    private LocalDateTime createdAt = LocalDateTime.now();
+
+    @Column(length = 255)
+    private String remark;           // error ya note
+   
+    public InboundTraceLog(String requestId, String txnId, String apiName, String mid, 
+            String orgId, String httpMethod, String requestPayload) {
+this.requestId = requestId;
+this.txnId = txnId;
+this.apiName = apiName;
+this.mid = mid;
+this.orgId = orgId;
+this.httpMethod = httpMethod;
+this.requestPayload = requestPayload;
+this.requestTime = LocalDateTime.now();
+this.createdAt = LocalDateTime.now();
+}
+}

src/main/java/com/billpaymentservice/bbps/entites/OutboundTraceLog.java

@@ -0,0 +1,58 @@
+package com.billpaymentservice.bbps.entites;
+
+import java.time.LocalDateTime;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Entity
+@Getter @Setter @NoArgsConstructor @ToString
+public class OutboundTraceLog {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    // 🔹 Linking fields
+    private String requestId;   // same as inbound ka requestId
+    private String txnId;       // same txnId for full trace
+
+    // 🔹 API / endpoint info
+    private String apiName;     // e.g. fetchBillerData
+    private String endpointUrl; // full URL of external API
+    private String httpMethod;  // GET / POST
+
+    // 🔹 Request/Response payloads
+    @Column(columnDefinition = "TEXT")
+    private String requestPayload;   // jo tumne bheja external ko
+    @Column(columnDefinition = "TEXT")
+    private String responsePayload;  // jo external ne bheja
+
+    // 🔹 Response/status
+    private String responseCode;     // HTTP status code (200, 500, etc.)
+    private String status;           // SUCCESS / FAILED
+    private LocalDateTime sendTime;        // jab request gayi
+    private LocalDateTime responseReceiveTime; // jab response aaya
+    private LocalDateTime createdAt = LocalDateTime.now();
+
+    @Column(length = 255)
+    private String remark;
+    public OutboundTraceLog(String txnId, String requestId, String apiName, 
+            String endpointUrl, String httpMethod, String requestPayload) {
+this.txnId = txnId;
+this.requestId = requestId;
+this.apiName = apiName;
+this.endpointUrl = endpointUrl;
+this.httpMethod = httpMethod;
+this.requestPayload = requestPayload;
+this.sendTime = LocalDateTime.now();
+this.createdAt = LocalDateTime.now();
+}
+}

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

@@ -2,16 +2,60 @@ package com.billpaymentservice.bbps.exception;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
-import com.billpaymentservice.bbps.dto.GeneralResp;
+
 import com.billpaymentservice.bbps.dto.ResponseModel;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @ControllerAdvice
 public class GlobalExceptionHandler {
 
+    // ✅ Handle CustomException
     @ExceptionHandler(CustomException.class)
-    public ResponseEntity<ResponseModel> handleCustomException(CustomException ex) {
+    public ResponseEntity<ResponseModel<?>> handleCustomException(CustomException ex) {
         return new ResponseEntity<>(ex.getResponseModel(), HttpStatus.BAD_REQUEST);
     }
+
+    // ✅ Handle validation errors
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<ResponseModel<?>> handleValidationExceptions(MethodArgumentNotValidException ex) {
+
+        Map<String, String> errors = new HashMap<>();
+
+        ex.getBindingResult().getFieldErrors().forEach(error -> {
+            errors.put(error.getField(), error.getDefaultMessage());
+        });
+
+        ResponseModel<?> response = new ResponseModel<>(
+                "Validation Failed",
+                "FAILED",
+                HttpStatus.BAD_REQUEST.value(),
+                errors
+        );
+
+        return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
+    }
+
+    // ✅ NEW: Handle ALL other exceptions (Generic Handler)
+    @ExceptionHandler(Exception.class)
+    public ResponseEntity<ResponseModel<?>> handleAllExceptions(Exception ex) {
+        
+        // ✅ Internal logging (tumhare system ko pata chale)
+        System.err.println("INTERNAL SERVER ERROR: " + ex.getMessage());
+        ex.printStackTrace(); // Stack trace for debugging
+        
+        // ✅ Client ko generic message
+        ResponseModel<?> response = new ResponseModel<>(
+            "Service temporarily unavailable. Please try again later.",
+            "FAILED",
+            HttpStatus.INTERNAL_SERVER_ERROR.value(),
+            null
+        );
+
+        return new ResponseEntity<>(response, HttpStatus.INTERNAL_SERVER_ERROR);
+    }
 }

src/main/java/com/billpaymentservice/bbps/repository/InboundTraceLogRepository.java

@@ -0,0 +1,8 @@
+package com.billpaymentservice.bbps.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.billpaymentservice.bbps.entites.InboundTraceLog;
+public interface InboundTraceLogRepository extends JpaRepository<InboundTraceLog, Long> {
+
+}

src/main/java/com/billpaymentservice/bbps/repository/OutboundTraceLogRepository.java

@@ -0,0 +1,9 @@
+package com.billpaymentservice.bbps.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.billpaymentservice.bbps.entites.OutboundTraceLog;
+
+public interface OutboundTraceLogRepository extends JpaRepository<OutboundTraceLog, Long> {
+
+}

src/main/java/com/billpaymentservice/bbps/service/MasterDataService.java

@@ -4,6 +4,7 @@ import com.billpaymentservice.bbps.dto.ResponseModel;
 import com.billpaymentservice.bbps.dto.request.BillerDetailRequest;
 import com.billpaymentservice.bbps.dto.request.ContactMasterRequest;
 import com.billpaymentservice.bbps.dto.request.CustomParamRequest;
+import com.billpaymentservice.bbps.dto.request.DispositionRequest;
 import com.billpaymentservice.bbps.dto.request.MasterCategoryRequest;
 import com.billpaymentservice.bbps.dto.request.MasterRequest;
 import com.billpaymentservice.bbps.dto.request.MerchantRequestModel;
@@ -31,7 +32,7 @@ public interface MasterDataService {
 
 	public ResponseModel fetchInitiatingChannel(BillerDetailRequest requestModel);
 
-	public ResponseModel getDispositionDetails();
+	public ResponseModel getDispositionDetails(DispositionRequest dispositionDetailRequest);
 
 	public ResponseModel fetchPlanByCategories(PlanRequest requestModel);
 

src/main/java/com/billpaymentservice/bbps/serviceImpl/MasterDataServiceImpl.java

@@ -1,22 +1,23 @@
+// java
 package com.billpaymentservice.bbps.serviceImpl;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-
 import org.modelmapper.ModelMapper;
 import org.modelmapper.convention.MatchingStrategies;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-
 import com.billpaymentservice.bbps.dto.GeneralResp;
 import com.billpaymentservice.bbps.dto.MasterApiResponse;
 import com.billpaymentservice.bbps.dto.ResponseModel;
 import com.billpaymentservice.bbps.dto.request.BillerDetailRequest;
 import com.billpaymentservice.bbps.dto.request.ContactMasterRequest;
 import com.billpaymentservice.bbps.dto.request.CustomParamRequest;
+import com.billpaymentservice.bbps.dto.request.DispositionRequest;
 import com.billpaymentservice.bbps.dto.request.MasterCategoryRequest;
 import com.billpaymentservice.bbps.dto.request.MasterRequest;
 import com.billpaymentservice.bbps.dto.request.PlanRequest;
@@ -32,11 +33,15 @@ import com.billpaymentservice.bbps.dto.response.PlaneCategoriesResponse;
 import com.billpaymentservice.bbps.entites.BharatConnectMaster;
 import com.billpaymentservice.bbps.entites.BillerDetails;
 import com.billpaymentservice.bbps.entites.DispositionDetails;
+import com.billpaymentservice.bbps.entites.InboundTraceLog;
+import com.billpaymentservice.bbps.entites.OutboundTraceLog;
 import com.billpaymentservice.bbps.exception.CustomException;
 import com.billpaymentservice.bbps.repository.BharatConnectMasterRepository;
 import com.billpaymentservice.bbps.repository.BillerDataRepository;
 import com.billpaymentservice.bbps.repository.DispositionRepository;
+import com.billpaymentservice.bbps.repository.InboundTraceLogRepository;
 import com.billpaymentservice.bbps.repository.MerchantRepository;
+import com.billpaymentservice.bbps.repository.OutboundTraceLogRepository;
 import com.billpaymentservice.bbps.service.MasterDataService;
 import com.billpaymentservice.bbps.util.BBPSConstant;
 import com.billpaymentservice.bbps.util.EntityRelationshipUtil;
@@ -62,10 +67,14 @@ public class MasterDataServiceImpl implements MasterDataService {
 	private static final Logger log = LoggerFactory.getLogger(MasterDataServiceImpl.class);
 	private final HttpService httpService;
 	private final ObjectMapper objectMapper = new ObjectMapper();
+	private final InboundTraceLogRepository inboundTraceLogRepository;
+	private final OutboundTraceLogRepository outboundTraceLogRepository;
 
 	public MasterDataServiceImpl(MerchantRepository merchantRegisterRepo, HttpService httpService,
 			HttpClientApi httpClientApi, Helper helper, BillerDataRepository billerDataRespository,
-			DispositionRepository dispositionRepository, BharatConnectMasterRepository beneficiaryDetailsRepository) {
+			DispositionRepository dispositionRepository, BharatConnectMasterRepository beneficiaryDetailsRepository,
+			InboundTraceLogRepository inboundTraceLogRepository,
+			OutboundTraceLogRepository outboundTraceLogRepository) {
 		this.merchantRegisterRepo = merchantRegisterRepo;
 		this.httpService = httpService;
 		this.httpClientApi = httpClientApi;
@@ -73,13 +82,70 @@ public class MasterDataServiceImpl implements MasterDataService {
 		this.billerDataRespository = billerDataRespository;
 		this.dispositionRepository = dispositionRepository;
 		this.beneficiaryDetailsRepository = beneficiaryDetailsRepository;
+		this.inboundTraceLogRepository = inboundTraceLogRepository;
+		this.outboundTraceLogRepository = outboundTraceLogRepository;
 
 	}
 
+	/* ---------- Trace helper methods ---------- */
+	private InboundTraceLog createInboundLog(String requestId, String txnId, String apiName, String mid,
+			String httpMethod, String requestPayload) {
+		InboundTraceLog inboundLog = new InboundTraceLog(requestId, txnId, apiName, mid == null ? "N/A" : mid,
+				"BBPS_ORG", httpMethod, requestPayload == null ? "N/A" : requestPayload);
+		inboundTraceLogRepository.save(inboundLog);
+		return inboundLog;
+	}
+
+	private void updateInboundLogSuccess(InboundTraceLog inboundLog, String responsePayload, String responseCode) {
+		if (inboundLog == null)
+			return;
+		inboundLog.setResponsePayload(responsePayload);
+		inboundLog.setResponseCode(responseCode);
+		inboundLog.setStatus("SUCCESS");
+		inboundLog.setResponseTime(LocalDateTime.now());
+		inboundTraceLogRepository.save(inboundLog);
+	}
+
+	private void updateInboundLogFailure(InboundTraceLog inboundLog, String responsePayload, String responseCode) {
+		if (inboundLog == null)
+			return;
+		inboundLog.setResponsePayload(responsePayload);
+		inboundLog.setResponseCode(responseCode);
+		inboundLog.setStatus("FAILED");
+		inboundLog.setResponseTime(LocalDateTime.now());
+		inboundTraceLogRepository.save(inboundLog);
+	}
+
+	private OutboundTraceLog createOutboundLog(String txnId, String requestId, String apiName, String url,
+			String httpMethod, String requestPayload) {
+		OutboundTraceLog outboundLog = new OutboundTraceLog(txnId, requestId, apiName, url, httpMethod,
+				requestPayload == null ? "N/A" : requestPayload);
+		outboundTraceLogRepository.save(outboundLog);
+		return outboundLog;
+	}
+
+	private void updateOutboundLogResponse(OutboundTraceLog outboundLog, String responsePayload) {
+		if (outboundLog == null)
+			return;
+		outboundLog.setResponsePayload(responsePayload);
+		outboundLog.setResponseReceiveTime(LocalDateTime.now());
+		outboundTraceLogRepository.save(outboundLog);
+	}
+
+	/* ---------- End helpers ---------- */
+
 	@Override
 	public ResponseModel getMasterData(MasterRequest masterRequest) {
 		LOGGER.info("Request DTO: {}", masterRequest);
 
+		String txnID = helper.generateTxnId(15);
+		String apiName = "GetMasterData";
+		String requestId = masterRequest.getReqId();
+		String requestJson = helper.convertObjectToJson(masterRequest);
+
+		InboundTraceLog inboundLog = createInboundLog(requestId, txnID, apiName, masterRequest.getMid(), "POST",
+				requestJson);
+
 		try {
 			// Merchant Validation
 			helper.validateMerchant(masterRequest.getMid());
@@ -93,26 +159,28 @@ public class MasterDataServiceImpl implements MasterDataService {
 			BharatConnectMaster headersData = beneficiaryDetailsRepository.findByOrgId("ORG001");
 			log.info("Response -: " + headersData);
 			if (headersData == null) {
-				ResponseModel responseModel = new ResponseModel("Tenant Id Is Null", "Not Found",
-						BBPSConstant.BADREQUEST, headersData);
-				return responseModel;
+				updateInboundLogFailure(inboundLog, "Tenant Id Is Null", "NOT_FOUND");
+				return new ResponseModel("Tenant Id Is Null", "Not Found", BBPSConstant.BADREQUEST, headersData);
 			}
 
 			// get full url
 			String fullUrl = masterRegisterUrl + BBPSConstant.MASTER_CATEGORY_URL + headersData.getTenantId();
 			LOGGER.info("Calling external API: {}", fullUrl);
 
+			OutboundTraceLog outboundLog = createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
+
 			Map<String, String> responseMap = httpService.getRequest(fullUrl);
 			String responseData = responseMap.get("data");
 			LOGGER.info("Response Data: {}", responseData);
 
-			ObjectMapper objectMapper = new ObjectMapper();
+			updateOutboundLogResponse(outboundLog, responseData);
+
 			Map<String, Object> dataMap = objectMapper.readValue(responseData,
 					new TypeReference<Map<String, Object>>() {
 					});
 
-			// ✅ Same check as in getBillerByBillerId()
 			if (!dataMap.containsKey("generalResp")) {
+				updateInboundLogFailure(inboundLog, responseData, String.valueOf(dataMap.get("status")));
 				throw new CustomException(String.valueOf(dataMap.get("message")), // message
 						String.valueOf(dataMap.get("status")), // status
 						Integer.parseInt(String.valueOf(dataMap.get("statusCode"))), // statusCode
@@ -126,10 +194,13 @@ public class MasterDataServiceImpl implements MasterDataService {
 			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
 					Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
 
+			updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
+
 			return responseModel;
 
 		} catch (JsonProcessingException e) {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		} catch (CustomException ex) {
 			LOGGER.warn("Merchant validation failed: {}", ex.getMessage());
@@ -140,56 +211,69 @@ public class MasterDataServiceImpl implements MasterDataService {
 	@Override
 	public ResponseModel getBillerByBillerId(BillerDetailRequest billerDetailRequest) {
 
+		helper.validateMerchant(billerDetailRequest.getMid());
+		String txnID = helper.generateTxnId(15);
+		String apiName = "GetBillerByBillerId";
+		String requestId = billerDetailRequest.getReqId();
+		String billerId = billerDetailRequest.getBillerId();
+		String fullUrl = masterRegisterUrl + BBPSConstant.BILLER_DATA_FETCH_URL + billerId;
+
+		String requestJson = helper.convertObjectToJson(billerDetailRequest);
+		InboundTraceLog inboundLog = createInboundLog(requestId, txnID, apiName, billerDetailRequest.getMid(), "POST",
+				requestJson);
+
+		OutboundTraceLog outboundLog = createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
+
+		Map<String, String> responseMap = httpService.getRequest(fullUrl);
+		String responseData = responseMap.get("data");
+		log.info("data is :{}", responseData);
+
+		updateOutboundLogResponse(outboundLog, responseData);
+
 		try {
-
-			helper.validateMerchant(billerDetailRequest.getMid());
-
-//			if (!"Valid".equalsIgnoreCase(validateMerchant)) {
-//				LOGGER.warn("Merchant validation failed: {}", validateMerchant);
-//				return new ResponseModel("Merchant validation failed", validateMerchant, BBPSConstant.BADREQUEST, null);
-//			}
-
-			String billerId = billerDetailRequest.getBillerId();
-			String fullUrl = masterRegisterUrl + BBPSConstant.BILLER_DATA_FETCH_URL + billerId;
-
-			Map<String, String> responseMap = httpService.getRequest(fullUrl);
-			String responseData = responseMap.get("data");
-			log.info("data is :{}", responseData);
-
-			ObjectMapper objectMapper = new ObjectMapper();
-
 			Map<String, Object> dataMap = objectMapper.readValue(responseData,
 					new TypeReference<Map<String, Object>>() {
 					});
+
 			if (!dataMap.containsKey("generalResp")) {
-				throw new CustomException(String.valueOf(dataMap.get("message")), // message
-						String.valueOf(dataMap.get("status")), // status
-						Integer.parseInt(String.valueOf(dataMap.get("statusCode"))), // statusCode (int)
+				updateInboundLogFailure(inboundLog, responseData, String.valueOf(dataMap.get("status")));
+				throw new CustomException(String.valueOf(dataMap.get("message")), String.valueOf(dataMap.get("status")),
+						Integer.parseInt(String.valueOf(dataMap.get("statusCode"))),
 						String.valueOf(dataMap.get("remarks")));
 			}
+
 			BillerDataResponse responseWrapper = objectMapper.convertValue(dataMap, BillerDataResponse.class);
 			GeneralResp generalResp = responseWrapper.getGeneralResp();
+
 			ModelMapper mapper = new ModelMapper();
 			mapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STRICT);
 			BillerDetails entity = mapper.map(responseWrapper.getBillerDAO(), BillerDetails.class);
 			EntityRelationshipUtil.linkBillerRelationships(entity);
-			// billerDataRespository.save(entity);
+
 			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
 					Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
-			return responseModel;
 
+			updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
+
+			return responseModel;
 		} catch (JsonProcessingException e) {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
-		} catch (CustomException ex) {
-			LOGGER.warn("Merchant validation failed: {}", ex.getMessage());
-			return ex.getResponseModel(); // Directly return ResponseModel from exception
 		}
+
 	}
 
 	@Override
 	public ResponseModel getCustomerParamByBillerId(CustomParamRequest customerParamRequest) {
 
+		String txnID = helper.generateTxnId(15);
+		String apiName = "GetCustomerParamByBillerId";
+		String requestId = customerParamRequest.getReqId();
+		String requestJson = helper.convertObjectToJson(customerParamRequest);
+		InboundTraceLog inboundLog = createInboundLog(requestId, txnID, apiName, customerParamRequest.getMid(), "POST",
+				requestJson);
+
 		try {
 			helper.validateMerchant(customerParamRequest.getMid());
 
@@ -201,16 +285,19 @@ public class MasterDataServiceImpl implements MasterDataService {
 			String billerId = customerParamRequest.getBillerId();
 			String fullUrl = masterRegisterUrl + BBPSConstant.CUSTOMPARAM_URL + billerId;
 
+			OutboundTraceLog outboundLog = createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
+
 			Map<String, String> responseMap = httpService.getRequest(fullUrl);
 			String responseData = responseMap.get("data");
 			log.info("data is :{}", responseData);
 
-			ObjectMapper objectMapper = new ObjectMapper();
+			updateOutboundLogResponse(outboundLog, responseData);
 
 			Map<String, Object> dataMap = objectMapper.readValue(responseData,
 					new TypeReference<Map<String, Object>>() {
 					});
 			if (!dataMap.containsKey("generalResp")) {
+				updateInboundLogFailure(inboundLog, responseData, String.valueOf(dataMap.get("status")));
 				throw new CustomException(String.valueOf(dataMap.get("message")), // message
 						String.valueOf(dataMap.get("status")), // status
 						Integer.parseInt(String.valueOf(dataMap.get("statusCode"))), // statusCode (int)
@@ -223,9 +310,12 @@ public class MasterDataServiceImpl implements MasterDataService {
 			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
 					Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
 
+			updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
+
 			return responseModel;
 		} catch (JsonProcessingException e) {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		} catch (CustomException ex) {
 			LOGGER.warn("Merchant validation failed: {}", ex.getMessage());
@@ -237,37 +327,41 @@ public class MasterDataServiceImpl implements MasterDataService {
 	@Override
 	public ResponseModel getContactMaster(ContactMasterRequest contactMasterRequest) {
 
-		// yeh krna hai
 		return new ResponseModel();
 	}
 
 	@Override
 	public ResponseModel fetchMasterDataCategoryWise(MasterCategoryRequest masterRequest) {
 		LOGGER.info("Fetching Master Data Category-wise " + masterRequest);
+
+		String txnID = helper.generateTxnId(15);
+		String apiName = "FetchMasterDataCategoryWise";
+		String requestId = masterRequest.getReqId();
+		String requestJson = helper.convertObjectToJson(masterRequest);
+		InboundTraceLog inboundLog = createInboundLog(requestId, txnID, apiName, masterRequest.getMid(), "POST",
+				requestJson);
+
 		try {
 			helper.validateMerchant(masterRequest.getMid());
 
-//			if (!"Valid".equalsIgnoreCase(validateMerchant)) {
-//				LOGGER.warn("Merchant validation failed: {}", validateMerchant);
-//				return new ResponseModel("Merchant validation failed", validateMerchant, BBPSConstant.BADREQUEST, null);
-//			}
-
 			String fullUrl = String.format("%s%s?billerName=%s&category=%s&page=%d&pagesize=%d", masterRegisterUrl,
 					BBPSConstant.BILLER_URL, masterRequest.getBillerName(), masterRequest.getCategory(),
 					masterRequest.getPageStart(), masterRequest.getPageEnd());
 
+			OutboundTraceLog outboundLog = createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
+
 			Map<String, String> responseMap = httpService.getRequest(fullUrl);
 			String responseData = responseMap.get("data");
 			LOGGER.info("Response Data: {}", responseData);
 
-			ObjectMapper objectMapper = new ObjectMapper();
+			updateOutboundLogResponse(outboundLog, responseData);
 
 			Map<String, Object> dataMap = objectMapper.readValue(responseData,
 					new TypeReference<Map<String, Object>>() {
 					});
 
-			// ✅ Same check as in getBillerByBillerId()
 			if (!dataMap.containsKey("generalResp")) {
+				updateInboundLogFailure(inboundLog, responseData, String.valueOf(dataMap.get("status")));
 				throw new CustomException(String.valueOf(dataMap.get("message")), // message
 						String.valueOf(dataMap.get("status")), // status
 						Integer.parseInt(String.valueOf(dataMap.get("statusCode"))), // statusCode
@@ -281,24 +375,35 @@ public class MasterDataServiceImpl implements MasterDataService {
 			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
 					Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
 
+			updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
+
 			return responseModel;
 		} catch (JsonProcessingException e) {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		} catch (CustomException ex) {
 			LOGGER.warn("Merchant validation failed: {}", ex.getMessage());
 			return ex.getResponseModel(); // Directly return ResponseModel from exception
 		}
-
 	}
 
 	@Override
-	public ResponseModel getDispositionDetails() {
+	public ResponseModel getDispositionDetails(DispositionRequest dispositionDetailRequest) {
+		String txnID = helper.generateTxnId(15);
+		String apiName = "GetDispositionDetails";
+		String requestId = dispositionDetailRequest.getReqId();
+		;
+		InboundTraceLog inboundLog = createInboundLog(requestId, txnID, apiName, dispositionDetailRequest.getMid(),
+				"GET", "N/A");
 
+		String fullUrl = masterRegisterUrl + BBPSConstant.DISPOSTION_URL;
+		OutboundTraceLog outboundLog = createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
+		Map<String, String> responseMap = httpService.getRequest(fullUrl);
+		String responseData = responseMap.get("data");
+
+		updateOutboundLogResponse(outboundLog, responseData);
 		try {
-			String fullUrl = masterRegisterUrl + BBPSConstant.DISPOSTION_URL;
-			Map<String, String> responseMap = httpService.getRequest(fullUrl);
-			String responseData = responseMap.get("data");
 
 			ObjectMapper objectMapper = new ObjectMapper();
 
@@ -306,6 +411,7 @@ public class MasterDataServiceImpl implements MasterDataService {
 					new TypeReference<Map<String, Object>>() {
 					});
 			if (!dataMap.containsKey("generalResp")) {
+				updateInboundLogFailure(inboundLog, responseData, String.valueOf(dataMap.get("status")));
 				throw new CustomException(String.valueOf(dataMap.get("message")), // message
 						String.valueOf(dataMap.get("status")), // status
 						Integer.parseInt(String.valueOf(dataMap.get("statusCode"))), // statusCode (int)
@@ -331,39 +437,45 @@ public class MasterDataServiceImpl implements MasterDataService {
 			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
 					Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
 
+			updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
+
 			return responseModel;
 		} catch (JsonProcessingException e) {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		} catch (CustomException ex) {
 			LOGGER.warn("Merchant validation failed: {}", ex.getMessage());
 			return ex.getResponseModel(); // Directly return ResponseModel from exception
 		}
-
 	}
 
 	@Override
 	public ResponseModel fetchCustomerParamGroup(BillerDetailRequest requestModel) {
 		LOGGER.info("Fetching Master Data Category-wise for MID={}", requestModel.getMid());
 
+		String txnID = helper.generateTxnId(15);
+		String apiName = "FetchCustomerParamGroup";
+		String requestId = requestModel.getReqId();
+		InboundTraceLog inboundLog = createInboundLog(requestId, txnID, apiName, requestModel.getMid(), "POST",
+				helper.convertObjectToJson(requestModel));
+
 		try {
 			helper.validateMerchant(requestModel.getMid());
 
-//			if (!"Valid".equalsIgnoreCase(validateMerchant)) {
-//				LOGGER.warn("Merchant validation failed: {}", validateMerchant);
-//				return new ResponseModel("Merchant validation failed", validateMerchant, BBPSConstant.BADREQUEST, null);
-//			}
-
 			String fullUrl = masterRegisterUrl + BBPSConstant.CUSTOMER_PARAM_GROUP + requestModel.getBillerId();
-			// LOGGER.info("Calling Master API: {}", fullUrl);
+			OutboundTraceLog outboundLog = createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
 
 			Map<String, String> apiResponse = httpService.getRequest(fullUrl);
 			String responseData = apiResponse.get("data").toString();
+			updateOutboundLogResponse(outboundLog, responseData);
+
 			Map<String, Object> dataMap = objectMapper.readValue(responseData,
 					new TypeReference<Map<String, Object>>() {
 					});
 
 			if (!dataMap.containsKey("generalResp")) {
+				updateInboundLogFailure(inboundLog, responseData, String.valueOf(dataMap.get("status")));
 				throw new CustomException(String.valueOf(dataMap.get("message")), // message
 						String.valueOf(dataMap.get("status")), // status
 						Integer.parseInt(String.valueOf(dataMap.get("statusCode"))), // statusCode (int)
@@ -377,10 +489,13 @@ public class MasterDataServiceImpl implements MasterDataService {
 			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
 					Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
 
+			updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
+
 			return responseModel;
 
 		} catch (JsonProcessingException e) {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		} catch (CustomException ex) {
 			LOGGER.warn("Merchant validation failed: {}", ex.getMessage());
@@ -392,26 +507,31 @@ public class MasterDataServiceImpl implements MasterDataService {
 	@Override
 	public ResponseModel fetchAllMasterAmountOption(BillerDetailRequest requestModel) {
 		LOGGER.info("Fetching Master Data Amount List for MID={}", requestModel.getMid());
+
+		String txnID = helper.generateTxnId(15);
+		String apiName = "FetchAllMasterAmountOption";
+		String requestId = requestModel.getReqId();
+		InboundTraceLog inboundLog = createInboundLog(requestId, txnID, apiName, requestModel.getMid(), "POST",
+				helper.convertObjectToJson(requestModel));
+
 		try {
 			helper.validateMerchant(requestModel.getMid());
 
-//			if (!"Valid".equalsIgnoreCase(validateMerchant)) {
-//				LOGGER.warn("Merchant validation failed: {}", validateMerchant);
-//				return new ResponseModel("Merchant validation failed", validateMerchant, BBPSConstant.BADREQUEST, null);
-//			}
-
 			String fullUrl = masterRegisterUrl + BBPSConstant.AMOUNT_OPTIONS + requestModel.getBillerId();
-			// LOGGER.info("Calling Master API: {}", fullUrl);
+			OutboundTraceLog outboundLog = createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
 
 			Map<String, String> apiResponse = httpService.getRequest(fullUrl);
 			log.info("Response" + apiResponse);
 			String responseData = apiResponse.get("data").toString();
 
+			updateOutboundLogResponse(outboundLog, responseData);
+
 			Map<String, Object> dataMap = objectMapper.readValue(responseData,
 					new TypeReference<Map<String, Object>>() {
 					});
 
 			if (!dataMap.containsKey("generalResp")) {
+				updateInboundLogFailure(inboundLog, responseData, String.valueOf(dataMap.get("status")));
 				throw new CustomException(String.valueOf(dataMap.get("message")), // message
 						String.valueOf(dataMap.get("status")), // status
 						Integer.parseInt(String.valueOf(dataMap.get("statusCode"))), // statusCode (int)
@@ -424,10 +544,13 @@ public class MasterDataServiceImpl implements MasterDataService {
 			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
 					Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
 
+			updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
+
 			return responseModel;
 
 		} catch (JsonProcessingException e) {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		} catch (CustomException e) {
 			LOGGER.error("Custom Exception: {}", e.getMessage());
@@ -439,26 +562,31 @@ public class MasterDataServiceImpl implements MasterDataService {
 	@Override
 	public ResponseModel fetchPlanCategorie(BillerDetailRequest requestModel) {
 		LOGGER.info("Fetching Master Data Amount List for MID={}", requestModel.getMid());
+
+		String txnID = helper.generateTxnId(15);
+		String apiName = "FetchPlanCategorie";
+		String requestId = requestModel.getReqId();
+		InboundTraceLog inboundLog = createInboundLog(requestId, txnID, apiName, requestModel.getMid(), "POST",
+				helper.convertObjectToJson(requestModel));
+
 		try {
 			helper.validateMerchant(requestModel.getMid());
 
-//			if (!"Valid".equalsIgnoreCase(validateMerchant)) {
-//				LOGGER.warn("Merchant validation failed: {}", validateMerchant);
-//				return new ResponseModel("Merchant validation failed", validateMerchant, BBPSConstant.BADREQUEST, null);
-//			}
-
 			String fullUrl = masterRegisterUrl + BBPSConstant.PLAN_CATEGORIES + requestModel.getBillerId();
-			// LOGGER.info("Calling Master API: {}", fullUrl);
+			OutboundTraceLog outboundLog = createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
 
 			Map<String, String> apiResponse = httpService.getRequest(fullUrl);
 			log.info("Response" + apiResponse);
 			String responseData = apiResponse.get("data").toString();
 
+			updateOutboundLogResponse(outboundLog, responseData);
+
 			Map<String, Object> dataMap = objectMapper.readValue(responseData,
 					new TypeReference<Map<String, Object>>() {
 					});
 
 			if (!dataMap.containsKey("generalResp")) {
+				updateInboundLogFailure(inboundLog, responseData, String.valueOf(dataMap.get("status")));
 				throw new CustomException(String.valueOf(dataMap.get("message")), // message
 						String.valueOf(dataMap.get("status")), // status
 						Integer.parseInt(String.valueOf(dataMap.get("statusCode"))), // statusCode (int)
@@ -471,10 +599,13 @@ public class MasterDataServiceImpl implements MasterDataService {
 			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
 					Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
 
+			updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
+
 			return responseModel;
 
 		} catch (JsonProcessingException e) {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		} catch (CustomException e) {
 			LOGGER.error("Custom Exception: {}", e.getMessage());
@@ -485,26 +616,33 @@ public class MasterDataServiceImpl implements MasterDataService {
 	@Override
 	public ResponseModel fetchInitiatingChannel(BillerDetailRequest requestModel) {
 		LOGGER.info("Fetching Initiating Channel List for MID={}", requestModel.getMid());
+
+		String txnID = helper.generateTxnId(15);
+		String apiName = "FetchInitiatingChannel";
+		String requestId = requestModel.getReqId();
+		InboundTraceLog inboundLog = createInboundLog(requestId, txnID, apiName, requestModel.getMid(), "POST",
+				helper.convertObjectToJson(requestModel));
+
 		try {
 			helper.validateMerchant(requestModel.getMid());
 
-//			if (!"Valid".equalsIgnoreCase(validateMerchant)) {
-//				LOGGER.warn("Merchant validation failed: {}", validateMerchant);
-//				return new ResponseModel("Merchant validation failed", validateMerchant, BBPSConstant.BADREQUEST, null);
-//			}
-
 			String fullUrl = masterRegisterUrl + BBPSConstant.INITIATING_CHANNEL;
 			LOGGER.info("Calling Master API: {}", fullUrl);
 
+			OutboundTraceLog outboundLog = createOutboundLog(txnID, requestId, apiName, fullUrl, "GET", null);
+
 			Map<String, String> apiResponse = httpService.getRequest(fullUrl);
 			log.info("Response" + apiResponse);
 			String responseData = apiResponse.get("data").toString();
 
+			updateOutboundLogResponse(outboundLog, responseData);
+
 			Map<String, Object> dataMap = objectMapper.readValue(responseData,
 					new TypeReference<Map<String, Object>>() {
 					});
 
 			if (!dataMap.containsKey("generalResp")) {
+				updateInboundLogFailure(inboundLog, responseData, String.valueOf(dataMap.get("status")));
 				throw new CustomException(String.valueOf(dataMap.get("message")), // message
 						String.valueOf(dataMap.get("status")), // status
 						Integer.parseInt(String.valueOf(dataMap.get("statusCode"))), // statusCode (int)
@@ -517,10 +655,13 @@ public class MasterDataServiceImpl implements MasterDataService {
 			ResponseModel responseModel = new ResponseModel(generalResp.getMessage(), generalResp.getStatus(),
 					Integer.parseInt(generalResp.getStatusCode()), responseWrapper);
 
+			updateInboundLogSuccess(inboundLog, responseData, generalResp.getStatus());
+
 			return responseModel;
 
 		} catch (JsonProcessingException e) {
 			log.error("Error parsing responseData JSON: {}", e.getMessage());
+			updateInboundLogFailure(inboundLog, e.getMessage(), "JSON_ERROR");
 			throw new CustomException("Invalid JSON received from API");
 		} catch (CustomException e) {
 			LOGGER.error("Custom Exception: {}", e.getMessage());
@@ -547,7 +688,7 @@ public class MasterDataServiceImpl implements MasterDataService {
 					requestModel.getCircle() != null ? "&circle=" + requestModel.getCircle() : "",
 					requestModel.getPage(), requestModel.getPagesize());
 
-			//String fullUrl = masterRegisterUrl + BBPSConstant.PLANS_URL + url;
+			// String fullUrl = masterRegisterUrl + BBPSConstant.PLANS_URL + url;
 			LOGGER.info("Calling Master API: {}", url);
 
 			Map<String, String> apiResponse = httpService.getRequest(url);

src/main/java/com/billpaymentservice/bbps/serviceImpl/PaymentServiceImpl.java

@@ -117,7 +117,7 @@ public class PaymentServiceImpl implements PaymentService {
 			paymentRepository.save(entity);
 			TransactionStatusRequest transactionStatusRequest=new TransactionStatusRequest();
 			//call the checkTransactionStatus
-			transactionStatusRequest.setTxnId(billPaymentResponse.getTxnId());
+			transactionStatusRequest.setTxnId(helper.generateTxnId(15));
 			System.out.println(transactionStatusRequest);
 			 responseModel= checkTrasactionStatus(transactionStatusRequest);
 		} catch (Exception e) {

src/main/java/com/billpaymentservice/bbps/util/Helper.java

@@ -1,5 +1,6 @@
 package com.billpaymentservice.bbps.util;
 
+import java.security.SecureRandom;
 import java.util.function.Function;
 
 import org.slf4j.Logger;
@@ -10,12 +11,23 @@ import com.billpaymentservice.bbps.dto.ResponseModel;
 import com.billpaymentservice.bbps.entites.BBPSMastersData;
 import com.billpaymentservice.bbps.exception.CustomException;
 import com.billpaymentservice.bbps.repository.BBPSMasterDataRepo;
+import com.billpaymentservice.bbps.dto.request.BillerDetailRequest;
+import com.billpaymentservice.bbps.dto.request.MerchantRequestModel;
+import com.billpaymentservice.bbps.entites.BBPSMerchantValidation;
+import com.billpaymentservice.bbps.exception.CustomException;
+import com.billpaymentservice.bbps.repository.MerchantRepository;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Component
 public class Helper {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(Helper.class);
 
+	private static final String CHARACTERS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+	private static final SecureRandom secureRandom = new SecureRandom();
+	private final ObjectMapper objectMapper = new ObjectMapper();
+
 	private final BBPSMasterDataRepo bbpsMasterDataRepo;
 
 	// Constructor Injection
@@ -148,4 +160,26 @@ public class Helper {
 		// Agar exception nahi throw hua, merchant valid hai
 	}
 
+	public static String generateTxnId(int n) {
+		StringBuilder sb = new StringBuilder(n);
+
+		for (int i = 0; i < n; i++) {
+			int index = secureRandom.nextInt(CHARACTERS.length());
+			sb.append(CHARACTERS.charAt(index));
+		}
+		return sb.toString(); // Prefix
+	}
+
+	public String convertObjectToJson(Object obj) {
+		if (obj == null)
+			return "null";
+		try {
+			return new com.fasterxml.jackson.databind.ObjectMapper().writeValueAsString(obj);
+		} catch (com.fasterxml.jackson.core.JsonProcessingException e) {
+			// log appropriately (use your existing logger)
+			System.err.println("JSON conversion failed: " + e.getMessage());
+			return "{}"; // or "N/A" depending on your needs
+		}
+	}
+
 }

src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.application.name=bbps
 
 
 # Server port
-server.port=8080
+server.port=9090
 
 # JPA & Hibernate
 spring.jpa.hibernate.ddl-auto=update
@@ -13,7 +13,7 @@ spring.jpa.properties.hibernate.default_schema=public
 # DataSource
 spring.datasource.url=jdbc:postgresql://localhost:5432/BBPS
 spring.datasource.username=postgres
-spring.datasource.password=UAT@DB_2025
+spring.datasource.password=thakur@123
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource