diff --git a/.java-version b/.java-version index 62593409..03b6389f 100644 --- a/.java-version +++ b/.java-version @@ -1 +1 @@ -1.8 +17.0 diff --git a/pom.xml b/pom.xml index f29e4dca..454fd02a 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 17 jdt_apt 1.2.0.Final - 1.16.18 + 1.18.36 commonapi-v1.0 ${ENV_VAR} target/classes/application.properties @@ -107,6 +107,12 @@ + + + com.google.firebase + firebase-admin + 9.4.3 + org.springframework.boot spring-boot-starter-data-jpa @@ -511,12 +517,24 @@ org.apache.maven.plugins maven-compiler-plugin + 3.14.0 17 17 + + + org.projectlombok + lombok + ${org.projectlombok.version} + + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} + + - org.apache.maven.plugins maven-resources-plugin diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties index 84c70090..a9a8426f 100644 --- a/src/main/environment/common_ci.properties +++ b/src/main/environment/common_ci.properties @@ -34,6 +34,13 @@ send-message-url=@env.SMS_MESSAGE_URL@ start-sms-scheduler=false cron-scheduler-sms=0 0/1 * * * ? * +# Firebase Configuration +firebase.enabled=@env.FIREBASE_ENABLE@ +# if using file +firebase.credential-file=@env.FIREBASE_CREDENTIAL@ +# for CI/CD +firebase.credential-base64=@env.CREDENTIAL_BASE64@ + #### Email Configuration send-email=@env.SEND_EMAIL@ spring.mail.host=@env.MAIL_HOST@ @@ -148,7 +155,7 @@ logging.file.name=@env.COMMON_API_LOGGING_FILE_NAME@ ##grievance API call -updateGrievanceDetails = @env.GRIEVANCE_API_BASE_URL@/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list +updateGrievanceDetails = @env.GRIEVANCE_API_BASE_URL@/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list?page=PageNumber¤tpage=1 updateGrievanceTransactionDetails=@env.GRIEVANCE_API_BASE_URL@/grsbepro/igemr1097/public/api/v1/grievance_details/ ## grievance variables @@ -160,6 +167,12 @@ grievanceDataSyncDuration = @env.GRIEVANCE_DATA_SYNC_DURATION@ springdoc.api-docs.enabled=false springdoc.swagger-ui.enabled=false + +isProduction=false grievanceAllocationRetryConfiguration=3 +start-grievancedatasync-scheduler=false +cron-scheduler-grievancedatasync=0 0/2 * * * ? + + diff --git a/src/main/environment/common_dev.properties b/src/main/environment/common_dev.properties index d59acb42..597a8bf6 100644 --- a/src/main/environment/common_dev.properties +++ b/src/main/environment/common_dev.properties @@ -118,7 +118,7 @@ nhm.agent.real.time.data.cron.flag=true ##----------------------------------------------------#grievance data sync----------------------------------------------------------- start-grievancedatasync-scheduler=false -cron-scheduler-grievancedatasync=0 0/5 * * * ? * +cron-scheduler-grievancedatasync=0 0/2 * * * ? carestream_socket_ip = 192.168.43.39 carestream_socket_port = 1235 @@ -173,7 +173,7 @@ fileBasePath =/Doc jwt.secret= ##grievance API call -updateGrievanceDetails = /grsbepro/igemr1097/public/api/v1/state-wise/grievance-list +updateGrievanceDetails = /grsbepro/igemr1097/public/api/v1/state-wise/grievance-list?page=PageNumber¤tpage=1 updateGrievanceTransactionDetails=/grsbepro/igemr1097/public/api/v1/grievance_details/ ## grievance variables @@ -186,4 +186,6 @@ grievanceDataSyncDuration = springdoc.api-docs.enabled=true springdoc.swagger-ui.enabled=true +isProduction=false grievanceAllocationRetryConfiguration=3 + diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties index bcc6c6ca..9a90154d 100644 --- a/src/main/environment/common_example.properties +++ b/src/main/environment/common_example.properties @@ -88,7 +88,7 @@ cron-scheduler-nhmdashboard=0 1 * * * ? * ##----------------------------------------------------#grievance data sync----------------------------------------------------------- start-grievancedatasync-scheduler=false -cron-scheduler-grievancedatasync=0 0/5 * * * ? * +cron-scheduler-grievancedatasync=0 0/2 * * * ? ### Redis IP spring.redis.host=localhost @@ -173,7 +173,7 @@ jwt.secret= fileBasePath =/Doc ##grievance API call -updateGrievanceDetails = /grsbepro/igemr1097/public/api/v1/state-wise/grievance-list +updateGrievanceDetails = /grsbepro/igemr1097/public/api/v1/state-wise/grievance-list?page=PageNumber¤tpage=1 updateGrievanceTransactionDetails=/grsbepro/igemr1097/public/api/v1/grievance_details/ ## grievance variables @@ -186,7 +186,7 @@ grievanceDataSyncDuration = springdoc.api-docs.enabled=true springdoc.swagger-ui.enabled=true +isProduction=false grievanceAllocationRetryConfiguration=3 - diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties index 169317db..df9007ee 100644 --- a/src/main/environment/common_test.properties +++ b/src/main/environment/common_test.properties @@ -84,7 +84,7 @@ cron-scheduler-everwelldatasync=0 0/5 * * * ? * ##----------------------------------------------------#grievance data sync----------------------------------------------------------- start-grievancedatasync-scheduler=false -cron-scheduler-grievancedatasync=0 0/5 * * * ? * +cron-scheduler-grievancedatasync=0 0/2 * * * ? ##-----------------------------------------------#NHM data dashboard schedular---------------------------------------------------------------- # run at everyday 12:01AM start-nhmdashboard-scheduler=true @@ -175,7 +175,7 @@ jwt.secret= ##grievance API call -updateGrievanceDetails = /grsbepro/igemr1097/public/api/v1/state-wise/grievance-list +updateGrievanceDetails = /grsbepro/igemr1097/public/api/v1/state-wise/grievance-list?page=PageNumber¤tpage=1 updateGrievanceTransactionDetails=/grsbepro/igemr1097/public/api/v1/grievance_details/ ## grievance variables @@ -187,5 +187,5 @@ grievanceDataSyncDuration = springdoc.api-docs.enabled=true springdoc.swagger-ui.enabled=true - +isProduction=false grievanceAllocationRetryConfiguration=3 diff --git a/src/main/environment/common_uat.properties b/src/main/environment/common_uat.properties index 0b55a003..92c55f4a 100644 --- a/src/main/environment/common_uat.properties +++ b/src/main/environment/common_uat.properties @@ -59,7 +59,7 @@ cron-scheduler-ctidatacheck=0 10 00 * * * ##----------------------------------------------------#grievance data sync----------------------------------------------------------- start-grievancedatasync-scheduler=false -cron-scheduler-grievancedatasync=0 0/5 * * * ? * +cron-scheduler-grievancedatasync=0 0/2 * * * ? ### generate Beneficiary IDs URL genben-api=/bengenapi-v1.0 @@ -146,7 +146,7 @@ fileBasePath =/Doc jwt.secret= ##grievance API call -updateGrievanceDetails = /grsbepro/igemr1097/public/api/v1/state-wise/grievance-list +updateGrievanceDetails = /grsbepro/igemr1097/public/api/v1/state-wise/grievance-list?page=PageNumber¤tpage=1 updateGrievanceTransactionDetails=/grsbepro/igemr1097/public/api/v1/grievance_details/ ## grievance variables @@ -158,5 +158,5 @@ grievanceDataSyncDuration = springdoc.api-docs.enabled=true springdoc.swagger-ui.enabled=true - +isProduction=false grievanceAllocationRetryConfiguration=3 diff --git a/src/main/java/com/iemr/common/CommonApplication.java b/src/main/java/com/iemr/common/CommonApplication.java index 83078018..ea0adb97 100644 --- a/src/main/java/com/iemr/common/CommonApplication.java +++ b/src/main/java/com/iemr/common/CommonApplication.java @@ -21,11 +21,16 @@ */ package com.iemr.common; +import com.google.auth.oauth2.GoogleCredentials; +import com.google.firebase.FirebaseApp; +import com.google.firebase.FirebaseOptions; +import com.google.firebase.messaging.FirebaseMessaging; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.context.annotation.Bean; +import org.springframework.core.io.ClassPathResource; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; @@ -36,6 +41,8 @@ import com.iemr.common.data.users.User; import com.iemr.common.utils.IEMRApplBeans; +import java.io.IOException; + @SpringBootApplication @EnableScheduling public class CommonApplication extends SpringBootServletInitializer { @@ -73,4 +80,6 @@ public RedisTemplate redisTemplate(RedisConnectionFactory factor return template; } + } + diff --git a/src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.java b/src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.java new file mode 100644 index 00000000..438ca4f9 --- /dev/null +++ b/src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.java @@ -0,0 +1,57 @@ +package com.iemr.common.config.firebase; + +import com.google.auth.oauth2.GoogleCredentials; +import com.google.firebase.FirebaseApp; +import com.google.firebase.FirebaseOptions; +import com.google.firebase.messaging.FirebaseMessaging; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.ClassPathResource; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.Base64; + +@Configuration +public class FirebaseMessagingConfig { + + @Value("${firebase.enabled:false}") + private boolean firebaseEnabled; + + @Value("${firebase.credential-file:}") + private String firebaseCredentialFile; + + @Value("${firebase.credential-base64:}") + private String firebaseCredentialBase64; + + @Bean + public FirebaseMessaging firebaseMessaging() throws IOException { + if (!firebaseEnabled) { + throw new IllegalStateException("Firebase is disabled"); + } + + GoogleCredentials credentials; + + if (!firebaseCredentialBase64.isBlank()) { + byte[] decoded = Base64.getDecoder().decode(firebaseCredentialBase64); + credentials = GoogleCredentials.fromStream(new ByteArrayInputStream(decoded)); + } else if (!firebaseCredentialFile.isBlank()) { + credentials = GoogleCredentials.fromStream( + new ClassPathResource(firebaseCredentialFile).getInputStream() + ); + } else { + throw new IllegalStateException("No Firebase credentials provided"); + } + + FirebaseOptions options = FirebaseOptions.builder() + .setCredentials(credentials) + .build(); + + FirebaseApp firebaseApp = FirebaseApp.getApps().isEmpty() + ? FirebaseApp.initializeApp(options) + : FirebaseApp.getInstance(); + + return FirebaseMessaging.getInstance(firebaseApp); + } +} diff --git a/src/main/java/com/iemr/common/controller/firebaseNotification/FirebaseNotificationController.java b/src/main/java/com/iemr/common/controller/firebaseNotification/FirebaseNotificationController.java new file mode 100644 index 00000000..18601d22 --- /dev/null +++ b/src/main/java/com/iemr/common/controller/firebaseNotification/FirebaseNotificationController.java @@ -0,0 +1,24 @@ +package com.iemr.common.controller.firebaseNotification; + +import com.iemr.common.model.notification.NotificationMessage; +import com.iemr.common.service.firebaseNotification.FirebaseNotificationService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping(value= "/firebaseNotification",headers = "Authorization") +public class FirebaseNotificationController { + final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + + @Autowired + FirebaseNotificationService firebaseNotificationService; + + @RequestMapping(value = "sendNotification",method = RequestMethod.POST) + public String sendNotificationByToken(@RequestBody NotificationMessage notificationMessage){ + return firebaseNotificationService.sendNotification(notificationMessage); + } + + +} diff --git a/src/main/java/com/iemr/common/controller/grievance/GrievanceController.java b/src/main/java/com/iemr/common/controller/grievance/GrievanceController.java index a4e3212c..bf243f69 100644 --- a/src/main/java/com/iemr/common/controller/grievance/GrievanceController.java +++ b/src/main/java/com/iemr/common/controller/grievance/GrievanceController.java @@ -1,6 +1,9 @@ package com.iemr.common.controller.grievance; +import java.lang.reflect.Type; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -12,13 +15,17 @@ 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.PostMapping; 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.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import com.iemr.common.data.grievance.UnallocationRequest; import com.iemr.common.dto.grivance.GrievanceWorklistDTO; import com.iemr.common.service.grievance.GrievanceDataSync; @@ -130,11 +137,12 @@ public String moveToBin(@RequestBody String request) { @Operation(summary = "get grievance outbound worklist)") @PostMapping(value = "/getGrievanceOutboundWorklist", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") - public ResponseEntity> getGrievanceOutboundWorklist(@Param(value = "{\"providerServiceMapId\":\" called service ID integer\", " - + "\"userId\":\"Optional - Integer ID of user that is assigned to\"}") @RequestBody String request) { + public String getGrievanceOutboundWorklist(@Param(value = "{\"providerServiceMapId\":\" called service ID integer\", " + + "\"userId\":\"Optional - Integer ID of user that is assigned to\"}") @RequestBody String request) throws JsonProcessingException { logger.info("Request received for grievance worklist"); List response = new ArrayList<>(); Map responseMap = new HashMap<>(); + ObjectMapper objectMapper = new ObjectMapper(); try { response = grievanceHandlingService.getFormattedGrievanceData(request); @@ -160,9 +168,17 @@ public ResponseEntity> getGrievanceOutboundWorklist(@Param(v responseMap.put("errorMessage", e.getMessage()); responseMap.put("status", "Error"); } - - - return ResponseEntity.ok(responseMap); + Gson gson = new GsonBuilder() + .registerTypeAdapter(Date.class, new JsonSerializer() { + @Override + public JsonElement serialize(Date date, Type typeOfSrc, JsonSerializationContext context) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + return context.serialize(sdf.format(date)); // Format date + } + }) + .create(); + + return gson.toJson(responseMap); } diff --git a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java index c05436e1..e26f15dd 100644 --- a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java +++ b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java @@ -21,17 +21,14 @@ */ package com.iemr.common.controller.users; -import java.security.NoSuchAlgorithmException; -import java.security.spec.InvalidKeySpecException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.TimeUnit; import javax.ws.rs.core.MediaType; +import com.iemr.common.utils.UserAgentUtil; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.ExpiredJwtException; import org.json.JSONArray; import org.json.JSONObject; import org.slf4j.Logger; @@ -40,20 +37,13 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -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 org.springframework.web.bind.annotation.*; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.iemr.common.config.encryption.SecurePassword; -import com.iemr.common.data.directory.Directory; import com.iemr.common.data.users.LoginSecurityQuestions; import com.iemr.common.data.users.M_Role; import com.iemr.common.data.users.ServiceRoleScreenMapping; @@ -63,10 +53,8 @@ import com.iemr.common.model.user.ChangePasswordModel; import com.iemr.common.model.user.ForceLogoutRequestModel; import com.iemr.common.model.user.LoginRequestModel; -import com.iemr.common.model.user.LoginResponseModel; import com.iemr.common.service.users.IEMRAdminUserService; import com.iemr.common.utils.CookieUtil; -import com.iemr.common.utils.JwtAuthenticationUtil; import com.iemr.common.utils.JwtUtil; import com.iemr.common.utils.encryption.AESUtil; import com.iemr.common.utils.exception.IEMRException; @@ -94,8 +82,6 @@ public class IEMRAdminController { @Autowired private CookieUtil cookieUtil; @Autowired - private JwtAuthenticationUtil jwtAuthenticationUtil; - @Autowired private RedisTemplate redisTemplate; private AESUtil aesUtil; @@ -164,21 +150,39 @@ public String userAuthenticate( } else if (m_User.getUserName() != null && m_User.getDoLogout() != null && m_User.getDoLogout() == true) { deleteSessionObject(m_User.getUserName().trim().toLowerCase()); } + + String jwtToken = null; + String refreshToken = null; + boolean isMobile = false; if (mUser.size() == 1) { - String Jwttoken = jwtUtil.generateToken(m_User.getUserName(), mUser.get(0).getUserID().toString()); - logger.info("jwt token is:" + Jwttoken); + jwtToken = jwtUtil.generateToken(m_User.getUserName(), mUser.get(0).getUserID().toString()); User user = new User(); // Assuming the Users class exists user.setUserID(mUser.get(0).getUserID()); user.setUserName(mUser.get(0).getUserName()); - - String redisKey = "user_" + mUser.get(0).getUserID(); // Use user ID to create a unique key - // Store the user in Redis (set a TTL of 30 minutes) - redisTemplate.opsForValue().set(redisKey, user, 30, TimeUnit.MINUTES); + String userAgent = request.getHeader("User-Agent"); + isMobile = UserAgentUtil.isMobileDevice(userAgent); + logger.info("UserAgentUtil isMobile : " + isMobile); + + if (isMobile) { + refreshToken = jwtUtil.generateRefreshToken(m_User.getUserName(), user.getUserID().toString()); + logger.debug("Refresh token generated successfully for user: {}", user.getUserName()); + String jti = jwtUtil.getJtiFromToken(refreshToken); + redisTemplate.opsForValue().set( + "refresh:" + jti, + user.getUserID().toString(), + jwtUtil.getRefreshTokenExpiration(), + TimeUnit.MILLISECONDS + ); + } else { + cookieUtil.addJwtTokenToCookie(jwtToken, httpResponse, request); + } + + String redisKey = "user_" + mUser.get(0).getUserID(); // Use user ID to create a unique key - // Set Jwttoken in the response cookie - cookieUtil.addJwtTokenToCookie(Jwttoken, httpResponse, request); + // Store the user in Redis (set a TTL of 30 minutes) + redisTemplate.opsForValue().set(redisKey, user, 30, TimeUnit.MINUTES); createUserMapping(mUser.get(0), resMap, serviceRoleMultiMap, serviceRoleMap, serviceRoleList, previlegeObj); @@ -199,6 +203,13 @@ public String userAuthenticate( } responseObj = iemrAdminUserServiceImpl.generateKeyAndValidateIP(responseObj, remoteAddress, request.getRemoteHost()); + + // Add tokens to response for mobile + if (isMobile && !mUser.isEmpty()) { + responseObj.put("jwtToken", jwtToken); + responseObj.put("refreshToken", refreshToken); + } + response.setResponse(responseObj.toString()); } catch (Exception e) { logger.error("userAuthenticate failed with error " + e.getMessage(), e); @@ -208,6 +219,68 @@ public String userAuthenticate( return response.toString(); } + @Operation(summary = "generating a auth token with the refreshToken.") + @RequestMapping(value = "/refreshToken", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) + public ResponseEntity refreshToken(@RequestBody Map request) { + String refreshToken = request.get("refreshToken"); + + try { + if (jwtUtil.validateToken(refreshToken) == null) { + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("Invalid token"); + } + + Claims claims = jwtUtil.getAllClaimsFromToken(refreshToken); + + // Verify token type + if (!"refresh".equals(claims.get("token_type", String.class))) { + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("Invalid token type"); + } + + // Check revocation using JTI + String jti = claims.getId(); + if (!redisTemplate.hasKey("refresh:" + jti)) { + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("Token revoked"); + } + + // Get user details + // Get user details + String userId = claims.get("userId", String.class); + User user = iemrAdminUserServiceImpl.getUserById(Long.parseLong(userId)); + + // Validate that the user still exists and is active + if (user == null) { + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("User not found"); + } + + if (user.getM_status() == null || !"Active".equalsIgnoreCase(user.getM_status().getStatus())) { + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("User account is inactive"); + } + // Generate new tokens + String newJwt = jwtUtil.generateToken(user.getUserName(), userId); + + Map tokens = new HashMap<>(); + tokens.put("jwtToken", newJwt); + + // Generate and store a new refresh token (token rotation) + String newRefreshToken = jwtUtil.generateRefreshToken(user.getUserName(), userId); + String newJti = jwtUtil.getJtiFromToken(newRefreshToken); + redisTemplate.opsForValue().set( + "refresh:" + newJti, + userId, + jwtUtil.getRefreshTokenExpiration(), + TimeUnit.MILLISECONDS + ); + tokens.put("refreshToken", newRefreshToken); + + return ResponseEntity.ok(tokens); + } catch (ExpiredJwtException ex) { + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("Token expired"); + } catch (Exception e) { + logger.error("Refresh failed: ", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Token refresh failed"); + } + } + @CrossOrigin() @Operation(summary = "Log out user from concurrent session") @RequestMapping(value = "/logOutUserFromConcurrentSession", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) @@ -740,7 +813,7 @@ public String userLogout(HttpServletRequest request) { /** * - * @param request + * @param key * @return */ private void deleteSessionObjectByGettingSessionDetails(String key) { diff --git a/src/main/java/com/iemr/common/data/grievance/GrievanceTransaction.java b/src/main/java/com/iemr/common/data/grievance/GrievanceTransaction.java index 628c9ca8..51232dcc 100644 --- a/src/main/java/com/iemr/common/data/grievance/GrievanceTransaction.java +++ b/src/main/java/com/iemr/common/data/grievance/GrievanceTransaction.java @@ -1,16 +1,22 @@ package com.iemr.common.data.grievance; -import jakarta.persistence.*; +import java.util.Date; import com.google.gson.annotations.Expose; -import jakarta.validation.constraints.NotBlank; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import jakarta.validation.constraints.Size; import lombok.Data; -import java.util.Date; - @Entity @Data @Table(name = "t_grievancetransaction") diff --git a/src/main/java/com/iemr/common/dto/grivance/GrievanceWorklistDTO.java b/src/main/java/com/iemr/common/dto/grivance/GrievanceWorklistDTO.java index 365c76a3..b8184162 100644 --- a/src/main/java/com/iemr/common/dto/grivance/GrievanceWorklistDTO.java +++ b/src/main/java/com/iemr/common/dto/grivance/GrievanceWorklistDTO.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.NoArgsConstructor; @@ -15,6 +16,7 @@ public class GrievanceWorklistDTO implements Serializable { private static final long serialVersionUID = 1L; private String complaintID; + private Long grievanceId; private String subjectOfComplaint; private String complaint; private Long beneficiaryRegID; @@ -39,22 +41,19 @@ public class GrievanceWorklistDTO implements Serializable { private Integer callCounter; private Timestamp lastCall; - public GrievanceWorklistDTO(String complaintID, String subjectOfComplaint, String complaint, - Long beneficiaryRegID, Integer providerServiceMapID, String firstName, String lastName, - String primaryNumber, List transactions, String severety, String state, + public GrievanceWorklistDTO(String complaintID,Long grievanceId, String subjectOfComplaint, String complaint, + Long beneficiaryRegID, Integer providerServiceMapID,String primaryNumber,String severety,String state, Integer userId, Boolean deleted, String createdBy, Timestamp createdDate, Timestamp lastModDate, - Boolean isCompleted, String gender, String district, Long beneficiaryID, String age, + Boolean isCompleted,String firstName, String lastName, String gender, String district, Long beneficiaryID, String age, Boolean retryNeeded, Integer callCounter, Timestamp lastCall) { super(); this.complaintID = complaintID; + this.grievanceId = grievanceId; this.subjectOfComplaint = subjectOfComplaint; this.complaint = complaint; this.beneficiaryRegID = beneficiaryRegID; this.providerServiceMapID = providerServiceMapID; - this.firstName = firstName; - this.lastName = lastName; this.primaryNumber = primaryNumber; - this.transactions = transactions; this.severety = severety; this.state = state; this.userId = userId; @@ -63,6 +62,8 @@ public GrievanceWorklistDTO(String complaintID, String subjectOfComplaint, Strin this.createdDate = createdDate; this.lastModDate = lastModDate; this.isCompleted = isCompleted; + this.firstName = firstName; + this.lastName = lastName; this.gender = gender; this.district = district; this.beneficiaryID = beneficiaryID; diff --git a/src/main/java/com/iemr/common/model/notification/NotificationMessage.java b/src/main/java/com/iemr/common/model/notification/NotificationMessage.java new file mode 100644 index 00000000..eed0c171 --- /dev/null +++ b/src/main/java/com/iemr/common/model/notification/NotificationMessage.java @@ -0,0 +1,15 @@ +package com.iemr.common.model.notification; + +import lombok.Data; + +import java.util.Map; + +@Data +public class NotificationMessage { + private String appType; + private String token; + private String topic; + private String title; + private String body; + private Map data; +} diff --git a/src/main/java/com/iemr/common/repository/callhandling/BeneficiaryCallRepository.java b/src/main/java/com/iemr/common/repository/callhandling/BeneficiaryCallRepository.java index e48e8f9d..38c67f08 100644 --- a/src/main/java/com/iemr/common/repository/callhandling/BeneficiaryCallRepository.java +++ b/src/main/java/com/iemr/common/repository/callhandling/BeneficiaryCallRepository.java @@ -191,7 +191,7 @@ public ArrayList getExistingBCByCallIDAndAgentID(@Param("callID BeneficiaryCall findByBenCallID(Long benCallID); - @Query("SELECT b.remarks FROM BeneficiaryCall b WHERE b.beneficiaryRegID = :beneficiaryRegID") - List fetchBenCallRemarks(@Param("beneficiaryRegID") Long beneficiaryRegID); + @Query("SELECT b.remarks FROM BeneficiaryCall b WHERE b.benCallID = :benCallID") + List fetchBenCallRemarks(@Param("benCallID") Long benCallID); } diff --git a/src/main/java/com/iemr/common/repository/grievance/GrievanceDataRepo.java b/src/main/java/com/iemr/common/repository/grievance/GrievanceDataRepo.java index 7d8f39b7..37d2f0dc 100644 --- a/src/main/java/com/iemr/common/repository/grievance/GrievanceDataRepo.java +++ b/src/main/java/com/iemr/common/repository/grievance/GrievanceDataRepo.java @@ -1,5 +1,6 @@ package com.iemr.common.repository.grievance; +import java.math.BigInteger; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Date; @@ -33,8 +34,8 @@ List findGrievancesInDateRangeAndLanguage(@Param("startDate") public int allocateGrievance(@Param("grievanceId") Long grievanceId, @Param("userId") Integer userId); - @Query(nativeQuery = true, value = "SELECT PreferredLanguageId, PreferredLanguage, VanSerialNo, VanID, ParkingPlaceId, VehicalNo FROM db_1097_identity.i_beneficiarydetails WHERE BeneficiaryRegID = :benRegId") - public ArrayList getBeneficiaryGrievanceDetails(@Param("benRegId") Long benRegId); + @Query(nativeQuery = true, value = "SELECT preferredLanguageId, preferredLanguage, VanSerialNo, VanID, ParkingPlaceID, VehicalNo FROM db_1097_identity.i_beneficiarydetails WHERE beneficiarydetailsid = :beneficiarydetailsid") + public ArrayList getBeneficiaryGrievanceDetails(@Param("beneficiarydetailsid") Long beneficiarydetailsid); @Query(nativeQuery = true, value = "SELECT t2.preferredPhoneNum FROM db_1097_identity.i_beneficiarymapping t1 join" + " db_1097_identity.i_beneficiarycontacts t2 on t1.benContactsId = t2.benContactsID" @@ -43,13 +44,12 @@ public int allocateGrievance(@Param("grievanceId") Long grievanceId, @Query("select grievance.preferredLanguage, count(distinct grievance.grievanceId) " - + "from GrievanceDetails grievance " + "where grievance.providerServiceMapID = :providerServiceMapID " - + "and grievance.userID = :userID " + "and grievance.deleted = false " + + "from GrievanceDetails grievance where " + + "grievance.userID = :userID and grievance.isCompleted=false and grievance.deleted = false " + "group by grievance.preferredLanguage") - public Set fetchGrievanceRecordsCount(@Param("providerServiceMapID") Integer providerServiceMapID, - @Param("userID") Integer userID); + public Set fetchGrievanceRecordsCount(@Param("userID") Integer userID); - @Query("SELECT g FROM GrievanceDetails g WHERE g.userID = :userID AND g.preferredLanguage = :language AND g.isAllocated = true") + @Query("SELECT g FROM GrievanceDetails g WHERE g.userID = :userID AND g.preferredLanguage = :language AND g.isAllocated = true AND g.isCompleted = false") List findAllocatedGrievancesByUserAndLanguage(@Param("userID") Integer userID, @Param("language") String language); @@ -85,7 +85,7 @@ public Set fetchUnallocatedGrievanceCount( @Modifying @Query("UPDATE GrievanceDetails g SET g.complaintResolution = :complaintResolution, g.remarks = :remarks, g.modifiedBy = :modifiedBy, " + "g.benCallID = :benCallID " - + "WHERE g.complaintID = :complaintID AND g.beneficiaryRegID = :beneficiaryRegID AND g.providerServiceMapID = :providerServiceMapID" + + "WHERE g.complaintID = :complaintID AND g.beneficiaryRegID = :beneficiaryRegID " + " AND g.userID = :userID") @Transactional int updateComplaintResolution(@Param("complaintResolution") String complaintResolution, @@ -94,13 +94,12 @@ int updateComplaintResolution(@Param("complaintResolution") String complaintReso @Param("benCallID") Long benCallID, @Param("complaintID") String complaintID, @Param("beneficiaryRegID") Long beneficiaryRegID, - @Param("providerServiceMapID") Integer providerServiceMapID, @Param("userID") Integer userID); @Modifying @Query("UPDATE GrievanceDetails g SET g.complaintResolution = :complaintResolution, g.modifiedBy = :modifiedBy, " + "g.benCallID = :benCallID " - + "WHERE g.complaintID = :complaintID AND g.beneficiaryRegID = :beneficiaryRegID AND g.providerServiceMapID = :providerServiceMapID" + + "WHERE g.complaintID = :complaintID AND g.beneficiaryRegID = :beneficiaryRegID " + " AND g.userID = :userID") @Transactional int updateComplaintResolution(@Param("complaintResolution") String complaintResolution, @@ -108,41 +107,37 @@ int updateComplaintResolution(@Param("complaintResolution") String complaintReso @Param("benCallID") Long benCallID, @Param("complaintID") String complaintID, @Param("beneficiaryRegID") Long beneficiaryRegID, - @Param("providerServiceMapID") Integer providerServiceMapID, @Param("userID") Integer userID); - @Query(" Select grievance.callCounter, grievance.retryNeeded FROM GrievanceDetails grievance where grievance.complaintID = :complaintID") + @Query(" Select grievance.callCounter, grievance.retryNeeded,grievance.complaintResolution FROM GrievanceDetails grievance where grievance.complaintID = :complaintID") public List getCallCounter(@Param("complaintID") String complaintID); @Modifying @Query("UPDATE GrievanceDetails g SET g.isCompleted = :isCompleted, g.retryNeeded = :retryNeeded " - + "WHERE g.complaintID = :complaintID AND g.userID = :userID AND g.beneficiaryRegID = :beneficiaryRegID " - + "AND g.providerServiceMapID = :providerServiceMapID") + + "WHERE g.complaintID = :complaintID AND g.userID = :userID AND g.beneficiaryRegID = :beneficiaryRegID ") @Transactional public int updateCompletedStatusInCall(@Param("isCompleted") Boolean isCompleted, @Param("retryNeeded") Boolean retryNeeded, @Param("complaintID") String complaintID, @Param("userID") Integer userID, - @Param("beneficiaryRegID") Long beneficiaryRegID, - @Param("providerServiceMapID") Integer providerServiceMapID); + @Param("beneficiaryRegID") Long beneficiaryRegID); @Modifying @Query("UPDATE GrievanceDetails g SET g.callCounter = :callCounter, g.retryNeeded = :retryNeeded " - + "WHERE g.complaintID = :complaintID AND g.beneficiaryRegID = :beneficiaryRegID AND g.providerServiceMapID = :providerServiceMapID" + + "WHERE g.complaintID = :complaintID AND g.beneficiaryRegID = :beneficiaryRegID " + " AND g.userID = :userID") @Transactional public int updateCallCounter(@Param("callCounter") Integer callCounter, @Param("retryNeeded") Boolean retryNeeded, @Param("complaintID") String complaintID, @Param("beneficiaryRegID") Long beneficiaryRegID, - @Param("providerServiceMapID") Integer providerServiceMapID, @Param("userID") Integer userID); @Query("SELECT g FROM GrievanceDetails g WHERE " + "(g.state = :state OR :state IS NULL) " + "AND (g.complaintResolution = :complaintResolution OR :complaintResolution IS NULL) " - + "AND g.createdDate BETWEEN :startDate AND :endDate") + + "AND g.createdDate BETWEEN :startDate AND :endDate AND g.isCompleted = true") List fetchGrievanceDetailsBasedOnParams( @Param("state") String state, @Param("complaintResolution") String complaintResolution, @@ -160,6 +155,9 @@ List fetchGrievanceDetailsBasedOnParams( @Query("SELECT g.gwid FROM GrievanceDetails g WHERE g.grievanceId = :grievanceId") Long getUniqueGwid(@Param("grievanceId")Long grievanceIdObj); +@Query(value = "SELECT BenDetailsId FROM db_1097_identity.i_beneficiarymapping WHERE BenRegId = :beneficiaryRegID", nativeQuery = true) +Long getBeneficiaryMapping(@Param("beneficiaryRegID") Long beneficiaryRegID); + } diff --git a/src/main/java/com/iemr/common/repository/grievance/GrievanceOutboundRepository.java b/src/main/java/com/iemr/common/repository/grievance/GrievanceOutboundRepository.java index 88c8dfa9..6df5853e 100644 --- a/src/main/java/com/iemr/common/repository/grievance/GrievanceOutboundRepository.java +++ b/src/main/java/com/iemr/common/repository/grievance/GrievanceOutboundRepository.java @@ -15,8 +15,7 @@ public interface GrievanceOutboundRepository extends JpaRepository { - @Query(value =" call db_iemr.Pr_Grievanceworklist(:providerServiceMapID, :userId)", nativeQuery = true) - List getGrievanceWorklistData(@Param("providerServiceMapID") Integer providerServiceMapID, - @Param("userId") Integer userId); + @Query(value =" call db_iemr.Pr_Grievanceworklist(:userId)", nativeQuery = true) + List getGrievanceWorklistData(@Param("userId") Integer userId); } diff --git a/src/main/java/com/iemr/common/repository/grievance/GrievanceTransactionRepo.java b/src/main/java/com/iemr/common/repository/grievance/GrievanceTransactionRepo.java index 2c513836..b1d2d1a1 100644 --- a/src/main/java/com/iemr/common/repository/grievance/GrievanceTransactionRepo.java +++ b/src/main/java/com/iemr/common/repository/grievance/GrievanceTransactionRepo.java @@ -1,11 +1,17 @@ package com.iemr.common.repository.grievance; +import java.util.List; + +import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import com.iemr.common.data.grievance.GrievanceTransaction; @Repository public interface GrievanceTransactionRepo extends CrudRepository { + @Query(value = "select actionTakenBy,status,FileName,FileType,Redressed,createdAt,updatedAt,Comments from t_grievancetransaction t where t.grievanceId = :grievanceId",nativeQuery = true) + List getGrievanceTransaction(@Param("grievanceId") Long grievanceId); } diff --git a/src/main/java/com/iemr/common/service/firebaseNotification/FirebaseNotificationService.java b/src/main/java/com/iemr/common/service/firebaseNotification/FirebaseNotificationService.java new file mode 100644 index 00000000..e41ca94f --- /dev/null +++ b/src/main/java/com/iemr/common/service/firebaseNotification/FirebaseNotificationService.java @@ -0,0 +1,37 @@ +package com.iemr.common.service.firebaseNotification; + +import com.google.firebase.FirebaseException; +import com.google.firebase.messaging.FirebaseMessaging; +import com.google.firebase.messaging.Message; +import com.google.firebase.messaging.Notification; +import com.iemr.common.model.notification.NotificationMessage; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class FirebaseNotificationService { + final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + + @Autowired + FirebaseMessaging firebaseMessaging; + + public String sendNotification(NotificationMessage notificationMessage) { + + Notification notification = Notification.builder().setTitle(notificationMessage.getTitle()).setBody(notificationMessage.getBody()).build(); + + Message message = Message.builder().setToken(notificationMessage.getToken()).setNotification(notification).putAllData(notificationMessage.getData()).build(); + + + try { + String response = FirebaseMessaging.getInstance().send(message); + + return response; + } catch (FirebaseException e) { + return "Error sending notification"; + + } + } + +} diff --git a/src/main/java/com/iemr/common/service/grievance/GrievanceDataSyncImpl.java b/src/main/java/com/iemr/common/service/grievance/GrievanceDataSyncImpl.java index 113a6c7c..5a05b94f 100644 --- a/src/main/java/com/iemr/common/service/grievance/GrievanceDataSyncImpl.java +++ b/src/main/java/com/iemr/common/service/grievance/GrievanceDataSyncImpl.java @@ -1,5 +1,7 @@ package com.iemr.common.service.grievance; +import java.math.BigInteger; +import java.nio.charset.StandardCharsets; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Arrays; @@ -30,6 +32,7 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -73,8 +76,8 @@ public class GrievanceDataSyncImpl implements GrievanceDataSync { // Constructor-based injection @Autowired public GrievanceDataSyncImpl(GrievanceDataRepo grievanceDataRepo, GrievanceTransactionRepo grievanceTransactionRepo, - GrievanceFetchBenDetailsRepo grievanceFetchBenDetailsRepo, - LocationStateRepository locationStateRepository, IEMRCalltypeRepositoryImplCustom iEMRCalltypeRepositoryImplCustom) { + GrievanceFetchBenDetailsRepo grievanceFetchBenDetailsRepo, LocationStateRepository locationStateRepository, + IEMRCalltypeRepositoryImplCustom iEMRCalltypeRepositoryImplCustom) { this.grievanceDataRepo = grievanceDataRepo; this.grievanceTransactionRepo = grievanceTransactionRepo; this.grievanceFetchBenDetailsRepo = grievanceFetchBenDetailsRepo; @@ -102,155 +105,133 @@ public GrievanceDataSyncImpl(GrievanceDataRepo grievanceDataRepo, GrievanceTrans @Value("${grievanceAllocationRetryConfiguration}") private int grievanceAllocationRetryConfiguration; - + private String GRIEVANCE_AUTH_TOKEN; private Long GRIEVANCE_TOKEN_EXP; - //public List> dataSyncToGrievance() { - public String dataSyncToGrievance() { + public String dataSyncToGrievance() { - int count = 0; - String registeringUser = ""; - List> responseData = new ArrayList<>(); - List grievanceDetailsListAS = new ArrayList<>(); - // List grievanceDetailsListAS = new ArrayList<>(); - List grievanceDetailsListAll = new ArrayList<>(); + List grievanceDetailsListAll = new ArrayList<>(); List grievanceTransactionList = new ArrayList<>(); - // GrievanceTransaction grievanceTransaction = new GrievanceTransaction(); GrievanceTransaction grievanceTransactionListObj = new GrievanceTransaction(); - List grievanceIds = new ArrayList<>(); // List to collect all grievance IDs - + List grievanceIds = new ArrayList<>(); Long gwid; try { - // Loop to fetch data for multiple pages - while (count >= 0) { - RestTemplate restTemplate = new RestTemplate(); - - if (GRIEVANCE_AUTH_TOKEN != null && GRIEVANCE_TOKEN_EXP != null - && GRIEVANCE_TOKEN_EXP > System.currentTimeMillis()) { - // no need of calling auth API - } else { - // call method to generate Auth Token at Everwell end - generateGrievanceAuthToken(); - } - - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); - headers.add(USER_AGENT_HEADER, USER_AGENT_VALUE); - headers.add("AUTHORIZATION", GRIEVANCE_AUTH_TOKEN); - //headers.add("Authorization", "Bearer " + GRIEVANCE_AUTH_TOKEN); - - Date date = new Date(); - java.sql.Date sqlDate = new java.sql.Date(date.getTime()); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(sqlDate); - calendar.add(Calendar.DATE, -Integer.parseInt(grievanceDataSyncDuration)); - - // Request object - HttpEntity request = new HttpEntity(headers); - - // Call rest-template to call API to download master data for given table - ResponseEntity response = restTemplate.exchange(updateGrievanceDetails, HttpMethod.POST, - request, String.class); - - if (response != null && response.hasBody()) { - JSONObject obj = new JSONObject(response.getBody()); - //if (obj != null && obj.has("data") && obj.has(STATUS_CODE) && obj.getInt(STATUS_CODE) == 200) { - if (obj != null && obj.has("data") && obj.has("status") && obj.getInt("status") == 200) { - logger.info("Grievance data details response received successfully "); - - String responseStr = response.getBody(); - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(responseStr); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - // Handle "data" as a JsonArray - JsonArray grievanceJsonDataArray = jsnOBJ.getAsJsonArray("data"); - // registeringUser = grievanceJsonDataArray.get(0).getAsJsonObject().get("userName").getAsString(); - - // registeringUser = grievanceJsonData.get("userName").getAsString(); - - // if (Integer.parseInt(jsnOBJ.get("TotalRecords").toString()) > 0) { - if (Integer.parseInt(jsnOBJ.get("total").toString()) > 0) { + RestTemplate restTemplate = new RestTemplate(); + if (GRIEVANCE_AUTH_TOKEN != null && GRIEVANCE_TOKEN_EXP != null + && GRIEVANCE_TOKEN_EXP > System.currentTimeMillis()) { + } else { + generateGrievanceAuthToken(); + } - List grievanceDetailsList = new ArrayList<>(); + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + headers.add(USER_AGENT_HEADER, USER_AGENT_VALUE); + headers.add("AUTHORIZATION", GRIEVANCE_AUTH_TOKEN); - - // Iterate over the data array - for (JsonElement grievanceElement : grievanceJsonDataArray) { - JsonObject grievanceJsonData = grievanceElement.getAsJsonObject(); + Date date = new Date(); + java.sql.Date sqlDate = new java.sql.Date(date.getTime()); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(sqlDate); + calendar.add(Calendar.DATE, -Integer.parseInt(grievanceDataSyncDuration)); + String json = prepareRequestObject(); + int contentLength = json.getBytes(StandardCharsets.UTF_8).length; + headers.add("Content-Length", String.valueOf(contentLength)); + HttpEntity request = new HttpEntity<>(json, headers); + String url = updateGrievanceDetails.replace("PageNumber", "1"); + ResponseEntity response = restTemplate.exchange(url, HttpMethod.POST, request, String.class); - - GrievanceDetails grievance = new GrievanceDetails(); + if (response != null && response.hasBody()) { + JSONObject obj = new JSONObject(response.getBody()); + if (obj != null && obj.has("data") && obj.has("status") && obj.getInt("status") == 200) { + logger.info("Grievance data details response received successfully "); - // Loop through the fetched grievance list and integrate transaction details + String responseStr = response.getBody(); + JsonObject jsnOBJ = new JsonObject(); + JsonParser jsnParser = new JsonParser(); + JsonElement jsnElmnt = jsnParser.parse(responseStr); + jsnOBJ = jsnElmnt.getAsJsonObject(); + int total = jsnOBJ.get("total").getAsInt(); + String GrievanceUrl = updateGrievanceDetails.replace("PageNumber", String.valueOf(total)); + ResponseEntity grievienceResponse = restTemplate.exchange(GrievanceUrl, HttpMethod.POST, + request, String.class); + String respStr = grievienceResponse.getBody(); + + JsonElement jsnElmntResp = jsnParser.parse(respStr); + jsnOBJ = jsnElmntResp.getAsJsonObject(); + JsonArray grievanceJsonDataArray = jsnOBJ.getAsJsonArray("data"); + if (Integer.parseInt(jsnOBJ.get("total").toString()) > 0) { + for (JsonElement grievanceElement : grievanceJsonDataArray) { + String formattedComplaintId = null; + try { + JsonObject grievanceJsonData = grievanceElement.getAsJsonObject(); + GrievanceDetails grievance = new GrievanceDetails(); String complaintId = grievanceJsonData.get("complainId").getAsString(); - String formattedComplaintId = complaintId.replace("\\/", "/"); - - // Check if the complaintId is already present in the t_grievance_worklist table + formattedComplaintId = complaintId.replace("\\/", "/"); boolean complaintExists = grievanceDataRepo.existsByComplaintId(formattedComplaintId); if (complaintExists) { - throw new RuntimeException("Complaint ID " + formattedComplaintId + logger.info("Complaint ID " + formattedComplaintId + " already exists in the grievance worklist table."); + continue; } - + grievance.setComplaintID(formattedComplaintId); // Fetch related grievance transaction details Long grievanceID = grievanceJsonData.get("grievanceId").getAsLong(); grievance.setGrievanceId(grievanceID); - grievanceIds.add(grievanceJsonData.get("grievanceId").getAsLong()); - + grievanceIds.add(grievanceJsonData.get("grievanceId").getAsLong()); - // Adding other grievance-related fields - - grievance.setSubjectOfComplaint(grievanceJsonData.has("subject") && !grievanceJsonData.get("subject").isJsonNull() - ? grievanceJsonData.get("subject").getAsString() : null); + grievance.setSubjectOfComplaint(grievanceJsonData.has("subject") + && !grievanceJsonData.get("subject").isJsonNull() + ? grievanceJsonData.get("subject").getAsString() + : null); ArrayList lists = grievanceFetchBenDetailsRepo .findByComplaintId(formattedComplaintId); - grievance.setComplaint(grievanceJsonData.has("Complaint") - ? grievanceJsonData.get("Complaint").getAsString() : null); - String severityName = grievanceJsonData.has("severity") && grievanceJsonData.get("severity").getAsJsonObject().has("severity") - ? grievanceJsonData.get("severity").getAsJsonObject().get("severity").getAsString() - : null; - grievance.setSeverety(severityName); - - // Setting Level - Integer levelId = grievanceJsonData.has("level") && grievanceJsonData.get("level").getAsJsonObject().has("levelId") - ? grievanceJsonData.get("level").getAsJsonObject().get("levelId").getAsInt() - : null; - grievance.setLevel(levelId); - - // Setting state - String stateName = grievanceJsonData.has("state") && grievanceJsonData.get("state").getAsJsonObject().has("stateName") - ? grievanceJsonData.get("state").getAsJsonObject().get("stateName").getAsString() - : null; - grievance.setState(stateName);; + grievance.setComplaint(grievanceJsonData.has("Complaint") + ? grievanceJsonData.get("Complaint").getAsString() + : null); + String severityName = grievanceJsonData.has("severity") + && grievanceJsonData.get("severity").getAsJsonObject().has("severity") + ? grievanceJsonData.get("severity").getAsJsonObject().get("severity") + .getAsString() + : null; + grievance.setSeverety(severityName); + + // Setting Level + Integer levelId = grievanceJsonData.has("level") + && grievanceJsonData.get("level").getAsJsonObject().has("levelId") + ? grievanceJsonData.get("level").getAsJsonObject().get("levelId") + .getAsInt() + : null; + grievance.setLevel(levelId); + + // Setting state + String stateName = grievanceJsonData.has("state") + && grievanceJsonData.get("state").getAsJsonObject().has("stateName") + ? grievanceJsonData.get("state").getAsJsonObject().get("stateName") + .getAsString() + : null; + grievance.setState(stateName); + for (Object[] objects : lists) { if (objects != null && objects.length <= 4) { grievance.setComplaintID((String) objects[0]); grievance.setBenCallID((Long) objects[1]); grievance.setBeneficiaryRegID((Long) objects[2]); grievance.setProviderServiceMapID((Integer) objects[3]); - // String state = locationStateRepository - // .findByStateIDForGrievance((Integer) objects[4]); - // grievance.setState(state); } } - - - - - // setting language related properties and other + Long benDetailsID = grievanceDataRepo + .getBeneficiaryMapping(grievance.getBeneficiaryRegID()); ArrayList list1 = grievanceDataRepo - .getBeneficiaryGrievanceDetails(grievance.getBeneficiaryRegID()); + .getBeneficiaryGrievanceDetails(benDetailsID); for (Object[] objects : list1) { if (objects != null && objects.length >= 6) { grievance.setPreferredLanguageId((Integer) objects[0]); @@ -259,141 +240,115 @@ public String dataSyncToGrievance() { grievance.setVanID((Integer) objects[3]); grievance.setParkingPlaceID((Integer) objects[4]); grievance.setVehicalNo((String) objects[5]); - } } - String phoneNum = grievanceDataRepo.getPrimaryNumber(grievance.getBeneficiaryRegID()); grievance.setPrimaryNumber(phoneNum); - - // Setting remaining grievance properties (similar to the existing code) - // grievance.setAgentid(grievance.getAgentid()); grievance.setDeleted(grievance.getDeleted()); - //grievance.setCreatedBy(registeringUser); grievance.setCreatedBy("Admin"); grievance.setProcessed('N'); grievance.setIsAllocated(false); grievance.setCallCounter(0); grievance.setRetryNeeded(true); - - grievanceDetailsList.add(grievance); - - } - // Add all new grievances to the main list - grievanceDetailsListAll.addAll(grievanceDetailsList); - // Save the grievance details to the t_grievance table - grievanceDetailsListAS = (List) grievanceDataRepo - .saveAll(grievanceDetailsListAll); - - for (Long grievanceIdObj : grievanceIds) { - - JsonArray transactionDetailsList = fetchGrievanceTransactions(grievanceIdObj); + grievanceDataRepo.save(grievance); + JsonArray transactionDetailsList = fetchGrievanceTransactions(grievanceID); if (transactionDetailsList != null && !transactionDetailsList.isEmpty()) { - // Loop through each transaction and set individual properties - for (JsonElement transactionElement : transactionDetailsList) { - JsonObject transactionDetailsJson = transactionElement.getAsJsonObject(); - GrievanceTransaction grievanceTransaction = new GrievanceTransaction(); - gwid = grievanceDataRepo.getUniqueGwid(grievanceIdObj); - grievanceTransaction.setGwid(gwid); - grievanceTransaction.setGrievanceId(grievanceIdObj); - - - grievanceTransaction.setActionTakenBy(transactionDetailsJson.has("actionTakenBy") - ? transactionDetailsJson.get("actionTakenBy").getAsString() - : null); - grievanceTransaction.setStatus(transactionDetailsJson.has("status") - ? transactionDetailsJson.get("status").getAsString() - : null); - grievanceTransaction.setFileName(transactionDetailsJson.has(FILE_NAME) - ? transactionDetailsJson.get(FILE_NAME).getAsString() - : null); - grievanceTransaction.setFileType(transactionDetailsJson.has(FILE_TYPE) - ? transactionDetailsJson.get(FILE_TYPE).getAsString() - : null); - grievanceTransaction.setRedressed(transactionDetailsJson.has("redressed") - ? transactionDetailsJson.get("redressed").getAsString() - : null); - grievanceTransaction.setCreatedAt(Timestamp - .valueOf(transactionDetailsJson.get("createdAt").getAsString())); - grievanceTransaction.setUpdatedAt(Timestamp - .valueOf(transactionDetailsJson.get("updatedAt").getAsString())); - grievanceTransaction.setComments(transactionDetailsJson.has("comment") - ? transactionDetailsJson.get("comment").getAsString() - : null); - grievanceTransaction.setCreatedBy("Admin"); - Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - grievanceTransaction.setCreatedDate(timestamp); - - // Save individual transaction detail in the t_grievance_transaction table - grievanceTransactionListObj = grievanceTransactionRepo.save(grievanceTransaction); - grievanceTransactionList.add(grievanceTransactionListObj); - } - - // Add the transaction list to the grievance object - // grievance.setGrievanceTransactionDetails(grievanceTransactionList); + for (JsonElement transactionElement : transactionDetailsList) { + JsonObject transactionDetailsJson = transactionElement.getAsJsonObject(); + JsonArray asJsonArray = transactionDetailsJson.get("transaction") + .getAsJsonArray(); + for (JsonElement arr : asJsonArray) { + JsonObject transaction = arr.getAsJsonObject(); + GrievanceTransaction grievanceTransaction = new GrievanceTransaction(); + gwid = grievanceDataRepo.getUniqueGwid(grievanceID); + grievanceTransaction.setGwid(gwid); + grievanceTransaction.setGrievanceId(grievanceID); + grievanceTransaction.setActionTakenBy(transaction.has("actionTakenBy") + && !transaction.get("actionTakenBy").isJsonNull() + ? transaction.get("actionTakenBy").getAsString() + : null); + grievanceTransaction.setStatus( + transaction.has("status") && !transaction.get("status").isJsonNull() + ? transaction.get("status").getAsString() + : null); + grievanceTransaction.setFileName(transaction.has(FILE_NAME) + && !transaction.get(FILE_NAME).isJsonNull() + ? transaction.get(FILE_NAME).getAsString() + : null); + grievanceTransaction.setFileType(transaction.has(FILE_TYPE) + && !transaction.get(FILE_TYPE).isJsonNull() + ? transaction.get(FILE_TYPE).getAsString() + : null); + grievanceTransaction.setRedressed(transaction.has("redressed") + && !transaction.get("redressed").isJsonNull() + ? transaction.get("redressed").getAsString() + : null); + grievanceTransaction.setCreatedAt( + Timestamp.valueOf(transaction.get("createdAt").getAsString())); + grievanceTransaction.setUpdatedAt( + Timestamp.valueOf(transaction.get("updatedAt").getAsString())); + grievanceTransaction.setComments(transaction.has("comment") + ? transaction.get("comment").getAsString() + : null); + grievanceTransaction.setCreatedBy("Admin"); + Timestamp timestamp = new Timestamp(System.currentTimeMillis()); + grievanceTransaction.setCreatedDate(timestamp); + + grievanceTransactionListObj = grievanceTransactionRepo + .save(grievanceTransaction); + grievanceTransactionList.add(grievanceTransactionListObj); + } + } + } + } catch (Exception e) { + logger.error("Error while Grievance Details " + e.getMessage() + " Complaint ID " + + formattedComplaintId); } - // Combine grievance and transaction data for response -// -// for (GrievanceDetails grievanceValue : grievanceDetailsListAS) { -// Map combinedData = new HashMap<>(); -// combinedData.put("complaintID", grievanceValue.getGrievanceId()); -// combinedData.put("subjectOfComplaint", grievanceValue.getSubjectOfComplaint()); -// combinedData.put("complaint", grievanceValue.getComplaint()); -// combinedData.put("beneficiaryRegID", grievanceValue.getBeneficiaryRegID()); -// combinedData.put("providerServiceMapId", grievanceValue.getProviderServiceMapID()); -// -// combinedData.put("primaryNumber", grievanceValue.getPrimaryNumber()); -// -// // Add transaction data -// List> transactions = new ArrayList<>(); -// for (GrievanceTransaction transaction : grievanceValue.getGrievanceTransactionDetails()) { -// Map transactionData = new HashMap<>(); -// //transactionData.put("actionTakenBy", transaction.getActionTakenBy()); -// // transactionData.put("status", transaction.getStatus()); -// transactionData.put(FILE_NAME, transaction.getFileName()); -// transactionData.put(FILE_TYPE, transaction.getFileType()); -// transactionData.put("redressed", transaction.getRedressed()); -// transactionData.put("createdAt", transaction.getCreatedAt().toString()); -// transactionData.put("updatedAt", transaction.getUpdatedAt().toString()); -// transactionData.put("comments", transaction.getComments()); -// transactions.add(transactionData); -// } -// -// combinedData.put("transaction", transactions); -// combinedData.put("severity", grievanceValue.getSeverety()); -// combinedData.put("state", grievanceValue.getState()); -// // combinedData.put("agentId", grievanceValue.getAgentid()); -// combinedData.put("deleted", grievanceValue.getDeleted()); -// combinedData.put("createdBy", grievanceValue.getCreatedBy()); -// combinedData.put("createdDate", grievanceValue.getCreatedDate()); -// combinedData.put("lastModDate", grievanceValue.getLastModDate()); -// combinedData.put("isCompleted", grievanceValue.getIsCompleted()); -// -// combinedData.put("retryNeeded", grievanceValue.getRetryNeeded()); -// combinedData.put("callCounter", grievanceValue.getCallCounter()); -// -// responseData.add(combinedData); -// } - - // Return the combined response as required - - } else { - logger.info("No records found for page = {}", count); - count = -1; } } } } + } catch (Exception e) { logger.error("Error in saving data into t_grievanceworklist: ", e); } - // return responseData; + // return responseData; return "Grievance Data saved successfully"; } + private String prepareRequestObject() { + Map bodyMap = new HashMap<>(); + bodyMap.put("draw", 1); + bodyMap.put("columns", new Object[] {}); + bodyMap.put("order", new Object[] {}); + bodyMap.put("start", 0); + bodyMap.put("length", 10); + + Map search = new HashMap<>(); + search.put("value", ""); + search.put("regex", false); + bodyMap.put("search", search); + + bodyMap.put("state_id", ""); + bodyMap.put("complain_id", ""); + bodyMap.put("color", ""); + bodyMap.put("level", "3"); + bodyMap.put("start_date", ""); + bodyMap.put("end_date", ""); + + ObjectMapper objectMapper = new ObjectMapper(); + String jsonBody = ""; + try { + jsonBody = objectMapper.writeValueAsString(bodyMap); + } catch (Exception e) { + logger.error("Error while preparing Grievance jsonRequest"); + } + return jsonBody; + } + private JsonArray fetchGrievanceTransactions(Long grievanceId) { List transactionDetailsList = new ArrayList<>(); JsonArray transactionDataArray = new JsonArray(); @@ -417,16 +372,15 @@ private JsonArray fetchGrievanceTransactions(Long grievanceId) { JsonElement jsnElmnt = jsnParser.parse(response.getBody()); jsnOBJ = jsnElmnt.getAsJsonObject(); - - transactionDataArray = jsnOBJ.getAsJsonArray("data"); + transactionDataArray = jsnOBJ.getAsJsonArray("data"); // if (transactionDataArray != null && transactionDataArray.size() > 0) { // GrievanceTransaction[] transactionDetailsArray = new Gson() // .fromJson(transactionDataArray, GrievanceTransaction[].class); // transactionDetailsList = Arrays.asList(transactionDetailsArray); // } + } } - } - + } catch (Exception e) { logger.error("Error fetching grievance transaction details for grievanceId " + grievanceId, e); } @@ -452,36 +406,34 @@ private void generateGrievanceAuthToken() { // JSONObject requestObj = new JSONObject(request); // String complaintResolution = requestObj.optString("ComplaintResolution", null); // String state = requestObj.optString("State", null); - + String responseBody = responseEntity.getBody(); JsonObject jsnOBJ = new JsonObject(); JsonParser jsnParser = new JsonParser(); JsonElement jsnElmnt = jsnParser.parse(responseBody); jsnOBJ = jsnElmnt.getAsJsonObject(); - - // Accessing the "data" object first - if (jsnOBJ.has("data")) { - JsonObject dataObj = jsnOBJ.getAsJsonObject("data"); - - // Now check for "token_type" and "access_token" inside the "data" object - if (dataObj.has("token_type") && dataObj.has("access_token")) { - String tokenType = dataObj.get("token_type").getAsString(); - String accessToken = dataObj.get("access_token").getAsString(); - GRIEVANCE_AUTH_TOKEN = tokenType + " " + accessToken; - } else { - logger.error("Missing token_type or access_token in 'data' object: {}", responseBody); - // Handle missing tokens gracefully - return; - } - } else { - logger.error("'data' object is missing in response: {}", responseBody); - return; - } - - - - // GRIEVANCE_AUTH_TOKEN = jsnOBJ.get("token_type").getAsString() + " " - // + jsnOBJ.get("access_token").getAsString(); + + // Accessing the "data" object first + if (jsnOBJ.has("data")) { + JsonObject dataObj = jsnOBJ.getAsJsonObject("data"); + + // Now check for "token_type" and "access_token" inside the "data" object + if (dataObj.has("token_type") && dataObj.has("access_token")) { + String tokenType = dataObj.get("token_type").getAsString(); + String accessToken = dataObj.get("access_token").getAsString(); + GRIEVANCE_AUTH_TOKEN = tokenType + " " + accessToken; + } else { + logger.error("Missing token_type or access_token in 'data' object: {}", responseBody); + // Handle missing tokens gracefully + return; + } + } else { + logger.error("'data' object is missing in response: {}", responseBody); + return; + } + + // GRIEVANCE_AUTH_TOKEN = jsnOBJ.get("token_type").getAsString() + " " + // + jsnOBJ.get("access_token").getAsString(); JsonObject grievanceLoginJsonData = jsnOBJ.getAsJsonObject("data"); @@ -499,7 +451,7 @@ private void generateGrievanceAuthToken() { int count = 3; while (count > 0) { try { - // List> savedGrievanceData = dataSyncToGrievance(); + // List> savedGrievanceData = dataSyncToGrievance(); String savedGrievanceData = dataSyncToGrievance(); if (savedGrievanceData != null) break; @@ -520,59 +472,52 @@ private void generateGrievanceAuthToken() { } @Override - public String fetchUnallocatedGrievanceCount(String preferredLanguage, Timestamp filterStartDate, + public String fetchUnallocatedGrievanceCount(String preferredLanguage, Timestamp filterStartDate, Timestamp filterEndDate, Integer providerServiceMapID) throws IEMRException, JSONException { logger.debug("Request received for fetchUnallocatedGrievanceCount"); // Fetch all unallocated grievances count from the database Set resultSet = grievanceDataRepo.fetchUnallocatedGrievanceCount(filterStartDate, filterEndDate); - // Initialize the result JSON object to hold counts JSONObject result = new JSONObject(); boolean preferredLanguageFound = false; result.put("All", 0); // Initialize the "All" language count to 0 - // Loop through the resultSet and populate the counts for each language if (resultSet != null && !resultSet.isEmpty()) { for (Object[] recordSet : resultSet) { - String language = ((String) recordSet[0]).trim(); - Long count = (Long) recordSet[1]; + String language = null; + Long count = null; + if(null != recordSet[0]) + language = ((String) recordSet[0]).trim(); + if(null != recordSet[1]) + count = (Long) recordSet[1]; - // Add the count to the result for the current language result.put(language, count); result.put("All", result.getLong("All") + count); // Add to the total "All" count - // If the preferred language matches, mark it as found if (preferredLanguage != null && preferredLanguage.equalsIgnoreCase(language)) { preferredLanguageFound = true; } } } - // If the preferred language is provided but not found in the results, add it - // with count 0 if (preferredLanguage != null && !preferredLanguageFound) { result.put(preferredLanguage, 0); } - // Create the final JSON response array JSONArray resultArray = new JSONArray(); - // Case 1: If preferredLanguage is provided, return only that language's count if (preferredLanguage != null) { JSONObject preferredLanguageEntry = new JSONObject(); preferredLanguageEntry.put(PREFERRED_LANGUAGE, preferredLanguage); preferredLanguageEntry.put(COUNT_OF_PREFERRED_LANGUAGE, result.getLong(preferredLanguage)); resultArray.put(preferredLanguageEntry); } else { - // Case 2: If no preferredLanguage is provided, return counts for all languages - // Add the "All" entry first + JSONObject allEntry = new JSONObject(); allEntry.put(PREFERRED_LANGUAGE, "All"); allEntry.put(COUNT_OF_PREFERRED_LANGUAGE, result.getLong("All")); resultArray.put(allEntry); - - // Add counts for other languages Iterator keys = result.keys(); while (keys.hasNext()) { String key = keys.next(); @@ -587,112 +532,96 @@ public String fetchUnallocatedGrievanceCount(String preferredLanguage, Timestamp return resultArray.toString(); } - - + @Override @Transactional public String completeGrievanceCall(String request) throws Exception { - + GrievanceCallRequest grievanceCallRequest = InputMapper.gson().fromJson(request, GrievanceCallRequest.class); - String complaintID = grievanceCallRequest.getComplaintID(); - Integer userID = grievanceCallRequest.getUserID(); - Boolean isCompleted = grievanceCallRequest.getIsCompleted(); - Long beneficiaryRegID = grievanceCallRequest.getBeneficiaryRegID(); - Integer callTypeID = grievanceCallRequest.getCallTypeID(); - Integer providerServiceMapID = grievanceCallRequest.getProviderServiceMapID(); - - CallType callTypeObj = new CallType(); - String response = "failure"; - int updateCount = 0; - int updateCallCounter = 0; - try { - - GrievanceDetails grievanceCallStatus = new GrievanceDetails(); - - List lists = grievanceDataRepo.getCallCounter(complaintID); - for (Object[] objects : lists) { - if (objects != null && objects.length >= 2) { - grievanceCallStatus.setCallCounter((Integer) objects[0]); - grievanceCallStatus.setRetryNeeded((Boolean)objects[1]); - } + String complaintID = grievanceCallRequest.getComplaintID(); + Integer userID = grievanceCallRequest.getUserID(); + Boolean isCompleted = grievanceCallRequest.getIsCompleted(); + Long beneficiaryRegID = grievanceCallRequest.getBeneficiaryRegID(); + Integer callTypeID = grievanceCallRequest.getCallTypeID(); + Integer providerServiceMapID = grievanceCallRequest.getProviderServiceMapID(); + + CallType callTypeObj = new CallType(); + String response = "failure"; + int updateCount = 0; + int updateCallCounter = 0; + try { + + GrievanceDetails grievanceCallStatus = new GrievanceDetails(); + + List lists = grievanceDataRepo.getCallCounter(complaintID); + for (Object[] objects : lists) { + if (objects != null && objects.length >= 2) { + grievanceCallStatus.setCallCounter((Integer) objects[0]); + grievanceCallStatus.setRetryNeeded((Boolean) objects[1]); + grievanceCallStatus.setComplaintResolution((String) objects[2]); } - - // Fetching CallDetails using BenCallID and CallTypeID - Set callTypesArray = new HashSet(); - callTypesArray = iEMRCalltypeRepositoryImplCustom.getCallDetails(callTypeID); - for (Object[] object : callTypesArray) - { - if (object != null && object.length >= 2) - { - callTypeObj.setCallGroupType((String) object[0]); - callTypeObj.setCallType((String) object[1]); - - } - - } - - String callGroupType = callTypeObj.getCallGroupType(); - String callType = callTypeObj.getCallType(); - - - // Logic for reattempt based on call group type and call type - - boolean isRetryNeeded = grievanceCallStatus.getRetryNeeded(); - if (callGroupType.equals("Valid")) { - // Conditions when no reattempt is needed - if (callType.equals("Valid") || callType.equals("Test Call")) { - isRetryNeeded = false; - } else if (callType.equals("Disconnected Call") || callType.equals("Serviced Call") || - callType.equals("Silent Call") || callType.equals("Call Back")) { - // Reattempt is needed for these call subtypes - isRetryNeeded = true; - } - } - if (callGroupType.equals("Invalid") && callType.equals("Wrong Number")) { - isRetryNeeded = false; - //isCompleted = true; - grievanceDataRepo.updateCompletedStatusInCall(isCompleted, isRetryNeeded, complaintID, userID, beneficiaryRegID, providerServiceMapID); - } - - // Check if max attempts (3) are reached - if (isRetryNeeded == true && grievanceCallStatus.getCallCounter() < grievanceAllocationRetryConfiguration) { - // Increment the call counter for reattempt - grievanceCallStatus.setCallCounter(grievanceCallStatus.getCallCounter() + 1); - // Update the retryNeeded flag - isRetryNeeded = true; - //isCompleted = false; - updateCallCounter = grievanceDataRepo.updateCallCounter(grievanceCallStatus.getCallCounter(), isRetryNeeded, grievanceCallRequest.getComplaintID(), - grievanceCallRequest.getBeneficiaryRegID(), grievanceCallRequest.getProviderServiceMapID(), - grievanceCallRequest.getUserID()); - // Return success when reattempt logic is applied successfully. The grievance call needs to be retried, and a reattempt is performed. - if (updateCallCounter > 0) - response = "Successfully closing call"; - else { - response = "failure in closing call"; - } - } else if (grievanceCallStatus.getCallCounter()== grievanceAllocationRetryConfiguration) { - // Max attempts reached, no further reattempt - isRetryNeeded = false; - //isCompleted = true; - updateCount = grievanceDataRepo.updateCompletedStatusInCall(isCompleted, isRetryNeeded, complaintID, userID, beneficiaryRegID, providerServiceMapID); - response = "max_attempts_reached"; // Indicate that max attempts are reached - - - } else { + } - response = "no_reattempt_needed"; // No reattempt needed - } + // Fetching CallDetails using BenCallID and CallTypeID + Set callTypesArray = new HashSet(); + callTypesArray = iEMRCalltypeRepositoryImplCustom.getCallDetails(callTypeID); + for (Object[] object : callTypesArray) { + if (object != null && object.length >= 2) { + callTypeObj.setCallGroupType((String) object[0]); + callTypeObj.setCallType((String) object[1]); + } + } - } - catch (Exception e) { - response = "error: " + e.getMessage(); - } + String callGroupType = callTypeObj.getCallGroupType(); + String callType = callTypeObj.getCallType(); - return response; // Return the response (either success or error message) - } + // Logic for reattempt based on call group type and call type + boolean isRetryNeeded = grievanceCallStatus.getRetryNeeded(); + if ((null != grievanceCallStatus.getComplaintResolution() + && grievanceCallStatus.getComplaintResolution().equalsIgnoreCase("Resolved")) || (callGroupType.equalsIgnoreCase("Valid") && (callType.equalsIgnoreCase("Valid") || callType.equals("Test Call")))) { + isRetryNeeded = false; + updateCount = grievanceDataRepo.updateCompletedStatusInCall(true, false, complaintID, userID, beneficiaryRegID); + } + else if (callGroupType.equalsIgnoreCase("Invalid") && (callType.equalsIgnoreCase("Wrong Number") || callType.equalsIgnoreCase("Invalid Call"))) { + isRetryNeeded = false; + updateCount = grievanceDataRepo.updateCompletedStatusInCall(true, isRetryNeeded, complaintID, userID, + beneficiaryRegID); + }else { + isRetryNeeded = true; + updateCount = grievanceDataRepo.updateCompletedStatusInCall(false, isRetryNeeded, complaintID, + userID, beneficiaryRegID); + } + // Check if max attempts (3) are reached + if (isRetryNeeded && grievanceCallStatus.getCallCounter() < grievanceAllocationRetryConfiguration) { + grievanceCallStatus.setCallCounter(grievanceCallStatus.getCallCounter() + 1); + updateCallCounter = grievanceDataRepo.updateCallCounter(grievanceCallStatus.getCallCounter(), + isRetryNeeded, grievanceCallRequest.getComplaintID(), + grievanceCallRequest.getBeneficiaryRegID(), + grievanceCallRequest.getUserID()); + if (updateCallCounter > 0) + response = "Successfully closing call"; + else { + response = "failure in closing call"; + } + } else if (grievanceCallStatus.getCallCounter() == grievanceAllocationRetryConfiguration) { + // Max attempts reached, no further reattempt + isRetryNeeded = false; + // isCompleted = true; + updateCount = grievanceDataRepo.updateCompletedStatusInCall(isCompleted, isRetryNeeded, complaintID, + userID, beneficiaryRegID); + response = "max_attempts_reached"; // Indicate that max attempts are reached + + }else if(updateCount > 0) { + response = "Successfully closing call"; + } + } catch (Exception e) { + response = "error: " + e.getMessage(); + } + return response; // Return the response (either success or error message) + } } diff --git a/src/main/java/com/iemr/common/service/grievance/GrievanceHandlingServiceImpl.java b/src/main/java/com/iemr/common/service/grievance/GrievanceHandlingServiceImpl.java index b930bce3..68e8e76e 100644 --- a/src/main/java/com/iemr/common/service/grievance/GrievanceHandlingServiceImpl.java +++ b/src/main/java/com/iemr/common/service/grievance/GrievanceHandlingServiceImpl.java @@ -1,17 +1,17 @@ package com.iemr.common.service.grievance; +import java.lang.reflect.Type; import java.sql.Timestamp; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Comparator; import java.util.Date; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; +import org.apache.commons.lang.StringUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -22,6 +22,11 @@ import org.springframework.stereotype.Service; import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import com.iemr.common.data.grievance.GetGrievanceWorklistRequest; import com.iemr.common.data.grievance.GrievanceAllocationRequest; import com.iemr.common.data.grievance.GrievanceDetails; @@ -33,6 +38,7 @@ import com.iemr.common.repository.callhandling.BeneficiaryCallRepository; import com.iemr.common.repository.grievance.GrievanceDataRepo; import com.iemr.common.repository.grievance.GrievanceOutboundRepository; +import com.iemr.common.repository.grievance.GrievanceTransactionRepo; import com.iemr.common.utils.exception.IEMRException; import com.iemr.common.utils.mapper.InputMapper; @@ -46,13 +52,15 @@ public class GrievanceHandlingServiceImpl implements GrievanceHandlingService { private final GrievanceDataRepo grievanceDataRepo; private final GrievanceOutboundRepository grievanceOutboundRepo; private final BeneficiaryCallRepository beneficiaryCallRepo; + private final GrievanceTransactionRepo grievanceTransactionRepo; @Autowired public GrievanceHandlingServiceImpl(GrievanceDataRepo grievanceDataRepo, GrievanceOutboundRepository grievanceOutboundRepo, - BeneficiaryCallRepository beneficiaryCallRepo) { + BeneficiaryCallRepository beneficiaryCallRepo,GrievanceTransactionRepo grievanceTransactionRepo) { this.grievanceDataRepo = grievanceDataRepo; this.grievanceOutboundRepo = grievanceOutboundRepo; this.beneficiaryCallRepo = beneficiaryCallRepo; + this.grievanceTransactionRepo = grievanceTransactionRepo; } @Value("${grievanceAllocationRetryConfiguration}") @@ -60,7 +68,6 @@ public GrievanceHandlingServiceImpl(GrievanceDataRepo grievanceDataRepo, Grievan // configure // retry logic - private InputMapper inputMapper = new InputMapper(); // InputMapper used to map the JSON request @Override public String allocateGrievances(String request) throws Exception { @@ -82,9 +89,7 @@ public String allocateGrievances(String request) throws Exception { int allocateNo = allocationRequest.getAllocateNo(); // Number of grievances to allocate per user // Step 4: Initialize counters - int totalAllocated = 0; int grievanceIndex = 0; // Start from the first grievance - int totalUsers = userIds.size(); int totalGrievances = grievances.size(); // Step 5: Allocate grievances to users, ensuring each user gets exactly 'allocateNo' grievances @@ -98,7 +103,6 @@ public String allocateGrievances(String request) throws Exception { // Allocate the grievance to the user int rowsAffected = grievanceDataRepo.allocateGrievance(grievance.getGrievanceId(), userId); if (rowsAffected > 0) { - totalAllocated++; logger.debug("Allocated grievance ID {} to user ID {}", grievance.getGrievanceId(), userId); } else { logger.error("Failed to allocate grievance ID {} to user ID {}", grievance.getGrievanceId(), userId); @@ -120,10 +124,9 @@ public String allocateGrievances(String request) throws Exception { public String allocatedGrievanceRecordsCount(String request) throws IEMRException, JSONException { GrievanceDetails grievanceRequest = InputMapper.gson().fromJson(request, GrievanceDetails.class); - Integer providerServiceMapID = grievanceRequest.getProviderServiceMapID(); Integer userID = grievanceRequest.getUserID(); - Set resultSet = grievanceDataRepo.fetchGrievanceRecordsCount(providerServiceMapID, userID); + Set resultSet = grievanceDataRepo.fetchGrievanceRecordsCount(userID); JSONObject result = new JSONObject(); result.put("All", 0); @@ -277,11 +280,10 @@ public List getFormattedGrievanceData(String request) thro // Fetch grievance worklist data using @Procedure annotation List worklistData; try { - if (getGrievanceWorklistRequest.getProviderServiceMapID() == null || - getGrievanceWorklistRequest.getUserId() == null) { - throw new IllegalArgumentException("ProviderServiceMapID and UserId are required"); + if (getGrievanceWorklistRequest.getUserId() == null) { + throw new IllegalArgumentException("UserId are required"); } - worklistData = grievanceOutboundRepo.getGrievanceWorklistData(getGrievanceWorklistRequest.getProviderServiceMapID(), getGrievanceWorklistRequest.getUserId()); + worklistData = grievanceOutboundRepo.getGrievanceWorklistData(getGrievanceWorklistRequest.getUserId()); if (worklistData == null || worklistData.isEmpty()) { logger.info("No grievance data found for the given criteria"); return new ArrayList<>(); @@ -294,7 +296,7 @@ public List getFormattedGrievanceData(String request) thro // Loop through the worklist data and format the response for (Object[] row : worklistData) { - if (row == null || row.length < 30) + if (row == null || row.length < 22) { logger.warn("invalid row data received"); continue; @@ -302,56 +304,57 @@ public List getFormattedGrievanceData(String request) thro // Handle age conversion from Double to "x years" format String ageFormatted = null; // Default value for age if it's not available - if (row[25] != null) { - Long age = (Long) row[25]; + if (row[20] != null) { + Long age = (Long) row[20]; ageFormatted = age.intValue() + " years"; // Convert the age to integer and append " years" } GrievanceWorklistDTO grievance = new GrievanceWorklistDTO( (String) row[0], // complaintID - (String) row[1], // subjectOfComplaint - (String) row[2], // complaint - (Long) row[3], // beneficiaryRegID - (Integer) row[4],// providerServiceMapID - - (String) row[20], // firstName - (String) row[21], // lastName - (String) row[5], // primaryNumber - - new ArrayList<>(),// transactions (initially empty, will be populated later) - (String) row[12], // severety - (String) row[13], // state - (Integer) row[14],// userId - (Boolean) row[15],// deleted - (String) row[16],// createdBy - (Timestamp) row[17], // createdDate - (Timestamp) row[18], // lastModDate - (Boolean) row[19], // isCompleted - (String) row[22], // gender - (String) row[23], // district - (Long) row[24], // beneficiaryID - // (Double) row[25], // age + (Long) row[1], //grievanceId + (String) row[2], // subjectOfComplaint + (String) row[3], // complaint + (Long) row[4], // beneficiaryRegID + (Integer) row[5],// providerServiceMapID + (String) row[6], // primaryNumber + (String) row[7], // severety + (String) row[8], // state + (Integer) row[9],// userId + (Boolean) row[10],// deleted + (String) row[11],// createdBy + (Timestamp) row[12], // createdDate + (Timestamp) row[13], // lastModDate + (Boolean) row[14], // isCompleted + + (String) row[15], // firstName + (String) row[16], // lastName + (String) row[17], // gender + (String) row[18], // district + (Long) row[19], // beneficiaryID ageFormatted, - (Boolean) row[26], // retryNeeded - (Integer) row[27], // callCounter - (Timestamp) row[17] //lastCall yet to fill + (Boolean) row[21], // retryNeeded + (Integer) row[22], // callCounter + (Timestamp) row[13] //lastCall + ); // Extract transactions from the current row and add them to the grievance object - GrievanceTransactionDTO transaction = new GrievanceTransactionDTO( - (String) row[28], //actionTakenBy yet to fill - (String) row[29], //status yet to fill - (String) row[6], // fileName - (String) row[7], // fileType - (String) row[8], // redressed - (Timestamp) row[9], // createdAt - (Timestamp) row[10], // updatedAt - (String) row[11] // comment - ); + List transaction = grievanceTransactionRepo.getGrievanceTransaction((Long) row[1]); + List arrayList = new ArrayList<>(); + for (Object[] tras : transaction) { + String actionTakenBy = (tras[0]!=null)?(String) tras[0]:null; + String status = (tras[1]!=null)?(String) tras[1]:null; + String fileName = (tras[2]!=null)?(String) tras[2]:null; + String fileType = (tras[3]!=null)?(String) tras[3]:null; + String redressed = (tras[4]!=null)?(String) tras[4]:null; + Timestamp createdAt = (tras[5]!=null)?(Timestamp) tras[5]:null; + Timestamp updatedAt = (tras[6]!=null)?(Timestamp) tras[6]:null; + String comment = (tras[7]!=null)?(String) tras[7]:null; + GrievanceTransactionDTO grievanceTransactionDTO = new GrievanceTransactionDTO(actionTakenBy, status, fileName, fileType, redressed, createdAt, updatedAt,comment); + arrayList.add(grievanceTransactionDTO); + } + grievance.setTransactions(arrayList); - grievance.getTransactions().add(transaction); // Add the transaction to the grievance's list - - // Add the grievance to the result list formattedGrievances.add(grievance); } @@ -406,12 +409,12 @@ public String saveComplaintResolution(String request) throws Exception { int updateCount = 0; if (remarks == null) { updateCount = grievanceDataRepo.updateComplaintResolution(complaintResolution, modifiedBy, benCallID, complaintID, - beneficiaryRegID, providerServiceMapID, userID); + beneficiaryRegID, userID); logger.debug("updated complaint resolution without remarks for complaint id: {}", complaintID); } else { updateCount = grievanceDataRepo.updateComplaintResolution(complaintResolution, remarks, modifiedBy, benCallID, complaintID, - beneficiaryRegID, providerServiceMapID, userID); + beneficiaryRegID, userID); logger.debug("updated complaint resolution with remarks for complaint id: {}", complaintID); } @@ -478,32 +481,29 @@ public String getGrievanceDetailsWithRemarks(String request) throws Exception { // Fetch and set remarks based on complaintResolution value String remarks = ""; - if ("unresolved".equalsIgnoreCase(complaintResolution)) { - // Fetch remarks from t_bencall by joining with t_grievanceworklist based on benRegId - remarks = fetchRemarksFromBenCallByComplaint(grievance.getComplaintID()); - } else if ("resolved".equalsIgnoreCase(complaintResolution)) { - // Fetch remarks from t_grievanceworklist - remarks = fetchRemarksFromGrievanceWorklist(grievance.getComplaintID()); - } else { - // Default: Fetch remarks based on the grievance's specific conditions (no specific resolution status) - String callRemarks = fetchRemarksFromBenCallByComplaint(grievance.getComplaintID()); - if(remarks != null && !remarks.startsWith("No remarks found")) { - remarks = callRemarks; - } - else { - remarks = fetchRemarksFromGrievanceWorklist(grievance.getComplaintID()); - - } + if(!StringUtils.isEmpty(grievance.getRemarks())) { + remarks = grievance.getRemarks(); + }else { + remarks = fetchRemarksFromBenCallByComplaint(grievance.getComplaintID()); } + grievanceResponse.setRemarks(remarks); // Add to response list grievanceResponseList.add(grievanceResponse); } - - // Convert the list of GrievanceResponse objects to JSON and return as a string - return objectMapper.writeValueAsString(grievanceResponseList); + Gson gson = new GsonBuilder() + .serializeNulls() + .registerTypeAdapter(Date.class, new JsonSerializer() { + @Override + public JsonElement serialize(Date date, Type typeOfSrc, JsonSerializationContext context) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + return context.serialize(sdf.format(date)); // Format date + } + }) + .create(); + return gson.toJson(grievanceResponseList); } catch (Exception e) { logger.error("Error while getting grievance details with remarks: " + e.getMessage(), e); @@ -520,16 +520,17 @@ private String fetchRemarksFromBenCallByComplaint(String complaintID) throws Exc if (grievanceWorklist != null && !grievanceWorklist.isEmpty()) { GrievanceDetails grievance = grievanceWorklist.get(0); Long beneficiaryRegID = grievance.getBeneficiaryRegID(); // Fetch the beneficiaryRegID from the grievance - + Long benCallID = grievance.getBenCallID(); // Query t_bencall to fetch remarks based on benRegId - List benCallResults = beneficiaryCallRepo.fetchBenCallRemarks(beneficiaryRegID); + List benCallResults = beneficiaryCallRepo.fetchBenCallRemarks(benCallID); if (benCallResults != null && !benCallResults.isEmpty()) { - return (String) benCallResults.get(0)[0]; // Fetch the remarks + if(null != benCallResults.get(0) && null != benCallResults.get(0)[0]) + return (String) benCallResults.get(0)[0]; // Fetch the remarks } } - return "No remarks found in t_bencall"; + return "No remarks found"; } private String fetchRemarksFromGrievanceWorklist(String complaintID) throws JSONException { diff --git a/src/main/java/com/iemr/common/service/users/IEMRAdminUserService.java b/src/main/java/com/iemr/common/service/users/IEMRAdminUserService.java index 58ed2b00..3f1d8068 100644 --- a/src/main/java/com/iemr/common/service/users/IEMRAdminUserService.java +++ b/src/main/java/com/iemr/common/service/users/IEMRAdminUserService.java @@ -116,7 +116,7 @@ public List getUserServiceRoleMappingForProvider(Integ String generateTransactionIdForPasswordChange(User user) throws Exception; - + User getUserById(Long userId) throws IEMRException; diff --git a/src/main/java/com/iemr/common/utils/CookieUtil.java b/src/main/java/com/iemr/common/utils/CookieUtil.java index 8c0a0b76..678f639c 100644 --- a/src/main/java/com/iemr/common/utils/CookieUtil.java +++ b/src/main/java/com/iemr/common/utils/CookieUtil.java @@ -3,6 +3,7 @@ import java.util.Arrays; import java.util.Optional; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import jakarta.servlet.http.Cookie; @@ -11,6 +12,9 @@ @Service public class CookieUtil { + + @Value("${isProduction}") + private Boolean isProduction; public Optional getCookieValue(HttpServletRequest request, String cookieName) { Cookie[] cookies = request.getCookies(); @@ -39,6 +43,9 @@ public void addJwtTokenToCookie(String Jwttoken, HttpServletResponse response, H // Set the SameSite attribute for cross-site request handling (if needed) String sameSite = "None"; // Allow cross-site cookies (can be 'Strict', 'Lax', or 'None') + if(isProduction) { + sameSite= "Strict"; + } cookie.setSecure(true); // Build the Set-Cookie header manually (to add SameSite attribute support) diff --git a/src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java b/src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java index 0c12c3a6..b83f4873 100644 --- a/src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java +++ b/src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java @@ -52,11 +52,9 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo String jwtTokenFromHeader = request.getHeader("Jwttoken"); logger.info("JWT token from header: "); - // Skip login and public endpoints - if (path.equals(contextPath + "/user/userAuthenticate") - || path.equalsIgnoreCase(contextPath + "/user/logOutUserFromConcurrentSession") - || path.startsWith(contextPath + "/public")) { - logger.info("Skipping filter for path: " + path); + // Skip authentication for public endpoints + if (shouldSkipAuthentication(path, contextPath)) { + logger.info("Skipping filter for path: {}", path); filterChain.doFilter(servletRequest, servletResponse); return; } @@ -69,17 +67,18 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo // Determine which token (cookie or header) to validate String jwtToken = jwtTokenFromCookie != null ? jwtTokenFromCookie : jwtTokenFromHeader; if (jwtToken == null) { + logger.error("JWT token not found in cookies or headers"); response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "JWT token not found in cookies or headers"); return; } // Validate JWT token and userId - boolean isValid = jwtAuthenticationUtil.validateUserIdAndJwtToken(jwtToken); - - if (isValid) { + if (jwtAuthenticationUtil.validateUserIdAndJwtToken(jwtToken)) { // If token is valid, allow the request to proceed + logger.info("Valid JWT token"); filterChain.doFilter(servletRequest, servletResponse); } else { + logger.error("Invalid JWT token"); response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Invalid JWT token"); } } catch (Exception e) { @@ -88,6 +87,16 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo } } + private boolean shouldSkipAuthentication(String path, String contextPath) { + return path.equals(contextPath + "/user/userAuthenticate") + || path.equalsIgnoreCase(contextPath + "/user/logOutUserFromConcurrentSession") + || path.startsWith(contextPath + "/swagger-ui") + || path.startsWith(contextPath + "/v3/api-docs") + || path.startsWith(contextPath + "/public") + || path.equals(contextPath + "/user/refreshToken") + ; + } + private String getJwtTokenFromCookies(HttpServletRequest request) { Cookie[] cookies = request.getCookies(); if (cookies != null) { diff --git a/src/main/java/com/iemr/common/utils/JwtUtil.java b/src/main/java/com/iemr/common/utils/JwtUtil.java index a6e8b942..c0241954 100644 --- a/src/main/java/com/iemr/common/utils/JwtUtil.java +++ b/src/main/java/com/iemr/common/utils/JwtUtil.java @@ -1,16 +1,21 @@ package com.iemr.common.utils; -import java.security.Key; import java.util.Date; +import java.util.UUID; import java.util.function.Function; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import io.jsonwebtoken.Claims; +import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.SignatureAlgorithm; +import io.jsonwebtoken.MalformedJwtException; +import io.jsonwebtoken.UnsupportedJwtException; import io.jsonwebtoken.security.Keys; +import io.jsonwebtoken.security.SignatureException; + +import javax.crypto.SecretKey; @Component public class JwtUtil { @@ -18,51 +23,79 @@ public class JwtUtil { @Value("${jwt.secret}") private String SECRET_KEY; - private static final long EXPIRATION_TIME = 24L * 60 * 60 * 1000; // 1 day in milliseconds + @Value("${jwt.access.expiration}") + private long ACCESS_EXPIRATION_TIME; + + @Value("${jwt.refresh.expiration}") + private long REFRESH_EXPIRATION_TIME; - // Generate a key using the secret - private Key getSigningKey() { + private SecretKey getSigningKey() { if (SECRET_KEY == null || SECRET_KEY.isEmpty()) { throw new IllegalStateException("JWT secret key is not set in application.properties"); } return Keys.hmacShaKeyFor(SECRET_KEY.getBytes()); } - // Generate JWT Token public String generateToken(String username, String userId) { - Date now = new Date(); - Date expiryDate = new Date(now.getTime() + EXPIRATION_TIME); + return buildToken(username, userId, "access", ACCESS_EXPIRATION_TIME); + } - // Include the userId in the JWT claims - return Jwts.builder().setSubject(username).claim("userId", userId) // Add userId as a claim - .setIssuedAt(now).setExpiration(expiryDate).signWith(getSigningKey(), SignatureAlgorithm.HS256) + public String generateRefreshToken(String username, String userId) { + return buildToken(username, userId, "refresh", REFRESH_EXPIRATION_TIME); + } + + private String buildToken(String username, String userId, String tokenType, long expiration) { + return Jwts.builder() + .subject(username) + .claim("userId", userId) + .claim("token_type", tokenType) + .id(UUID.randomUUID().toString()) + .issuedAt(new Date()) + .expiration(new Date(System.currentTimeMillis() + expiration)) + .signWith(getSigningKey()) .compact(); } - // Validate and parse JWT Token public Claims validateToken(String token) { try { - // Use the JwtParserBuilder correctly in version 0.12.6 - return Jwts.parser() // Correct method in 0.12.6 to get JwtParserBuilder - .setSigningKey(getSigningKey()) // Set the signing key - .build() // Build the JwtParser - .parseClaimsJws(token) // Parse and validate the token - .getBody(); - } catch (Exception e) { - return null; // Handle token parsing/validation errors + return Jwts.parser() + .verifyWith(getSigningKey()) + .build() + .parseSignedClaims(token) + .getPayload(); + + } catch (ExpiredJwtException ex) { + // Handle expired token specifically if needed + } catch (UnsupportedJwtException | MalformedJwtException | SignatureException | IllegalArgumentException ex) { + // Log specific error types } + return null; } - public String extractUsername(String token) { - return extractClaim(token, Claims::getSubject); + public T getClaimFromToken(String token, Function claimsResolver) { + final Claims claims = getAllClaimsFromToken(token); + return claimsResolver.apply(claims); } - public T extractClaim(String token, Function claimsResolver) { - final Claims claims = extractAllClaims(token); - return claimsResolver.apply(claims); + public Claims getAllClaimsFromToken(String token) { + return Jwts.parser() + .verifyWith(getSigningKey()) + .build() + .parseSignedClaims(token) + .getPayload(); + } + + + public long getRefreshTokenExpiration() { + return REFRESH_EXPIRATION_TIME; + } + + // Additional helper methods + public String getJtiFromToken(String token) { + return getAllClaimsFromToken(token).getId(); } - private Claims extractAllClaims(String token) { - return Jwts.parser().setSigningKey(getSigningKey()).build().parseClaimsJws(token).getBody(); + public String getUsernameFromToken(String token) { + return getAllClaimsFromToken(token).getSubject(); } } \ No newline at end of file diff --git a/src/main/java/com/iemr/common/utils/UserAgentUtil.java b/src/main/java/com/iemr/common/utils/UserAgentUtil.java new file mode 100644 index 00000000..e6b0dbce --- /dev/null +++ b/src/main/java/com/iemr/common/utils/UserAgentUtil.java @@ -0,0 +1,9 @@ +package com.iemr.common.utils; + +public class UserAgentUtil { + public static boolean isMobileDevice(String userAgent) { + if (userAgent == null) return false; + String lowerUA = userAgent.toLowerCase(); + return lowerUA.contains("mobile") || lowerUA.contains("android") || lowerUA.contains("iphone"); + } +} diff --git a/src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java b/src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java index a31b2a2b..b8359fe6 100644 --- a/src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java +++ b/src/main/java/com/iemr/common/utils/http/HTTPRequestInterceptor.java @@ -101,13 +101,12 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons case "api-docs": case "updateBenCallIdsInPhoneBlock": case "userAuthenticateByEncryption": - case "sendOTP": case "validateOTP": case "resendOTP": case "validateSecurityQuestionAndAnswer": case "logOutUserFromConcurrentSession": - + case "refreshToken": break; case "error": status = false; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index d645f273..9418e973 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -179,3 +179,7 @@ quality-Audit-PageSize=5 ## max no of failed login attempt failedLoginAttempt=5 + +#Jwt Token configuration +jwt.access.expiration=900000 +jwt.refresh.expiration=604800000