Dev to master for voucher tag, downsync (#572)

* HLM-3376: review comments commit

* HLM-3069: side effect code comments, code refactor

* HLM-3376: code review comments and code refactoring

* updated the common-models version to 1.0.10, and updated in dependent service

* HLM-3376 : Added additional field in side effect, referral.

* HLM-3376: missing column fix

* HLM-3372: constants type changed

* HLM-3376: removed not used validators

* code refactor and code comments

* hlm-3376: added test cases

* hlm-3376: referralmanagement context in test cases

* hlm-3376: changed parameters for find by id

* HLM-3372: typo fix

* hlm-3376: persister changes, removed invalid parameters

* hlm-3372: added changes as per code review, removed unused properties

* hlm-3376: recipient validator for faciliy not working fix

* HLM-3376: throwing exception on invalid recipient type

* HLM-4062: added count api changes for household

* HLM-4062: Updated findbyid references

* HLM-4062: Updated pom.xml of household

* Hlm 3376 reviewcomments (#524)

* HLM-3376: review comments commit

* HLM-3069: side effect code comments, code refactor

* HLM-3376: code review comments and code refactoring

* updated the common-models version to 1.0.10, and updated in dependent service

* HLM-3376 : Added additional field in side effect, referral.

* HLM-3376: missing column fix

* HLM-3372: constants type changed

* HLM-3376: removed not used validators

* code refactor and code comments

* hlm-3376: added test cases

* hlm-3376: referralmanagement context in test cases

* hlm-3376: changed parameters for find by id

* HLM-3372: typo fix

* hlm-3376: persister changes, removed invalid parameters

* hlm-3372: added changes as per code review, removed unused properties

* hlm-3376: recipient validator for faciliy not working fix

* HLM-3376: throwing exception on invalid recipient type

* HLM-3376: added comments as per review comments

* HLM-3376 : added changes as per code review comments, each column's name included in query

* HLM-3376: query column names

* Hlm 4062 count api (#547)

* hlm-4062: updated household

* HLM-4062: added  count api support using cte for household

* HLM-4062: updated HouseholdRepository.java

* updated householdrowmapper.java

* HLM-4062:code refactor, removed useCTE parameter

* Project beneficiary tag cherrypick (#539)

* added downsync dummy api

* added downsync dummy api with res

* HLM-4062: added count api changes for household

* HLM-4062: Updated findbyid references

* HLM-3376: review comments commit

* HLM-3069: side effect code comments, code refactor

* HLM-3376: code review comments and code refactoring

* updated the common-models version to 1.0.10, and updated in dependent service

* HLM-3376 : Added additional field in side effect, referral.

* HLM-3376: missing column fix

* HLM-3372: constants type changed

* HLM-3376: removed not used validators

* code refactor and code comments

* hlm-3376: added test cases

* hlm-3376: referralmanagement context in test cases

* hlm-3376: changed parameters for find by id

* HLM-3372: typo fix

* hlm-3376: persister changes, removed invalid parameters

* hlm-3372: added changes as per code review, removed unused properties

* hlm-3376: recipient validator for faciliy not working fix

* HLM-3376: throwing exception on invalid recipient type

* HLM-4062: Updated pom.xml of household

* Hlm 3376 reviewcomments (#524)

* HLM-3376: review comments commit

* HLM-3069: side effect code comments, code refactor

* HLM-3376: code review comments and code refactoring

* updated the common-models version to 1.0.10, and updated in dependent service

* HLM-3376 : Added additional field in side effect, referral.

* HLM-3376: missing column fix

* HLM-3372: constants type changed

* HLM-3376: removed not used validators

* code refactor and code comments

* hlm-3376: added test cases

* hlm-3376: referralmanagement context in test cases

* hlm-3376: changed parameters for find by id

* HLM-3372: typo fix

* hlm-3376: persister changes, removed invalid parameters

* hlm-3372: added changes as per code review, removed unused properties

* hlm-3376: recipient validator for faciliy not working fix

* HLM-3376: throwing exception on invalid recipient type

* HLM-3376: added comments as per review comments

* HLM-3376 : added changes as per code review comments, each column's name included in query

* HLM-3376: query column names

* Dev (#537)

* HLM-3376: review comments commit

* HLM-3069: side effect code comments, code refactor

* HLM-3376: code review comments and code refactoring

* updated the common-models version to 1.0.10, and updated in dependent service

* HLM-3376 : Added additional field in side effect, referral.

* HLM-3376: missing column fix

* HLM-3372: constants type changed

* HLM-3376: removed not used validators

* code refactor and code comments

* hlm-3376: added test cases

* hlm-3376: referralmanagement context in test cases

* hlm-3376: changed parameters for find by id

* HLM-3372: typo fix

* hlm-3376: persister changes, removed invalid parameters

* hlm-3372: added changes as per code review, removed unused properties

* hlm-3376: recipient validator for faciliy not working fix

* HLM-3376: throwing exception on invalid recipient type

* HLM-4062: added count api changes for household

* HLM-4062: Updated findbyid references

* HLM-4062: Updated pom.xml of household

* Hlm 3376 reviewcomments (#524)

* HLM-3376: review comments commit

* HLM-3069: side effect code comments, code refactor

* HLM-3376: code review comments and code refactoring

* updated the common-models version to 1.0.10, and updated in dependent service

* HLM-3376 : Added additional field in side effect, referral.

* HLM-3376: missing column fix

* HLM-3372: constants type changed

* HLM-3376: removed not used validators

* code refactor and code comments

* hlm-3376: added test cases

* hlm-3376: referralmanagement context in test cases

* hlm-3376: changed parameters for find by id

* HLM-3372: typo fix

* hlm-3376: persister changes, removed invalid parameters

* hlm-3372: added changes as per code review, removed unused properties

* hlm-3376: recipient validator for faciliy not working fix

* HLM-3376: throwing exception on invalid recipient type

* HLM-3376: added comments as per review comments

* HLM-3376 : added changes as per code review comments, each column's name included in query

* HLM-3376: query column names

---------

Co-authored-by: kanishq-egov <[email protected]>
Co-authored-by: kanishq-egov <[email protected]>

* Added project beneficiary tag field

* renamed project beneficiary tag to voucher tag

* Added project beneficiary tag field

* renamed project beneficiary tag to voucher tag

* rebased project-persister.yml from configs

* updated pom.xml: update common model version to 1.0.10

* updated db script, added unique constraint to tag column

* updated referral-management.yml

* updated db script

* project beneficiary voucher tag uniqueness validator and search support

* updated PbVoucherTagUniqueValidator.java

* Added and updated for unique field voucher tag create and update scenario

* project beneficiary bug fix

* removed unused import

* project beneficiary : voucherTag renamed to tag

* Hlm 4062 count api (#547) (#548)

* hlm-4062: updated household

* HLM-4062: added  count api support using cte for household

* HLM-4062: updated HouseholdRepository.java

* updated householdrowmapper.java

* HLM-4062:code refactor, removed useCTE parameter

Co-authored-by: kanishq-egov <[email protected]>

* referral management project beneficiary validation fix

* deleted persister and indexer file from project module resource folder

---------

Co-authored-by: kavi_elrey <[email protected]>
Co-authored-by: Vishal <[email protected]>

* HH member clientrefid (#551)

* adding clientRefId, Models version change, migration file

* adding clientRefId for HouseholdMemberSearch as List

* updated migration

* adding Notnull for clientrefId

---------

Co-authored-by: Vishal <[email protected]>

* Downsync smc referral module (#556)

* added downsync dummy api

* added downsync dummy api with res

* HLM-4062: added count api changes for household

* HLM-4062: Updated findbyid references

* HLM-3376: review comments commit

* HLM-3069: side effect code comments, code refactor

* HLM-3376: code review comments and code refactoring

* updated the common-models version to 1.0.10, and updated in dependent service

* HLM-3376 : Added additional field in side effect, referral.

* HLM-3376: missing column fix

* HLM-3372: constants type changed

* HLM-3376: removed not used validators

* code refactor and code comments

* hlm-3376: added test cases

* hlm-3376: referralmanagement context in test cases

* hlm-3376: changed parameters for find by id

* HLM-3372: typo fix

* hlm-3376: persister changes, removed invalid parameters

* hlm-3372: added changes as per code review, removed unused properties

* hlm-3376: recipient validator for faciliy not working fix

* HLM-3376: throwing exception on invalid recipient type

* HLM-4062: Updated pom.xml of household

* Hlm 3376 reviewcomments (#524)

* HLM-3376: review comments commit

* HLM-3069: side effect code comments, code refactor

* HLM-3376: code review comments and code refactoring

* updated the common-models version to 1.0.10, and updated in dependent service

* HLM-3376 : Added additional field in side effect, referral.

* HLM-3376: missing column fix

* HLM-3372: constants type changed

* HLM-3376: removed not used validators

* code refactor and code comments

* hlm-3376: added test cases

* hlm-3376: referralmanagement context in test cases

* hlm-3376: changed parameters for find by id

* HLM-3372: typo fix

* hlm-3376: persister changes, removed invalid parameters

* hlm-3372: added changes as per code review, removed unused properties

* hlm-3376: recipient validator for faciliy not working fix

* HLM-3376: throwing exception on invalid recipient type

* HLM-3376: added comments as per review comments

* HLM-3376 : added changes as per code review comments, each column's name included in query

* HLM-3376: query column names

* Dev (#537)

* HLM-3376: review comments commit

* HLM-3069: side effect code comments, code refactor

* HLM-3376: code review comments and code refactoring

* updated the common-models version to 1.0.10, and updated in dependent service

* HLM-3376 : Added additional field in side effect, referral.

* HLM-3376: missing column fix

* HLM-3372: constants type changed

* HLM-3376: removed not used validators

* code refactor and code comments

* hlm-3376: added test cases

* hlm-3376: referralmanagement context in test cases

* hlm-3376: changed parameters for find by id

* HLM-3372: typo fix

* hlm-3376: persister changes, removed invalid parameters

* hlm-3372: added changes as per code review, removed unused properties

* hlm-3376: recipient validator for faciliy not working fix

* HLM-3376: throwing exception on invalid recipient type

* HLM-4062: added count api changes for household

* HLM-4062: Updated findbyid references

* HLM-4062: Updated pom.xml of household

* Hlm 3376 reviewcomments (#524)

* HLM-3376: review comments commit

* HLM-3069: side effect code comments, code refactor

* HLM-3376: code review comments and code refactoring

* updated the common-models version to 1.0.10, and updated in dependent service

* HLM-3376 : Added additional field in side effect, referral.

* HLM-3376: missing column fix

* HLM-3372: constants type changed

* HLM-3376: removed not used validators

* code refactor and code comments

* hlm-3376: added test cases

* hlm-3376: referralmanagement context in test cases

* hlm-3376: changed parameters for find by id

* HLM-3372: typo fix

* hlm-3376: persister changes, removed invalid parameters

* hlm-3372: added changes as per code review, removed unused properties

* hlm-3376: recipient validator for faciliy not working fix

* HLM-3376: throwing exception on invalid recipient type

* HLM-3376: added comments as per review comments

* HLM-3376 : added changes as per code review comments, each column's name included in query

* HLM-3376: query column names

---------

Co-authored-by: kanishq-egov <[email protected]>
Co-authored-by: kanishq-egov <[email protected]>

* Added project beneficiary tag field

* renamed project beneficiary tag to voucher tag

* Hlm 4062 count api (#547) (#548)

* hlm-4062: updated household

* HLM-4062: added  count api support using cte for household

* HLM-4062: updated HouseholdRepository.java

* updated householdrowmapper.java

* HLM-4062:code refactor, removed useCTE parameter

Co-authored-by: kanishq-egov <[email protected]>

* Project beneficiary tag cherrypick (#549)

* Added project beneficiary tag field

* renamed project beneficiary tag to voucher tag

* rebased project-persister.yml from configs

* updated pom.xml: update common model version to 1.0.10

* updated db script, added unique constraint to tag column

* updated referral-management.yml

* updated db script

* project beneficiary voucher tag uniqueness validator and search support

* updated PbVoucherTagUniqueValidator.java

* Added and updated for unique field voucher tag create and update scenario

* project beneficiary bug fix

* removed unused import

* project beneficiary : voucherTag renamed to tag

* referral management project beneficiary validation fix

---------

Co-authored-by: kanishq-egov <[email protected]>
Co-authored-by: Vishal <[email protected]>

* dummy api with same pagination response

* dummy api with same pagination response

* dummy api with same pagination response

* downsync data test

* data integrated till beneficiary

* Update CHANGELOG.md

* Delete health-services/project/src/main/resources/project-persistor.yml

* skip on empty result added

* skip on empty result added

* beneficary searhc based on individual clientref id added

* sideeffetc, ref, task fetch added

* tasks earch fix

* referral search fix

---------

Co-authored-by: kavi_elrey <[email protected]>
Co-authored-by: Vishal <[email protected]>

* Dev downsync fix smc (#561)

* household model reverse

* Update CHANGELOG.md

* Added changes for includeDeleted for downsync

* not null added

---------

Co-authored-by: kavi_elrey <[email protected]>
Co-authored-by: kanishq-egov <[email protected]>

* Dev master conflict fix (#562)

* HLM-3069: updated build.config.yml

* HLM-3069: updated build-config.yml renamed adrm to referralmanagement

* HLM-3372: increased stock version from 1.1.0 to 1.1.1-beta and project version from 1.1.0 to 1.1.1-beta

* referralmanagement version 1.0.0-beta, added changelog, localsetup

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* HLM-3069: null project beneficiary validation error fix

* HLM-3069: added comments and splitted validation condition

* Dev to master (#550)

* HLM-3376: review comments commit

* HLM-3069: side effect code comments, code refactor

* HLM-3376: code review comments and code refactoring

* updated the common-models version to 1.0.10, and updated in dependent service

* HLM-3376 : Added additional field in side effect, referral.

* HLM-3376: missing column fix

* HLM-3372: constants type changed

* HLM-3376: removed not used validators

* code refactor and code comments

* hlm-3376: added test cases

* hlm-3376: referralmanagement context in test cases

* hlm-3376: changed parameters for find by id

* HLM-3372: typo fix

* hlm-3376: persister changes, removed invalid parameters

* hlm-3372: added changes as per code review, removed unused properties

* hlm-3376: recipient validator for faciliy not working fix

* HLM-3376: throwing exception on invalid recipient type

* HLM-4062: added count api changes for household

* HLM-4062: Updated findbyid references

* HLM-4062: Updated pom.xml of household

* Hlm 3376 reviewcomments (#524)

* HLM-3376: review comments commit

* HLM-3069: side effect code comments, code refactor

* HLM-3376: code review comments and code refactoring

* updated the common-models version to 1.0.10, and updated in dependent service

* HLM-3376 : Added additional field in side effect, referral.

* HLM-3376: missing column fix

* HLM-3372: constants type changed

* HLM-3376: removed not used validators

* code refactor and code comments

* hlm-3376: added test cases

* hlm-3376: referralmanagement context in test cases

* hlm-3376: changed parameters for find by id

* HLM-3372: typo fix

* hlm-3376: persister changes, removed invalid parameters

* hlm-3372: added changes as per code review, removed unused properties

* hlm-3376: recipient validator for faciliy not working fix

* HLM-3376: throwing exception on invalid recipient type

* HLM-3376: added comments as per review comments

* HLM-3376 : added changes as per code review comments, each column's name included in query

* HLM-3376: query column names

* Hlm 4062 count api (#547)

* hlm-4062: updated household

* HLM-4062: added  count api support using cte for household

* HLM-4062: updated HouseholdRepository.java

* updated householdrowmapper.java

* HLM-4062:code refactor, removed useCTE parameter

---------

Co-authored-by: kavi_elrey@1993 <[email protected]>

---------

Co-authored-by: kanishq-egov <[email protected]>
Co-authored-by: kanishq-egov <[email protected]>

* Dev downsync fix smc (#563)

* household model reverse

* Update CHANGELOG.md

* Added changes for includeDeleted for downsync

* not null added

---------

Co-authored-by: kanishq-egov <[email protected]>

* Dev master conflict fix (#565)

* HLM-3069: updated build.config.yml

* HLM-3069: updated build-config.yml renamed adrm to referralmanagement

* HLM-3372: increased stock version from 1.1.0 to 1.1.1-beta and project version from 1.1.0 to 1.1.1-beta

* referralmanagement version 1.0.0-beta, added changelog, localsetup

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* HLM-3069: null project beneficiary validation error fix

* HLM-3069: added comments and splitted validation condition

* Dev to master (#550)

* HLM-3376: review comments commit

* HLM-3069: side effect code comments, code refactor

* HLM-3376: code review comments and code refactoring

* updated the common-models version to 1.0.10, and updated in dependent service

* HLM-3376 : Added additional field in side effect, referral.

* HLM-3376: missing column fix

* HLM-3372: constants type changed

* HLM-3376: removed not used validators

* code refactor and code comments

* hlm-3376: added test cases

* hlm-3376: referralmanagement context in test cases

* hlm-3376: changed parameters for find by id

* HLM-3372: typo fix

* hlm-3376: persister changes, removed invalid parameters

* hlm-3372: added changes as per code review, removed unused properties

* hlm-3376: recipient validator for faciliy not working fix

* HLM-3376: throwing exception on invalid recipient type

* HLM-4062: added count api changes for household

* HLM-4062: Updated findbyid references

* HLM-4062: Updated pom.xml of household

* Hlm 3376 reviewcomments (#524)

* HLM-3376: review comments commit

* HLM-3069: side effect code comments, code refactor

* HLM-3376: code review comments and code refactoring

* updated the common-models version to 1.0.10, and updated in dependent service

* HLM-3376 : Added additional field in side effect, referral.

* HLM-3376: missing column fix

* HLM-3372: constants type changed

* HLM-3376: removed not used validators

* code refactor and code comments

* hlm-3376: added test cases

* hlm-3376: referralmanagement context in test cases

* hlm-3376: changed parameters for find by id

* HLM-3372: typo fix

* hlm-3376: persister changes, removed invalid parameters

* hlm-3372: added changes as per code review, removed unused properties

* hlm-3376: recipient validator for faciliy not working fix

* HLM-3376: throwing exception on invalid recipient type

* HLM-3376: added comments as per review comments

* HLM-3376 : added changes as per code review comments, each column's name included in query

* HLM-3376: query column names

* Hlm 4062 count api (#547)

* hlm-4062: updated household

* HLM-4062: added  count api support using cte for household

* HLM-4062: updated HouseholdRepository.java

* updated householdrowmapper.java

* HLM-4062:code refactor, removed useCTE parameter

---------

Co-authored-by: kavi_elrey@1993 <[email protected]>

---------

Co-authored-by: kanishq-egov <[email protected]>
Co-authored-by: kanishq-egov <[email protected]>

* Dev downsync fix smc (#566)

* household model reverse

* Update CHANGELOG.md

* Added changes for includeDeleted for downsync

* not null added

---------

Co-authored-by: kanishq-egov <[email protected]>

* Added fix for testcases for householdmember (#570)

Co-authored-by: kanishq-egov <[email protected]>

* updated the version, and added the changelog (#571)

* updated the version, and added the changelog

* updated ReferralManagement CHANGELOG

* Update CHANGELOG.md

---------

Co-authored-by: kavi_elrey@1993 <[email protected]>

---------

Co-authored-by: kavi_elrey@1993 <[email protected]>
Co-authored-by: Vishal <[email protected]>
Co-authored-by: bhanu prakash <[email protected]>
Co-authored-by: Naveen J <[email protected]>

docs/health-api-specs/contracts/referral-management.yml

@@ -738,6 +738,9 @@ definitions:
       locality:
         type: string
         description: locality/boundary code from which all beneficiary has to be downloaded
+      totalCount:
+        type: [null,long]
+        description: totalCount
       tenantId:
         $ref: '#/parameters/tenantId'
       offset:

health-services/household/CHANGELOG.md

@@ -1,5 +1,10 @@
 All notable changes to this module will be documented in this file.
 
+## 1.1.1
+
+- Added total count for household
+- Added a field for HouseholdMember : clientReferenceId
+
 ## 1.1.1-beta
 
 - Added proximity based search support

health-services/household/pom.xml

@@ -5,7 +5,7 @@
     <artifactId>household</artifactId>
     <packaging>jar</packaging>
     <name>household</name>
-    <version>1.1.1-beta</version>
+    <version>1.1.1</version>
     <properties>
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>

health-services/household/src/test/java/org/egov/household/helper/HouseholdMemberTestBuilder.java

@@ -22,7 +22,9 @@ public HouseholdMember build() {
     }
 
     public HouseholdMemberTestBuilder withHouseholdIdAndIndividualId(){
-        this.builder.id("some-id").additionalFields(AdditionalFields.builder().build())
+        this.builder.id("some-id")
+                .clientReferenceId("some-client-reference-id")
+                .additionalFields(AdditionalFields.builder().build())
                 .rowVersion(1)
                 .isHeadOfHousehold(false)
                 .individualId("some-individual-id")

health-services/individual/CHANGELOG.md

@@ -1,5 +1,8 @@
 All notable changes to this module will be documented in this file.
 
+## 1.1.2
+- upgraded version from beta
+
 ## 1.1.2-beta
 
 - Added proximity based search support

health-services/individual/pom.xml

@@ -5,7 +5,7 @@
     <artifactId>individual</artifactId>
     <packaging>jar</packaging>
     <name>individual</name>
-    <version>1.1.2-beta</version>
+    <version>1.1.2</version>
     <properties>
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>

health-services/project/CHANGELOG.md

@@ -1,5 +1,8 @@
 All notable changes to this module will be documented in this file.
 
+## 1.1.1 
+- Added tag in project beneficiary 
+
 ## 1.1.1-beta 19-10-2023
   - Added support for multi round, Added new validator for project task.
 

health-services/project/pom.xml

@@ -5,7 +5,7 @@
     <artifactId>project</artifactId>
     <packaging>jar</packaging>
     <name>project</name>
-    <version>1.1.1-beta</version>
+    <version>1.1.1</version>
     <properties>
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>

health-services/referralmanagement/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this module will be documented in this file.
 
+## 1.0.0
+  - Added Downsync Feature
+
+
 ## 1.0.0-beta
   - Base version
-  - Added functionility for Side-Effects and Refferal management
+  - Added functionality for Side-Effects and Refferal management