resolved Conflict

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

@@ -3,6 +3,10 @@ package com.billpaymentservice.bbps.controller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
+
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -13,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.billpaymentservice.bbps.dto.ResponseModel;
 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.service.ComplainService;
 
@@ -31,6 +36,13 @@ public class ComplainController {
 		this.complainService = complainService;
 	}
 
+	@PostMapping(value = "/addComplain", 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("/checkComplaintStatus")
 	public ResponseEntity<ResponseModel> getComplaintStatus(@RequestBody ComplainStatusRequest request) {
 		log.info("Received complaint status request for complaintId: {}", request.getComplaintId());
@@ -51,7 +63,7 @@ public class ComplainController {
 		ResponseModel response = complainService.viewComplaintHistory(request);
 		return ResponseEntity.ok(response);
 	}
-	
+
 	@PostMapping("/closeComplaint")
 	public ResponseEntity<ResponseModel> closeComplaint(@RequestBody CloseComplaintRequest request) {
 		log.info("Received complaint Close Complaint request for complaintId: {}", request.getComplaintId());