Feature/signaturerelease

src/main/java/com/iemr/admin/controller/employeemaster/EmployeeMasterController.java

@@ -30,16 +30,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.http.MediaType;
-
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.iemr.admin.data.employeemaster.M_Community;
 import com.iemr.admin.data.employeemaster.M_Designation;
 import com.iemr.admin.data.employeemaster.M_Gender;
@@ -1051,7 +1050,7 @@ public String getEmployeeByDesignation(@RequestBody String getDesignation) {
 
 			ArrayList<M_User1> employeeBydesiganation = employeeMasterInter.getEmployeeByDesiganationID(
 					employeeMaster.getDesignationID(), employeeMaster1.getServiceProviderID());
-
+			
 			response.setResponse(employeeBydesiganation.toString());
 
 		} catch (Exception e) {

src/main/java/com/iemr/admin/controller/employeemaster/EmployeeSignatureController.java

@@ -47,6 +47,7 @@
 import com.iemr.admin.utils.response.OutputResponse;
 
 import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletRequest;
 
 
 @PropertySource("classpath:application.properties")
@@ -93,26 +94,19 @@ public ResponseEntity<byte[]> fetchFile(@PathVariable("userID") Long userID) thr
 
 			EmployeeSignature userSignID = employeeSignatureServiceImpl.fetchSignature(userID);
 			HttpHeaders responseHeaders = new HttpHeaders();
-			String fileName = URLEncoder.encode(userSignID.getFileName(), StandardCharsets.UTF_8);
-
-			responseHeaders.set(HttpHeaders.CONTENT_DISPOSITION,
-			    "attachment; filename=\"" + fileName + "\"; filename*=UTF-8''" + fileName);
+			ContentDisposition cd = ContentDisposition.attachment()
+					.filename(userSignID.getFileName(), StandardCharsets.UTF_8).build();
+			responseHeaders.setContentDisposition(cd);
 
 			MediaType mediaType;
 			try {
-			    mediaType = MediaType.parseMediaType(userSignID.getFileType());
+				mediaType = MediaType.parseMediaType(userSignID.getFileType());
 			} catch (InvalidMediaTypeException | NullPointerException e) {
-			    mediaType = MediaType.APPLICATION_OCTET_STREAM;
+				mediaType = MediaType.APPLICATION_OCTET_STREAM;
 			}
-
 			byte[] fileBytes = userSignID.getSignature(); // MUST be byte[]
-
-			return ResponseEntity.ok()
-			    .headers(responseHeaders)
-			    .contentType(mediaType)
-			    .contentLength(fileBytes.length)
-			    .body(fileBytes);
-
+			return ResponseEntity.ok().headers(responseHeaders).contentType(mediaType).contentLength(fileBytes.length)
+					.body(fileBytes);
 		} catch (Exception e) {
 			logger.error("Unexpected error:", e);
 			logger.error("File download for userID failed with exception " + e.getMessage(), e);
@@ -142,4 +136,19 @@ public String existFile(@PathVariable("userID") Long userID) throws Exception {
 		logger.debug("response" + response);
 		return response.toString();
 	}
+
+	@Operation(summary = "Active or DeActive user Signature")
+	@PostMapping(value = "/activateOrdeActivateSignature", headers = "Authorization", produces = { "application/json" })
+	public String ActivateUser(@RequestBody String activateUser, HttpServletRequest request) {
+		OutputResponse response = new OutputResponse();
+		try {
+			EmployeeSignature empSignature = employeeSignatureServiceImpl.updateUserSignatureStatus(activateUser);
+			boolean active = empSignature.getDeleted() == null ? false : !empSignature.getDeleted();
+			response.setResponse("{\"userID\":" + empSignature.getUserID() + ",\"active\":" + active + "}");
+		} catch (Exception e) {
+			logger.error("Active or Deactivate User Signature failed with exception " + e.getMessage(), e);
+			response.setError(e);
+		}
+		return response.toString();
+	}
 }

src/main/java/com/iemr/admin/data/employeemaster/M_User1.java

