Skip to content

Commit

Permalink
HLM-5361, HLM-5362 : updated common models with EgovModel and EgovOff…
Browse files Browse the repository at this point in the history
…lineModel (#678)

* 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 <kanishq.bhatnagar@egovernments.org>
Co-authored-by: kanishq-egov <138671649+kanishq-egov@users.noreply.github.com>

* Added project beneficiary tag field

* renamed project beneficiary tag to voucher tag

* hlm-4062: updated household

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

* HLM-4062: updated HouseholdRepository.java

* 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

* updated householdrowmapper.java

* project beneficiary bug fix

* removed unused import

* HLM-4062:code refactor, removed useCTE parameter

* 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 <138671649+kanishq-egov@users.noreply.github.com>

* referral management project beneficiary validation fix

* 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 <kanishq.bhatnagar@egovernments.org>
Co-authored-by: Vishal <sarasani.vishalreddy@egovernments.org>

* dummy api with same pagination response

* dummy api with same pagination response

* dummy api with same pagination response

* added changes for individual

* Added count api in household member and project beneficiary models

* added total count for findById in individual

* HLM-4062: Added SearchResponse model, updated CommonUtils.java,Removed total count from Individual, HouseholdMember, ProjectBeneficiary. Added count api changes for Household, Individual, HouseholdMember, ProjectBeneficiary

* HLM-4062: updated health-service-common version to 1.0.15

* updated health common version to 1.0.15

* 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

* HLM-4062: fixed testcases

* Updated referral-management api specs contract

* HLM-4062: updated application.properties and code refactor

* HLM-4062: added changes for searchresponse type

* HLM-4062: change to boundary code

* HLM-4062: reverted some changes

* hlm-4062: updated referral-management

* HLM-4062: updated pom.xml

* bug fix hlm-4062: individual count was not correct

* HLM-4062: fixed offset not working for household member and project beneficiary

* HLM-4062: updated total count for ProjectTask, SideEffect, Referral

* HLM-4062: HLM-4822: fixed ProjectTaskApiControllerTest.java

* dev to master - 28-02-24 (#654)

* 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 <kanishq.bhatnagar@egovernments.org>
Co-authored-by: kanishq-egov <138671649+kanishq-egov@users.noreply.github.com>

* 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 <138671649+kanishq-egov@users.noreply.github.com>

* referral management project beneficiary validation fix

* deleted persister and indexer file from project module resource folder

---------

Co-authored-by: kavi_elrey <25226238+kavi-egov@users.noreply.github.com>
Co-authored-by: Vishal <sarasani.vishalreddy@egovernments.org>

* 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 <sarasani.vishalreddy@egovernments.org>

* 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 <kanishq.bhatnagar@egovernments.org>
Co-authored-by: kanishq-egov <138671649+kanishq-egov@users.noreply.github.com>

* 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 <138671649+kanishq-egov@users.noreply.github.com>

* 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 <kanishq.bhatnagar@egovernments.org>
Co-authored-by: Vishal <sarasani.vishalreddy@egovernments.org>

* 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 <25226238+kavi-egov@users.noreply.github.com>
Co-authored-by: Vishal <sarasani.vishalreddy@egovernments.org>

* 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 <25226238+kavi-egov@users.noreply.github.com>
Co-authored-by: kanishq-egov <kanishq.bhatnagar@egovernments.org>

* 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 <25226238+kavi-egov@users.noreply.github.com>

---------

Co-authored-by: kanishq-egov <kanishq.bhatnagar@egovernments.org>
Co-authored-by: kanishq-egov <138671649+kanishq-egov@users.noreply.github.com>

* 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 <kanishq.bhatnagar@egovernments.org>

* 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 <25226238+kavi-egov@users.noreply.github.com>

---------

Co-authored-by: kanishq-egov <kanishq.bhatnagar@egovernments.org>
Co-authored-by: kanishq-egov <138671649+kanishq-egov@users.noreply.github.com>

* 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 <kanishq.bhatnagar@egovernments.org>

* Added fix for testcases for householdmember (#570)

Co-authored-by: kanishq-egov <kanishq.bhatnagar@egovernments.org>

* 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 <25226238+kavi-egov@users.noreply.github.com>

* HLM-4062: removed pagination from fields excluding household api call

* HLM-4062: missed in implementation (#574)

* HLM-4062: missed in implementation

* HLM-4062: default max is set to 1000 for not null limit value and 0 for offset value

* project beneficiary tag update failed fix HLM-4444

* HLM-4444: added code review comments

* sownsync bug fix for limit

---------

Co-authored-by: kavi_elrey <25226238+kavi-egov@users.noreply.github.com>

* HLM-4444: project beneficiary update fix (#575)

* Update CHANGELOG.md

* updated changelog with dates (#577)

* updated stock module changelog (#578)

* Hlm 4501 smc referral flow (#602)

* HLM-4501: Added changes for HFReferral flow

* updated comments for common models

* updated comments for common models removed ini file

This reverts commit c1e226f961042f1162bb9ece8d2e1c01b62d220c.

* HLM-4501: updated topics and hfreferal constants

* HLM-4501: updated HFReferralService.java

* HLM-4501: Added changes in project id validator

* HLM-4501: updated HFReferralService.java

* HLM-4501: fixed hfreferral changes

* HLM-4501: added project facility id validator for hf_referral

* HLM-4501: missing link for validator added

* HLM-4501: updated HfrProjectFacilityIdValidator for NPE

* HLM-4501 : updated hf referral symtoms character length to 256

* HLM-4501: updated additionalFields field value size from 2 to 1

* Hlm 3372 enhance inventory flow backend fixes (#623)

* HLM-3372: added changes required to fix quantity, Sender Receiver enum

* HLM-3372: Sender and Receiver id validator

* HLM-3372: updated all reference for SenderType and Receiver Type enum

* HLM-3372: stock model updated, removed size annotations from referenceidtype enum field

* HLM-3372: Min validation added for integer type of quantity

* HLM-3372: test cases updated

* HLM-5004 Added max value and decimal condition for quantity in stock, added component and order annotation for SSenderIdReceiverIdEqualsValidator

* HLM-5004 Custom JsonDeserializer validator IntegerValidator added in health-services-models

* hlm-5004 added custom exception and a custom exception handler to handle the integer validator exception

* hlm-5004 optimized imports and added code comments

* hlm-5004 CustomIntegerSerializer added and unnecessary validators removed

* hlm-5004 Registered the CustomIntegerDeserializer with objectMapper for Integer class

* hlm-5004 Removed line of code that was removing all the invalid entities from the list in SSenderIdReceiverIdEqualsValidator

* hlm-5004 changes in test configurations and optimized imports

* hlm-5004 added row version validator for stock delete

* hlm-5004 dateOfEntry field was handled in StockRowMapper to return null if no value is present and description was added to stock contact for transactionReason

* updated pom.xml for health campaign models

* Revert "updated pom.xml for health campaign models"

This reverts commit 035c78720c610916000c8de76fa87e7904774b59.

---------

Co-authored-by: syed-egov <syed.owais@egovernments.org>

* Hlm 4501 smc referral flow code comments (#636)

* Dev to master : beneficiary tag bug fix, downsync pagination fix (#576)

* 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 <kanishq.bhatnagar@egovernments.org>
Co-authored-by: kanishq-egov <138671649+kanishq-egov@users.noreply.github.com>

* 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 <138671649+kanishq-egov@users.noreply.github.com>

* referral management project beneficiary validation fix

* deleted persister and indexer file from project module resource folder

---------

Co-authored-by: kavi_elrey <25226238+kavi-egov@users.noreply.github.com>
Co-authored-by: Vishal <sarasani.vishalreddy@egovernments.org>

* 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 <sarasani.vishalreddy@egovernments.org>

* 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 <kanishq.bhatnagar@egovernments.org>
Co-authored-by: kanishq-egov <138671649+kanishq-egov@users.noreply.github.com>

* 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 <138671649+kanishq-egov@users.noreply.github.com>

* 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 <kanishq.bhatnagar@egovernments.org>
Co-authored-by: Vishal <sarasani.vishalreddy@egovernments.org>

* 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 <25226238+kavi-egov@users.noreply.github.com>
Co-authored-by: Vishal <sarasani.vishalreddy@egovernments.org>

* 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 <25226238+kavi-egov@users.noreply.github.com>
Co-authored-by: kanishq-egov <kanishq.bhatnagar@egovernments.org>

* 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 <25226238+kavi-egov@users.noreply.github.com>

---------

Co-authored-by: kanishq-egov <kanishq.bhatnagar@egovernments.org>
Co-authored-by: kanishq-egov <138671649+kanishq-egov@users.noreply.github.com>

* 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 <kanishq.bhatnagar@egovernments.org>

* 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 <25226238+kavi-egov@users.noreply.github.com>

---------

Co-authored-by: kanishq-egov <kanishq.bhatnagar@egovernments.org>
Co-authored-by: kanishq-egov <138671649+kanishq-egov@users.noreply.github.com>

* 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 <kanishq.bhatnagar@egovernments.org>

* Added fix for testcases for householdmember (#570)

Co-authored-by: kanishq-egov <kanishq.bhatnagar@egovernments.org>

* 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 <25226238+kavi-egov@users.noreply.github.com>

* HLM-4062: removed pagination from fields excluding household api call

* HLM-4062: missed in implementation (#574)

* HLM-4062: missed in implementation

* HLM-4062: default max is set to 1000 for not null limit value and 0 for offset value

* project beneficiary tag update failed fix HLM-4444

* HLM-4444: added code review comments

* sownsync bug fix for limit

---------

Co-authored-by: kavi_elrey <25226238+kavi-egov@users.noreply.github.com>

* HLM-4444: project beneficiary update fix (#575)

* Update CHANGELOG.md

* updated changelog with dates (#577)

* updated stock module changelog (#578)

---------

Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com>
Co-authored-by: Vishal <sarasani.vishalreddy@egovernments.org>
Co-authored-by: bhanu prakash <109132521+bhanuprakash-egov@users.noreply.github.com>
Co-authored-by: Naveen J <83631045+naveen-egov@users.noreply.github.com>
Co-authored-by: talele08 <talele08@users.noreply.github.com>

* Referral and Side effect sequence diagram

* HLM-4501: Added changes for HFReferral flow

* updated comments for common models

* updated comments for common models removed ini file

This reverts commit c1e226f961042f1162bb9ece8d2e1c01b62d220c.

* HLM-4501: updated topics and hfreferal constants

* HLM-4501: updated HFReferralService.java

* HLM-4501: Added changes in project id validator

* HLM-4501: updated HFReferralService.java

* HLM-4501: fixed hfreferral changes

* HLM-4501: added project facility id validator for hf_referral

* HLM-4501: missing link for validator added

* HLM-4501: updated HfrProjectFacilityIdValidator for NPE

* HLM-4501 : updated hf referral symtoms character length to 256

* HLM-4501: updated additionalFields field value size from 2 to 1

* HLM-4501: added code comments for all hf referral related classes

* HLM-4501: hf-referral sequence diagram

---------

Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com>
Co-authored-by: Vishal <sarasani.vishalreddy@egovernments.org>
Co-authored-by: bhanu prakash <109132521+bhanuprakash-egov@users.noreply.github.com>
Co-authored-by: Naveen J <83631045+naveen-egov@users.noreply.github.com>
Co-authored-by: talele08 <talele08@users.noreply.github.com>

* HLM-4496, HLM-4207 attendance module (#616)

* HLM-4496: Added attendance module in HCM

* HLM-4496: updated attendance directory, removed target folder and imi file

* buil config added for hlm-4496 in feature branch

* HLM-4207: offline enablement in attendance log

* HLM-4207: added db migration script

* HLM-4207: updated db migration script

* HLM-4207: updated incorrect statements

* HLM-4207: bulk api support, without redis cache

* HLM-4207: updated Attendancelog consumer for bulk api

* HLM-4207: consumer fix

* HLM-4207: cache support added for attendance log create and update

* HLM-4207: added health-individual endpoint

* HLM-4207: added radis host

* HLM-4207: updated qualified for objectmapper in attendance module

* HLM-4496,HLM-4207: updated application.properties for redis config

* HLM-4207: updated kafka listener topics

* HLM-4207: changed kafka config

* HLM-4894 adding hrms related flag to Individual object, adding another ApiOperation

* HLM-4894 adding hrms related flag to Individual object, adding another ApiOperation

* HLM-4207, HLM-4986, HLM-4987 : bug fix

* HLM-4894 adding changes related to linking of HRMS Employee with Individual

* HLM-4894 adding changes related to linking of HRMS Employee with Individual

* HLM-4207: added clientreferenceid search, null check for document id

* HLM-4894 reverting changes related to linking of HRMS Employee with Individual

* HLM-4894 reverting changes related to linking of HRMS Employee with Individual from libraries, common-models

* HLM-4207: code re-format

* HLM-4894 adding changes for managing attendees while enrollment

* HLM-4207: updated attendance search, register id or clientreference id are mandatory

* hlm-5009 staffId in ProjectStaffSearch changed to list from string

* HLM-4894 updating build config

* HLM-4207: clientReferenceIds is changed to clientReferenceId for Attendance Log search criteria

* HLM-4207: removed staff validation for search without register id

* HLM-4894 adding changes for project staff validation

* HLM-4894 adding @Qualifier annotation for object mapper

* HLM-4894 fixing hrms url

* HLM-4771: added changes for updating the registers on project date update

* HLM-4771: project update changes

* HLM-4771: updated the project start date update validation, can not update start date if it is already started

* HLM-4771: updated attendance register consumer and service with comments

* HLM-4771: updated the tenant id

* HLM-4894 updating environment variables.

* HLM-4894 updating code changes

* HLM-4894 adding code changes

* HLM-4894 adding code changes

* HLM-4894 adding code changes

* HLM-4771: updated the project validators, validation for start and end date of project

* HLM-4894 adding useruuid as search param in individual search

* HLM-4894 adding useruuid as search param in individual search

* HLM-4894 adding useruuid as search param in individual search

* HLM-4894 adding changes for registry creation when supervisor enrolls

* HLM-4496, HLM-4894: first staff enrollment on attendance register creation is optional

* HLM-4894 adding changes attendee enrollment

* HLM-4894 adding changes for making staffId as list of staffId in ProjectStaffSearch

* HLM-4894 adding changes for making staffId as list of staffId in ProjectStaffSearch

* HLM-4894 adding changes for making staffId as list of staffId in ProjectStaffSearch

* HLM-4894 removing staff-bulk-create-topic

* HLM-4894 removing staff-bulk-create-topic

* HLM-4894 removing staff-bulk-create-topic

* HLM-4894 removing staff-bulk-create-topic

* HLM-4894 changing health-attendance consumer group-id

* HLM-4894 adding changes for projectstaff consumer

* HLM-4894 adding changes for projectstaff consumer

* HLM-4894 adding changes for projectstaff consumer

* HLM-4894 adding changes for projectstaff consumer

* HLM-4894 adding changes for projectstaff consumer

* HLM-5045: added changes, project start date and end date difference should at least be 1 day.

* HLM-4894 adding comments

* HLM-4894 adding additional Details during attendance register creation

* HLM-4894 adding additional Details during attendance register creation

* hlm-4496 : bug fix on adding staff on updation of register

* HLM-4894 increasing limit to 1000

* Added changelog for individual, health-services-models, project, stock

* HLM-4496 : remove attendance module as it is moved to DIGIT-Works repository.

* HLM-5076: added changes related to project module

* updated individual user uuid search field for hlm-4496, hlm-4207

* changed common models build to 1.0.19-SNAPSHOT

---------

Co-authored-by: Priyanka-eGov <priyanka@egovernments.org>
Co-authored-by: syed-egov <syed.owais@egovernments.org>
Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com>

* Hlm 4496 individual UUID search (#656)

* HLM-4496: updated changedlog for individual, health-services-models, project, referralmanagement

* HLM-4496: Added size annotations on individual search userUuid field

* hlm-4496: Revert of application.properties changes

* updated pom.xml version for individual, project, referralmanagement, stock (#657)

---------

Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com>
Co-authored-by: Vishal <sarasani.vishalreddy@egovernments.org>
Co-authored-by: bhanu prakash <109132521+bhanuprakash-egov@users.noreply.github.com>
Co-authored-by: Naveen J <83631045+naveen-egov@users.noreply.github.com>
Co-authored-by: talele08 <talele08@users.noreply.github.com>
Co-authored-by: syed-egov <syed.owais@egovernments.org>
Co-authored-by: Priyanka-eGov <priyanka@egovernments.org>

* Dev to master - March 04, 2024 (#664)

* 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: remo…
  • Loading branch information
11 people committed May 28, 2024
1 parent f10b777 commit 89e94d4
Show file tree
Hide file tree
Showing 452 changed files with 6,924 additions and 4,612 deletions.
4 changes: 1 addition & 3 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
* @kavi-egov


* @kavi-egov @sathishp-eGov
34 changes: 34 additions & 0 deletions build/17/maven/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

FROM egovio/amazoncorretto:17-alpine3.19 AS build
# FROM egovio/alpine-maven-builder-jdk-8:1-master-NA-6036091e AS build
#FROM ghcr.io/egovernments/alpine-maven-builder-jdk-8:1-master-na-6036091e AS build
ARG WORK_DIR
WORKDIR /app

# Install Maven
RUN apk add --no-cache maven

# copy the project files
COPY ${WORK_DIR}/pom.xml ./pom.xml
COPY build/maven/start.sh ./start.sh

# not useful for stateless builds
# RUN mvn -B dependency:go-offline

COPY ${WORK_DIR}/src ./src
RUN mvn -B -f /app/pom.xml package


# Create runtime image
#FROM egovio/8-openjdk-alpine
#FROM ghcr.io/egovernments/8-openjdk-alpine:latest
FROM egovio/amazoncorretto:17-alpine3.19


WORKDIR /opt/egov

COPY --from=build /app/target/*.jar /app/start.sh /opt/egov/

RUN chmod +x /opt/egov/start.sh

CMD ["/opt/egov/start.sh"]
89 changes: 84 additions & 5 deletions build/build-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,27 @@ config:
dockerfile: "build/maven/Dockerfile"
- work-dir: "health-services/household/src/main/resources/db"
image-name: "household-db"
- name: "builds/health-campaign-services/health-services/household-java-17"
build:
- work-dir: "health-services/household"
image-name: "household"
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "health-services/household/src/main/resources/db"
image-name: "household-db"
- name: "builds/health-campaign-services/health-services/health-project-java-17"
build:
- work-dir: "health-services/project"
image-name: "health-project"
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "health-services/project/src/main/resources/db"
image-name: "health-project-db"
- name: "builds/health-campaign-services/health-services/referralmanagement-java-17"
build:
- work-dir: "health-services/referralmanagement"
image-name: "referralmanagement"
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "health-services/referralmanagement/src/main/resources/db"
image-name: "referralmanagement-db"
- name: "builds/health-campaign-services/health-services/individual"
build:
- work-dir: "health-services/individual"
Expand All @@ -71,13 +92,20 @@ config:
dockerfile: "build/maven/Dockerfile"
- work-dir: "health-services/individual/src/main/resources/db"
image-name: "health-individual-db"
- name: "builds/health-campaign-services/health-services/household"
- name: "builds/health-campaign-services/health-services/health-individual-java-17"
build:
- work-dir: "health-services/household"
image-name: "household"
- work-dir: "health-services/individual"
image-name: "health-individual"
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "health-services/individual/src/main/resources/db"
image-name: "health-individual-db"
- name: "builds/health-campaign-services/health-services/health-attendance"
build:
- work-dir: "health-services/attendance"
image-name: "health-attendance"
dockerfile: "build/maven/Dockerfile"
- work-dir: "health-services/household/src/main/resources/db"
image-name: "household-db"
- work-dir: "health-services/attendance/src/main/resources/db"
image-name: "health-attendance-db"
- name: "builds/health-campaign-services/core-services/error-handler"
build:
- work-dir: "core-services/error-handler"
Expand All @@ -95,6 +123,13 @@ config:
dockerfile: "build/maven/Dockerfile"
- work-dir: "health-services/stock/src/main/resources/db"
image-name: "stock-db"
- name: "builds/health-campaign-services/health-services/stock-java-17"
build:
- work-dir: "health-services/stock"
image-name: "stock"
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "health-services/stock/src/main/resources/db"
image-name: "stock-db"
- name: "builds/health-campaign-services/core-services/egov-survey-services"
build:
- work-dir: "core-services/egov-survey-services"
Expand All @@ -109,11 +144,23 @@ config:
dockerfile: "build/maven/Dockerfile"
- work-dir: "health-services/facility/src/main/resources/db"
image-name: "facility-db"
- name: "builds/health-campaign-services/health-services/facility-java-17"
build:
- work-dir: "health-services/facility"
image-name: "facility"
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "health-services/facility/src/main/resources/db"
image-name: "facility-db"
- name: "builds/health-campaign-services/health-services/transformer"
build:
- work-dir: "health-services/transformer"
image-name: "transformer"
dockerfile: "build/maven/Dockerfile"
- name: "builds/health-campaign-services/health-services/transformer-java-17"
build:
- work-dir: "health-services/transformer"
image-name: "transformer"
dockerfile: "build/17/maven/Dockerfile"
- name: "builds/health-campaign-services/core-services/service-request"
build:
- work-dir: "core-services/service-request"
Expand Down Expand Up @@ -161,3 +208,35 @@ config:
dockerfile: "build/maven/Dockerfile"
- work-dir: "core-services/egov-hrms/src/main/resources/db"
image-name: "health-hrms-db"
- name: "builds/health-campaign-services/core-services/health-hrms-java-17"
build:
- work-dir: "core-services/egov-hrms"
image-name: "health-hrms"
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "core-services/egov-hrms/src/main/resources/db"
image-name: "health-hrms-db"
- name: "builds/health-campaign-services/core-services/egov-hrms"
build:
- work-dir: "core-services/egov-hrms"
image-name: "egov-hrms"
dockerfile: "build/maven/Dockerfile"
- work-dir: "core-services/egov-hrms/src/main/resources/db"
image-name: "egov-hrms-db"
- name: "builds/health-campaign-services/health-services/plan-service"
build:
- work-dir: "health-services/plan-service"
image-name: "plan-service"
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "health-services/plan-service/src/main/resources/db"
image-name: "plan-service-db"
- name: "builds/health-campaign-services/health-services/resource-estimation-service"
build:
- work-dir: "health-services/resource-estimation-service"
image-name: "resource-estimation-service"
dockerfile: "build/17/maven/Dockerfile"
- work-dir: "health-services/resource-estimation-service/src/main/resources/db"
image-name: "resource-estimation-service-db"
- name: "builds/health-campaign-services/analytics/auth-proxy"
build:
- work-dir: "analytics/auth-proxy"
image-name: "auth-proxy"
2 changes: 1 addition & 1 deletion core-services/egov-hrms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<dependency>
<groupId>org.egov.common</groupId>
<artifactId>health-services-models</artifactId>
<version>1.0.9-SNAPSHOT</version>
<version>1.0.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,10 @@ public class PropertiesManager {

@Value("${egov.hrms.auto.generate.password}")
private boolean autoGeneratePassword;

@Value("${egov.boundary.host}")
private String boundaryServiceHost;

@Value("${egov.boundary.search.url}")
private String boundarySearchUrl;
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
Expand All @@ -13,6 +14,7 @@
import digit.models.coremodels.AuditDetails;
import digit.models.coremodels.user.enums.UserType;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.egov.common.contract.request.RequestInfo;
import org.egov.common.models.core.Role;
import org.egov.common.models.individual.Address;
Expand All @@ -23,8 +25,6 @@
import org.egov.common.models.individual.IndividualBulkResponse;
import org.egov.common.models.individual.IndividualRequest;
import org.egov.common.models.individual.IndividualResponse;
import org.egov.common.models.individual.IndividualSearch;
import org.egov.common.models.individual.IndividualSearchRequest;
import org.egov.common.models.individual.Name;
import org.egov.common.models.individual.UserDetails;
import org.egov.hrms.config.PropertiesManager;
Expand All @@ -33,6 +33,8 @@
import org.egov.hrms.web.contract.User;
import org.egov.hrms.web.contract.UserRequest;
import org.egov.hrms.web.contract.UserResponse;
import org.egov.hrms.web.models.IndividualSearch;
import org.egov.hrms.web.models.IndividualSearchRequest;
import org.springframework.beans.factory.annotation.Autowired;

import static org.egov.hrms.utils.HRMSConstants.SYSTEM_GENERATED;
Expand Down Expand Up @@ -86,13 +88,25 @@ public UserResponse updateUser(UserRequest userRequest) {

@Override
public UserResponse getUser(RequestInfo requestInfo, Map<String, Object> userSearchCriteria ) {
String mobileNumber = (String) userSearchCriteria.get("mobileNumber");
String username = (String) userSearchCriteria.get(HRMSConstants.HRMS_USER_SEARCH_CRITERA_USERNAME);
List<String> mobileNumberList = null;
List<String> usernameList = null;
if(!StringUtils.isEmpty(mobileNumber)) {
mobileNumberList = Collections.singletonList(mobileNumber);
}
if(!StringUtils.isEmpty(username)) {
usernameList = Collections.singletonList(username);
}
IndividualSearchRequest request = IndividualSearchRequest.builder()
.requestInfo(requestInfo)
.individual(IndividualSearch.builder()
.mobileNumber((String) userSearchCriteria.get("mobileNumber"))
.mobileNumber(
mobileNumberList
)
.id((List<String>) userSearchCriteria.get("uuid"))
.roleCodes((List<String>) userSearchCriteria.get("roleCodes"))
.username((String) userSearchCriteria.get(HRMSConstants.HRMS_USER_SEARCH_CRITERA_USERNAME))
.username(usernameList)
// given name
.individualName((String) userSearchCriteria
.get(HRMSConstants.HRMS_USER_SEARCH_CRITERA_NAME))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package org.egov.hrms.web.models;

import java.util.List;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;

@Data
@NoArgsConstructor
@AllArgsConstructor
@SuperBuilder
@JsonIgnoreProperties(ignoreUnknown = true)
public class EgovOfflineSearchModel extends EgovSearchModel {
@JsonProperty("clientReferenceId")
private List<String> clientReferenceId = null;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.egov.hrms.web.models;

import java.util.List;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import javax.validation.Valid;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;

@Data
@NoArgsConstructor
@AllArgsConstructor
@SuperBuilder
@JsonIgnoreProperties(ignoreUnknown = true)
public class EgovSearchModel {
@JsonProperty("id")
@Valid
private List<String> id = null;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package org.egov.hrms.web.models;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
// This annotation is used to mark fields in a model class that should be ignored or excluded when the class is being processed,
// specifically during serialization to JSON or when constructing database queries.
public @interface Exclude {
}
Loading

0 comments on commit 89e94d4

Please sign in to comment.