Fix/handel approval status of mt

.gitignore

@@ -31,3 +31,4 @@ mvnw
 mvnw.cmd
 .mvn
 /logs/
+src/main/environment/common_local.properties

pom.xml

@@ -337,6 +337,32 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>io.github.git-commit-id</groupId>
+				<artifactId>git-commit-id-maven-plugin</artifactId>
+				<version>9.0.2</version>
+				<executions>
+					<execution>
+						<id>get-the-git-infos</id>
+						<goals>
+							<goal>revision</goal>
+						</goals>
+						<phase>initialize</phase>
+					</execution>
+				</executions>
+				<configuration>
+					<generateGitPropertiesFile>true</generateGitPropertiesFile>
+					<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+					<includeOnlyProperties>
+						<property>^git.branch$</property>
+						<property>^git.commit.id.abbrev$</property>
+						<property>^git.build.version$</property>
+						<property>^git.build.time$</property>
+					</includeOnlyProperties>
+					<failOnNoGitDirectory>false</failOnNoGitDirectory>
+					<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
+				</configuration>
+			</plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -420,4 +446,4 @@
             </plugin>
         </plugins>
     </reporting>
-</project>
+</project>

src/main/environment/common_ci.properties

@@ -1,6 +1,7 @@
 
 fhir-url = @env.FHIR_API@
 tm-url = @env.TM_API@
+common-api-base-url=@env.COMMON_API@
 
 ##--------------------------------------------## Primary db-------------------------------------------------------------------
 
@@ -16,8 +17,7 @@ secondary.datasource.password=@env.DATABASE_IDENTITY_PASSWORD@
 secondary.datasource.url=@env.DATABASE_IDENTITY_URL@
 secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
 
-springdoc.api-docs.enabled=@env.SWAGGER_UI_ENABLED@
-springdoc.swagger-ui.enabled=@env.SWAGGER_UI_ENABLED@
+
 
 #ELK logging file name
 logging.path=logs/
@@ -37,4 +37,17 @@ sms-username=@env.SMS_USERNAME@
 sms-password=@env.SMS_PASSWORD@
 send-message-url=@env.SMS_MESSAGE_URL@
 
-crash.logs.base.path=@env.CRASH_LOGS_PATH@
+#crash.logs.base.path=@env.CRASH_LOGS_PATH@
+
+# ABHA Token Config
+abha.client.id=@env.ABHA_CLIENT_ID@
+abha.client.secret=@env.ABHA_CLIENT_SECRET@
+abha.token.url=@env.ABHA_TOKEN_URL@
+abha.xcmid=@env.ABHA_XCM_ID@
+
+# GovThealth API Config
+govthealth.user.details.url=@env.GOVTHEALTH_USER_DETAILS_URL@
+govthealth.user.id=@env.GOVTHEALTH_USER_ID@
+govthealth.password=@env.GOVTHEALTH_PASSWORD@
+
+

src/main/environment/common_docker.properties

@@ -1,5 +1,8 @@
-fhir-url = ${FHIR_URL}
-tm-url = ${TM_URL}
+fhir-url = ${FHIR_API}
+tm-url = ${TM_API}
+common-api-base-url=${COMMON_API}
+
+
 
 ##--------------------------------------------## Primary db-------------------------------------------------------------------
 
@@ -15,8 +18,8 @@ secondary.datasource.password=${DATABASE_IDENTITY_PASSWORD}
 secondary.datasource.url=${DATABASE_IDENTITY_URL}
 secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
 
-springdoc.api-docs.enabled=true
-springdoc.swagger-ui.enabled=true
+
+
 
 #ELK logging file name
 logging.path=logs/
@@ -35,4 +38,18 @@ sms-password=${SMS_PASSWORD}
 
 send-message-url=${SMS_MESSAGE_URL}
 
-crash.logs.base.path=${CRASH_LOGS_PATH}
+#crash.logs.base.path=${CRASH_LOGS_PATH}
+
+# ABHA Token Config
+abha.client.id=${ABHA_CLIENT_ID}
+abha.client.secret=${ABHA_CLIENT_SECRET}
+abha.token.url=${ABHA_TOKEN_URL}
+abha.xcmid=${ABHA_XCM_ID}
+
+# GovThealth API Config
+govthealth.user.details.url=${GOVTHEALTH_USER_DETAILS_URL}
+govthealth.user.id=${GOVTHEALTH_USER_ID}
+govthealth.password=${GOVTHEALTH_PASSWORD}
+
+
+

src/main/environment/common_example.properties

@@ -38,6 +38,12 @@ send-message-url=
 
 crash.logs.base.path=<path used>
 
+# ABHA Token Config
+abha.client.id=<your-abha-client-id>
+abha.client.secret=<your-abha-client-secret>
+abha.token.url=<abha-token-url>
+abha.xcmid=<sbx-or-prod>
+
 
 
 

src/main/java/com/iemr/flw/controller/AbhaBeneficiaryController.java

