Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Hcmpre 639 shashwat changes #919

Merged
merged 6 commits into from
Sep 30, 2024
Merged

Hcmpre 639 shashwat changes #919

merged 6 commits into from
Sep 30, 2024

Conversation

kanishq-egov
Copy link
Contributor

No description provided.

Copy link
Contributor

coderabbitai bot commented Sep 27, 2024

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

yashita-egov pushed a commit to yashita-egov/health-campaign-services that referenced this pull request Sep 27, 2024
* Updated the user Password generation logic egovernments#761

* Update Listener.ts (egovernments#730)

* Update Listener.ts

* added try catch logic in producer

* Feat : added parallel batch execution (egovernments#767)

* Feat : added parallel batch execution

* Refactor

* Update utilities/project-factory/src/server/validators/campaignValidators.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fixed the stepper (egovernments#765)

* changes config (egovernments#769)

* Project type config and added loggers for process of campaign (egovernments#772)

* Feat : added themes in generate template (egovernments#773)

* fixed the ajv package version for build issue

* Feat : removed xlsx (egovernments#776)

* HLM-6177: PARALLEL SEARCH IMPLEMENT, DELIVERY TYPE IMPLEMENT (egovernments#778)

Co-authored-by: nabeelmd-eGov <[email protected]>

* css update (egovernments#780)

Co-authored-by: nabeelmd-eGov <[email protected]>

* HLM-6179 and HLM-6180 (egovernments#777)

* HLM-6179 and HLM-6180

* campaign name changes

---------

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

* Feat : fixed target generation (egovernments#781)

* fixed tenantId issue (egovernments#784)

* fix: resolved AJV-related Jenkins build issue reference egovernments#783 egovernments#786 (egovernments#787)

* module ui fix

* updated all the package version for build fixes

* fixed kafka-error at target generation (egovernments#789)

* updated core version (egovernments#791)

* updated core version

* updated css also

* Update campaignValidators.ts (egovernments#794)

* Updated the excel generation logic and files

* added changes for configurable column in target sheet (egovernments#779)

* change in filter recursive

* lowest level

* made target headers  genearte through mdms schema

* changed config index.ts

* changed config index.ts

* changes for now

* added configurable column logic from schema HLM-6169

* updated validate of target columns through schema

* added masterForColumnSchema in index.ts

* formatted dataManageService

* refactored lock TargetFields func

* removed console.log

* User creation performance improved (egovernments#800)

* Feat : Improved user creation performance

* Change status color

* Update utilities/project-factory/src/server/utils/campaignUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update genericUtils.ts (egovernments#801)

* Hlm 6170 (egovernments#802)

* change in filter recursive

* lowest level

* HLM -6170 added logic for only village level data in target sheet and some refactoring

* updated css (egovernments#804)

* fixed button issue (egovernments#805)

* HLM 6177: Error card implementation in summary screen (egovernments#806)

* HLM-6177: PARALLEL SEARCH IMPLEMENT, DELIVERY TYPE IMPLEMENT

* Added Error Cards in summary screen and redirection

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* added error button styles (egovernments#807)

Co-authored-by: nabeelmd-eGov <[email protected]>

* updated popUp css (egovernments#808)

* HLM 6178: Implementing New Pop up screen in boundaries (egovernments#809)

* added error button styles

* Implementing New Pop up screen in boundaries

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Facility changes (egovernments#812)

* Feat : changed facility Template

* Feat : locked target templates

* fixed colour issue (egovernments#813)

* Updated the project type conversion logic for the             "deliveryType" dont1 and n config

* Unique field added (egovernments#814)

* Feat : changed facility Template

* Feat : locked target templates

* Feat : added unique check logic

* Target schema update (egovernments#815)

* change in filter recursive

* lowest level

* updated shcema of target columns to be configurable

* removed empty spaces from config index.ts

* Active mapping (egovernments#817)

* Feat : changed facility Template

* Feat : locked target templates

* Feat : added unique check logic

* Feat : added mapping via active field

* changes in the schema validation (egovernments#816)

* Updated the workbench and css module version

* Feat : added active inactive boundary check (egovernments#818)

* Update campaignValidators.ts (egovernments#819)

* added active inactive validation (egovernments#820)

* changed api call time (egovernments#826)

* Feat : added target sum mapping (egovernments#825)

* added campaign type as filter (egovernments#827)

* Update genericApis.ts (egovernments#828)

* Update excelUtils.ts (egovernments#829)

* UI issue fixes, icon fix in summary error (egovernments#831)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Target columns (egovernments#830)

* change in filter recursive

* lowest level

* commit

* Feat : target flow fixed for LLIN-mz

* uat to dev

---------

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

* Feat : freezed target columns (egovernments#833)

* Target mr dn (egovernments#834)

* change in filter recursive

* lowest level

* Feat : skipped validation temporarily

* changes in the target validation (egovernments#835)

* fixed error info (egovernments#837)

* Added roboto font (egovernments#840)

* Feat : added roboto font

* Fixed config

* target validation based on diff campaign types (egovernments#843)

* change in filter recursive

* lowest level

* updated validation of target based on campaign type

* fixed validation issue (egovernments#844)

* Updated the workbench package version

* fixed validation logic (egovernments#846)

* fixed validation logic

* Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Error messages improved (egovernments#848)

* Feat : imporved error messages and initilised utils for tracking process

* Fix ; unused variables fixed

* Feat : improved error messages

* Fix : download error fix (egovernments#850)

* Update campaignUtils.ts (egovernments#851)

* Update campaignUtils.ts

* Update utilities/project-factory/src/server/utils/campaignUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update campaignValidators.ts (egovernments#853)

* HLM 6210: Toast, error focus fix and project type reset delivery data fix  (egovernments#854)

* HLM-6210: campaign type change reset delivery data fix, summary error focus fix

* summary error focus fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* HLM-6225_added time out according to data (egovernments#855)

* Update campaignValidators.ts (egovernments#859)

* HLM 6210 (egovernments#858)

* HLM-6210: campaign type change reset delivery data fix, summary error focus fix

* summary error focus fix

* parallel search fixes

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Remove validation (egovernments#852)

* change in filter recursive

* lowest level

* removed unnecessary validation for target

* spacing refactor

* Update campaignValidators.ts (egovernments#863)

* Header validation (egovernments#861)

* change in filter recursive

* lowest level

* removed unnecessary validation for target

* changed the logic of header validation

* space refactor

* Update campaignUtils.ts (egovernments#864)

* fixed ui error (egovernments#865)

* Read me (egovernments#867)

* change in filter recursive

* lowest level

* removed unnecessary validation for target

* changed the logic of header validation

* fixed portugese language error

* space refactoring

* Update Dockerfile

* Update Dockerfile

* Update migrate.sh

* Update Dockerfile

* Update campaignValidators.ts (egovernments#868)

* HLM 6210:campaign type change reset fix (egovernments#869)

* HLM-6210: campaign type change reset delivery data fix, summary error focus fix

* summary error focus fix

* parallel search fixes

* campaign type change reset fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update excelUtils.ts for sheetHeaders wraping (egovernments#870)

* Update package.json

* updated error messages (egovernments#871)

* feat : added jaeger-client tracing (egovernments#872)

* updated the table config

* Update campaignApis.ts (egovernments#875)

* removed the schema and updated the db name

* fixing generate API call, file auto delete, date error (egovernments#877)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Trim resource (egovernments#878)

* Feat : trimmed resource persist message

* Refactor

* Removed reject error in produce message

* fixed min time, draft logic (egovernments#879)

* Update index.ts (egovernments#880)

* added min ui error and facility usage (egovernments#883)

* added min ui error and facility usage

* changes

* Update campaignUtils.ts (egovernments#884)

* HLM 6007 (egovernments#885)

* fixing generate API call, file auto delete, date error

* generate api fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update Dockerfile

* Feat : docker config update (egovernments#886)

* Update Dockerfile (egovernments#887)

* Create buildWorkbenchUI.yml

* Update README.md (egovernments#917)

* Update buildWorkbenchUI.yml

* Update README.md

* Updated the DB Schema issue of Project-factory

* fixed hierarchy order (egovernments#919)

* User flag hcm (egovernments#920)

* Feat : docker config update

* Feat : added user create flag

* Refactored

* Update campaignUtils.ts

* Update campaignMappingUtils.ts (egovernments#922)

* Ashish egov patch 2 (egovernments#921)

* Update index.ts

* Update campaignApis.ts

* Fixed the project type conversion and product duplicate issue

* Update campaignApis.ts (egovernments#924)

* Update campaignMappingUtils.ts (egovernments#925)

* Update campaignMappingUtils.ts

* Refactored

* Update publishProjectFactory.yml

* Update buildWorkbenchUI.yml

* Update campaignMappingUtils.ts (egovernments#926)

* Update request.ts (egovernments#928)

* Update request.ts

* Feat : updated httprequest

* Feat : warning response added

* Refactor

* added start and enddate in cycles

* Update campaignApis.ts (egovernments#930)

* Update request.ts (egovernments#932)

* fixed generate issue (egovernments#933)

* Fixed project-type resources duplication

* updated target error messages (egovernments#936)

* fixed stepper from draft (egovernments#937)

* Update Listener.ts

* delivery type disable fix, product sku name change (egovernments#939)

Co-authored-by: nabeelmd-eGov <[email protected]>

* fixed error message issue (egovernments#941)

* Redis integration (egovernments#940)

* Feat : added redis

* Feat : added redis retry

* updated migration

* Feat : changed download logic (egovernments#942)

* Update README.md (egovernments#943)

* fixed target validate for different tabs not present (egovernments#945)

* Enriching already exsisting user (egovernments#946)

* Feat : adding dropdowns (egovernments#952)

* HLM-6270: Date logic changes, added localisation code (egovernments#953)

Co-authored-by: nabeelmd-eGov <[email protected]>

* changed maximum target message (egovernments#954)

* changed maximum target message

* Update UploadData.js

* Call generate (egovernments#951)

* updated target error messages

* generate call while campaign update changes boundaries

* some update on call-generate

* call-generate

* updated call-gnerate logic

* added column campaign id in generated resource table

* updated config index.ts

* removed console.logs

* Update utilities/project-factory/src/server/utils/generateUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/utils/generateUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* added some additional conditions

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* changed facility info message (egovernments#955)

* HLM 6270 (egovernments#957)

* refactor

* added title text

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update genericUtils.ts (egovernments#958)

* fixed boundary draft logic (egovernments#959)

* Boundary code generated has now configurable hierarchy type and boundary name at last based on config (egovernments#963)

* fixed target validate for different tabs not present

* made hierarchytype and bondary name configurable in auto generation of boundary code

* added toString() on elment for safety

* HLM-6270: Elimated Generate API & enhance download API, Date logic fixes (egovernments#966)

* refactor

* added title text

* HLM-6270: Elimated Generate API & enhance download API, Date logic fixes

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Ashish table create (egovernments#972)

* saving

* Feat : adding table

* Feat : table creating

* updated configs

* Feat : added table

* Feat : table added

* Feat : integrated processtracks

* Fix : name format (egovernments#973)

* Update campaignUtils.ts (egovernments#974)

* configure app static screen and skeleton (egovernments#980)

* configure app static screen and skeleton

* comments resolved

* Migration repair (egovernments#981)

* migration repair

* migration repair

* migration repair

* Updated CampaignCard to add NATIONAL_SUPERVISOR dashboard link

* made isActive change (egovernments#986)

* boundaries on which we split to be fetched from mdms (egovernments#982)

* fixed target validate for different tabs not present

* split boundaries fetch from mdms

* updated logic to fetch split on from mdms based on campaign type

* fromatting

* Update campaignUtils.ts (egovernments#988)

* Update processTrackUtils.ts (egovernments#989)

* fixs (egovernments#990)

* fixs

* Update SelectingBoundaries.js

* Update processTrackUtils.ts (egovernments#991)

* Summary screen api loop fix (egovernments#992)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Resource activity (egovernments#993)

* fixed target validate for different tabs not present

* resource activity persisting in db

* Update processTrackUtils.ts (egovernments#994)

* added timeout of 2 sec for boundary entity to persist (egovernments#996)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* css version fix (egovernments#997)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Process tracking update (egovernments#998)

* Feat : changed logic of process track

* Feat : improved process tracks

* improved process tracking

* Update campaignUtils.ts (egovernments#999)

* Update campaignUtils.ts (egovernments#1000)

* Update campaignUtils.ts

* Update Listener.ts

* Feat : imporved process track (egovernments#1001)

* Update campaignManageService.ts (egovernments#1003)

* Update campaignManageService.ts

* Update campaignUtils.ts

* Update processTrackUtils.ts

* Feat : added user mapping for multiple boundaries with common parent (egovernments#1005)

* new template will be generated if source is microplan accordingly from mdms (egovernments#1004)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* new template generate if source is microplan

* updated logic for generating templates if source of campaign is from microplan

* made separate function for checking source is microplan

* added separate  func for checking source is microplan

* refactor

* chnaged the checkIFSourceMicoplan func

* refactored checkifsourceismicroplan

* Fix : fix array fetch from cell (egovernments#1006)

* Feat : fixed array issue in target (egovernments#1007)

* Feat : fixed array issue in target

* Update index.ts

* Some fixes and refactor (egovernments#1008)

* Feat : fixed array issue in target

* Update index.ts

* Refactor

* Fixed status row

* commented harcoded check && added new dashboard icon (egovernments#1011)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Fixed sheetrows issues (egovernments#1012)

* Sheet row fixed (egovernments#1013)

* Fixed sheetrows issues

* Shut down if kafka error

* Feat : formated sheet (egovernments#1015)

* integrated admin schema  with mdms_v2 (egovernments#1018)

* Fix process timeline (egovernments#1029)

* Feat : formated sheet

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* Feat : imporved processTracking and fixed migration script

* Feat : fixed error persistence

* Fix

* Un wrap other rows (egovernments#1034)

* Feat : formated sheet

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* Feat : imporved processTracking and fixed migration script

* Feat : fixed error persistence

* Unwraped lower rows

* Update publishProjectFactory.yml

* updated package versions (egovernments#1042)

* HLM-6325/HLM-6277: Update date with & without boundary screen integration and actionable column added (egovernments#1045)

* HLM-6007

* css version fix

* update date screen added

* change add

* css fixes and API Integration for search project

* Implemented Action component in My Campaign screen

* Implemented Date Update with and without boundary with API integration

* Boundary change

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Facility dynamic generate for source microplan (egovernments#1046)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* added code for generating facility template if source is microplan

* updated name

* updated version (egovernments#1047)

* updated core version to fix login forget password issues(egovernments#1051)

* Fixed update topic (egovernments#1056)

* updated version (egovernments#1061)

* Hidden sheet impel (egovernments#1077)

* Feat : formated sheet

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* Feat : imporved processTracking and fixed migration script

* Feat : fixed error persistence

* Unwraped lower rows

* Update campaignUtils.ts

* Update publishProjectFactory.yml

* Update genericUtils.ts (egovernments#1078)

* target template download based on delivery conditions if present (egovernments#1080)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* logic for dynamic target generate template based on delivery conditions

* fixed stepper color issue from draft (egovernments#1083)

* fixed reordering of tab issue (egovernments#1092)

* Hlm 6350 (egovernments#1094)

* timeline wip

* added timeline from summary

* removed log

* integarte with mdms (egovernments#1095)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update genericUtils.ts (egovernments#1097)

* Update targetUtils.ts (egovernments#1098)

* Hlm 6350 (egovernments#1100)

* timeline wip

* added timeline from summary

* removed log

* integrated timeline with popup

* updated version

* updated css version

* HCMPRE-32: Resolve date update demo points (egovernments#1104)

* integarte with mdms

* HCMPRE-32: Resolve date update demo points

* comment resolve

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Dynamic target upload and download both with target columns as per delivery conditions when campaign is updated with cahnegs in delivery conditions (egovernments#1109)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* target upload based on dynamic column in reference to deliveryRules

* logic for calling generate target tempalte when campaign delivery conditions change

* removed console

* updated css version (egovernments#1102)

* added chip for dropdown (egovernments#1111)

* version fix to resolve issue (egovernments#1112)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Ashish patch1 (egovernments#1118)

* Feat : formated sheet

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* Feat : imporved processTracking and fixed migration script

* Feat : fixed error persistence

* Unwraped lower rows

* Update campaignUtils.ts

* Update genericValidator.ts

* Update publishProjectFactory.yml

* Update targetUtils.ts

* edit product with prefilled value and count (egovernments#1115)

* Boundary upload  to have not generate boundary code if  code is already filled to support migration (egovernments#1121)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* Boundary upload  to have not generate boundary code if  code is already filled to support migration

* Update index.ts

* Update constants.ts (egovernments#1122)

* Update constants.ts

* Update utilities/project-factory/src/server/config/constants.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update campaignUtils.ts

* Update campaignUtils.ts

* Update campaignMappingUtils.ts

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* template downlod for source microplan (egovernments#1123)

* Different tabs onlevel to fetch from mdms rather than from config in target upload flow (egovernments#1124)

* template downlod for source microplan

* updated logic for getting different tabs based on level from config to fetch it from mdms in target upload flow

* Sequence order change in action button (egovernments#1125)

Co-authored-by: nabeelmd-eGov <[email protected]>

* reverted  the function validateAllDistrictTabsPresentOrNot (egovernments#1126)

* template downlod for source microplan

* updated logic for getting different tabs based on level from config to fetch it from mdms in target upload flow

* restored the func validateAllDistrictTabsPresentOrNot to default

* Update index.ts (egovernments#1129)

* Update index.ts

* Update Listener.ts

* Update Producer.ts

* Update generateUtils.ts (egovernments#1130)

* some changes related to generate boundary template (egovernments#1133)

* updated logic for target columns acc to delivery conditions only for smc (egovernments#1137)

* some changes related to generate boundary template

* updated logic for making configurable target acc to delivery only for smc

* refactored code for including dynamic target columns for specific types according to configs array

* updated version and boundary fix (egovernments#1141)

* updated readmeconfig for sheet (egovernments#1142)

* HCMPRE-140: Action column fixes, date editable logic change (egovernments#1143)

* Action column fixes, date editable logic change

* added roles for dss

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update constants.ts (egovernments#1145)

* Update constants.ts

* Update processTrackUtils.ts

* Update Listener.ts (egovernments#1147)

* HCMPRE 140 (egovernments#1149)

* Action column fixes, date editable logic change

* added roles for dss

* update dates fixes

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* updated core version (egovernments#1150)

* Ashish patch2 (egovernments#1152)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Update publishProjectFactory.yml

* Redis cache for generating target when delivery conditions change (egovernments#1156)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added cache time in config

* refactored caching code in generate flow for boundary sheet

* refactored callGenerate function

* Ashish egov patch 2 (egovernments#1166)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Update publishProjectFactory.yml

* HCMPRE-154: Update Dates bug fixes, Toast added for error. (egovernments#1158)

* Action column fixes, date editable logic change

* added roles for dss

* update dates fixes

* HCMPRE-154 update dates bug fixes, Added toast for error

* code clean

* Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Adding date bug

* date fix

* Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/DateWithBoundary.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/DateWithBoundary.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Jagankumar <[email protected]>

* version update (egovernments#1168)

Co-authored-by: nabeelmd-eGov <[email protected]>

* HCMPRE-6407 download template changes  (egovernments#1128)

* HLM-6407 adding changes for facility template

* HLM-6407 adding changes for facility template

* HLM-6407 adding changes for facility template

* HLM-6407 codde review comment

* HCMPRE-91 code review comments

* HLM-6407 using same mdms schema for microplan

* HLM-6407 adding changes for facility template

* HLM-6407 adding changes for facility template

* HLM-6407 adding changes for facility template

* HLM-6407 codde review comment

* HCMPRE-91 code review comments

* HLM-6407 using same mdms schema for microplan

* HLM-6407 code review comments

* HLM-6407 code review comments

* Core ui version fix (egovernments#1176)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Ashish egov patch 2 (egovernments#1178)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Update publishProjectFactory.yml

* Update Producer.ts (egovernments#1182)

* fixed timeline issues (egovernments#1185)

* HCMPRE 154 (egovernments#1186)

* date validation fix

* Update date logic

* FIX

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* changes in timeline (egovernments#1187)

* CSS version add (egovernments#1188)

* date validation fix

* Update date logic

* FIX

* css add

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* HCMPRE 154 (egovernments#1189)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* limited the number of columns of target for upto only 18 in number  (egovernments#1190)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added logic for having only 18 target columns  if exceed i will create one column with  header OTHER_TARGETS

* HCMPRE 154 (egovernments#1191)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

* date start from tomorrow

* css fix for language screen

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Produceasync (egovernments#1192)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Producer update

* Feat : updated producemodified message

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* HCMPRE 154 (egovernments#1193)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

* date start from tomorrow

* css fix for language screen

* disable today date

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* config updates according to devops (egovernments#1197)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added logic for having only 18 target columns  if exceed i will create one column with  header OTHER_TARGETS

* updated config to fetch from devops accordingly

* Update index.ts

* All changes (egovernments#1201)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Update Producer.ts

* Update Producer.ts

* Feat : updated producemodified message

* Feat : removed waiting

* adding constraint

* Update V20240731162600__add_uniqiue_constraint_process_track.sql

* Update constants.ts

* Update publishProjectFactory.yml

* HCMPRE 154 (egovernments#1202)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

* date start from tomorrow

* css fix for language screen

* disable today date

* date and cycle fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Revert "HCMPRE 154 (egovernments#1191)" (egovernments#1203)

This reverts commit 59ec953.

Co-authored-by: nabeelmd-eGov <[email protected]>

* updated versions (egovernments#1205)

* Update date change screen date logic fix, info added, hard reload issue fix (egovernments#1206)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Config update for project-factory (egovernments#1207)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added logic for having only 18 target columns  if exceed i will create one column with  header OTHER_TARGETS

* updated config to fetch from devops accordingly

* updated config for project -factory

* Timeline (egovernments#1210)

* updated versions

* fixed user credential button

* Kafka fix (egovernments#1212)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Revert "Ashish egov patch 2 (egovernments#1178)"

This reverts commit e86a4dc.

* Update Producer.ts

* Update Producer.ts

* Feat : updated producemodified message

* Feat : removed waiting

* adding constraint

* Update V20240731162600__add_uniqiue_constraint_process_track.sql

* Update constants.ts

* Feat : improved kafka

* Fix kafka restart issue

* fixed the pop up button issue (egovernments#1215)

* Kafka restart (egovernments#1217)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Revert "Ashish egov patch 2 (egovernments#1178)"

This reverts commit e86a4dc.

* Update Producer.ts

* Update Producer.ts

* Feat : updated producemodified message

* Feat : removed waiting

* adding constraint

* Update V20240731162600__add_uniqiue_constraint_process_track.sql

* Update constants.ts

* Feat : improved kafka

* Update Producer.ts

* Update Producer.ts

* Update publishProjectFactory.yml

* updated core versions for privacy component  (egovernments#1223)

* Ashish egov patch 1 (egovernments#1228)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Revert "Ashish egov patch 2 (egovernments#1178)"

This reverts commit e86a4dc.

* Update Producer.ts

* Update Producer.ts

* Feat : updated producemodified message

* Feat : removed waiting

* adding constraint

* Update V20240731162600__add_uniqiue_constraint_process_track.sql

* Update constants.ts

* Feat : improved kafka

* Update Producer.ts

* Update Producer.ts

* Update campaignUtils.ts

* feat : solved localization passing through kafka

* Update publishProjectFactory.yml

* removed frontend

* Update package.json

* Squashed commit of the following:

commit 3cd21c2
Merge: 12061ca 80f6307
Author: Jagankumar <[email protected]>
Date:   Thu Aug 8 15:13:48 2024 +0530

    Merge branch 'campaign' into campaign-merged

commit 80f6307
Author: nitish-egov <[email protected]>
Date:   Wed Aug 7 18:08:15 2024 +0530

    Updated changelog (egovernments#1242)

    * default enableDynamicTemplateForWillBe empty string in config

    * updated changelog and postman collection

commit f897dba
Author: Jagankumar <[email protected]>
Date:   Wed Aug 7 17:25:39 2024 +0530

    Update package.json

commit dd691e6
Author: Bhavya-egov <[email protected]>
Date:   Tue Aug 6 13:34:40 2024 +0530

    updated workbench version (egovernments#1236)

commit 3a30736
Author: Bhavya-egov <[email protected]>
Date:   Tue Aug 6 11:00:14 2024 +0530

    updated micro ui core version (egovernments#1233)

commit a1f7329
Author: nitish-egov <[email protected]>
Date:   Mon Aug 5 18:29:40 2024 +0530

    default enableDynamicTemplateForWillBe empty string in config (egovernments#1231)

commit d3c3e95
Author: nabeelmd-eGov <[email protected]>
Date:   Mon Aug 5 18:11:23 2024 +0530

    build issue fix for optional chanining issue (egovernments#1230)

    Co-authored-by: nabeelmd-eGov <[email protected]>

commit 236b843
Author: nabeelmd-eGov <[email protected]>
Date:   Mon Aug 5 17:17:20 2024 +0530

    fix (egovernments#1229)

    Co-authored-by: nabeelmd-eGov <[email protected]>

* sending only activity object to kafka in place of request body (egovernments#851)

---------

Co-authored-by: ashish-egov <[email protected]>
Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Bhavya-egov <[email protected]>
Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: Priyanka-eGov <[email protected]>
yashita-egov pushed a commit to yashita-egov/health-campaign-services that referenced this pull request Sep 27, 2024
* Updated the user Password generation logic egovernments#761

* Update Listener.ts (egovernments#730)

* Update Listener.ts

* added try catch logic in producer

* Feat : added parallel batch execution (egovernments#767)

* Feat : added parallel batch execution

* Refactor

* Update utilities/project-factory/src/server/validators/campaignValidators.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fixed the stepper (egovernments#765)

* changes config (egovernments#769)

* Project type config and added loggers for process of campaign (egovernments#772)

* Feat : added themes in generate template (egovernments#773)

* fixed the ajv package version for build issue

* Feat : removed xlsx (egovernments#776)

* HLM-6177: PARALLEL SEARCH IMPLEMENT, DELIVERY TYPE IMPLEMENT (egovernments#778)

Co-authored-by: nabeelmd-eGov <[email protected]>

* css update (egovernments#780)

Co-authored-by: nabeelmd-eGov <[email protected]>

* HLM-6179 and HLM-6180 (egovernments#777)

* HLM-6179 and HLM-6180

* campaign name changes

---------

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

* Feat : fixed target generation (egovernments#781)

* fixed tenantId issue (egovernments#784)

* fix: resolved AJV-related Jenkins build issue reference egovernments#783 egovernments#786 (egovernments#787)

* module ui fix

* updated all the package version for build fixes

* fixed kafka-error at target generation (egovernments#789)

* updated core version (egovernments#791)

* updated core version

* updated css also

* Update campaignValidators.ts (egovernments#794)

* Updated the excel generation logic and files

* added changes for configurable column in target sheet (egovernments#779)

* change in filter recursive

* lowest level

* made target headers  genearte through mdms schema

* changed config index.ts

* changed config index.ts

* changes for now

* added configurable column logic from schema HLM-6169

* updated validate of target columns through schema

* added masterForColumnSchema in index.ts

* formatted dataManageService

* refactored lock TargetFields func

* removed console.log

* User creation performance improved (egovernments#800)

* Feat : Improved user creation performance

* Change status color

* Update utilities/project-factory/src/server/utils/campaignUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update genericUtils.ts (egovernments#801)

* Hlm 6170 (egovernments#802)

* change in filter recursive

* lowest level

* HLM -6170 added logic for only village level data in target sheet and some refactoring

* updated css (egovernments#804)

* fixed button issue (egovernments#805)

* HLM 6177: Error card implementation in summary screen (egovernments#806)

* HLM-6177: PARALLEL SEARCH IMPLEMENT, DELIVERY TYPE IMPLEMENT

* Added Error Cards in summary screen and redirection

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* added error button styles (egovernments#807)

Co-authored-by: nabeelmd-eGov <[email protected]>

* updated popUp css (egovernments#808)

* HLM 6178: Implementing New Pop up screen in boundaries (egovernments#809)

* added error button styles

* Implementing New Pop up screen in boundaries

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Facility changes (egovernments#812)

* Feat : changed facility Template

* Feat : locked target templates

* fixed colour issue (egovernments#813)

* Updated the project type conversion logic for the             "deliveryType" dont1 and n config

* Unique field added (egovernments#814)

* Feat : changed facility Template

* Feat : locked target templates

* Feat : added unique check logic

* Target schema update (egovernments#815)

* change in filter recursive

* lowest level

* updated shcema of target columns to be configurable

* removed empty spaces from config index.ts

* Active mapping (egovernments#817)

* Feat : changed facility Template

* Feat : locked target templates

* Feat : added unique check logic

* Feat : added mapping via active field

* changes in the schema validation (egovernments#816)

* Updated the workbench and css module version

* Feat : added active inactive boundary check (egovernments#818)

* Update campaignValidators.ts (egovernments#819)

* added active inactive validation (egovernments#820)

* changed api call time (egovernments#826)

* Feat : added target sum mapping (egovernments#825)

* added campaign type as filter (egovernments#827)

* Update genericApis.ts (egovernments#828)

* Update excelUtils.ts (egovernments#829)

* UI issue fixes, icon fix in summary error (egovernments#831)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Target columns (egovernments#830)

* change in filter recursive

* lowest level

* commit

* Feat : target flow fixed for LLIN-mz

* uat to dev

---------

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

* Feat : freezed target columns (egovernments#833)

* Target mr dn (egovernments#834)

* change in filter recursive

* lowest level

* Feat : skipped validation temporarily

* changes in the target validation (egovernments#835)

* fixed error info (egovernments#837)

* Added roboto font (egovernments#840)

* Feat : added roboto font

* Fixed config

* target validation based on diff campaign types (egovernments#843)

* change in filter recursive

* lowest level

* updated validation of target based on campaign type

* fixed validation issue (egovernments#844)

* Updated the workbench package version

* fixed validation logic (egovernments#846)

* fixed validation logic

* Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Error messages improved (egovernments#848)

* Feat : imporved error messages and initilised utils for tracking process

* Fix ; unused variables fixed

* Feat : improved error messages

* Fix : download error fix (egovernments#850)

* Update campaignUtils.ts (egovernments#851)

* Update campaignUtils.ts

* Update utilities/project-factory/src/server/utils/campaignUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update campaignValidators.ts (egovernments#853)

* HLM 6210: Toast, error focus fix and project type reset delivery data fix  (egovernments#854)

* HLM-6210: campaign type change reset delivery data fix, summary error focus fix

* summary error focus fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* HLM-6225_added time out according to data (egovernments#855)

* Update campaignValidators.ts (egovernments#859)

* HLM 6210 (egovernments#858)

* HLM-6210: campaign type change reset delivery data fix, summary error focus fix

* summary error focus fix

* parallel search fixes

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Remove validation (egovernments#852)

* change in filter recursive

* lowest level

* removed unnecessary validation for target

* spacing refactor

* Update campaignValidators.ts (egovernments#863)

* Header validation (egovernments#861)

* change in filter recursive

* lowest level

* removed unnecessary validation for target

* changed the logic of header validation

* space refactor

* Update campaignUtils.ts (egovernments#864)

* fixed ui error (egovernments#865)

* Read me (egovernments#867)

* change in filter recursive

* lowest level

* removed unnecessary validation for target

* changed the logic of header validation

* fixed portugese language error

* space refactoring

* Update Dockerfile

* Update Dockerfile

* Update migrate.sh

* Update Dockerfile

* Update campaignValidators.ts (egovernments#868)

* HLM 6210:campaign type change reset fix (egovernments#869)

* HLM-6210: campaign type change reset delivery data fix, summary error focus fix

* summary error focus fix

* parallel search fixes

* campaign type change reset fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update excelUtils.ts for sheetHeaders wraping (egovernments#870)

* Update package.json

* updated error messages (egovernments#871)

* feat : added jaeger-client tracing (egovernments#872)

* updated the table config

* Update campaignApis.ts (egovernments#875)

* removed the schema and updated the db name

* fixing generate API call, file auto delete, date error (egovernments#877)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Trim resource (egovernments#878)

* Feat : trimmed resource persist message

* Refactor

* Removed reject error in produce message

* fixed min time, draft logic (egovernments#879)

* Update index.ts (egovernments#880)

* added min ui error and facility usage (egovernments#883)

* added min ui error and facility usage

* changes

* Update campaignUtils.ts (egovernments#884)

* HLM 6007 (egovernments#885)

* fixing generate API call, file auto delete, date error

* generate api fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update Dockerfile

* Feat : docker config update (egovernments#886)

* Update Dockerfile (egovernments#887)

* Create buildWorkbenchUI.yml

* Update README.md (egovernments#917)

* Update buildWorkbenchUI.yml

* Update README.md

* Updated the DB Schema issue of Project-factory

* fixed hierarchy order (egovernments#919)

* User flag hcm (egovernments#920)

* Feat : docker config update

* Feat : added user create flag

* Refactored

* Update campaignUtils.ts

* Update campaignMappingUtils.ts (egovernments#922)

* Ashish egov patch 2 (egovernments#921)

* Update index.ts

* Update campaignApis.ts

* Fixed the project type conversion and product duplicate issue

* Update campaignApis.ts (egovernments#924)

* Update campaignMappingUtils.ts (egovernments#925)

* Update campaignMappingUtils.ts

* Refactored

* Update publishProjectFactory.yml

* Update buildWorkbenchUI.yml

* Update campaignMappingUtils.ts (egovernments#926)

* Update request.ts (egovernments#928)

* Update request.ts

* Feat : updated httprequest

* Feat : warning response added

* Refactor

* added start and enddate in cycles

* Update campaignApis.ts (egovernments#930)

* Update request.ts (egovernments#932)

* fixed generate issue (egovernments#933)

* Fixed project-type resources duplication

* updated target error messages (egovernments#936)

* fixed stepper from draft (egovernments#937)

* Update Listener.ts

* delivery type disable fix, product sku name change (egovernments#939)

Co-authored-by: nabeelmd-eGov <[email protected]>

* fixed error message issue (egovernments#941)

* Redis integration (egovernments#940)

* Feat : added redis

* Feat : added redis retry

* updated migration

* Feat : changed download logic (egovernments#942)

* Update README.md (egovernments#943)

* fixed target validate for different tabs not present (egovernments#945)

* Enriching already exsisting user (egovernments#946)

* Feat : adding dropdowns (egovernments#952)

* HLM-6270: Date logic changes, added localisation code (egovernments#953)

Co-authored-by: nabeelmd-eGov <[email protected]>

* changed maximum target message (egovernments#954)

* changed maximum target message

* Update UploadData.js

* Call generate (egovernments#951)

* updated target error messages

* generate call while campaign update changes boundaries

* some update on call-generate

* call-generate

* updated call-gnerate logic

* added column campaign id in generated resource table

* updated config index.ts

* removed console.logs

* Update utilities/project-factory/src/server/utils/generateUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/utils/generateUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* added some additional conditions

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* changed facility info message (egovernments#955)

* HLM 6270 (egovernments#957)

* refactor

* added title text

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update genericUtils.ts (egovernments#958)

* fixed boundary draft logic (egovernments#959)

* Boundary code generated has now configurable hierarchy type and boundary name at last based on config (egovernments#963)

* fixed target validate for different tabs not present

* made hierarchytype and bondary name configurable in auto generation of boundary code

* added toString() on elment for safety

* HLM-6270: Elimated Generate API & enhance download API, Date logic fixes (egovernments#966)

* refactor

* added title text

* HLM-6270: Elimated Generate API & enhance download API, Date logic fixes

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Ashish table create (egovernments#972)

* saving

* Feat : adding table

* Feat : table creating

* updated configs

* Feat : added table

* Feat : table added

* Feat : integrated processtracks

* Fix : name format (egovernments#973)

* Update campaignUtils.ts (egovernments#974)

* configure app static screen and skeleton (egovernments#980)

* configure app static screen and skeleton

* comments resolved

* Migration repair (egovernments#981)

* migration repair

* migration repair

* migration repair

* Updated CampaignCard to add NATIONAL_SUPERVISOR dashboard link

* made isActive change (egovernments#986)

* boundaries on which we split to be fetched from mdms (egovernments#982)

* fixed target validate for different tabs not present

* split boundaries fetch from mdms

* updated logic to fetch split on from mdms based on campaign type

* fromatting

* Update campaignUtils.ts (egovernments#988)

* Update processTrackUtils.ts (egovernments#989)

* fixs (egovernments#990)

* fixs

* Update SelectingBoundaries.js

* Update processTrackUtils.ts (egovernments#991)

* Summary screen api loop fix (egovernments#992)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Resource activity (egovernments#993)

* fixed target validate for different tabs not present

* resource activity persisting in db

* Update processTrackUtils.ts (egovernments#994)

* added timeout of 2 sec for boundary entity to persist (egovernments#996)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* css version fix (egovernments#997)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Process tracking update (egovernments#998)

* Feat : changed logic of process track

* Feat : improved process tracks

* improved process tracking

* Update campaignUtils.ts (egovernments#999)

* Update campaignUtils.ts (egovernments#1000)

* Update campaignUtils.ts

* Update Listener.ts

* Feat : imporved process track (egovernments#1001)

* Update campaignManageService.ts (egovernments#1003)

* Update campaignManageService.ts

* Update campaignUtils.ts

* Update processTrackUtils.ts

* Feat : added user mapping for multiple boundaries with common parent (egovernments#1005)

* new template will be generated if source is microplan accordingly from mdms (egovernments#1004)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* new template generate if source is microplan

* updated logic for generating templates if source of campaign is from microplan

* made separate function for checking source is microplan

* added separate  func for checking source is microplan

* refactor

* chnaged the checkIFSourceMicoplan func

* refactored checkifsourceismicroplan

* Fix : fix array fetch from cell (egovernments#1006)

* Feat : fixed array issue in target (egovernments#1007)

* Feat : fixed array issue in target

* Update index.ts

* Some fixes and refactor (egovernments#1008)

* Feat : fixed array issue in target

* Update index.ts

* Refactor

* Fixed status row

* commented harcoded check && added new dashboard icon (egovernments#1011)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Fixed sheetrows issues (egovernments#1012)

* Sheet row fixed (egovernments#1013)

* Fixed sheetrows issues

* Shut down if kafka error

* Feat : formated sheet (egovernments#1015)

* integrated admin schema  with mdms_v2 (egovernments#1018)

* Fix process timeline (egovernments#1029)

* Feat : formated sheet

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* Feat : imporved processTracking and fixed migration script

* Feat : fixed error persistence

* Fix

* Un wrap other rows (egovernments#1034)

* Feat : formated sheet

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* Feat : imporved processTracking and fixed migration script

* Feat : fixed error persistence

* Unwraped lower rows

* Update publishProjectFactory.yml

* updated package versions (egovernments#1042)

* HLM-6325/HLM-6277: Update date with & without boundary screen integration and actionable column added (egovernments#1045)

* HLM-6007

* css version fix

* update date screen added

* change add

* css fixes and API Integration for search project

* Implemented Action component in My Campaign screen

* Implemented Date Update with and without boundary with API integration

* Boundary change

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Facility dynamic generate for source microplan (egovernments#1046)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* added code for generating facility template if source is microplan

* updated name

* updated version (egovernments#1047)

* updated core version to fix login forget password issues(egovernments#1051)

* Fixed update topic (egovernments#1056)

* updated version (egovernments#1061)

* Hidden sheet impel (egovernments#1077)

* Feat : formated sheet

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* Feat : imporved processTracking and fixed migration script

* Feat : fixed error persistence

* Unwraped lower rows

* Update campaignUtils.ts

* Update publishProjectFactory.yml

* Update genericUtils.ts (egovernments#1078)

* target template download based on delivery conditions if present (egovernments#1080)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* logic for dynamic target generate template based on delivery conditions

* fixed stepper color issue from draft (egovernments#1083)

* fixed reordering of tab issue (egovernments#1092)

* Hlm 6350 (egovernments#1094)

* timeline wip

* added timeline from summary

* removed log

* integarte with mdms (egovernments#1095)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update genericUtils.ts (egovernments#1097)

* Update targetUtils.ts (egovernments#1098)

* Hlm 6350 (egovernments#1100)

* timeline wip

* added timeline from summary

* removed log

* integrated timeline with popup

* updated version

* updated css version

* HCMPRE-32: Resolve date update demo points (egovernments#1104)

* integarte with mdms

* HCMPRE-32: Resolve date update demo points

* comment resolve

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Dynamic target upload and download both with target columns as per delivery conditions when campaign is updated with cahnegs in delivery conditions (egovernments#1109)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* target upload based on dynamic column in reference to deliveryRules

* logic for calling generate target tempalte when campaign delivery conditions change

* removed console

* updated css version (egovernments#1102)

* added chip for dropdown (egovernments#1111)

* version fix to resolve issue (egovernments#1112)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Ashish patch1 (egovernments#1118)

* Feat : formated sheet

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* Feat : imporved processTracking and fixed migration script

* Feat : fixed error persistence

* Unwraped lower rows

* Update campaignUtils.ts

* Update genericValidator.ts

* Update publishProjectFactory.yml

* Update targetUtils.ts

* edit product with prefilled value and count (egovernments#1115)

* Boundary upload  to have not generate boundary code if  code is already filled to support migration (egovernments#1121)

* fixed target validate for different tabs not present

* resource activity persisting in db

* added timeout of 2 sec for boundary entity to persist

* Boundary upload  to have not generate boundary code if  code is already filled to support migration

* Update index.ts

* Update constants.ts (egovernments#1122)

* Update constants.ts

* Update utilities/project-factory/src/server/config/constants.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update campaignUtils.ts

* Update campaignUtils.ts

* Update campaignMappingUtils.ts

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* template downlod for source microplan (egovernments#1123)

* Different tabs onlevel to fetch from mdms rather than from config in target upload flow (egovernments#1124)

* template downlod for source microplan

* updated logic for getting different tabs based on level from config to fetch it from mdms in target upload flow

* Sequence order change in action button (egovernments#1125)

Co-authored-by: nabeelmd-eGov <[email protected]>

* reverted  the function validateAllDistrictTabsPresentOrNot (egovernments#1126)

* template downlod for source microplan

* updated logic for getting different tabs based on level from config to fetch it from mdms in target upload flow

* restored the func validateAllDistrictTabsPresentOrNot to default

* Update index.ts (egovernments#1129)

* Update index.ts

* Update Listener.ts

* Update Producer.ts

* Update generateUtils.ts (egovernments#1130)

* some changes related to generate boundary template (egovernments#1133)

* updated logic for target columns acc to delivery conditions only for smc (egovernments#1137)

* some changes related to generate boundary template

* updated logic for making configurable target acc to delivery only for smc

* refactored code for including dynamic target columns for specific types according to configs array

* updated version and boundary fix (egovernments#1141)

* updated readmeconfig for sheet (egovernments#1142)

* HCMPRE-140: Action column fixes, date editable logic change (egovernments#1143)

* Action column fixes, date editable logic change

* added roles for dss

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update constants.ts (egovernments#1145)

* Update constants.ts

* Update processTrackUtils.ts

* Update Listener.ts (egovernments#1147)

* HCMPRE 140 (egovernments#1149)

* Action column fixes, date editable logic change

* added roles for dss

* update dates fixes

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* updated core version (egovernments#1150)

* Ashish patch2 (egovernments#1152)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Update publishProjectFactory.yml

* Redis cache for generating target when delivery conditions change (egovernments#1156)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added cache time in config

* refactored caching code in generate flow for boundary sheet

* refactored callGenerate function

* Ashish egov patch 2 (egovernments#1166)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Update publishProjectFactory.yml

* HCMPRE-154: Update Dates bug fixes, Toast added for error. (egovernments#1158)

* Action column fixes, date editable logic change

* added roles for dss

* update dates fixes

* HCMPRE-154 update dates bug fixes, Added toast for error

* code clean

* Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Adding date bug

* date fix

* Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/DateWithBoundary.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/DateWithBoundary.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Jagankumar <[email protected]>

* version update (egovernments#1168)

Co-authored-by: nabeelmd-eGov <[email protected]>

* HCMPRE-6407 download template changes  (egovernments#1128)

* HLM-6407 adding changes for facility template

* HLM-6407 adding changes for facility template

* HLM-6407 adding changes for facility template

* HLM-6407 codde review comment

* HCMPRE-91 code review comments

* HLM-6407 using same mdms schema for microplan

* HLM-6407 adding changes for facility template

* HLM-6407 adding changes for facility template

* HLM-6407 adding changes for facility template

* HLM-6407 codde review comment

* HCMPRE-91 code review comments

* HLM-6407 using same mdms schema for microplan

* HLM-6407 code review comments

* HLM-6407 code review comments

* Core ui version fix (egovernments#1176)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Ashish egov patch 2 (egovernments#1178)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Update publishProjectFactory.yml

* Update Producer.ts (egovernments#1182)

* fixed timeline issues (egovernments#1185)

* HCMPRE 154 (egovernments#1186)

* date validation fix

* Update date logic

* FIX

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* changes in timeline (egovernments#1187)

* CSS version add (egovernments#1188)

* date validation fix

* Update date logic

* FIX

* css add

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* HCMPRE 154 (egovernments#1189)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* limited the number of columns of target for upto only 18 in number  (egovernments#1190)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added logic for having only 18 target columns  if exceed i will create one column with  header OTHER_TARGETS

* HCMPRE 154 (egovernments#1191)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

* date start from tomorrow

* css fix for language screen

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Produceasync (egovernments#1192)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Producer update

* Feat : updated producemodified message

* Update publishProjectFactory.yml

* Update publishProjectFactory.yml

* HCMPRE 154 (egovernments#1193)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

* date start from tomorrow

* css fix for language screen

* disable today date

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* config updates according to devops (egovernments#1197)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added logic for having only 18 target columns  if exceed i will create one column with  header OTHER_TARGETS

* updated config to fetch from devops accordingly

* Update index.ts

* All changes (egovernments#1201)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Update Producer.ts

* Update Producer.ts

* Feat : updated producemodified message

* Feat : removed waiting

* adding constraint

* Update V20240731162600__add_uniqiue_constraint_process_track.sql

* Update constants.ts

* Update publishProjectFactory.yml

* HCMPRE 154 (egovernments#1202)

* date validation fix

* Update date logic

* FIX

* css add

* non editable fix

* date start from tomorrow

* css fix for language screen

* disable today date

* date and cycle fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Revert "HCMPRE 154 (egovernments#1191)" (egovernments#1203)

This reverts commit 59ec953.

Co-authored-by: nabeelmd-eGov <[email protected]>

* updated versions (egovernments#1205)

* Update date change screen date logic fix, info added, hard reload issue fix (egovernments#1206)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Config update for project-factory (egovernments#1207)

* updated readmeconfig for sheet

* added cache for generating target template when only delivery conditions change

* added logic for having only 18 target columns  if exceed i will create one column with  header OTHER_TARGETS

* updated config to fetch from devops accordingly

* updated config for project -factory

* Timeline (egovernments#1210)

* updated versions

* fixed user credential button

* Kafka fix (egovernments#1212)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Revert "Ashish egov patch 2 (egovernments#1178)"

This reverts commit e86a4dc.

* Update Producer.ts

* Update Producer.ts

* Feat : updated producemodified message

* Feat : removed waiting

* adding constraint

* Update V20240731162600__add_uniqiue_constraint_process_track.sql

* Update constants.ts

* Feat : improved kafka

* Fix kafka restart issue

* fixed the pop up button issue (egovernments#1215)

* Kafka restart (egovernments#1217)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Revert "Ashish egov patch 2 (egovernments#1178)"

This reverts commit e86a4dc.

* Update Producer.ts

* Update Producer.ts

* Feat : updated producemodified message

* Feat : removed waiting

* adding constraint

* Update V20240731162600__add_uniqiue_constraint_process_track.sql

* Update constants.ts

* Feat : improved kafka

* Update Producer.ts

* Update Producer.ts

* Update publishProjectFactory.yml

* updated core versions for privacy component  (egovernments#1223)

* Ashish egov patch 1 (egovernments#1228)

* Update Listener.ts

* added new branch

* Update Listener.ts

* fixed mapping kafka error

* mapping kafka fixed

* fix kafka

* fix kafka

* Removing foreign key constraint

* Producer update

* Revert "Ashish egov patch 2 (egovernments#1178)"

This reverts commit e86a4dc.

* Update Producer.ts

* Update Producer.ts

* Feat : updated producemodified message

* Feat : removed waiting

* adding constraint

* Update V20240731162600__add_uniqiue_constraint_process_track.sql

* Update constants.ts

* Feat : improved kafka

* Update Producer.ts

* Update Producer.ts

* Update campaignUtils.ts

* feat : solved localization passing through kafka

* Update publishProjectFactory.yml

* removed frontend

* Update package.json

* Squashed commit of the following:

commit 3cd21c2
Merge: 12061ca 80f6307
Author: Jagankumar <[email protected]>
Date:   Thu Aug 8 15:13:48 2024 +0530

    Merge branch 'campaign' into campaign-merged

commit 80f6307
Author: nitish-egov <[email protected]>
Date:   Wed Aug 7 18:08:15 2024 +0530

    Updated changelog (egovernments#1242)

    * default enableDynamicTemplateForWillBe empty string in config

    * updated changelog and postman collection

commit f897dba
Author: Jagankumar <[email protected]>
Date:   Wed Aug 7 17:25:39 2024 +0530

    Update package.json

commit dd691e6
Author: Bhavya-egov <[email protected]>
Date:   Tue Aug 6 13:34:40 2024 +0530

    updated workbench version (egovernments#1236)

commit 3a30736
Author: Bhavya-egov <[email protected]>
Date:   Tue Aug 6 11:00:14 2024 +0530

    updated micro ui core version (egovernments#1233)

commit a1f7329
Author: nitish-egov <[email protected]>
Date:   Mon Aug 5 18:29:40 2024 +0530

    default enableDynamicTemplateForWillBe empty string in config (egovernments#1231)

commit d3c3e95
Author: nabeelmd-eGov <[email protected]>
Date:   Mon Aug 5 18:11:23 2024 +0530

    build issue fix for optional chanining issue (egovernments#1230)

    Co-authored-by: nabeelmd-eGov <[email protected]>

commit 236b843
Author: nabeelmd-eGov <[email protected]>
Date:   Mon Aug 5 17:17:20 2024 +0530

    fix (egovernments#1229)

    Co-authored-by: nabeelmd-eGov <[email protected]>

* sending only activity object to kafka in place of request body (egovernments#851)

---------

Co-authored-by: ashish-egov <[email protected]>
Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Bhavya-egov <[email protected]>
Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: Priyanka-eGov <[email protected]>
@@ -274,9 +274,6 @@ private static <T> void enrichErrorForStock(List<Stock> validEntities,
if (SenderReceiverType.WAREHOUSE.equals(stock.getSenderType()) && !facilityIds.contains(senderId)) {
populateErrorForStock(stock, senderId, errorDetailsMap);
}

if (SenderReceiverType.WAREHOUSE.equals(stock.getReceiverType()) && !facilityIds.contains(receiverId))
populateErrorForStock(stock, receiverId, errorDetailsMap);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

remove receiverId local property as it is not being used.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ishaan-egov pushed a commit to ishaan-egov/health-campaign-services that referenced this pull request Sep 30, 2024
…ng, delivery type integarted (egovernments#790)

* Update campaignValidators.ts (egovernments#655)

* fixes-> cyclenumber issue, hover issue, dropdown height issue,

* css

* fixes-> cyclenumber issue, hover issue, dropdown height issue, (egovernments#656)

* fixes-> cyclenumber issue, hover issue, dropdown height issue,

* css

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update campaignUtils.ts

* fixed HLM-5970

* Feat : added boundary validation at data level

* fixes

* local add

* Added boundary validation

* Refactor

* fixed HLM-5935 and HLM-5749

* Refactor

* Feat : updated table

* change campaignid in payload

* Feat : added campaignId

* Update campaignApis.ts

* Update campaignValidators.ts

* refactored

* Refactor

* assigned campaignId

* Refactor

* updated createRequest Schema

* Feat : invalid Status Persist

* status fix

* version-fix

* Update CODEOWNERS

* core version updated and css fix for language dropdown

* refactor (egovernments#676)

* Uat signoff (egovernments#678)

* change in filter recursive

* lowest level

* added validation related to target sheet headers

* HLM-5916

* download button fixes in summary (egovernments#682)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Hlm 5927 (egovernments#687)

* change in filter recursive

* lowest level

* added validation for boundary codes to be invalid other than that selected from UI in target upload

* Added Delivery and cycle config for LLIN and SMC both (egovernments#688)

* no of cycle and deivery drafted changes

* fixes

* add localisation code for boundaries

* fixes

* fixes

* Value localise in summary screen, api error change

* fixes

* genarate api call fix

* font size change for summary

* login css change

* HLM-5718: SMC delivery config enhancement

* config update

* added config for in between

* fix config for llin

* added mdms integration

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Fixed HLM-5988_warning message (egovernments#689)

Co-authored-by: nabeelmd-eGov <[email protected]>

* download filename fixes (egovernments#693)

* download button fixes in summary

* download filename with custom name changes added

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* download filename fixes (egovernments#694)

* download button fixes in summary

* download filename with custom name changes added

* config fix for llin

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* successful toast message is fixed (egovernments#695)

* successful toast message is fixed

* Update UploadData.js

* HLM-5991: Alert Pop UP CR (egovernments#696)

Co-authored-by: nabeelmd-eGov <[email protected]>

* HLM-5718 changes (egovernments#703)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Localization cache (egovernments#706)

* change in filter recursive

* lowest level

* refactored  localization cache logic

* Update README.md (egovernments#707)

* Update README.md

* Update README.md

* Update utilities/project-factory/README.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update README.md

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* HLM-5985_made lowest level changes (egovernments#708)

* HLM-5985_made lowest level changes

* resolved codeRabbit comments

* Create LOCALSETUP.md (egovernments#709)

* Create LOCALSETUP.md

* Refactored config

* Update LOCALSETUP.md

* Update utilities/project-factory/LOCALSETUP.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/LOCALSETUP.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/LOCALSETUP.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/LOCALSETUP.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update LOCALSETUP.md

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* updated the localisation module config

* Refactor config (egovernments#713)

* Refactor config

* Update utilities/project-factory/src/server/validators/campaignValidators.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/validators/campaignValidators.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/validators/campaignValidators.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update postman_collection.json (egovernments#714)

* Update postman_collection.json

* Update postman_collection.json

* Delete utilities/project-factory/project_factory_swagger.yml (egovernments#715)

* Feat : removed campaignId validation for boundary upload (egovernments#718)

* updated the delay for boundary relationship

* added logger for request TODO TEST

will be reverted

* Revert "added logger for request TODO TEST"

This reverts commit d5c2bf5.

* Schema validation (egovernments#719)

* Feat : removed campaignId validation for boundary upload

* Feat : added schema validation

* Fixed mdms host

* updated the logger messages

* updated the loggers

* delivery new changes, toast fix, error fix (egovernments#716)

* delivery new changes, toast fix, error fix

* new fixes

* fixes

* change text component to field component

* added hierarchy

* fix

* fix

* fix

* fix

* passing hierarchy from props

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Schema validation2 (egovernments#721)

* Feat : removed campaignId validation for boundary upload

* Feat : added schema validation

* Fixed mdms host

* Feat : added boundary validation

* Feat : optimized product search

* Fix : project mapping fixed (egovernments#722)

* Fixed project search (egovernments#723)

* smc fixes (egovernments#724)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Feat : added boundary confirmation (egovernments#727)

* Fix: fixed processing boundary

* Refactor

* fixed HLM-6109 (egovernments#729)

* gate fixes validation, ui ux (egovernments#731)

Co-authored-by: nabeelmd-eGov <[email protected]>

* integrated panelcard component (egovernments#732)

* integrated panelcard component

* Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/Response.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update genericUtils.ts (egovernments#733)

* updated the folder structure

* Create CHANGELOG.md (egovernments#717)

* updated the versions

* Update .gitignore

* Update request.ts (egovernments#735)

* fixed generate api issue (egovernments#734)

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

* Create CHANGELOG.md

* gate fixes (egovernments#736)

* gate fixes validation, ui ux

* gate fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* added loader in the selecting boundaries (egovernments#737)

* Update createAndSearch.ts (egovernments#738)

* fix (egovernments#739)

* fix

* fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Patch 3 (egovernments#740)

* change in filter recursive

* lowest level

* trimmed underscore and empty spaces

* boundary fix (egovernments#742)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update genericUtils.ts (egovernments#746)

* fixed the delivery products issue

* Fixed delivery conditions issue

* Update campaignApis.ts (egovernments#747)

* fixed warning toast (egovernments#748)

* fixed warning toast

* Update UploadData.js

* fix (egovernments#749)

* fix

* fx

* fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* core -update (egovernments#751)

Co-authored-by: nabeelmd-eGov <[email protected]>

* fixed stepper issue (egovernments#752)

* fixed stepper issue

* Update index.html

* Feat : added user validation via individual (egovernments#753)

* fixes (egovernments#754)

Co-authored-by: nabeelmd-eGov <[email protected]>

* code fix nabeel (egovernments#756)

* fixes

* fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Updated few loggers (egovernments#759)

* updated few loggers flow

* Update utilities/project-factory/src/server/api/campaignApis.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/utils/campaignMappingUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/utils/campaignUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/validators/campaignValidators.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/api/campaignApis.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/utils/campaignMappingUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update utilities/project-factory/src/server/utils/genericUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Updated the user Password generation logic egovernments#761

* Update Listener.ts (egovernments#730)

* Update Listener.ts

* added try catch logic in producer

* Feat : added parallel batch execution (egovernments#767)

* Feat : added parallel batch execution

* Refactor

* Update utilities/project-factory/src/server/validators/campaignValidators.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fixed the stepper (egovernments#765)

* changes config (egovernments#769)

* Project type config and added loggers for process of campaign (egovernments#772)

* Feat : added themes in generate template (egovernments#773)

* fixed the ajv package version for build issue

* Feat : removed xlsx (egovernments#776)

* HLM-6177: PARALLEL SEARCH IMPLEMENT, DELIVERY TYPE IMPLEMENT (egovernments#778)

Co-authored-by: nabeelmd-eGov <[email protected]>

* css update (egovernments#780)

Co-authored-by: nabeelmd-eGov <[email protected]>

* HLM-6179 and HLM-6180 (egovernments#777)

* HLM-6179 and HLM-6180

* campaign name changes

---------

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

* Feat : fixed target generation (egovernments#781)

* fixed tenantId issue (egovernments#784)

* fix: resolved AJV-related Jenkins build issue reference egovernments#783 egovernments#786 (egovernments#787)

* module ui fix

* updated all the package version for build fixes

* fixed kafka-error at target generation (egovernments#789)

* updated core version (egovernments#791)

* updated core version

* updated css also

* Update campaignValidators.ts (egovernments#794)

* Updated the excel generation logic and files

* added changes for configurable column in target sheet (egovernments#779)

* change in filter recursive

* lowest level

* made target headers  genearte through mdms schema

* changed config index.ts

* changed config index.ts

* changes for now

* added configurable column logic from schema HLM-6169

* updated validate of target columns through schema

* added masterForColumnSchema in index.ts

* formatted dataManageService

* refactored lock TargetFields func

* removed console.log

* User creation performance improved (egovernments#800)

* Feat : Improved user creation performance

* Change status color

* Update utilities/project-factory/src/server/utils/campaignUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update genericUtils.ts (egovernments#801)

* Hlm 6170 (egovernments#802)

* change in filter recursive

* lowest level

* HLM -6170 added logic for only village level data in target sheet and some refactoring

* updated css (egovernments#804)

* fixed button issue (egovernments#805)

* HLM 6177: Error card implementation in summary screen (egovernments#806)

* HLM-6177: PARALLEL SEARCH IMPLEMENT, DELIVERY TYPE IMPLEMENT

* Added Error Cards in summary screen and redirection

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* added error button styles (egovernments#807)

Co-authored-by: nabeelmd-eGov <[email protected]>

* updated popUp css (egovernments#808)

* HLM 6178: Implementing New Pop up screen in boundaries (egovernments#809)

* added error button styles

* Implementing New Pop up screen in boundaries

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Facility changes (egovernments#812)

* Feat : changed facility Template

* Feat : locked target templates

* fixed colour issue (egovernments#813)

* Updated the project type conversion logic for the             "deliveryType" dont1 and n config

* Unique field added (egovernments#814)

* Feat : changed facility Template

* Feat : locked target templates

* Feat : added unique check logic

* Target schema update (egovernments#815)

* change in filter recursive

* lowest level

* updated shcema of target columns to be configurable

* removed empty spaces from config index.ts

* Active mapping (egovernments#817)

* Feat : changed facility Template

* Feat : locked target templates

* Feat : added unique check logic

* Feat : added mapping via active field

* changes in the schema validation (egovernments#816)

* Updated the workbench and css module version

* Feat : added active inactive boundary check (egovernments#818)

* Update campaignValidators.ts (egovernments#819)

* added active inactive validation (egovernments#820)

* changed api call time (egovernments#826)

* Feat : added target sum mapping (egovernments#825)

* added campaign type as filter (egovernments#827)

* Update genericApis.ts (egovernments#828)

* Update excelUtils.ts (egovernments#829)

* UI issue fixes, icon fix in summary error (egovernments#831)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Target columns (egovernments#830)

* change in filter recursive

* lowest level

* commit

* Feat : target flow fixed for LLIN-mz

* uat to dev

---------

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

* Feat : freezed target columns (egovernments#833)

* Target mr dn (egovernments#834)

* change in filter recursive

* lowest level

* Feat : skipped validation temporarily

* changes in the target validation (egovernments#835)

* fixed error info (egovernments#837)

* Added roboto font (egovernments#840)

* Feat : added roboto font

* Fixed config

* target validation based on diff campaign types (egovernments#843)

* change in filter recursive

* lowest level

* updated validation of target based on campaign type

* fixed validation issue (egovernments#844)

* Updated the workbench package version

* fixed validation logic (egovernments#846)

* fixed validation logic

* Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Error messages improved (egovernments#848)

* Feat : imporved error messages and initilised utils for tracking process

* Fix ; unused variables fixed

* Feat : improved error messages

* Fix : download error fix (egovernments#850)

* Update campaignUtils.ts (egovernments#851)

* Update campaignUtils.ts

* Update utilities/project-factory/src/server/utils/campaignUtils.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update campaignValidators.ts (egovernments#853)

* HLM 6210: Toast, error focus fix and project type reset delivery data fix  (egovernments#854)

* HLM-6210: campaign type change reset delivery data fix, summary error focus fix

* summary error focus fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* HLM-6225_added time out according to data (egovernments#855)

* Update campaignValidators.ts (egovernments#859)

* HLM 6210 (egovernments#858)

* HLM-6210: campaign type change reset delivery data fix, summary error focus fix

* summary error focus fix

* parallel search fixes

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Remove validation (egovernments#852)

* change in filter recursive

* lowest level

* removed unnecessary validation for target

* spacing refactor

* Update campaignValidators.ts (egovernments#863)

* Header validation (egovernments#861)

* change in filter recursive

* lowest level

* removed unnecessary validation for target

* changed the logic of header validation

* space refactor

* Update campaignUtils.ts (egovernments#864)

* fixed ui error (egovernments#865)

* Read me (egovernments#867)

* change in filter recursive

* lowest level

* removed unnecessary validation for target

* changed the logic of header validation

* fixed portugese language error

* space refactoring

* Update Dockerfile

* Update Dockerfile

* Update migrate.sh

* Update Dockerfile

* Update campaignValidators.ts (egovernments#868)

* HLM 6210:campaign type change reset fix (egovernments#869)

* HLM-6210: campaign type change reset delivery data fix, summary error focus fix

* summary error focus fix

* parallel search fixes

* campaign type change reset fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update excelUtils.ts for sheetHeaders wraping (egovernments#870)

* Update package.json

* updated error messages (egovernments#871)

* feat : added jaeger-client tracing (egovernments#872)

* updated the table config

* Update campaignApis.ts (egovernments#875)

* removed the schema and updated the db name

* fixing generate API call, file auto delete, date error (egovernments#877)

Co-authored-by: nabeelmd-eGov <[email protected]>

* Trim resource (egovernments#878)

* Feat : trimmed resource persist message

* Refactor

* Removed reject error in produce message

* fixed min time, draft logic (egovernments#879)

* Update index.ts (egovernments#880)

* added min ui error and facility usage (egovernments#883)

* added min ui error and facility usage

* changes

* Update campaignUtils.ts (egovernments#884)

* HLM 6007 (egovernments#885)

* fixing generate API call, file auto delete, date error

* generate api fix

---------

Co-authored-by: nabeelmd-eGov <[email protected]>

* Update Dockerfile

* Feat : docker config update (egovernments#886)

* Update Dockerfile (egovernments#887)

* Create buildWorkbenchUI.yml

* Update README.md (egovernments#917)

* Update buildWorkbenchUI.yml

* Update README.md

* Updated the DB Schema issue of Project-factory

* fixed hierarchy order (egovernments#919)

* User flag hcm (egovernments#920)

* Feat : docker config update

* Feat : added user create flag

* Refactored

* Update campaignUtils.ts

* Update campaignMappingUtils.ts (egovernments#922)

* Ashish egov patch 2 (egovernments#921)

* Update index.ts

* Update campaignApis.ts

* Fixed the project type conversion and product duplicate issue

* Update campaignApis.ts (egovernments#924)

* Update campaignMappingUtils.ts (egovernments#925)

* Update campaignMappingUtils.ts

* Refactored

* Update publishProjectFactory.yml

* Update buildWorkbenchUI.yml

* Update campaignMappingUtils.ts (egovernments#926)

* Update request.ts (egovernments#928)

* Update request.ts

* Feat : updated httprequest

* Feat : warning response added

* Refactor

* added start and enddate in cycles

* Update campaignApis.ts (egovernments#930)

* Update request.ts (egovernments#932)

* fixed generate issue (egovernments#933)

* Fixed project-type resources duplication

* updated target error messages (egovernments#936)

* fixed stepper from draft (egovernments#937)

* Update Listener.ts

* delivery type disable fix, product sku name change (egovernments#939)

Co-authored-by: nabeelmd-eGov <[email protected]>

* fixed error message issue (egovernments#941)

* Redis integration (egovernments#940)

* Feat : added redis

* Feat : added redis retry

* updated migration

* fixed

* updated migration

* Delete .vscode/launch.json

* Delete .vscode/settings.json

---------

Co-authored-by: ashish-egov <[email protected]>
Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: nabeelmd-eGov <[email protected]>
Co-authored-by: Bhavya-egov <[email protected]>
Co-authored-by: ashish-egov <[email protected]>
Co-authored-by: nitish-egov <[email protected]>
Co-authored-by: Bhavya-egov <[email protected]>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Swathi-eGov <[email protected]>
Co-authored-by: admin1 <[email protected]>
…dation

Removed the local receiverId in ValidatorUtil.java
@kavi-egov kavi-egov merged commit de909f1 into dev Sep 30, 2024
2 of 3 checks passed
kavi-egov added a commit that referenced this pull request Dec 13, 2024
* Hlm 6385 irs changes (#841)

* HLM-6385: added changes for IRS activity track and closed household concepts

* HLM-6385: added changes for IRS activity track and closed household concepts, added db migration script, validations for closed household

* HLM-6385: added changes for location tracking

* HLM-6385: added changes for location points

* HLM-6385: added clientReferenceId and tenantId in LocationPoint, updated Location_capture model

* HLM-6385, HCMPRE-46: Updated changes as per design review

* HLM-6385, HCMPRE-46: Added Location capture changes

* HLM-6385, HCMPRE-46: Added UserAction changes

* HLM-6385, HCMPRE-46: updated common models, replaced digit models with service-common

* Revert "HLM-6385, HCMPRE-46: updated common models, replaced digit models with service-common"

This reverts commit 6abdea4.

* HLM-6385, HCMPRE-46: updated table informations and columns for migration scripts

* reverting BoundaryUtil change

* reverting BoundaryUtil changes

* HLM-6385, HCMPRE-46: updated validators and IRSConsumer

* HLM-6385, HCMPRE-46: updated validators

* HLM-6385, HCMPRE-46: updated project configuration

* HLM-6385, HCMPRE-49: updated models to have isDeleted as it is required in common utils enrichment code

* HLM-6385, HCMPRE-46: updated the projectid field, added notnull annotation

* HLM-6385, HCMPRE-46: updated all the changes related to enrichment

* HLM-6385, HCMPRE-46: made action field notnull

* HLM-6385, HCMPRE-46: updated locationCapture and userAction with mandatory latitude, longitude, locationAccuracy fields

* HLM-6385, HCMPRE-46: updated locationCapture and userAction with mandatory latitude, longitude, locationAccuracy fields, HCMPRE-116, HCMPRE-117

* HLM-6385, HCMPRE-46: updated locationCapture and userAction with mandatory latitude, longitude, locationAccuracy fields, HCMPRE-116, HCMPRE-117, added in services

* HLM-6385, HCMPRE-46: removed outdated changes from Task.java

* removed all user location models

* Refactored from LocationCapture model to UserAction and packges from irs to useraction

* HLM-6385 - lat/long irs name changes

* HLM Downsync Incremental product changes pull from impel (#831)

* HLM Downsync Incremental product changes pull from impel

* HLM removed impel specific changes

* renamed Project type filter code constant

* HLM updated beneficiary based search

* HLM updated downsync search, cycles is required only when it is smc based campaign

* HCM - removed project task resource quantity validator

* HLM updated downsync logic as per review comments

* HCMPRE-216 : Added Administration failed status for validation when task resource is empty or when status is ADMINISTRATION_FAILED

* HCMPRE-216: updated task status

* HCMPRE-216: changed to ADMINISTRATION_FAILED

* HLM-6385: updated with code review comments

* HLM-6385: added changes as per review comments, and added correct logs wherever required.

* HLM-6385: code review comments addressed.

* HLM-6385: review comment added for error handling on LocationCaptureRepository

* HLM-6385: another batch of coderabbitai code review comments addressed.

* HLM-6385: added more logs in repository for useraction and location capture

* HLM-6385: updated the code as per code review comments from @kavi-egov

---------

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

* Hcmpre 240 (#846)

* HLM closed household status

* HCMPRE-240: validate no resource task status scenario with configurable statuses

* HCMPRE-240: fixed issues related to string trimming

* HLM fixed rowversion referral bug, mis placement of rowversion validator

* HCMPRE-240: code review changes

* HCMPRE-242: updated for null resources and address check

* HCMPRE-242: added for proper null check

* HCMPRE-242: added checks for task resource where ever applicable

* HCMPRE-242: updated taskstatus to enum from string

* HCMPRE-242, HCMPRE-240: renamed task's status field to taskStatus field, as there is contradiction with EgovModel status field

* HCMPRE-242: fixed dupcalite entity cache issue for existing entity validation during bulk create

* HCMPRE-242: updated project test case for taskStatus field contraints changes : not null

* HCMPRE-242: fix generic repository code

* HCMPRE-242: added taskstatus migration script

* HCMPRE-240: updated PtIsResourceEmptyValidator, for task status

* HLM-242: added changes as per code review

* Revert "HCMPRE-242: added taskstatus migration script", and removed status field from EgovModel, and rename TaskStatus to status

This reverts commit 7caf0c4.

* HCMPRE-240: FIXED all task status reference

---------

Co-authored-by: sivajiganesh-dev <[email protected]>

* HLM rowmapper issue in household, referral fixed (#848)

* HLM rowmapper issue in household, referral fixed

* HCMPRE-255: updated the changes for household

* reverted local changes commit by mistake

* added logic for cascading project date updates (#834)

* added logic for cascading project date updates

* updated application.properties

* refactored logic for using ProjectRequest pojo to send message to kafka instead of Ancestor and Descendant Projects pojo

* added comments and enhanced search project logic

* made public back to private

* made  more concise the method in project service separated create project map logic

* separated concerns of update based on action whether null or updateProjectDates

* updated action logic for just test purpose

* updated version of health-service-models library

* update logic

* updated final logic for cascading update project dates based on flag in project request

* reverted config

* reverted config 2

* added multiple line comments

* udpated error messages

* HLM fixed issues in useraction existent entity validator (#850)

* HLM fixed issues in useraction existent entity validator

* updated after code review comments

* updated version for hcm v1.5 release (#852)

* updated version for hcm v1.5 release

* HLM updated the code as per code review from code rabbit

* HCMPRE-209: updated code review comments and code documentation

* Hcmpre 309 rebase (#857)

* removed digit-models from health-services-models library

* removed digit-models from health-services-models library

* added SMSRequest model

* Updated individual models

* Updating health services models version in health services common library

* version bump

* hcmpre-309: merged removed-digit-models and rebase to dev

* HLM-309: updated common models version

---------

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

* HCMPRE-169 code review comments (#835)

* HCMPRE-169 code review comments

* HCMPRE-169 adding code comments

* HCMPRE-169 adding code comments

* HCMPRE-169 changing mdms v2 field name for uom

* HCMPRE-169 code review comments

* HCMPRE-169 code review comments

* HCMPRE-218 adding validation for plan config name  (#844)

* HCMPRE-218 adding validation for name validation

* HCMPRE-218 adding validation for name validation

* HCMPRE-218 moving "$." into constants

* HCMPRE-218 code review comments

---------

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

* HCMPRE-646: added changes (#897)

* Update CODEOWNERS (#924)

* Hcmpre 639 shashwat changes (#919)

* Removed the project facility mapping validation check as it is not required

* Removed the project facilty valaidation check in ValidatorUtil.java

* Removed the local receiverId in ValidatorUtil.java

---------

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

* Fixed multiple role search in individual service (#992)

* Hcmpre 639 shashwat changes (#973)

* Removed the project facility mapping validation check as it is not required

* Removed the project facilty valaidation check in ValidatorUtil.java

* Removed the local receiverId in ValidatorUtil.java

* Validating the sender and receiver based on transactiontype

* Validating the sender and receiver based on transactiontype

* Corrected the validation for the failed case

* Added the comments

---------

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

* HCMPRE-371: Added service definition update api (#996)

* update service definition api added

* fix values persister config

* fix "values" persister config

* active added in service definition persister config

* resolved code review comments

* added includeDeleted parameter in search

* fix some issues

* fix create api

* Update ValidatorUtil.java (#1112)

* added-search-criterias-project-service (#1169)

* Service additional field (#1146)

* changed additionalDetails to additionalFields

* boolean data type added in attribute definition

* Added the filter for isActive

* changed the serviceDefinition.code size from character varying(64) to character varying(256)

* Revert "changed the serviceDefinition.code size from character varying(64) to character varying(256)"

This reverts commit 24c971f.

* Revert "Added the filter for isActive"

This reverts commit 09d65c4.

* changed the code character size from 64 to 256 (#1147)

Co-authored-by: shubhang-eGov <[email protected]>

* added validation for boolean data type in service-request

---------

Co-authored-by: yashita-egov <[email protected]>
Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: shubhang-eGov <[email protected]>

* Hcmpre 469 pagination all (#891)

* HCMPRE-469: added changes for facility count

* HCMPRE-469: added changes for models, added totalCount fields in required model classes

* HCMPRE-469: added changes for project facility, project staff, project resource, hf-referral, stock and stock reconciliation, also added helper function in common utils for findWithCount

* HCMPRE-469: added changes for removing digit-models deprecated dependency, replaced with tracer library references and mdms client references

* HCMPRE-469: added changes for project service, removed reference for digits model

* Removed the dev from version

* Removed the dev from version of common libraries

* Removed the dev from version of common libraries

* Removed the order by id statement while searching the facility

* Removed setting of total count line from the FacilityService file

* Removed setting of total count line from the FacilityService file

---------

Co-authored-by: Shashwat12-egov <[email protected]>
Co-authored-by: shubhang-eGov <[email protected]>

* PR to develop branch for Microplanning v0.1 (changes in plan-service, resource-generator service) (#1176)

* HCMPRE-599 updating Plan service models

* HCMPRE-599 updating Plan service models

* HCMPRE-599 changes

* HCMPRE-599 adding census POJOs

* HCMPRE-599changes for triggering pland census records on workflow status

* HCMPRE-599 app.prop changes for resource generator service

* Renaming resource-estimation-service to resource-generator

* HCMPRE-1078  enrichment of resource mapping

* HCMPRE-1122 changing processing logic

* HCMPRE-1122 changing processing logic

* HCMPRE-1122 updating operation related validations

* HCMPRE-1122 adding method comments

* enhancement in facilityCatchmentConsumer

* enhancement in facilityCatchmentConsumer

* removing catchement topic that was added before

* added wf validation for approving estimations

* adding additionalDetails as string while preparing rows for batchUpdate

* adding additionalDetails as string while preparing rows for batchUpdate

* HCMPRE-1094 changes for facility mapping create trigger on workflow

* reverting the change in census-bulk-api

* parsing additional details in bulk update api

* Added plan config name in plan employee's and plan facility's search criteria

* Bypassing validations for operations when source is CUSTOM

* added workflow validations

* removing unused service constants

* Changes for triggering plan-facility mapping

* adding project factory data create host

* handling case for empty areaCodes in search criteria

* handling case for empty areaCodes in search criteria

* adding project factory data create host

* Adding facility create trigger status

* Adding additionalField table in census

* adding plan config name in plan employee and plan facility pojo

* Adding additionalField table in census

* implemented partial search in plan config name

* Changing datatype of value

* HCMPRE-1162 enrich additionalfieldForCensus

* HCMPRE-1162 enrich additionalfieldForCensus

* updated query builder for census

* handling null pointer exception on updating additional details

* Changes to allow assumption values in input

* Removing older method for getting input value

* Making editable false for uploaded additional field during census create

* HCMPRE-853 removing lat long fields from additional field overridekeys

* Changes for adding execution order for operations

* Changes for adding execution order for operations

* Adding facilityName column and enriching servingPop

* HCMPRE-853 added chnages for census search and fetching boundarycodes from one sheet

* HCMPRE-853 changes for updating file with approved census data

* HCMPRE-853 adding logs

* pull from microplanning-dev

* HCMPRE-853 integrating with project factory with updated resources

* modification in wf-service

* workflow auto-assignee issue

* HCMPRE-853 commenting project factory integration

* adding pagination for plan-employee api

* changed the data type of BigDecimal

* HCMPRE-1282 changes for updating estimates into plan

* HCMPRE-1282 app.prop changes

* Adding case for when celltype is formula.

* enriching additional details with additional field key-value

* modified orderBy clause

* made changes in order by clause

* added facilityType

* pull from microplanning-dev

* making fuzzy search cAse-insenSItive

* making fuzzy search cAse-insenSItive

* making fuzzy search cAse-insenSItive

* pull from microplanning-dev

* pull from microplanning-dev

* modified pagination

* HCMPRE-1282 changes for updating approved plans into file for campaign integration

* added planConfigStatus in search criteria

* HCMPRE-1282 changes for updating approved plans into file for campaign integration

* HCMPRE-771 merging multiple alter table migration scripts into create table scripts.

* Adding workflow restricted roles in census

* Adding workflow restricted roles in census

* Fixing limit and adding check for empty row

* Fixing limit and adding check for empty row

* added ranked query for plan employee assignment

* added ranked query for plan employee assignment

* HCMPRE-1300 DB migration script cleanup

* adding plan bulk update topic

* Adding facility name in census additional details

* Wf auto assignment to multiple people

* Wf auto assignment to multiple people

* Adding boundaryTypeHierarchy Pojos and search endpoint

* enriching jurisdiction mapping in census

* changing jurisdictionMapping from jsonIgnore to jsonProperty

* optimizing the enrichment functions and adding comments

* handling null pointer exception

* Wf auto assignment to multiple people

* Set last modified time on update call

* enriching serving population with sum of confirmed target population of serving boundaries

* Reverting campaign update at the end.

* modifying Wf for send back actions

* enriching jurisdiction mapping in plan

* setting assignees separetly for send back actions

* Changing assignee column to Text in db

* Changing assignee column to Text in db

* enriching jurisdiction mapping

* Changing validation logic for operations

* enriching jurisdiction mapping

* Changes for only validating when operation is active

* Sort operations in planconfig search by execution order

* Sort operations in planconfig search by execution order

* Sort operations in planconfig search by execution order

* Sort operations in planconfig search by execution order

* type casting jurisdiction into list

* Adding census changelog

* Adding census changelog

* Adding census changelog

* Adding census changelog

* Adding census changelog

* Show on UI false for lat long fields

* Updated plan service CHANGELOG

* update plan config validation

* Adding jurisdiction mapping in plan facility

* Changing all collection dataType from list to set in API search criteria

* Changing all collection dataType from list to set in API search criteria

* removing validation for operation source

* adding overloaded method for query builder in plan

* adding overloaded method for query builder in plan

* Adding validation to check for duplicates

* pull from census-bulk-api

* pull from census-bulk-api

* Removing comments from WF in resource generator

* Decreasing min size of assumptionvalue in Operation POJO to 1.

* Changing mdms master in plan service for hierarchyConfig

* changing min size of resource type in resource pojo

* increasing request size for producer

* changed version from 1.1.0 to 1.0.0

* changed version from 1.1.0 to 1.0.0

* changing the order

* changing the order

* changing the order

* Increasing request size in application.properties

* Updating resource generator changelog

* Updating resource generator changelog

* Adding boundaryAncestralPath for Plan Facility API

* Adding boundaryAncestralPath for Plan Facility API

* Adding ProjectFactory consumer in Plan Facility Service

* Adding ProjectFactory consumer in Plan Facility Service

* Adding plan changelog

* Adding empty list as service boundary when null in consumer for project-factory

* Increasing the max-request-size in census producer configuration

* Increasing the max-request-size in plan producer configuration

* Adding orderBy clause for plan search query

* Removing unused census consumer

* Replacing map from set for duplicate check in census row mapper

* Replacing map from set for duplicate check in plan config row mapper

* Replacing map from set for duplicate check in census row mapper

* Replacing map from set for duplicate check in census row mapper

* Replacing map from set for duplicate check in plan config row mapper

* Replacing map from set for duplicate check in plan row mapper

* Clearing set on new census entry

* Clearing set on new plan entry

* Clearing set on new plan config entry

---------

Co-authored-by: Shashwat Mishra <[email protected]>
Co-authored-by: Tanishi Goyal <[email protected]>

---------

Co-authored-by: kanishq-egov <[email protected]>
Co-authored-by: kavi_elrey <[email protected]>
Co-authored-by: Holash Chand <[email protected]>
Co-authored-by: sivajiganesh-dev <[email protected]>
Co-authored-by: nitish-egov <[email protected]>
Co-authored-by: shubhang-egov <[email protected]>
Co-authored-by: Priyanka-eGov <[email protected]>
Co-authored-by: Shashwat12-egov <[email protected]>
Co-authored-by: Shashwat Mishra <[email protected]>
Co-authored-by: yashita-egov <[email protected]>
Co-authored-by: Jagankumar <[email protected]>
Co-authored-by: shubhang-eGov <[email protected]>
Co-authored-by: Tanishi Goyal <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants