Grievance Runtime issues and CICD file committed

PSMRI · Jan 22, 2025 · def5975 · def5975
1 parent bcad2f6
commit def5975
Show file tree

Hide file tree

Showing 10 changed files with 460 additions and 381 deletions.
diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties
@@ -142,3 +142,14 @@ spring.main.allow-circular-references=true
 
 #ELK logging file name
 logging.file.name=@env.COMMON_API_LOGGING_FILE_NAME@
+
+##grievance API call
+updateGrievanceDetails = https://grievance1097naco.piramalswasthya.org/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list
+updateGrievanceTransactionDetails=https://grievance1097naco.piramalswasthya.org/grsbepro/igemr1097/public/api/v1/grievance_details/
+
+## grievance variables
+grievanceUserName = <Enter Grievance username>
+grievancePassword = <Enter Grievance password>
+
+grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
+grievanceDataSyncDuration = 15
diff --git a/src/main/environment/common_dev.properties b/src/main/environment/common_dev.properties
@@ -115,6 +115,11 @@ nhm.agent.real.time.data.url= http://175.101.1.83/apps/utility/alive_api.php
 nhm.agent.real.time.data.cron.scheduler=0 */2 * ? * *
 nhm.agent.real.time.data.cron.flag=true
 
+##----------------------------------------------------#grievance data sync-----------------------------------------------------------
+
+start-grievancedatasync-scheduler=false
+cron-scheduler-grievancedatasync=0 0/5 * * * ? *
+
 carestream_socket_ip = 192.168.43.39
 carestream_socket_port = 1235
 
@@ -166,3 +171,13 @@ spring.main.allow-circular-references=true
 
 fileBasePath =<Enter your required basepath here>/Doc
 
+##grievance API call
+updateGrievanceDetails = https://grievance1097naco.piramalswasthya.org/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list
+updateGrievanceTransactionDetails=https://grievance1097naco.piramalswasthya.org/grsbepro/igemr1097/public/api/v1/grievance_details/
+
+## grievance variables
+grievanceUserName = <Enter Grievance username>
+grievancePassword = <Enter Grievance password>
+
+grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
+grievanceDataSyncDuration = 15
diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties
@@ -53,6 +53,11 @@ spring.mail.properties.mail.smtp.starttls.enable=true
 start-email-scheduler=true
 cron-scheduler-email=0 0/1 * * * ? *
 
+##----------------------------------------------------#grievance data sync-----------------------------------------------------------
+
+start-grievancedatasync-scheduler=false
+cron-scheduler-grievancedatasync=0 0/5 * * * ? *
+
 ### generate Beneficiary Config
 genben-api=http://localhost:8080/bengenapi-v1.0
 
@@ -110,3 +115,13 @@ eausadhaAuthorization=<Enter eausadha authorization key>
 spring.main.allow-bean-definition-overriding=true
 spring.main.allow-circular-references=true
 
+##grievance API call
+updateGrievanceDetails = https://grievance1097naco.piramalswasthya.org/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list
+updateGrievanceTransactionDetails=https://grievance1097naco.piramalswasthya.org/grsbepro/igemr1097/public/api/v1/grievance_details/
+
+## grievance variables
+grievanceUserName = <Enter Grievance username>
+grievancePassword = <Enter Grievance password>
+
+grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
+grievanceDataSyncDuration = 15
diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties
@@ -80,6 +80,11 @@ cron-scheduler-registration=0 34 19 * * ? *
 
 start-everwelldatasync-scheduler=false
 cron-scheduler-everwelldatasync=0 0/5 * * * ? *
+
+##----------------------------------------------------#grievance data sync-----------------------------------------------------------
+
+start-grievancedatasync-scheduler=false
+cron-scheduler-grievancedatasync=0 0/5 * * * ? *
 ##-----------------------------------------------#NHM data dashboard schedular----------------------------------------------------------------
 # run at everyday 12:01AM
 start-nhmdashboard-scheduler=true
@@ -167,4 +172,13 @@ spring.main.allow-circular-references=true
 
 fileBasePath =<Enter your required basepath here>/Doc
 
