merged code with feature1

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

@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.billpaymentservice.bbps.dto.ResponseModel;
 import com.billpaymentservice.bbps.dto.request.BillFetchByBillIdRequest;
+import com.billpaymentservice.bbps.dto.request.BillFetchByClientIdRequest;
+import com.billpaymentservice.bbps.dto.request.BillValidateByClientIdRequest;
 import com.billpaymentservice.bbps.dto.request.FetchBillRequest;
 import com.billpaymentservice.bbps.dto.request.FetchBillValidatestRequest;
 import com.billpaymentservice.bbps.service.AgentService;
@@ -68,5 +70,21 @@ public class AgentController {
 		ResponseModel response = agentService.initiateBillValidateByBillId(billRequest);
 		return ResponseEntity.ok(response);
 	}
+	
+	@PostMapping(value = "/fetchBillByClientReqId", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<ResponseModel> fetchBillByClientReqId(
+			@Validated @RequestBody  BillFetchByClientIdRequest billFetchByClientIdRequest) {
+
+		ResponseModel response = agentService.fetchBillByClientReqId(billFetchByClientIdRequest);
+		return ResponseEntity.ok(response);
+	}
+	
+	@PostMapping(value = "/fetchBillValidateByClientReqId", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<ResponseModel> fetchBillValidateByClientReqId(
+			@Validated @RequestBody  BillValidateByClientIdRequest billValidateByClientIdRequest) {
+
+		ResponseModel response = agentService.fetchBillValidateByClientReqId(billValidateByClientIdRequest);
+		return ResponseEntity.ok(response);
+	}
 
 }

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

@@ -18,6 +18,7 @@ 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.ViewAllComplaintsRequest;
 import com.billpaymentservice.bbps.dto.request.ViewComplainByIdRequest;
 import com.billpaymentservice.bbps.service.ComplainService;
 
@@ -82,4 +83,12 @@ public class ComplainController {
 	public ResponseEntity<ResponseModel> getAllStatuses(@Validated @RequestBody AllMasterOptionsRequest request) {
 	    return ResponseEntity.ok(complainService.getAllActiveStatuses(request));
 	}
+	@PostMapping("/viewAllComplaints")
+	public ResponseEntity<ResponseModel> viewAllComplaints(@RequestBody ViewAllComplaintsRequest 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/PaymentController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.billpaymentservice.bbps.dto.ResponseModel;
 import com.billpaymentservice.bbps.dto.request.BillPaymentRequest;
 import com.billpaymentservice.bbps.dto.request.TransactionStatusRequest;
+import com.billpaymentservice.bbps.dto.request.TrasactionStatusByClientReqIdRequest;
 import com.billpaymentservice.bbps.service.PaymentService;
 
 @RestController
@@ -50,5 +51,17 @@ public class PaymentController {
             return ResponseEntity.ok(response);
         }
     
+    @PostMapping(
+			value = "/checkTransactionStatusByClientReqId",
+			consumes = MediaType.APPLICATION_JSON_VALUE,
+			produces = MediaType.APPLICATION_JSON_VALUE
+		)
+		public ResponseEntity<ResponseModel> checkTransactionStatusByClientReqId(
+				@Validated @RequestBody TrasactionStatusByClientReqIdRequest transactionStatusRequest) {
+
+			ResponseModel response = paymentService.checkTrasactionStatusByClientReqId(transactionStatusRequest);
+			return ResponseEntity.ok(response);
+		}
+    
     
 }