@@ -0,0 +1,54 @@
+package com.iemr.flw.controller;
+
+import com.iemr.flw.domain.iemr.AdolescentHealth;
+import com.iemr.flw.dto.abhaBeneficiary.AbhaBeneficiaryDTO;
+import com.iemr.flw.dto.identity.GetBenRequestHandler;
+import com.iemr.flw.dto.iemr.AbhaRequestDTO;
+import com.iemr.flw.service.AbhaBeneficiaryService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+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 java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/UserRegistration")
+public class AbhaBeneficiaryController {
+    @Autowired
+    private AbhaBeneficiaryService abhaBeneficiaryService;
+
+    private final org.slf4j.Logger logger = LoggerFactory.getLogger(AbhaBeneficiaryController.class);
+
+
+
+    @RequestMapping(value = "/GetUserDetailsByAyushmanCardNo",method = RequestMethod.POST)
+    public ResponseEntity<Map<String,Object>> getAllAdolescentHealth(@RequestBody AbhaRequestDTO request ) {
+        Map<String,Object> response = new HashMap<>();
+        try {
+            if(request.getCardNo()!=null){
+                Object abhaBeneficiaryDTOList = abhaBeneficiaryService.getBeneficiaryByAbha(request);
+
+                if (abhaBeneficiaryDTOList != null ) {
+                    response.put("statusCode",200);
+                    response.put("data", abhaBeneficiaryDTOList);
+                } else {
+                    response.put("statusCode", 5000);
+                    response.put("error", "Invalid/NULL request obj");
+                }
+            }
+
+        } catch (Exception e) {
+            logger.error("Error in get data : " + e);
+            response.put("statusCode",5000);
+            response.put("error","Error in get data : " + e);
+
+        }
+        return ResponseEntity.ok(response);
+    }
+}

src/main/java/com/iemr/flw/controller/AbhaTokenController.java

@@ -0,0 +1,40 @@
+package com.iemr.flw.controller;
+
+import com.iemr.flw.service.AbhaTokenService;
+import com.iemr.flw.utils.ApiResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/abha", headers = "Authorization")
+public class AbhaTokenController {
+
+    private final Logger logger = LoggerFactory.getLogger(AbhaTokenController.class);
+
+    @Autowired
+    private AbhaTokenService abhaTokenService;
+
+    @Operation(summary = "Get ABHA access token")
+    @PostMapping("/token")
+    public ResponseEntity<?> getAbhaToken(
+            @RequestHeader(value = "Authorization") String authorization) {
+        try {
+            Map<String, Object> tokenResponse = abhaTokenService.getAbhaToken();
+            return new ResponseEntity<>(
+                    new ApiResponse(true, null, tokenResponse), HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error("Error fetching ABHA token: " + e.getMessage());
+            return new ResponseEntity<>(
+                    new ApiResponse(false, "Error fetching ABHA token: " + e.getMessage(), null),
+                    HttpStatus.INTERNAL_SERVER_ERROR);
+        }
+    }
+}

src/main/java/com/iemr/flw/controller/AshaProfileController.java

@@ -1,35 +1,21 @@
 package com.iemr.flw.controller;
 
 import com.iemr.flw.domain.iemr.AshaWorker;
-import com.iemr.flw.domain.iemr.M_User;
-import com.iemr.flw.dto.iemr.UserServiceRoleDTO;
-import com.iemr.flw.repo.iemr.UserServiceRoleRepo;
 import com.iemr.flw.service.AshaProfileService;
 import com.iemr.flw.service.EmployeeMasterInter;
-import com.iemr.flw.service.UserService;
 import io.lettuce.core.dynamic.annotation.Param;
 import com.iemr.flw.utils.JwtUtil;
-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.http.HttpStatus;
 
-import com.iemr.flw.utils.JwtAuthenticationUtil;
-import com.iemr.flw.utils.JwtUtil;
-import com.iemr.flw.utils.exception.IEMRException;
-import io.jsonwebtoken.Claims;
-import io.swagger.v3.oas.annotations.Operation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
 @RestController
 @RequestMapping(value = "/asha", produces = "application/json")
@@ -76,26 +62,26 @@ public ResponseEntity<Map<String, Object>> getProfile(HttpServletRequest request
         try {
             String jwtFromHeader = request.getHeader("JwtToken");
 
-            // Validate JWT header presence
-//            if (jwtFromHeader == null || jwtFromHeader.trim().isEmpty()) {
-//                response.put("statusCode", 401);
-//                response.put("status", "Unauthorized");
-//                response.put("errorMessage", "JWT token is missing");
-//                return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(response);
-//            }
+//             Validate JWT header presence
+            if (jwtFromHeader == null || jwtFromHeader.trim().isEmpty()) {
+                response.put("statusCode", 401);
+                response.put("status", "Unauthorized");
+                response.put("errorMessage", "JWT token is missing");
+                return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(response);
+            }
 
             // Extract and validate user ID from JWT
-           // int userId = jwtUtil.extractUserId(jwtFromHeader); // Make sure this returns 0 or throws for invalid token
+            int userId = jwtUtil.extractUserId(jwtFromHeader); // Make sure this returns 0 or throws for invalid token
 
-            if (employeeId == 0) {
+            if (userId == 0) {
                 response.put("statusCode", 401);
                 response.put("status", "Unauthorized");
                 response.put("errorMessage", "Invalid JWT token");
                 return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(response);
             }
 
             // Business logic
-            AshaWorker ashaWorker = ashaProfileService.getProfileData(employeeId);
+            AshaWorker ashaWorker = ashaProfileService.getProfileData(userId);
             logger.info("Asha Profile"+ashaWorker);
 
             response.put("statusCode", 200);