Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -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


5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,7 @@ logs/
# Ignore specific files
swaasaPathcoughSoundAssessment1234567890121678177840715.wav
replay_pid89928.log
hs_err_pid89928.log
hs_err_pid89928.log

# Properties
src/main/environment/common_local.properties
19 changes: 9 additions & 10 deletions src/main/environment/common_dev.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
spring.jpa.database=default

## Primary db
spring.datasource.url=<Enter AMRIT DB URL here>
spring.datasource.username=<Enter your AMRIT DB username>
spring.datasource.password=<Enter your AMRIT DB password>
spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
spring.datasource.username=<Enter your AMRIT DB_IEMR username>
spring.datasource.password=<Enter your AMRIT DB_IEMR password>
spring.datasource.driver-class-name=com.mysql.jdbc.Driver

## Secondary db
secondary.datasource.username=<Enter your secondary DB username>
secondary.datasource.password=<Enter your secondary DB password>
secondary.datasource.url=<Enter secondary DB URL here>
secondary.datasource.username=<Enter your DB_REPORTING username>
secondary.datasource.password=<Enter your DB_REPORTING password>
secondary.datasource.url=<Enter DB_REPORTING URL here>
secondary.datasource.driver-class-name=com.mysql.jdbc.Driver

# KM config
Expand All @@ -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=<Enter your socket address here>
identity-1097-api-url=<Enter your socket address here>/1097identityapi-v1.0

#### SMS Configuration
send-sms=true
Expand All @@ -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=<Enter your socket address here>/bengenapi-v1.0

### Redis IP
spring.redis.host=localhost
Expand Down
20 changes: 10 additions & 10 deletions src/main/environment/common_local.properties
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# dev env
# local env
# DB Connections
spring.datasource.url=<Enter AMRIT DB URL here>
spring.datasource.username=<Enter your AMRIT DB username>
spring.datasource.password=<Enter your AMRIT DB password>
spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
spring.datasource.username=<Enter your AMRIT DB_IEMR username>
spring.datasource.password=<Enter your AMRIT DB_IEMR password>
spring.datasource.driver-class-name=com.mysql.jdbc.Driver

secondary.datasource.username=<Enter your secondary DB username>
secondary.datasource.password=<Enter your secondary DB password>
secondary.datasource.url=<Enter secondary DB URL here>
secondary.datasource.username=<Enter your DB_REPORTING username>
secondary.datasource.password=<Enter your DB_REPORTING password>
secondary.datasource.url=<Enter DB_REPORTING URL here>
secondary.datasource.driver-class-name=com.mysql.jdbc.Driver

# KM config
Expand All @@ -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
Expand All @@ -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
Expand Down
18 changes: 9 additions & 9 deletions src/main/environment/common_test.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ spring.jpa.database=default
##--------------------------------------------## Primary db-------------------------------------------------------------------


spring.datasource.url=<Enter AMRIT DB URL here>
spring.datasource.username=<Enter your AMRIT DB username>
spring.datasource.password=<Enter your AMRIT DB password>
spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
spring.datasource.username=<Enter your AMRIT DB_IEMR username>
spring.datasource.password=<Enter your AMRIT DB_IEMR password>
spring.datasource.driver-class-name=com.mysql.jdbc.Driver



secondary.datasource.username=<Enter your secondary DB username>
secondary.datasource.password=<Enter your secondary DB password>
secondary.datasource.url=<Enter secondary DB URL here>
secondary.datasource.username=<Enter your DB_REPORTING username>
secondary.datasource.password=<Enter your DB_REPORTING password>
secondary.datasource.url=<Enter DB_REPORTING URL here>
secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
##-------------------------------------------------------------# KM config--------------------------------------------------

Expand All @@ -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=<Enter your socket address here>/identity-0.0.1
identity-1097-api-url=<Enter your socket address here>/1097identityapi-v1.0

### generate Beneficiary Config
genben-api=http://10.208.122.38:8080/bengenapi-v1.0
genben-api=<Enter your socket address here>/bengenapi-v1.0

##---------------------------------------------#### SMS Configuration------------------------------------------------------------------

Expand Down
18 changes: 9 additions & 9 deletions src/main/environment/common_uat.properties
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

# UAT env
# DB Connections
spring.datasource.url=<Enter AMRIT DB URL here>
spring.datasource.username=<Enter your AMRIT DB username>
spring.datasource.password=<Enter your AMRIT DB password>
spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
spring.datasource.username=<Enter your AMRIT DB_IEMR username>
spring.datasource.password=<Enter your AMRIT DB_IEMR password>
spring.datasource.driver-class-name=com.mysql.jdbc.Driver

secondary.datasource.username=<Enter your secondary DB username>
secondary.datasource.password=<Enter your secondary DB password>
secondary.datasource.url=<Enter secondary DB URL here>
secondary.datasource.username=<Enter your DB_REPORTING username>
secondary.datasource.password=<Enter your DB_REPORTING password>
secondary.datasource.url=<Enter DB_REPORTING URL here>
secondary.datasource.driver-class-name=com.mysql.jdbc.Driver

# KM config
Expand All @@ -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 = <Enter your socket address here>/identity-0.0.1
identity-1097-api-url = <Enter your socket address here>/1097identityapi-v1.0

#### SMS Configuration
send-sms=true
Expand All @@ -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=<Enter your socket address here>/bengenapi-v1.0

### Redis IP
spring.redis.host=localhost
Expand Down