Release 3.6.0

pom.xml

@@ -4,8 +4,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.admin</groupId>
-	<artifactId>admin-api</artifactId>
-	<version>3.1.0</version>
+	<artifactId>adminapi</artifactId>
+	<version>v3.1.0</version>
 	<packaging>war</packaging>
 	<name>Admin-API</name>
 	<description>Admin Page</description>
@@ -54,6 +54,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-xml</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
@@ -73,6 +77,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-compress</artifactId>
+			<version>1.21</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -181,12 +190,7 @@
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi-ooxml</artifactId>
 			<version>5.2.3</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.commons</groupId>
-					<artifactId>commons-compress</artifactId>
-				</exclusion>
-			</exclusions>
+
 		</dependency>
 
 		<!-- start newly added dependencies -->
@@ -275,7 +279,7 @@
 	</dependencies>
 
 	<build>
-		<finalName>${artifactId}-${version}</finalName>
+		<finalName>adminapi-v3.0.0</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.owasp</groupId>

src/main/environment/admin_example.properties

@@ -2,8 +2,8 @@ server.port=8082
 # local env 
 # DB Connections 
 spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr
-spring.datasource.username=root
-spring.datasource.password=1234
+spring.datasource.username=<Enter userName>
+spring.datasource.password=<Enter password>
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 callcentre-server-ip=10.208.122.99

src/main/java/com/iemr/admin/controller/bulkRegistration/BulkRegistrationController.java

@@ -0,0 +1,90 @@
+package com.iemr.admin.controller.bulkRegistration;
+
+import com.iemr.admin.repo.employeemaster.EmployeeMasterRepoo;
+import com.iemr.admin.service.bulkRegistration.BulkRegistrationService;
+import com.iemr.admin.service.bulkRegistration.BulkRegistrationServiceImpl;
+import com.iemr.admin.service.bulkRegistration.EmployeeXmlService;
+import com.iemr.admin.service.locationmaster.LocationMasterServiceInter;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+public class BulkRegistrationController {
+    @Autowired
+    private EmployeeXmlService employeeXmlService;
+    @Autowired
+    BulkRegistrationServiceImpl bulkRegistrationServiceimpl;
+    private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
+
+
+    @Autowired
+    BulkRegistrationService bulkRegistrationService;
+
+    @Autowired
+    private EmployeeMasterRepoo employeeMasterRepoo;
+    private Map<String, Object> errorResponse = new HashMap<>();
+    @Autowired
+    private LocationMasterServiceInter locationMasterServiceInter;
+    private Map<String, Object> response = new HashMap<>();
+
+    @PostMapping(value = "/bulkRegistration", headers = "Authorization")
+    public ResponseEntity<Map<String, Object>> registerBulkUser(@RequestBody String m_user, @RequestHeader String authorization) {
+        bulkRegistrationServiceimpl.bulkRegistrationErrors.clear();
+        logger.info("Bulk registration request received. Request payload is omitted from logs.");
+        try {
+            bulkRegistrationService.registerBulkUser(m_user, authorization);
+            response.put("status", "Success");
+            response.put("statusCode", 200);
+            response.put("totalUser", bulkRegistrationServiceimpl.totalEmployeeListSize);
+            response.put("registeredUser", bulkRegistrationServiceimpl.m_bulkUser.size());
+            response.put("error", bulkRegistrationServiceimpl.errorLogs.toString());
+
+            bulkRegistrationServiceimpl.m_bulkUser.clear();
+            bulkRegistrationServiceimpl.m_UserDemographics.clear();
+            bulkRegistrationServiceimpl.errorLogs.clear();
+            bulkRegistrationServiceimpl.totalEmployeeListSize=0;
+
+        } catch (Exception e) {
+            response.put("message", e.getMessage());
+            response.put("statusCode", 500);
+
+        }
+        return ResponseEntity.ok(response);
+
+    }
+
+    @GetMapping(value = "/download-error-sheet", headers = "Authorization")
+    public ResponseEntity<byte[]> downloadErrorSheet() {
+        try {
+            byte[] fileContent = bulkRegistrationServiceimpl.insertErrorLog();
+
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("Content-Disposition", "attachment; filename=error_log.xlsx");
+
+            if(!bulkRegistrationServiceimpl.bulkRegistrationErrors.isEmpty()){
+                bulkRegistrationServiceimpl.bulkRegistrationErrors.clear();
+            }
+            return ResponseEntity.ok()
+                    .headers(headers)
+                    .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                    .body(fileContent);
+
+        } catch (Exception e) {
+            return ResponseEntity.status(500).body(null);
+        }
+    }
+
+
+}

src/main/java/com/iemr/admin/data/bulkuser/BulkRegistrationError.java

@@ -0,0 +1,12 @@
+package com.iemr.admin.data.bulkuser;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BulkRegistrationError {
+    String userName;
+    Integer rowNumber;
+    List<String> error;
+}

src/main/java/com/iemr/admin/data/bulkuser/Employee.java

