update code complaint code

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

@@ -6,7 +6,6 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,11 +13,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.billpaymentservice.bbps.dto.ResponseModel;
 import com.billpaymentservice.bbps.dto.request.AllMasterOptionsRequest;
-import com.billpaymentservice.bbps.dto.request.CloseComplaintRequest;
 import com.billpaymentservice.bbps.dto.request.ComplainStatusRequest;
 import com.billpaymentservice.bbps.dto.request.ComplaintRequestDTO;
-import com.billpaymentservice.bbps.dto.request.ReOpenComplain;
-import com.billpaymentservice.bbps.dto.request.ViewComplainByIdRequest;
+import com.billpaymentservice.bbps.dto.request.GetTicketLatestStausRequest;
+import com.billpaymentservice.bbps.dto.request.ViewAllComplaintsTicketsRequest;
 import com.billpaymentservice.bbps.service.ComplainService;
 
 @RestController
@@ -36,44 +34,30 @@ public class ComplainController {
 		this.complainService = complainService;
 	}
     
-	@PostMapping(value = "/addComplain", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	@PostMapping(value = "/addComplainTicket", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<ResponseModel> addComplain(@Validated @RequestBody ComplaintRequestDTO complainRequestDTO) {
 
 		ResponseModel response = complainService.addComplain(complainRequestDTO);
 		return ResponseEntity.ok(response);
 	}
 
-	@PostMapping(value = "/checkComplaintStatus", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<ResponseModel> getComplaintStatus(@Validated @RequestBody ComplainStatusRequest request) {
-		log.info("Received complaint status request for complaintId: {}", request.getComplaintId());
+	@PostMapping(value = "/checkTicketStatus", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<ResponseModel> getComplaintStatus(@Validated @RequestBody GetTicketLatestStausRequest request) {
+		log.info("Received complaint status request for complaintId: {}", request.getTicketId());
 		ResponseModel response = complainService.getComplaintStatus(request);
 		return ResponseEntity.ok(response);
 	}
 
-	@PostMapping(value = "/reOpenComplaint", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<ResponseModel> reOpenComplaint(@Validated @RequestBody ReOpenComplain request) {
-		log.info("Received ReOpen Complaint request for complaintId: {}", request.getComplaintId());
-		ResponseModel response = complainService.reOpenComplaint(request);
-		return ResponseEntity.ok(response);
-	}
-
-	@PostMapping(value = "/viewComplainsHistory", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	@PostMapping(value = "/viewComplainsTicketHistory", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<ResponseModel> viewComplaintHistory(@Validated @RequestBody ComplainStatusRequest request) {
-		log.info("Received complaint View Complaint History request for complaintId: {}", request.getComplaintId());
+		log.info("Received complaint View Complaint History request for ticketId: {}", request.getTicketId());
 		ResponseModel response = complainService.viewComplaintHistory(request);
 		return ResponseEntity.ok(response);
 	}
 
-	@PostMapping(value = "/closeComplaint", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<ResponseModel> closeComplaint(@Validated @RequestBody CloseComplaintRequest request) {
-		log.info("Received complaint Close Complaint request for complaintId: {}", request.getComplaintId());
-		ResponseModel response = complainService.closeComplaint(request);
-		return ResponseEntity.ok(response);
-	}
-    
-	@PostMapping("/viewComplaintsById")
-	public ResponseEntity<ResponseModel> viewComplaintById(@Validated @RequestBody ViewComplainByIdRequest request) {
-		log.info("Received complaint View Complaint By ID request for complaintId: {}", request.getComplaintId());
+	@PostMapping("/viewTicketById")
+	public ResponseEntity<ResponseModel> viewComplaintById(@Validated @RequestBody ComplainStatusRequest request) {
+		log.info("Received complaint View Complaint By ID request for complaintId: {}", request.getTicketId());
 		ResponseModel response = complainService.viewComplaintById(request);
 		return ResponseEntity.ok(response);
 	}
@@ -82,4 +66,11 @@ public class ComplainController {
 	public ResponseEntity<ResponseModel> getAllStatuses(@Validated @RequestBody AllMasterOptionsRequest request) {
 	    return ResponseEntity.ok(complainService.getAllActiveStatuses(request));
 	}
+	
+	@PostMapping("/viewAllComplaints")
+	public ResponseEntity<ResponseModel> viewAllComplaints(@RequestBody ViewAllComplaintsTicketsRequest request) {
+		log.info("Received request complaint View All Complaints for Status Type={}", request.getStatusType());
+		ResponseModel response = complainService.ViewAllComplaints(request);
+		return ResponseEntity.ok(response);
+	}
 }

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

@@ -26,7 +26,7 @@ import jakarta.validation.Valid;
 @RequestMapping("/masterData")
 @RestController
 @Validated
-@CrossOrigin(origins="*")
+@CrossOrigin(origins = "*")
 public class MasterDataController {
 
 	private static final Logger log = LoggerFactory.getLogger(MasterDataController.class);
@@ -39,8 +39,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(
-	        @Valid @RequestBody BillerDetailRequest billerDetailRequest) {
+	public ResponseEntity<ResponseModel> getBillerDetails(@Valid @RequestBody BillerDetailRequest billerDetailRequest) {
 
 		log.info("Received biller details request for billerId: {}", billerDetailRequest.getBillerId());
 
@@ -61,6 +60,12 @@ public class MasterDataController {
 		return ResponseEntity.ok(masterDataService.getDispositionDetails(dispositionDetailRequest));
 	}
 
+	@PostMapping(value = "/getTicketDispositions", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<ResponseModel> getTicketDispositions(
+			@Validated @RequestBody DispositionRequest dispositionDetailRequest) {
+		return ResponseEntity.ok(masterDataService.getTicketDispositions(dispositionDetailRequest));
+	}
+
 	/**
 	 * Get CustomerParam by billerId.The parameter is different from the data we are
 	 * getting in the billerDetail
@@ -74,23 +79,30 @@ public class MasterDataController {
 
 		return ResponseEntity.ok(masterDataService.getCustomerParamByBillerId(customerParamRequest));
 	}
+
 	/**
-	 * Get All Master Data .The parameter is different from the data we are getting Made By Arham
-	 * in the MasterRequest
+	 * Get All Master Data .The parameter is different from the data we are getting
+	 * Made By Arham in the MasterRequest
 	 **/
 	@PostMapping("/getAllMastersData")
 	public ResponseModel fetchMasterData(@Validated @RequestBody MasterRequest masterRequest) {
 		return masterDataService.getMasterData(masterRequest);
 	}
 
-	/** POST Master CategoryResponseList Wise API Fetch CategoryResponseList Wise from BBPS URL Made By Arham **/
+	/**
+	 * POST Master CategoryResponseList Wise API Fetch CategoryResponseList Wise
+	 * from BBPS URL Made By Arham
+	 **/
 	@PostMapping(value = "/getMasterCategoryWise", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<ResponseModel> getMasterDataCategoryWise(
-			 @Valid @RequestBody MasterCategoryRequest masterRequest) {
+			@Valid @RequestBody MasterCategoryRequest masterRequest) {
 		return ResponseEntity.ok(masterDataService.fetchMasterDataCategoryWise(masterRequest));
 	}
 
-	/** POST Customer Param Groups API Fetch CategoryResponseList Wise from BBPS URL Made By Arham**/
+	/**
+	 * POST Customer Param Groups API Fetch CategoryResponseList Wise from BBPS URL
+	 * Made By Arham
+	 **/
 	@PostMapping(value = "/customerParamGroupsByBillerId", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<ResponseModel> getCustomerParamGroup(
 			@Validated @RequestBody BillerDetailRequest requestModel) {
@@ -98,8 +110,8 @@ public class MasterDataController {
 	}
 
 	/**
-	 * POST Fetch All AMount Options By Biller Id API Fetch CategoryResponseList Wise from BBPS
-	 * URL Made By Arham
+	 * POST Fetch All AMount Options By Biller Id API Fetch CategoryResponseList
+	 * Wise from BBPS URL Made By Arham
 	 **/
 	@PostMapping(value = "/fetchAmountOptionsByBillerId", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<ResponseModel> fetchAllMasterAmountOptionsByBillerId(
@@ -108,8 +120,8 @@ public class MasterDataController {
 	}
 
 	/**
-	 * POST Fetch All AMount Options By Biller Id API Fetch CategoryResponseList Wise from BBPS
-	 * URL Made By Arham
+	 * POST Fetch All AMount Options By Biller Id API Fetch CategoryResponseList
+	 * Wise from BBPS URL Made By Arham
 	 **/
 	@PostMapping(value = "/fetchAllPlanCategoriesByBillerId", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<ResponseModel> fetchPlanCategories(@Validated @RequestBody BillerDetailRequest requestModel) {
@@ -117,21 +129,21 @@ public class MasterDataController {
 	}
 
 	/**
-	 * POST Fetch Initiating Channel API Fetch CategoryResponseList Wise from BBPS URL Made By Arham
+	 * POST Fetch Initiating Channel API Fetch CategoryResponseList Wise from BBPS
+	 * URL Made By Arham
 	 **/
 	@PostMapping(value = "/initiatingChannel", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<ResponseModel> initiatingChannel(@Validated @RequestBody BillerDetailRequest requestModel) {
 		return ResponseEntity.ok(masterDataService.fetchInitiatingChannel(requestModel));
 	}
-	
+
 	/**
-	 * POST Fetch All AMount Options By Biller Id API Fetch CategoryResponseList Wise from BBPS Made By Arham
-	 * URL
+	 * POST Fetch All AMount Options By Biller Id API Fetch CategoryResponseList
+	 * Wise from BBPS Made By Arham URL
 	 **/
 	@PostMapping(value = "/fetchPlanByCategoryName", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<ResponseModel> fetchPlanByCategory(@Validated @RequestBody PlanRequest requestModel) {
 		return ResponseEntity.ok(masterDataService.fetchPlanByCategories(requestModel));
 	}
 
-	
 }

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

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.billpaymentservice.bbps.dto.ResponseModel;
+import com.billpaymentservice.bbps.dto.request.BillFetchbyClientIdRequest;
 import com.billpaymentservice.bbps.dto.request.BillPaymentRequest;
 import com.billpaymentservice.bbps.dto.request.TransactionStatusRequest;
 import com.billpaymentservice.bbps.service.PaymentService;
@@ -18,37 +19,37 @@ import com.billpaymentservice.bbps.service.PaymentService;
 public class PaymentController {
 
 	/**
-     * Fetches bill details from external BBPS service
-     */
-	
+	 * Fetches bill details from external BBPS service
+	 */
+
 	private final PaymentService paymentService;
+
 	public PaymentController(PaymentService paymentService) {
-		this.paymentService=paymentService;
+		this.paymentService = paymentService;
 	}
-	
-    @PostMapping(
-        value = "/intiatePayment",
-        consumes = MediaType.APPLICATION_JSON_VALUE,
-        produces = MediaType.APPLICATION_JSON_VALUE
-    )
-    public ResponseEntity<ResponseModel> requestBillFetch(
-            @Validated @RequestBody BillPaymentRequest billPaymentRequest) {
 
-        ResponseModel response = paymentService.initiatePayment(billPaymentRequest);
-        return ResponseEntity.ok(response);
-    }
-    
-    @PostMapping(
-            value = "/checkTransactionStatus",
-            consumes = MediaType.APPLICATION_JSON_VALUE,
-            produces = MediaType.APPLICATION_JSON_VALUE
-        )
-        public ResponseEntity<ResponseModel> checkTransactionStatus(
-                @Validated @RequestBody TransactionStatusRequest transactionStatusRequest) {
+	@PostMapping(value = "/intiatePayment", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<ResponseModel> requestBillFetch(
+			@Validated @RequestBody BillPaymentRequest billPaymentRequest) {
+
+		ResponseModel response = paymentService.initiatePayment(billPaymentRequest);
+		return ResponseEntity.ok(response);
+	}
+
+	@PostMapping(value = "/checkTransactionStatus", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<ResponseModel> checkTransactionStatus(
+			@Validated @RequestBody TransactionStatusRequest transactionStatusRequest) {
+
+		ResponseModel response = paymentService.checkTrasactionStatus(transactionStatusRequest);
+		return ResponseEntity.ok(response);
+	}
+
+	@PostMapping(value = "/billFetchbyClientId", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<ResponseModel> checkBillFetchbyClientId(
+			@Validated @RequestBody BillFetchbyClientIdRequest transactionStatusRequest) {
+
+		ResponseModel response = paymentService.checkBillFetchbyClientId(transactionStatusRequest);
+		return ResponseEntity.ok(response);
+	}
 
-            ResponseModel response = paymentService.checkTrasactionStatus(transactionStatusRequest);
-            return ResponseEntity.ok(response);
-        }
-    
-    
 }