Beneficiaries consent

pom.xml

@@ -171,7 +171,6 @@
 			<artifactId>hibernate-jpa-2.0-api</artifactId>
 			<version>1.0.1.Final</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-cache</artifactId>
@@ -503,7 +502,7 @@
 	</dependencies>
 
 	<build>
-		<finalName>commonapi-v3.0.0</finalName>
+		<finalName>commonapi-v1.0</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

src/main/java/com/iemr/common/controller/beneficiaryConsent/BeneficiaryConsentController.java

@@ -0,0 +1,100 @@
+package com.iemr.common.controller.beneficiaryConsent;
+
+import com.iemr.common.data.beneficiaryConsent.BeneficiaryConsentRequest;
+import com.iemr.common.data.otp.OTPRequestParsor;
+import com.iemr.common.service.beneficiaryOTPHandler.BeneficiaryOTPHandler;
+import com.iemr.common.service.otp.OTPHandler;
+import com.iemr.common.utils.mapper.InputMapper;
+import com.iemr.common.utils.response.OutputResponse;
+import io.lettuce.core.dynamic.annotation.Param;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.ws.rs.core.MediaType;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+public class BeneficiaryConsentController {
+    final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+    @Autowired
+    private BeneficiaryOTPHandler beneficiaryOTPHandler;
+
+    @Operation(summary = "Send Consent")
+    @RequestMapping(value = "/sendConsent", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+    public String sendConsent(@Param(value = "{\"mobNo\":\"String\"}") @RequestBody String requestOBJ) {
+        logger.info(requestOBJ.toString());
+
+        OutputResponse response = new OutputResponse();
+
+        try {
+            BeneficiaryConsentRequest obj = InputMapper.gson().fromJson(requestOBJ, BeneficiaryConsentRequest.class);
+
+            String success = beneficiaryOTPHandler.sendOTP(obj); // method name unchanged if internal logic still uses 'OTP'
+            logger.info(success.toString());
+            if (success.contains("otp"))
+                response.setResponse(success);
+            else
+                response.setError(500, "failure");
+
+        } catch (Exception e) {
+            logger.error("error in sending Consent : " + e);
+            response.setError(500, "error : " + e);
+        }
+        return response.toString();
+    }
+
+    @Operation(summary = "Validate Consent")
+    @RequestMapping(value = "/validateConsent", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+    public String validateConsent(@Param(value = "{\"mobNo\":\"String\",\"otp\":\"Integer\"}") @RequestBody String requestOBJ) {
+
+        OutputResponse response = new OutputResponse();
+
+        try {
+            OTPRequestParsor obj = InputMapper.gson().fromJson(requestOBJ, OTPRequestParsor.class);
+
+            JSONObject responseOBJ = beneficiaryOTPHandler.validateOTP(obj);
+            if (responseOBJ != null)
+                response.setResponse(responseOBJ.toString());
+            else
+                response.setError(500, "failure");
+
+        } catch (Exception e) {
+            logger.error("error in validating Consent : " + e);
+            response.setError(500, "error : " + e);
+        }
+        return response.toString();
+    }
+
+    @Operation(summary = "Resend Consent")
+    @RequestMapping(value = "/resendConsent", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+    public String resendConsent(@Param(value = "{\"mobNo\":\"String\"}") @RequestBody String requestOBJ) {
+        logger.info(requestOBJ.toString());
+
+        OutputResponse response = new OutputResponse();
+
+        try {
+            OTPRequestParsor obj = InputMapper.gson().fromJson(requestOBJ, OTPRequestParsor.class);
+
+            String success = beneficiaryOTPHandler.resendOTP(obj);
+            logger.info(success.toString());
+
+            if (success.contains("otp"))
+                response.setResponse(success);
+            else
+                response.setError(500, "failure");
+
+        } catch (Exception e) {
+            logger.error("error in re-sending Consent : " + e);
+            response.setError(500, "error : " + e);
+        }
+        return response.toString();
+    }
+
+
+}
+
+

src/main/java/com/iemr/common/controller/grievance/GrievanceController.java

@@ -234,6 +234,7 @@ public String completeGrievanceCall(
 		  }
 
 
+
 		  @Operation(summary = "Get Grievance Details with Remarks")
 		  @PostMapping(value = "/getCompleteGrievanceDetails", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 		  public String getGrievanceDetailsWithRemarks(@RequestBody String request) {

src/main/java/com/iemr/common/controller/otp/OTPGateway.java

@@ -55,14 +55,16 @@
 	@Operation(summary = "Send OTP")
 	@RequestMapping(value = "/sendOTP", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String sendOTP(@Param(value = "{\"mobNo\":\"String\"}") @RequestBody String requestOBJ) {
+		logger.info(requestOBJ.toString());
 
 		OutputResponse response = new OutputResponse();
 
 		try {
 			OTPRequestParsor obj = InputMapper.gson().fromJson(requestOBJ, OTPRequestParsor.class);
 
 			String success = otpHandler.sendOTP(obj);
-			if (success.equalsIgnoreCase("success"))
+			logger.info(success.toString());
+			if (success.contains("otp"))
 				response.setResponse(success);
 			else
 				response.setError(5000, "failure");
@@ -102,14 +104,17 @@
 	@Operation(summary = "Resend OTP")
 	@RequestMapping(value = "/resendOTP", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String resendOTP(@Param(value = "{\"mobNo\":\"String\"}") @RequestBody String requestOBJ) {
+		logger.info(requestOBJ.toString());
 
 		OutputResponse response = new OutputResponse();
 
 		try {
 			OTPRequestParsor obj = InputMapper.gson().fromJson(requestOBJ, OTPRequestParsor.class);
 
 			String success = otpHandler.resendOTP(obj);
-			if (success.equalsIgnoreCase("success"))
+			logger.info(success.toString());
+
+			if (success.contains("otp"))
 				response.setResponse(success);
 			else
 				response.setError(5000, "failure");

src/main/java/com/iemr/common/data/beneficiaryConsent/BeneficiaryConsentRequest.java

@@ -0,0 +1,12 @@
+package com.iemr.common.data.beneficiaryConsent;
+
+import lombok.Data;
+
+@Data
+public class BeneficiaryConsentRequest {
+    private String mobNo;
+    private int otp;
+    private String userName;
+    private String  designation;
+
+}

src/main/java/com/iemr/common/data/grievance/GrievanceCallRequest.java

@@ -11,6 +11,8 @@ public class GrievanceCallRequest {
       Long beneficiaryRegID;
       Integer callTypeID;
       Long benCallID;
+      Integer providerServiceMapId;
+
       Integer providerServiceMapID;
       String createdBy;
 

src/main/java/com/iemr/common/data/grievance/GrievanceDetails.java

@@ -183,6 +183,7 @@ public GrievanceDetails(Long gwid, Long grievanceId, Long beneficiaryRegID, Long
 		this.severety = severety;
 		this.level = level;
 		this.state = state;
+		this.agentid = agentID;
 		this.userID = userid;
 		this.isAllocated = isAllocated;
 		this.retryNeeded = retryNeeded;

src/main/java/com/iemr/common/dto/identity/CommonIdentityDTO.java

@@ -61,6 +61,7 @@ public class CommonIdentityDTO {
 	private Integer educationId;
 	private String education;
 	private Boolean emergencyRegistration = false;
+	private Boolean isConsent;
 	private Integer healthCareWorkerId;
 	private String healthCareWorker;
 	private String fatherName;

src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java

@@ -77,6 +77,10 @@ public class BeneficiaryModel implements Comparable<BeneficiaryModel> {
 	// private List<OutboundCallRequestModel> outboundCallRequests;
 	// private List<BeneficiaryCallModel> beneficiaryCalls;
 	// private List<FeedbackDetailsModel> feedbacks;
+	@Expose
+	private Boolean isConsent=false;
+
+
 	@Expose
 	private String beneficiaryID;
 	@Expose

src/main/java/com/iemr/common/repository/callhandling/IEMRCalltypeRepositoryImplCustom.java

@@ -88,6 +88,8 @@ Set<Object[]> getOutboundCallTypes(@Param("providerServiceMapID") Integer provid
 	@Query("select callType from CallType callType where deleted = false and callTypeID = :callTypeID")
 	CallType getCallTypeDetails(@Param("callTypeID") Integer callTypeID);
 
+	@Query("select callType, callGroupType from CallType "
+
 	@Query("select callGroupType, callType from CallType "
 			+ "where callTypeID = :callTypeID")
 	Set<Object[]> getCallDetails(@Param("callTypeID") Integer callTypeID);

src/main/java/com/iemr/common/repository/grievance/GrievanceDataRepo.java

@@ -66,15 +66,28 @@ List<GrievanceDetails> findGrievancesByUserAndLanguage(@Param("userID") Integer
 
 	@Modifying
 	@Transactional
+
+	@Query("UPDATE GrievanceDetails g SET g.userID = NULL WHERE g.grievanceId = :grievanceId AND g.userID = :userID")
+	int unassignGrievance(@Param("grievanceId") Long grievanceId, @Param("userID") Integer userID);
+
 	@Query("UPDATE GrievanceDetails g SET g.userID = :userID WHERE g.gwid = :gwid")
 	int unassignGrievance(@Param("userID") Integer userID, @Param("gwid") Long gwid);
 
+
 	@Modifying
 	@Transactional
 	@Query("UPDATE GrievanceDetails g SET g.isAllocated = :isAllocated WHERE g.gwid = :gwid")
 	int updateGrievanceAllocationStatus(@Param("gwid") Long gwid,
 			@Param("isAllocated") Boolean isAllocated);
 
+
+	@Query("Select grievance.preferredLanguage, count(grievance) from GrievanceDetails grievance where grievance.isAllocated=false group by grievance.preferredLanguage")
+	public Set<Object[]> fetchUnallocatedGrievanceCount();
+
+	@Modifying
+	@Query("UPDATE GrievanceDetails g SET g.complaintResolution = :complaintResolution, g.remarks = :remarks, g.modifiedBy =  :modifiedBy "
+	       + "WHERE g.complaintID = :complaintID AND g.beneficiaryRegID = :beneficiaryRegID AND g.providerServiceMapID = :providerServiceMapID"
+
 	@Query("Select grievance.preferredLanguage, count(grievance) from GrievanceDetails grievance where grievance.isAllocated=false "
 			+ "AND grievance.createdDate BETWEEN :filterStartDate AND :filterEndDate "
 			+ "group by grievance.preferredLanguage")
@@ -91,24 +104,31 @@ public Set<Object[]> fetchUnallocatedGrievanceCount(
 	int updateComplaintResolution(@Param("complaintResolution") String complaintResolution,
 	                              @Param("remarks") String remarks,
 	                              @Param("modifiedBy") String modifiedBy,
+
 	                              @Param("benCallID") Long benCallID,
 	                              @Param("complaintID") String complaintID,
 	                              @Param("beneficiaryRegID") Long beneficiaryRegID,
 	                              @Param("userID") Integer userID);
 
 	@Modifying
+	@Query("UPDATE GrievanceDetails g SET g.complaintResolution = :complaintResolution, g.modifiedBy =  :modifiedBy "
+	       + "WHERE g.complaintID = :complaintID AND g.beneficiaryRegID = :beneficiaryRegID AND g.providerServiceMapID = :providerServiceMapID"
+
 	@Query("UPDATE GrievanceDetails g SET g.complaintResolution = :complaintResolution, g.modifiedBy =  :modifiedBy, "
 			+ "g.benCallID = :benCallID "
 			+ "WHERE g.complaintID = :complaintID AND g.beneficiaryRegID = :beneficiaryRegID "
 			+ " AND g.userID = :userID")
 	@Transactional
 	int updateComplaintResolution(@Param("complaintResolution") String complaintResolution,
 			   					  @Param("modifiedBy") String modifiedBy,
+
 	                              @Param("benCallID") Long benCallID,
 	                              @Param("complaintID") String complaintID,
 	                              @Param("beneficiaryRegID") Long beneficiaryRegID,
 	                              @Param("userID") Integer userID);
 
+
+
 	@Query(" Select grievance.callCounter, grievance.retryNeeded,grievance.complaintResolution FROM GrievanceDetails grievance where grievance.complaintID = :complaintID")
 	public List<Object[]> getCallCounter(@Param("complaintID") String complaintID);
 
@@ -133,6 +153,7 @@ public int updateCallCounter(@Param("callCounter") Integer callCounter,
 	                              @Param("complaintID") String complaintID,
 	                              @Param("beneficiaryRegID") Long beneficiaryRegID,
 	                              @Param("userID") Integer userID);
+
 
 	@Query("SELECT g FROM GrievanceDetails g WHERE "
 	        + "(g.state = :state OR :state IS NULL) "

src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java

@@ -37,7 +37,6 @@
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
 import com.iemr.common.data.beneficiary.Beneficiary;
 import com.iemr.common.data.mctshistory.MctsOutboundCallDetail;
@@ -77,6 +76,8 @@ public class RegisterBenificiaryServiceImpl implements RegisterBenificiaryServic
 	@Autowired
 	Validator validator;
 
+
+
 	@Autowired
 	OutboundHistoryRepository outboundHistoryRepository;
 
@@ -171,6 +172,7 @@ public String save(BeneficiaryModel beneficiaryModel, HttpServletRequest servlet
 		identityDTO.setIsConsent(beneficiaryModel.getIsConsent());
 		identityDTO.setFaceEmbedding(beneficiaryModel.getFaceEmbedding());
 		identityDTO.setEmergencyRegistration(beneficiaryModel.isEmergencyRegistration());
+		identityDTO.setIsConsent(beneficiaryModel.getIsConsent());
 		identityDTO
 				.setBenFamilyDTOs(identityMapper.benPhoneMapListToBenFamilyDTOList(beneficiaryModel.getBenPhoneMaps()));
 		String request = new Gson().toJson(identityDTO);

src/main/java/com/iemr/common/service/beneficiaryOTPHandler/BeneficiaryOTPHandler.java

@@ -0,0 +1,14 @@
+package com.iemr.common.service.beneficiaryOTPHandler;
+
+import com.iemr.common.data.beneficiaryConsent.BeneficiaryConsentRequest;
+import com.iemr.common.data.otp.OTPRequestParsor;
+import org.json.JSONObject;
+
+public interface BeneficiaryOTPHandler {
+    public String sendOTP(BeneficiaryConsentRequest obj) throws Exception;
+
+    public JSONObject validateOTP(BeneficiaryConsentRequest obj) throws Exception;
+
+    public String resendOTP(BeneficiaryConsentRequest obj) throws Exception;
+
+}