From 6caaf7f9edde21ed4f58b5ed7dee8ad7bc21562c Mon Sep 17 00:00:00 2001 From: swetatech24 Date: Fri, 25 Aug 2023 20:08:52 +0530 Subject: [PATCH 1/3] Czentrix Changes --- .../com/iemr/common/config/quartz/ScheduleForCallCentre.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/iemr/common/config/quartz/ScheduleForCallCentre.java b/src/main/java/com/iemr/common/config/quartz/ScheduleForCallCentre.java index ed53b8ed..0d25a910 100644 --- a/src/main/java/com/iemr/common/config/quartz/ScheduleForCallCentre.java +++ b/src/main/java/com/iemr/common/config/quartz/ScheduleForCallCentre.java @@ -39,13 +39,13 @@ public class ScheduleForCallCentre implements Job { private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @Autowired - private CallCentreDataSync callCentreDataSync; + private CallCentreDataSync czentirxDataSync; @Override public void execute(JobExecutionContext arg0) throws JobExecutionException { logger.info("Started job for sync " + arg0.getClass().getName()); - callCentreDataSync.ctiDataSync(); + czentirxDataSync.ctiDataSync(); logger.info("Completed job for sync " + arg0.getClass().getName()); } } From d35b9168eabb3999d1d622d575690852dce78a1c Mon Sep 17 00:00:00 2001 From: swetatech24 Date: Fri, 6 Oct 2023 18:57:13 +0530 Subject: [PATCH 2/3] Added Pull Request template, added placeholders in properties file, and added admin_local to git ignore --- .github/PULL_REQUEST_TEMPLATE.md | 30 ++++++++++++++++++++ .gitignore | 5 +++- src/main/environment/common_dev.properties | 19 ++++++------- src/main/environment/common_local.properties | 20 ++++++------- src/main/environment/common_test.properties | 18 ++++++------ src/main/environment/common_uat.properties | 18 ++++++------ 6 files changed, 71 insertions(+), 39 deletions(-) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..58bdec2c --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,30 @@ +# Description + +Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. + +# Type of change + +- [ ] Bug fix +- [ ] New feature +- [ ] Enhancement +- [ ] Refactoring +- [ ] Documentation +- [ ] Other ( please specify ) + +# How Has This Been Tested? + +Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration. + +- [ ] Test A +- [ ] Test B + +# Checklist: + +- [ ] My code follows the style guidelines of this project +- [ ] I have performed a self-review of my own code +- [ ] I have commented my code, particularly in hard-to-understand areas +- [ ] I have made corresponding changes to the documentation +- [ ] My changes generate no new warnings +- [ ] Any dependent changes have been merged and published in downstream modules + + diff --git a/.gitignore b/.gitignore index c0f949c7..a7d733a1 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,7 @@ logs/ # Ignore specific files swaasaPathcoughSoundAssessment1234567890121678177840715.wav replay_pid89928.log -hs_err_pid89928.log \ No newline at end of file +hs_err_pid89928.log + +# Properties +src/main/environment/common_local.properties \ No newline at end of file diff --git a/src/main/environment/common_dev.properties b/src/main/environment/common_dev.properties index 7dd775a5..516f6156 100644 --- a/src/main/environment/common_dev.properties +++ b/src/main/environment/common_dev.properties @@ -3,15 +3,15 @@ spring.jpa.database=default ## Primary db -spring.datasource.url= -spring.datasource.username= -spring.datasource.password= +spring.datasource.url= +spring.datasource.username= +spring.datasource.password= spring.datasource.driver-class-name=com.mysql.jdbc.Driver ## Secondary db -secondary.datasource.username= -secondary.datasource.password= -secondary.datasource.url= +secondary.datasource.username= +secondary.datasource.password= +secondary.datasource.url= secondary.datasource.driver-class-name=com.mysql.jdbc.Driver # KM config @@ -24,9 +24,8 @@ cti-logger_base_url=http://10.208.122.99/logger # Identity Config -identity-api-url=http://10.208.122.32:8080 -#identity-api-url=http://10.208.122.32:8080/hwc-identity-0.0.1 -identity-1097-api-url=http://10.208.122.32:8080/1097identityapi-v1.0 +identity-api-url= +identity-1097-api-url=/1097identityapi-v1.0 #### SMS Configuration send-sms=true @@ -51,7 +50,7 @@ start-avni-scheduler=false cron-avni-registration=0 0/1 * * * ? * ### generate Beneficiary Config -genben-api=http://10.208.122.32:8080/bengenapi-v1.0 +genben-api=/bengenapi-v1.0 ### Redis IP spring.redis.host=localhost diff --git a/src/main/environment/common_local.properties b/src/main/environment/common_local.properties index 6789716d..1e444d04 100644 --- a/src/main/environment/common_local.properties +++ b/src/main/environment/common_local.properties @@ -1,13 +1,13 @@ -# dev env +# local env # DB Connections -spring.datasource.url= -spring.datasource.username= -spring.datasource.password= +spring.datasource.url= +spring.datasource.username= +spring.datasource.password= spring.datasource.driver-class-name=com.mysql.jdbc.Driver -secondary.datasource.username= -secondary.datasource.password= -secondary.datasource.url= +secondary.datasource.username= +secondary.datasource.password= +secondary.datasource.url= secondary.datasource.driver-class-name=com.mysql.jdbc.Driver # KM config @@ -19,8 +19,8 @@ cti-server-ip=10.208.122.99 cti-logger_base_url=http://10.208.122.99/logger # Identity Config -identity-api-url = http://10.208.122.38:8080/identity-0.0.1 -identity-1097-api-url = http://10.208.122.38:8080/1097identityapi-v1.0 +identity-api-url = http://localhost:8080/identity-0.0.1 +identity-1097-api-url = http://localhost:8080/1097identityapi-v1.0 #### SMS Configuration send-sms=false @@ -37,7 +37,7 @@ start-email-scheduler=true cron-scheduler-email=0 0/1 * * * ? * ### generate Beneficiary Config -genben-api=http://10.208.122.38:8080/bengenapi-v1.0 +genben-api=http://localhost:8080/bengenapi-v1.0 ### Redis IP spring.redis.host=localhost diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties index dba62e8b..255e63cb 100644 --- a/src/main/environment/common_test.properties +++ b/src/main/environment/common_test.properties @@ -5,16 +5,16 @@ spring.jpa.database=default ##--------------------------------------------## Primary db------------------------------------------------------------------- -spring.datasource.url= -spring.datasource.username= -spring.datasource.password= +spring.datasource.url= +spring.datasource.username= +spring.datasource.password= spring.datasource.driver-class-name=com.mysql.jdbc.Driver -secondary.datasource.username= -secondary.datasource.password= -secondary.datasource.url= +secondary.datasource.username= +secondary.datasource.password= +secondary.datasource.url= secondary.datasource.driver-class-name=com.mysql.jdbc.Driver ##-------------------------------------------------------------# KM config-------------------------------------------------- @@ -26,11 +26,11 @@ cti-server-ip=10.208.122.99 cti-logger_base_url=http://10.208.122.99/logger ##-------------------------------------------------#### Identity Config-------------------------------------------------------------- -identity-api-url=http://10.208.122.38:8080/identity-0.0.1 -identity-1097-api-url=http://10.208.122.38:8080/1097identityapi-v1.0 +identity-api-url=/identity-0.0.1 +identity-1097-api-url=/1097identityapi-v1.0 ### generate Beneficiary Config -genben-api=http://10.208.122.38:8080/bengenapi-v1.0 +genben-api=/bengenapi-v1.0 ##---------------------------------------------#### SMS Configuration------------------------------------------------------------------ diff --git a/src/main/environment/common_uat.properties b/src/main/environment/common_uat.properties index f3ed4f6a..a04ee909 100644 --- a/src/main/environment/common_uat.properties +++ b/src/main/environment/common_uat.properties @@ -1,14 +1,14 @@ # UAT env # DB Connections -spring.datasource.url= -spring.datasource.username= -spring.datasource.password= +spring.datasource.url= +spring.datasource.username= +spring.datasource.password= spring.datasource.driver-class-name=com.mysql.jdbc.Driver -secondary.datasource.username= -secondary.datasource.password= -secondary.datasource.url= +secondary.datasource.username= +secondary.datasource.password= +secondary.datasource.url= secondary.datasource.driver-class-name=com.mysql.jdbc.Driver # KM config @@ -20,8 +20,8 @@ cti-server-ip=172.16.19.47 cti-logger_base_url=http://helplines.piramalswasthya.org/logger # Identity Config -identity-api-url = http://172.16.19.40:8080/identity-0.0.1 -identity-1097-api-url = http://172.16.19.40:8080/1097identityapi-v1.0 +identity-api-url = /identity-0.0.1 +identity-1097-api-url = /1097identityapi-v1.0 #### SMS Configuration send-sms=true @@ -38,7 +38,7 @@ start-email-scheduler=true cron-scheduler-email=0 0/1 * * * ? * ### generate Beneficiary IDs URL -genben-api=http://172.16.19.40:8080/bengenapi-v1.0 +genben-api=/bengenapi-v1.0 ### Redis IP spring.redis.host=localhost From 9c9524e48d3042b48710e359bbbbf039bbc9975f Mon Sep 17 00:00:00 2001 From: swetatech24 Date: Fri, 6 Oct 2023 19:01:11 +0530 Subject: [PATCH 3/3] modified ScheduleForCallCentre --- .../com/iemr/common/config/quartz/ScheduleForCallCentre.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/iemr/common/config/quartz/ScheduleForCallCentre.java b/src/main/java/com/iemr/common/config/quartz/ScheduleForCallCentre.java index 0d25a910..ed53b8ed 100644 --- a/src/main/java/com/iemr/common/config/quartz/ScheduleForCallCentre.java +++ b/src/main/java/com/iemr/common/config/quartz/ScheduleForCallCentre.java @@ -39,13 +39,13 @@ public class ScheduleForCallCentre implements Job { private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @Autowired - private CallCentreDataSync czentirxDataSync; + private CallCentreDataSync callCentreDataSync; @Override public void execute(JobExecutionContext arg0) throws JobExecutionException { logger.info("Started job for sync " + arg0.getClass().getName()); - czentirxDataSync.ctiDataSync(); + callCentreDataSync.ctiDataSync(); logger.info("Completed job for sync " + arg0.getClass().getName()); } }