@@ -0,0 +1,102 @@
+package com.iemr.admin.data.bulkuser;
+
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import lombok.Data;
+
+@Data
+@JacksonXmlRootElement(localName = "Employee")
+public class Employee {
+
+    @JacksonXmlProperty(localName = "Title")
+    private String title="";
+
+    @JacksonXmlProperty(localName = "FirstName")
+    private String firstName="";
+
+    @JacksonXmlProperty(localName = "MiddleName")
+    private String middleName="";
+
+    @JacksonXmlProperty(localName = "LastName")
+    private String lastName="";
+
+    @JacksonXmlProperty(localName = "Gender")
+    private String gender="";
+
+    @JacksonXmlProperty(localName = "ContactNo")
+    private String contactNo="";
+
+    @JacksonXmlProperty(localName = "Designation")
+    private String designation="";
+
+    @JacksonXmlProperty(localName = "EmergencyContactNo")
+    private String emergencyContactNo="";
+
+    @JacksonXmlProperty(localName = "DateOfBirth")
+    private String dob="";
+
+    @JacksonXmlProperty(localName = "Age")
+    private int age=0;
+
+    @JacksonXmlProperty(localName = "Email")
+    private String email="";
+
+    @JacksonXmlProperty(localName = "MaritalStatus")
+    private String maritalStatus="";
+
+    @JacksonXmlProperty(localName = "AadhaarNo")
+    private String aadhaarNo="";
+
+    @JacksonXmlProperty(localName = "PAN")
+    private String pan="";
+
+    @JacksonXmlProperty(localName = "Qualification")
+    private String qualification="";
+
+    @JacksonXmlProperty(localName = "FatherName")
+    private String fatherName="";
+
+    @JacksonXmlProperty(localName = "MotherName")
+    private String motherName="";
+
+    @JacksonXmlProperty(localName = "Community")
+    private String community="";
+
+    @JacksonXmlProperty(localName = "Religion")
+    private String religion="";
+
+    @JacksonXmlProperty(localName = "CurrentAddressLine1")
+    private String addressLine1="";
+
+    @JacksonXmlProperty(localName = "CurrentState")
+    private String state="";
+
+    @JacksonXmlProperty(localName = "CurrentDistrict")
+    private String district="";
+
+    @JacksonXmlProperty(localName = "CurrentPincode")
+    private String pincode="";
+
+    @JacksonXmlProperty(localName = "PermanentAddressLine1")
+    private String permanentAddressLine1="";
+
+    @JacksonXmlProperty(localName = "PermanentState")
+    private String permanentState="";
+
+    @JacksonXmlProperty(localName = "PermanentDistrict")
+    private String permanentDistrict="";
+
+    @JacksonXmlProperty(localName = "PermanentPincode")
+    private String permanentPincode="";
+
+    @JacksonXmlProperty(localName = "DateOfJoining")
+    private String dateOfJoining="";
+
+    @JacksonXmlProperty(localName = "UserName")
+    private String UserName="";
+
+    @JacksonXmlProperty(localName = "Password")
+    private String Password="";
+
+
+}

src/main/java/com/iemr/admin/data/bulkuser/EmployeeList.java

@@ -0,0 +1,17 @@
+package com.iemr.admin.data.bulkuser;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@JacksonXmlRootElement(localName = "Employees")
+public class EmployeeList {
+
+    @JsonProperty("Employee")
+    @JacksonXmlElementWrapper(useWrapping = false) // To avoid extra nested array in XML
+    private List<Employee> employees;
+}

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

@@ -36,8 +36,7 @@
 
 @Entity
 @Table(name = "m_Religion")
-public class M_Religion
-{
+public class M_Religion {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/com/iemr/admin/repo/employeemaster/EmployeeMasterRepoo.java

@@ -40,9 +40,16 @@ public interface EmployeeMasterRepoo extends CrudRepository<M_User1, Integer>
 	@Query("SELECT u FROM M_User1 u WHERE u.userID=:userID  AND deleted=false")
 	M_User1 editEmployee(@Param("userID") Integer userID);
 
+	@Query("SELECT u FROM M_User1 u WHERE u.aadhaarNo=:aadhaar AND deleted=false ")
+	M_User1 findEmployeeAadhaarNo(@Param("aadhaar") String userName);
+
 	@Query("SELECT u FROM M_User1 u WHERE u.userName=:userName AND deleted=false ")
 	M_User1 findEmployeeByName(@Param("userName") String userName);
 
+
+	@Query("SELECT u FROM M_User1 u WHERE u.contactNo=:contactNo AND deleted=false ")
+	M_User1 findEmployeeByContact(@Param("contactNo") String userName);
+
 	@Query("SELECT u FROM M_User1 u WHERE u.userName=:userName OR u.aadhaarNo=:aadhaarNo OR u.pAN=:getpAN OR u.employeeID=:employeeID OR u.healthProfessionalID=:healthProfessionalID AND deleted=false ")
 	M_User1 checkingEmpDetails(@Param("userName") String userName, @Param("aadhaarNo") String aadhaarNo,
 			@Param("getpAN") String getpAN,@Param("employeeID") String employeeID, @Param("healthProfessionalID") String healthProfessionalID);

src/main/java/com/iemr/admin/service/bulkRegistration/BulkRegistrationService.java

@@ -0,0 +1,5 @@
+package com.iemr.admin.service.bulkRegistration;
+
+public interface  BulkRegistrationService {
+    void registerBulkUser(String user,String authorization);
+}