+##grievance API call
+updateGrievanceDetails = https://grievance1097naco.piramalswasthya.org/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list
+updateGrievanceTransactionDetails=https://grievance1097naco.piramalswasthya.org/grsbepro/igemr1097/public/api/v1/grievance_details/
+
+## grievance variables
+grievanceUserName = <Enter Grievance username>
+grievancePassword = <Enter Grievance password>
 
+greivanceUserAuthenticate = <Enter Grievance UserAuthenticate>
+grievanceDataSyncDuration = 15
diff --git a/src/main/environment/common_uat.properties b/src/main/environment/common_uat.properties
@@ -56,6 +56,11 @@ cron-scheduler-email=0 0/1 * * * ? *
 start-ctidatacheck-scheduler=true
 cron-scheduler-ctidatacheck=0 10 00 * * *
 
+##----------------------------------------------------#grievance data sync-----------------------------------------------------------
+
+start-grievancedatasync-scheduler=false
+cron-scheduler-grievancedatasync=0 0/5 * * * ? *
+
 ### generate Beneficiary IDs URL
 genben-api=<Enter your socket address here>/bengenapi-v1.0
 
@@ -139,3 +144,13 @@ spring.main.allow-circular-references=true
 
 fileBasePath =<Enter your required basepath here>/Doc
 
+##grievance API call
+updateGrievanceDetails = https://grievance1097naco.piramalswasthya.org/grsbepro/igemr1097/public/api/v1/state-wise/grievance-list
+updateGrievanceTransactionDetails=https://grievance1097naco.piramalswasthya.org/grsbepro/igemr1097/public/api/v1/grievance_details/
+
+## grievance variables
+grievanceUserName = <Enter Grievance username>
+grievancePassword = <Enter Grievance password>
+
+grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
+grievanceDataSyncDuration = 15
diff --git a/src/main/java/com/iemr/common/data/grievance/GrievanceTransaction.java b/src/main/java/com/iemr/common/data/grievance/GrievanceTransaction.java
@@ -1,7 +1,7 @@
 package com.iemr.common.data.grievance;
 
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import com.google.gson.annotations.Expose;
 

diff --git a/src/main/java/com/iemr/common/repository/grievance/GrievanceDataRepo.java b/src/main/java/com/iemr/common/repository/grievance/GrievanceDataRepo.java
@@ -12,7 +12,7 @@
 @Repository
 public interface GrievanceDataRepo  extends CrudRepository<GrievanceDetails, Long>{
 
-	@Query("SELECT COUNT(g) > 0 FROM GrievanceDetails g WHERE g.complaintId = :complaintId")
+	@Query("SELECT COUNT(g) > 0 FROM GrievanceDetails g WHERE g.complaintID = :complaintId")
     boolean existsByComplaintId(@Param("complaintId") String complaintId);
 
 	@Query("select count(request) "

diff --git a/src/main/java/com/iemr/common/repository/grievance/GrievanceFetchBenDetailsRepo.java b/src/main/java/com/iemr/common/repository/grievance/GrievanceFetchBenDetailsRepo.java
@@ -14,7 +14,7 @@
 @Repository
 public interface GrievanceFetchBenDetailsRepo extends CrudRepository<FeedbackDetails, Long> {
 
-	@Query("select f.requestID, f.benCallID, f.beneficiaryRegID, f.providerServiceMapID, f.stateID "
+	@Query("select f.requestID, f.benCallID, f.beneficiaryRegID, f.serviceID, f.stateID "
 			+ " from FeedbackDetails f where f.requestID = :requestID order by f.requestID desc")
 	public ArrayList<Object[]> findByComplaintId(@Param("requestID") String requestID);
 

diff --git a/src/main/java/com/iemr/common/repository/location/LocationStateRepository.java b/src/main/java/com/iemr/common/repository/location/LocationStateRepository.java
@@ -51,7 +51,7 @@ public interface LocationStateRepository extends CrudRepository<States, Integer>
 
 	States findByStateID(Integer stateID);
 
-	@Query("select state.state from States state where state.stateID = :id")
+	@Query("select stateName from States where stateID = :id")
 	public String findByStateIDForGrievance(@Param("id") int id);