@@ -202,10 +202,32 @@ public class M_User1{
 	   @Expose
 	    private M_Maritalstatus m_Maritalstatus;
 
+	   @Expose
+	   @Transient
+	   private String signatureStatus;
+
 	   /*@OneToOne(mappedBy="m_user")
 		private M_UserLangMapping m_UserLangMapping1;*/
 
-	// new field for rate-limit, failed authentication
+	public String getSignatureStatus() {
+		return signatureStatus;
+	}
+
+	   public void setSignatureStatus(String signatureStatus) {
+		   this.signatureStatus = signatureStatus;
+	   }
+
+
+
+
+
+
+
+
+
+
+
+			// new field for rate-limit, failed authentication
 			@Expose
 			@Column(name = "failed_attempt", insertable = false)
 			private Integer failedAttempt;

src/main/java/com/iemr/admin/service/employeemaster/EmployeeMasterServiceImpl.java

@@ -59,6 +59,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.JsonParser;
 import com.iemr.admin.data.blocking.M_Providerservicemapping_Blocking;
+import com.iemr.admin.data.employeemaster.EmployeeSignature;
 import com.iemr.admin.data.employeemaster.M_Community;
 import com.iemr.admin.data.employeemaster.M_Gender;
 import com.iemr.admin.data.employeemaster.M_ProviderServiceMap1;
@@ -80,6 +81,7 @@
 import com.iemr.admin.repo.blocking.MProviderservicemappingBlockingRepo;
 import com.iemr.admin.repo.employeemaster.EmployeeMasterRepo;
 import com.iemr.admin.repo.employeemaster.EmployeeMasterRepoo;
+import com.iemr.admin.repo.employeemaster.EmployeeSignatureRepo;
 import com.iemr.admin.repo.employeemaster.M_CommunityRepo;
 import com.iemr.admin.repo.employeemaster.M_GenderRepo;
 import com.iemr.admin.repo.employeemaster.M_ProviderServiceMap1Repo;
@@ -104,7 +106,6 @@
 import com.iemr.admin.utils.mapper.InputMapper;
 import com.iemr.admin.utils.response.OutputResponse;
 
-import jakarta.servlet.http.HttpServletRequest;
 
 @Service
 public class EmployeeMasterServiceImpl implements EmployeeMasterInter {
@@ -190,6 +191,9 @@ public void setConfigProperties(ConfigProperties configProperties) {
 
 	@Autowired
 	M_ServiceMasterRepo serviceMasterRepo;
+
+	@Autowired
+	private EmployeeSignatureRepo employeeSignatureRepo;
 	/*
 	 * @Override public ArrayList<M_Role> getAllRole() { //ArrayList<M_Role> resSet
 	 * = new ArrayList<M_Role>(); //resSet =
@@ -1089,6 +1093,19 @@ public ArrayList<V_Showuser> getEmployeeDetails4(Integer serviceProviderID) {
 	public ArrayList<M_User1> getEmployeeByDesiganationID(Integer designationID, Integer serviceProviderID) {
 		ArrayList<M_User1> getEmpByDesiganation = employeeMasterRepoo.getempByDesiganation(designationID,
 				serviceProviderID);
+		for (M_User1 user : getEmpByDesiganation) {
+			Integer userID = user.getUserID();
+			EmployeeSignature signature = employeeSignatureRepo.findOneByUserID(Long.valueOf(userID));
+			if (null != signature) {
+				if (signature.getDeleted()) {
+					user.setSignatureStatus("InActive");
+				} else {
+					user.setSignatureStatus("Active");
+				}
+			} else {
+				user.setSignatureStatus(null);
+			}
+		}
 		return getEmpByDesiganation;
 	}
 

src/main/java/com/iemr/admin/service/employeemaster/EmployeeSignatureService.java

@@ -29,4 +29,6 @@ public interface EmployeeSignatureService {
 
 	Long uploadSignature(EmployeeSignature empSign);
 
+	EmployeeSignature updateUserSignatureStatus(String activateUser);
+
 }

src/main/java/com/iemr/admin/service/employeemaster/EmployeeSignatureServiceImpl.java

@@ -21,6 +21,7 @@
 */
 package com.iemr.admin.service.employeemaster;
 
+import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -67,4 +68,17 @@ public Boolean existSignature(Long userID) {
 		return employeeSignatureRepo.countByUserIDAndSignatureNotNull(userID)>0;
 	}
 
+	@Override
+	public EmployeeSignature updateUserSignatureStatus(String activateUser) {
+		JSONObject obj = new JSONObject(activateUser);
+		Long userID = obj.getLong("userID");
+		// String role = obj.getString("role");
+		boolean active = obj.getBoolean("active");
+		EmployeeSignature signature = employeeSignatureRepo.findOneByUserID(userID);
+		if (signature == null) {
+			throw new IllegalArgumentException("No signature found for userID: " + userID);
+		}
+		signature.setDeleted(!active);
+		return employeeSignatureRepo.save(signature);
+	}
 }