Skip to content

adding newly added grievance related properties to properties file #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 49 commits into from
Feb 20, 2025
Merged

adding newly added grievance related properties to properties file #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
a7a9518
adding changes related to encryption and decryption
Oct 16, 2024
e1b5318
making final field static
Oct 16, 2024
eddabe3
making enclosing method static
Oct 16, 2024
6e626bb
adding beneficiaryConsent param to createFeedback API
Dec 10, 2024
6cf8550
Merge pull request #6 from PSMRI/develop
srishtigrp78 Dec 10, 2024
2303d60
Update src/main/java/com/iemr/common/data/feedback/FeedbackDetails.java
srishtigrp78 Dec 10, 2024
68d0483
Merge pull request #7 from PSMRI/develop
srishtigrp78 Dec 10, 2024
b7718c0
adding beneficiary consent param feedbacklist response
Dec 11, 2024
f9feef6
adding space
Dec 11, 2024
019d315
Merge pull request #8 from PSMRI/develop
srishtigrp78 Dec 20, 2024
507f830
Merge pull request #9 from PSMRI/develop
srishtigrp78 Jan 8, 2025
21be52e
adding code for schedule for grievance data sync
Jan 9, 2025
0a90728
adding code rabbit code suggestions
Jan 16, 2025
ea9ff9e
adding code rabbit suggestions
Jan 16, 2025
8825473
code rabbit suggested changes to Model classes
Jan 16, 2025
2d639c4
adding sonar quality changes
Jan 16, 2025
b0e039b
adding sonar quality code suggestions
Jan 16, 2025
9831500
adding sonar quality check suggestions
Jan 17, 2025
5cb6886
adding code rabbit suggestions
Jan 17, 2025
9e8e1f2
adding constant instead of duplicate literals
Jan 17, 2025
67b2f86
Merge pull request #10 from PSMRI/develop
srishtigrp78 Jan 19, 2025
7b3b990
adding cod changs to fetch unallocated grievance count
Jan 19, 2025
d834aa9
adding changes suggested by sonar quality check
Jan 20, 2025
734551a
adding code rabbit suggested changes
Jan 20, 2025
47ceb56
fixing config file
Jan 21, 2025
f26b8ff
fixing space
Jan 21, 2025
d3534d9
fixing space issue
Jan 21, 2025
6b58965
adding package for PrimaryDBConfig
Jan 22, 2025
8d97517
Merge pull request #11 from PSMRI/develop
srishtigrp78 Jan 22, 2025
b5798d2
adding code changes for allocate API for allocating grievance to agents
Jan 22, 2025
abe5bd3
removing space
Jan 22, 2025
3c8fbb9
Merge pull request #12 from PSMRI/develop
srishtigrp78 Jan 23, 2025
ef1021e
adding language related changes
Jan 23, 2025
3451ad5
add language related changes
Jan 23, 2025
fa02a49
adding name convention related changes
Jan 24, 2025
822ec19
adding code rabbit changes
Jan 24, 2025
c8e85ab
adding sonar quality check suggested changes
Jan 24, 2025
6557199
removing unused imports
Jan 24, 2025
9c8afce
Merge branch 'PSMRI:develop' into feature/version/upgrade
srishtigrp78 Jan 27, 2025
4c4cce0
Merge pull request #13 from PSMRI/develop
srishtigrp78 Feb 11, 2025
17a159f
Merge pull request #14 from PSMRI/develop
srishtigrp78 Feb 12, 2025
c20c9ab
Merge pull request #16 from PSMRI/develop
srishtigrp78 Feb 19, 2025
b2d99be
adding properties related to Grievance in properties file
Feb 19, 2025
76bf328
placing the placeholder for jwt secret key
Feb 19, 2025
eeaf00d
Update package.yml
srishtigrp78 Feb 19, 2025
b36477c
removing grievanc related properties from application properties file
Feb 20, 2025
48ac080
adding space
Feb 20, 2025
3fe65c4
removing extra space
Feb 20, 2025
b45a6da
Merge branch 'feature/version/upgrade' of https://github.com/srishtig…
Feb 20, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run: mvn -B package --file pom.xml

- name: Upload WAR file as artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4

with:
name: Common-API
Expand Down
4 changes: 4 additions & 0 deletions src/main/environment/common_ci.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,3 +159,7 @@ grievanceDataSyncDuration = @env.GRIEVANCE_DATA_SYNC_DURATION@

springdoc.api-docs.enabled=false
springdoc.swagger-ui.enabled=false

grievanceAllocationRetryConfiguration=1


4 changes: 3 additions & 1 deletion src/main/environment/common_dev.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,4 +184,6 @@ grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>

springdoc.api-docs.enabled=true
springdoc.swagger-ui.enabled=true
springdoc.swagger-ui.enabled=true

grievanceAllocationRetryConfiguration=1
4 changes: 4 additions & 0 deletions src/main/environment/common_example.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,3 +186,7 @@ grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
springdoc.api-docs.enabled=true
springdoc.swagger-ui.enabled=true

grievanceAllocationRetryConfiguration=1



4 changes: 3 additions & 1 deletion src/main/environment/common_test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,4 +186,6 @@ grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>

springdoc.api-docs.enabled=true
springdoc.swagger-ui.enabled=true
springdoc.swagger-ui.enabled=true

grievanceAllocationRetryConfiguration=1
4 changes: 3 additions & 1 deletion src/main/environment/common_uat.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,6 @@ grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>

springdoc.api-docs.enabled=true
springdoc.swagger-ui.enabled=true
springdoc.swagger-ui.enabled=true

grievanceAllocationRetryConfiguration=1
1 change: 0 additions & 1 deletion src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,3 @@ quality-Audit-PageSize=5

## max no of failed login attempt
failedLoginAttempt=5

Loading