Skip to content
Closed
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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
<org.projectlombok.version>1.16.18</org.projectlombok.version>
<final-name>commonapi-v1.0</final-name>
<final-name>commonapi-v3.0.0</final-name>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Inconsistent artifact final-name in build section
The <final-name> property under <properties> was updated to commonapi-v3.0.0, but the <build> section still uses:

<finalName>commonapi-v1.0</finalName>

This mismatch will package the WAR under the old name.

Please align the <build> finalName:

<build>
-    <finalName>commonapi-v1.0</finalName>
+    <finalName>commonapi-v3.0.0</finalName>
    ...

<environment>${ENV_VAR}</environment>
<target-properties>target/classes/application.properties</target-properties>
<source-properties>target/classes/common_${environment}.properties</source-properties>
Expand Down
2 changes: 1 addition & 1 deletion src/main/environment/common_ci.properties
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,4 @@ updateGrievanceTransactionDetails=@env.GRIEVANCE_API_BASE_URL@/grsbepro/igemr109
grievanceUserName = @env.GRIEVANCE_USERNAME@
grievancePassword = @env.GRIEVANCE_PASSWORD@
grievanceUserAuthenticate = @env.GRIEVANCE_USER_AUTHENTICATE@
grievanceDataSyncDuration = 15
grievanceDataSyncDuration = @env.GRIEVANCE_DATA_SYNC_DURATION@
2 changes: 1 addition & 1 deletion src/main/environment/common_dev.properties
Original file line number Diff line number Diff line change
Expand Up @@ -180,4 +180,4 @@ grievanceUserName = <Enter Grievance username>
grievancePassword = <Enter Grievance password>

grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
grievanceDataSyncDuration = 15
grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
2 changes: 1 addition & 1 deletion src/main/environment/common_example.properties
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,4 @@ grievanceUserName = <Enter Grievance username>
grievancePassword = <Enter Grievance password>

grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
grievanceDataSyncDuration = 15
grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
2 changes: 1 addition & 1 deletion src/main/environment/common_test.properties
Original file line number Diff line number Diff line change
Expand Up @@ -181,4 +181,4 @@ grievanceUserName = <Enter Grievance username>
grievancePassword = <Enter Grievance password>

grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
grievanceDataSyncDuration = 15
grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
2 changes: 1 addition & 1 deletion src/main/environment/common_uat.properties
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,4 @@ grievanceUserName = <Enter Grievance username>
grievancePassword = <Enter Grievance password>

grievanceUserAuthenticate = <Enter Grievance UserAuthenticate>
grievanceDataSyncDuration = 15
grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
28 changes: 14 additions & 14 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -117,22 +117,22 @@ enableIPValidation=false
iemr.extend.expiry.time.changePassword=true
iemr.session.expiry.time.changePassword=600

identity-api-url-advancesearch =IDENTITY_API_URL/id/advanceSearch
identity-api-url-getByBenRegIdList =IDENTITY_API_URL/id/getByBenRegIdList
identity-api-url-getByPartialBenRegIdList =IDENTITY_API_URL/id/getByPartialBenRegIdList
identity-api-url-getByPhoneNum =IDENTITY_API_URL/id/getByPhoneNum?phoneNum=
identity-api-url-getByBenId =IDENTITY_API_URL/id/getByBenId?benId=
identity-api-url-getByBenRegId =IDENTITY_API_URL/id/getByBenRegId?benRegId=
identity-api-url-benCreate =IDENTITY_API_URL/id/create
identity-api-url-benEdit =IDENTITY_API_URL/id/edit
identity-api-url-benEditEducationCommunity=IDENTITY_API_URL/id/editEducationOrCommunity

identity-api-url-getByFamilyId=IDENTITY_API_URL/id/searchByFamilyId?familyId=
identity-api-url-getByGovIdentity=IDENTITY_API_URL/id/searhByGovIdentity?identity=
identity-api-url-advancesearch =IDENTITY_BASE_URL/id/advanceSearch
identity-api-url-getByBenRegIdList =IDENTITY_BASE_URL/id/getByBenRegIdList
identity-api-url-getByPartialBenRegIdList =IDENTITY_BASE_URL/id/getByPartialBenRegIdList
identity-api-url-getByPhoneNum =IDENTITY_BASE_URL/id/getByPhoneNum?phoneNum=
identity-api-url-getByBenId =IDENTITY_BASE_URL/id/getByBenId?benId=
identity-api-url-getByBenRegId =IDENTITY_BASE_URL/id/getByBenRegId?benRegId=
identity-api-url-benCreate =IDENTITY_BASE_URL/id/create
identity-api-url-benEdit =IDENTITY_BASE_URL/id/edit
identity-api-url-benEditEducationCommunity=IDENTITY_BASE_URL/id/editEducationOrCommunity

identity-api-url-getByFamilyId=IDENTITY_BASE_URL/id/searchByFamilyId?familyId=
identity-api-url-getByGovIdentity=IDENTITY_BASE_URL/id/searchByGovIdentity?identity=

## ABHA id based search URL
identity-api-url-getByHealthID=IDENTITY_API_URL/id/getByAbhaAddress?healthID=
identity-api-url-getByHealthIDNo=IDENTITY_API_URL/id/getByAbhaIdNo?healthIDNo=
identity-api-url-getByHealthID=IDENTITY_BASE_URL/id/getByAbhaAddress?healthID=
identity-api-url-getByHealthIDNo=IDENTITY_BASE_URL/id/getByAbhaIdNo?healthIDNo=

Comment on lines +120 to 136
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Broken placeholder usage for identity URLs
The new identity URL entries reference IDENTITY_BASE_URL literally, but there is no property defined for it, and they lack ${...} syntax. These values will not resolve at runtime. You have two options:

  1. Define the base URL property:
    IDENTITY_BASE_URL=https://your.identity.endpoint
    And reference it:
    identity-api-url-advancesearch=${IDENTITY_BASE_URL}/id/advanceSearch
  2. Hardcode the full URL for each endpoint.

Please update accordingly to avoid unresolved placeholders.


#### Max retry count
Expand Down