[HCMPRE-658] Refractor resource-estimation-service to resource-generator #910
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
palak-egov
requested review from
kavi-egov and
sathishp-eGov
as code owners
WalkthroughThe changes involve updates to the Changes
Possibly related PRs
Suggested reviewers
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? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
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)
Other keywords and placeholders
Documentation and Community
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
shashwat-egov
approved these changes
Oct 24, 2024
kavi-egov
approved these changes
Oct 24, 2024
jagankumar-egov
added a commit
that referenced
this pull request
Dec 9, 2024
* HLM service request, updated DataTypeEnum (#872) * Service request changelog 1.5 (#875) * Added changelog and upgraded the versions for household, individual and service request * Update core-services/service-request/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/individual/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * HLM fixed merge issues * HLM fixed merge issues * HCMPRE-413: updated the changelog as per code review comments * Update health-services/project/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: kavi_elrey@1993 <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * HCMPRE-424: fixed hrms call from pgr-service * HCMPRE-424: updated as per code review comments * Create branch-name-validator (#960) * Create branch-name-validator * Update branch-name-validator * Update .github/workflows/branch-name-validator Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update .github/workflows/branch-name-validator 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 branch-name-validator * Rename branch-name-validator to branch-name-validator.yml * Added census-service in build-config (#990) * [HCMPRE-658] Refractor resource-estimation-service to resource-generator (#910) Co-authored-by: Priyanka-eGov <[email protected]> * Update package.json * Update tsconfig.json * Added configs and env dependencies * dockerfile update * Update tsconfig.json * Update tsconfig.json * refactored * HCM Admin Console v0.3 Release code changes (#1082) * kafka fix for large messages * Update genericUtils.ts * Update campaignValidators.ts * Fixed the mdms search path keys * fix of migration script * fix on repeated key * Update campaignApis.ts * Update campaignApis.ts * Update campaignUtils.ts * Update campaignUtils.ts * Update campaignUtils.ts * Fix project target mapping * refactored migration files fro project-factory (#867) * refactored migration files fro project-factory * updated logic for unique username generation * updated format and id name for user name * removed hash logic for username generation * added indexing on columns * updated idgen seq format for user name in index.ts * Update health-services/project-factory/src/server/api/campaignApis.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * updated logic for regenerate if campaign type differs (#876) * id generation throw error update * Enhance generate template for user and facility in update ongoing campaign flow (#885) * commit for update-generate-template * updated campaign flow generate template enhancement * just if else changes * some reformatting * update index.ts * added additional valiadtion for parent campaign * updated logic for validating parent campaign * refcatored as per change requests * update index.ts * updated logic for same campaignnumber when paren is present * updated the campaign name logic along with handling isfailed status too (#888) * updating campaign name same as parent name and number too * updated target template for updating ongoing campaign (#893) * Microplan bulk user creation (#890) * Feat : initialised bulk user creation for microplan * Enhanced user bulk upload for microplan * Fixed configs * Merge fix with console * Feat : added columns in user sheet * Added userroles sheet for bulk user template in microplan * Added source microplan while resource creation * changed logic for isSourceMicroplan * Update campaignApis.ts * Update campaignValidators.ts * changes for campaign update flow * Update campaignUtils.ts * Integrated required error messages * added numeric check in microplan phone number * Implemented no data validation * added logic for creating projects , project facility and project staff on newly added boundaries (#917) * updated target template for updating ongoing campaign * update flow campaign mapping * updated flow campaign mapping * added logic for project, project facility and project staff creation on newly added boundaries * removed one useless func * removed await from a func * removed console.logs * added some minor enhancemnets * added one edge case scenario * changed request limit to 1 mb * Feat : added locksheet filter for user microplan creation * updated logic for regenerate if campaign type differs (#876) * Enhancement for microplan user creation (#940) * some modifications for edge cases (#930) * added commit for testing update campaign flow * some chenages related to type boundary in data create api * /* MODIFIED FOR LTS UPGRADE */ * Microplan user enhancement * Some changes regarding microplan user and boundary * added some null checks * /* Temporay fix for project creation of LLIN since the structure of delivery rules is getting changed */ * Revert "/* MODIFIED FOR LTS UPGRADE */" This reverts commit 52ed772. * added code to add lat long in the project-factory apis * Changed code based on comments * removed default campaignid * added code to add lat long in the project-factory apis (#951) * added code to add lat long in the project-factory apis * Changed code based on comments * removed default campaignid * Fixed code to manage create * fixed the build * added for field protection on sheet data * Facility microplan validation (#975) * Microplan facility validation * Enhancement in microplan validations * Microplan sheet lock * Enhanced for multiple sheetErrors in additionalDetails * Update campaignApis.ts * fixes for filestore and unfreezing boundary code mandatory columns (#984) * Update CODEOWNERS * Update campaignValidators.ts (#987) * some correction of error after changes from microplan code merge (#988) * some correction of error after changes from microplan code merge * added question mark * added localization fix (#993) Co-authored-by: ansh-egov <[email protected]> * Update campaignApis.ts (#994) * Added some fixes for the project transformation * Update projectTypeUtils.ts * Update campaignUtils.ts * Removed date Update projectTypeUtils.ts #1006 * HCEMPRE-809-Boundary-geometry-codes (#1011) * added localization fix * added logic for boundaryGeometryManagement * fixed some things * fixed campaign search * update project facility and staff mappings of exisitng facilities and users (#998) * some correction of error after changes from microplan code merge * added logic for updating mapping of existing facilitie and users * resolved comments by jagan on the pr for delinking and linking project resources * fetchProjectsWithBoundaryCodeAndName fucntion update * Update campaignValidators.ts --------- Co-authored-by: Jagankumar <[email protected]> * added code to add lat long in the project-factory apis (#1019) * Project staff mapping correction from uuid to userserviceuuid (#1022) * some correction of error after changes from microplan code merge * corrected for mapping of project staff * added changes for project-resource mapping (#1028) * added changes for project-resource mapping * changed the variable name to boundaryProjectMappingForProjectResourceCreation from newBoundaryProjectMapping * renamed the entity --------- Co-authored-by: Jagankumar <[email protected]> * Added logic to retry in project campaign create (#1031) * not needed to update every resource in update flow (#1036) * not needed to update every resource in update flow * added changes for if boundaries present in update flow all resources are mandate * Some checks enhancement (#1042) * Update genericApis.ts (#1043) * Update campaignValidators.ts (#1046) * consolidate resources array in update campaign flow (#1051) * consolidate resources array in update campaign flow * spelling correct * Search criteria object corrected (#1052) * consolidate resources array in update campaign flow * data search criteria id has to be an array of strings * spelling * some more corrections regarding search criteria body * Boundaries consolidate after creating child campaign (#1056) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * Boundaries correction (#1058) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * changes in extracing boundaries from campaign object * Missing resources in chid campaign to be added from parent camaig logic refactored (#1059) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * refactored logic for adding missing resources from parent campaign * Correction datatocreate column from status to userservice uuids (#1061) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * changed data to create column from user sheet * Hide Boundary and Target Old Columns (#1062) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * hide boundary code old and target old * Corrected target update flow (#1065) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * corrected target mapping in update flow * Total count of Campaigns if only is active true (#1066) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * count will be only of active campaigns * HCMPRE-1212:: migrated to point only to MMDS v2 api * Update index.ts * User/facility inactive (#1070) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * added logic for making exiting user facility inactive --------- Co-authored-by: Jagankumar <[email protected]> * Refactor facility mappings (#1072) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * refactored facility mappings * Created enity for boundary * updated the boundary relationship function * Update index.ts * fixed some localization issue (#1075) * fixed some localization issue * fixed * Target update while campaign update flow (#1078) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * logic for updating targets * some refactor for adding logs and index.ts * updated the boundary localisation name --------- Co-authored-by: Jagankumar <[email protected]> * fixed some localization issue (#1079) * fixed some localization issue * fixed * fixed a issue * reverted failed campaign is active true from false (#1080) * reverted failed campaign is active true from false * took constants from index * refactor * Merge branch 'project-factory-kafka-fix' into console * Changed hierarchyFectch to v2 (#1077) * Changed hierarchyFectch to v2 * Changed messages * Merge branch 'project-factory-kafka-fix' into hierarchyFetchV2 --------- Co-authored-by: Jagankumar <[email protected]> * calll generate when create completes for type boundary management * auto generate resource if there is no previous generated history * Fixed crashloop issue (#1084) * Fixed crashloop issue * Update dataManageService.ts --------- Co-authored-by: Jagankumar <[email protected]> * changed the master from hierarchyConfig to HierarchySchema (#1086) * getting boundaries split on logic change (#1088) * fixed some localization issue (#1090) * fixed some localization issue * fixed * fixed a issue * integrated microplan with console * fixxed index * fixed crashloop (#1091) * added validation for boundary bulk upload (#1092) Co-authored-by: Jagankumar <[email protected]> * refcatored diffferent tab separation (#1093) * added timeout (#1095) * Microplan integration :: set start date to tommorow (#1096) * set start date to tommorow * updated end date * Enhance PlanFacility object (#1099) * validation for update template in create flow (#1100) * removed await (#1103) * some correction (#1104) * logic for updating targets only when present in resources array in update flow (#1105) * updated (#1106) * updated * added fix for the redis error in logs --------- Co-authored-by: Jagankumar <[email protected]> * added error responder (#1107) * refactored download api (#1108) * Cache issue fix(#1109) * refactored download api * refactor --------- Co-authored-by: Jagankumar <[email protected]> * made disable of cache always during boundary generate (#1110) Co-authored-by: Jagankumar <[email protected]> * Redis cache key deleted (#1113) * removed await * delete cache from boundary relationship search * updated redis delete func * Revert "removed await" This reverts commit a5acb54. * Update redisUtils.ts --------- Co-authored-by: Jagankumar <[email protected]> * updated redis delete func (#1114) * removed cache from boundary relation create (#1115) * corrected params of auto generate after download api (#1116) * refactored consolidate (#1119) * fix on the fetch from microplan Update campaignUtils.ts (#1120) * Update microplanUtils.ts (#1123) * addded localization function (#1125) * Update SearchCriteria.ts * made createandtransfrom localization as await to upsert all localization in boundary management create flow (#1127) * added logs in handledropdownthings (#1128) * Fixed district missing issue (#1129) * Facility Village List For microplan and dropdown fix (#1130) * Facility Village List For microplan and dropdown fix * Optional chaining * Reverted recievedDropdown Changes * removed localization caceh in boundary generate flow for hierarchy module (#1133) * planFacility create Fix (#1132) * fixed the localisation cache on multiple data creates in boundary * Revert "fixed the localisation cache on multiple data creates in boundary" This reverts commit 94eb970. * Facility fix generation for microplan (#1134) * planFacility create Fix * Fixed Facility Generation for microplan * added the count info of the localisation upsert (#1144) Co-authored-by: Jagankumar <[email protected]> * Microplan integrated with console for facility , user & target (#1151) * set start date to tommorow * updated end date * added code for target sheet * fixed * added mdms call * microplan integration changes added for target ,facility & user * undo changes * Update microplanIntergration.ts * saving all the progress on the integration * project facility mapping done * Update microplanIntergration.ts * Update microplanIntergration.ts * Update microplanIntergration.ts * target & facility integration completed statically * completed facility & target file created based on microplan * added static for user * Added user related changes * added the user integartion * added target and facility in resources array of campaign from microplan * added user in resources array in campaign object * Update microplanIntergration.ts * revert the others * Update index.ts * Cleaned up code --------- Co-authored-by: ansh-egov <[email protected]> Co-authored-by: Jagankumar <[email protected]> Co-authored-by: nitish-egov <[email protected]> * added missing default tenantid (#1152) * Boundary locale fix (#1153) * planFacility create Fix * Fixed boundary validation for different locales --------- Co-authored-by: Jagankumar <[email protected]> * removed duplicate key (#1154) * Logs for reordering added (#1161) * added missing default tenantid * added logs for reordering before project creation * Update index.ts --------- Co-authored-by: Jagankumar <[email protected]> * Readme for microplans (#1160) * Readme for microplans * Fixed boolean type * Optimized isMicroplanRequest * Optimizing roles for microplan (#1164) * Improved some performance with huge campaign object (#1165) * Trying optimised code by chatgpt * added 4mb limit * Update app.ts * Updted the comments * Changes for pollutils and reorder * Update pollUtils.ts --------- Co-authored-by: Jagankumar <[email protected]> Co-authored-by: ashish-egov <[email protected]> * Added fixes for error during processing (#1172) * added missing default tenantid * added try catch * Update index.ts --------- Co-authored-by: Jagankumar <[email protected]> * fixed the hard codings in the code (#1170) * fixed the hard codings in the code * fixed * Added filter check for the fetch from microplan if it has already some resources * fixed hardcoding in target flow (#1175) * fixed hardcoding in target flow * fixed * fixed * Update campaignApis.ts (#1177) * Update campaignApis.ts * Update campaignApis.ts * Update campaignApis.ts * Update genericUtils.ts (#1178) * changed the campaig key to activity (#1180) * added missing default tenantid * Update campaignUtils.ts * Update index.ts --------- Co-authored-by: Jagankumar <[email protected]> * handled failed generations in downlaod api (#1185) * Change for roles name change (#1187) * added search before update in fetch all datas (#1190) * added seacrh before update in fetch all datas * Change for roles name change (#1187) --------- Co-authored-by: ashish-egov <[email protected]> Co-authored-by: Jagankumar <[email protected]> * formatted and made promise all to do a promise all to make calls parallely * filtered the plan facility response to have only facility which has only service boundarires * added hierarchy filteration from mdms (#1188) * added hierarchy filteration from mdms * did some hardcoding * fixed fetching of headers * added some logs * added extra loggers for fetch from microplan activities (#1193) * added extra loggers for fetch from microplan activities * Update microplanIntergration.ts --------- Co-authored-by: Jagankumar <[email protected]> * added retry in localization upsert (#1194) * Adding the additonal loggers to know more informs on microplan integration * Update health-services/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/project-factory/src/server/controllers/campaignManage/campaignManage.controller.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fixed integration (#1197) * Global handler (#1199) * Change for roles name change * Global exception handler integrated * String logger * Update app.ts * added heap memory log & created a env variable for incomingRequestPay… …loadLimit (#1201) * added heap memory log & created a env variable for incomingRequestPayloadLimit * Update index.ts --------- Co-authored-by: Jagankumar <[email protected]> * Set memory limit and added log off avaiable, max limits (#1202) * added logs to check current value * Update app.ts * Update Dockerfile * Update Dockerfile * Update app.ts --------- Co-authored-by: Jagankumar <[email protected]> * Handle for google sheet formulas (#1207) * Update microplanValidators.ts (#1213) * Update microplanValidators.ts * Update microplanValidators.ts * Update microplanValidators.ts * Localised roles (#1217) * added change log for admin console version 0.3 (#1224) * Pvar validation (#1225) * product variant validation added * Optimized validations * Refactored * Logger error fix * Refactor * Refactor * refactored project reosurce mapping logic (#1204) * refactored project reosurce mapping logic * added new function ot search project after campaign creation time * added reference id params in project search * added logic for adding resources only for newly created projects * refactored and code clean up for project resource mapppings in update and create flow * refactor getProjectMappingBody func * some condition check * correction * removed project departments * microplan save topic changes (#1231) * Update microplanUtils.ts * Update index.ts * Update campaignApis.ts (#1232) * Update campaignApis.ts * Update campaignApis.ts * Update campaignApis.ts * Update campaignValidators.ts * Revert boundaryProject Mapping * Cleaned up data configs (#1234) * Update index.ts * Update campaignUtils.ts * Update health-services/project-factory/src/server/utils/onGoingCampaignUpdateUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update app.ts * Update health-services/project-factory/src/server/utils/microplanUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * added changes for performance testing (#1236) * added changes for performance testing * microplan save topic changes (#1231) * Update microplanUtils.ts * Update index.ts * Update campaignApis.ts (#1232) * Update campaignApis.ts * Update campaignApis.ts * Update campaignApis.ts * Update campaignValidators.ts * Revert boundaryProject Mapping * Cleaned up data configs (#1234) * Update index.ts * Update campaignUtils.ts * try catch handling * Update health-services/project-factory/src/server/service/dataManageService.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: ashish-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: Jagankumar <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/project-factory/src/server/utils/onGoingCampaignUpdateUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update app.ts * Update health-services/project-factory/src/server/utils/microplanUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update campaignValidators.ts (#1244) * Update campaignValidators.ts * Update campaignValidators.ts * add * added new config values * Other configs (#1250) * add * added new config values * Update request.ts --------- Co-authored-by: Jagankumar <[email protected]> * Updating debug function for error handeling (#1243) * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/project-factory/src/server/service/dataManageService.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update dataManageService.ts * Applied code rabbit changes * refactored sheet consolidate logic (#1254) * refactored sheet consolidate logic * Applied code rabbit changes --------- Co-authored-by: Jagankumar <[email protected]> * refactor sheet consolidate for target (#1255) * Update package.json * Update health-services/project-factory/src/server/utils/onGoingCampaignUpdateUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * removed other ui workflows * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Update publishProjectFactory.yml * consolidate sheet handle logic change (#1256) * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: ashish-egov <[email protected]> Co-authored-by: ashish-egov <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ejagankumar <[email protected]> * Changed docker file * package changes * dockerfile revert * changed package json * Update package.json * reverted other folders * reverted * Update settings.json --------- Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: kavi_elrey@1993 <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: Sathish P <[email protected]> Co-authored-by: tanishi-egov <[email protected]> Co-authored-by: Palak Garg <[email protected]> Co-authored-by: Priyanka-eGov <[email protected]> Co-authored-by: Jagankumar <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ejagankumar <[email protected]>
jagankumar-egov
added a commit
that referenced
this pull request
Dec 10, 2024
* HLM service request, updated DataTypeEnum (#872) * Service request changelog 1.5 (#875) * Added changelog and upgraded the versions for household, individual and service request * Update core-services/service-request/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/individual/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * HLM fixed merge issues * HLM fixed merge issues * HCMPRE-413: updated the changelog as per code review comments * Update health-services/project/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: kavi_elrey@1993 <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * HCMPRE-424: fixed hrms call from pgr-service * HCMPRE-424: updated as per code review comments * Create branch-name-validator (#960) * Create branch-name-validator * Update branch-name-validator * Update .github/workflows/branch-name-validator Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update .github/workflows/branch-name-validator 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 branch-name-validator * Rename branch-name-validator to branch-name-validator.yml * Added census-service in build-config (#990) * [HCMPRE-658] Refractor resource-estimation-service to resource-generator (#910) Co-authored-by: Priyanka-eGov <[email protected]> * Update package.json * Update tsconfig.json * Added configs and env dependencies * dockerfile update * Update tsconfig.json * Update tsconfig.json * refactored * HCM Admin Console v0.3 Release code changes (#1082) * kafka fix for large messages * Update genericUtils.ts * Update campaignValidators.ts * Fixed the mdms search path keys * fix of migration script * fix on repeated key * Update campaignApis.ts * Update campaignApis.ts * Update campaignUtils.ts * Update campaignUtils.ts * Update campaignUtils.ts * Fix project target mapping * refactored migration files fro project-factory (#867) * refactored migration files fro project-factory * updated logic for unique username generation * updated format and id name for user name * removed hash logic for username generation * added indexing on columns * updated idgen seq format for user name in index.ts * Update health-services/project-factory/src/server/api/campaignApis.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * updated logic for regenerate if campaign type differs (#876) * id generation throw error update * Enhance generate template for user and facility in update ongoing campaign flow (#885) * commit for update-generate-template * updated campaign flow generate template enhancement * just if else changes * some reformatting * update index.ts * added additional valiadtion for parent campaign * updated logic for validating parent campaign * refcatored as per change requests * update index.ts * updated logic for same campaignnumber when paren is present * updated the campaign name logic along with handling isfailed status too (#888) * updating campaign name same as parent name and number too * updated target template for updating ongoing campaign (#893) * Microplan bulk user creation (#890) * Feat : initialised bulk user creation for microplan * Enhanced user bulk upload for microplan * Fixed configs * Merge fix with console * Feat : added columns in user sheet * Added userroles sheet for bulk user template in microplan * Added source microplan while resource creation * changed logic for isSourceMicroplan * Update campaignApis.ts * Update campaignValidators.ts * changes for campaign update flow * Update campaignUtils.ts * Integrated required error messages * added numeric check in microplan phone number * Implemented no data validation * added logic for creating projects , project facility and project staff on newly added boundaries (#917) * updated target template for updating ongoing campaign * update flow campaign mapping * updated flow campaign mapping * added logic for project, project facility and project staff creation on newly added boundaries * removed one useless func * removed await from a func * removed console.logs * added some minor enhancemnets * added one edge case scenario * changed request limit to 1 mb * Feat : added locksheet filter for user microplan creation * updated logic for regenerate if campaign type differs (#876) * Enhancement for microplan user creation (#940) * some modifications for edge cases (#930) * added commit for testing update campaign flow * some chenages related to type boundary in data create api * /* MODIFIED FOR LTS UPGRADE */ * Microplan user enhancement * Some changes regarding microplan user and boundary * added some null checks * /* Temporay fix for project creation of LLIN since the structure of delivery rules is getting changed */ * Revert "/* MODIFIED FOR LTS UPGRADE */" This reverts commit 52ed772. * added code to add lat long in the project-factory apis * Changed code based on comments * removed default campaignid * added code to add lat long in the project-factory apis (#951) * added code to add lat long in the project-factory apis * Changed code based on comments * removed default campaignid * Fixed code to manage create * fixed the build * added for field protection on sheet data * Facility microplan validation (#975) * Microplan facility validation * Enhancement in microplan validations * Microplan sheet lock * Enhanced for multiple sheetErrors in additionalDetails * Update campaignApis.ts * fixes for filestore and unfreezing boundary code mandatory columns (#984) * Update CODEOWNERS * Update campaignValidators.ts (#987) * some correction of error after changes from microplan code merge (#988) * some correction of error after changes from microplan code merge * added question mark * added localization fix (#993) Co-authored-by: ansh-egov <[email protected]> * Update campaignApis.ts (#994) * Added some fixes for the project transformation * Update projectTypeUtils.ts * Update campaignUtils.ts * Removed date Update projectTypeUtils.ts #1006 * HCEMPRE-809-Boundary-geometry-codes (#1011) * added localization fix * added logic for boundaryGeometryManagement * fixed some things * fixed campaign search * update project facility and staff mappings of exisitng facilities and users (#998) * some correction of error after changes from microplan code merge * added logic for updating mapping of existing facilitie and users * resolved comments by jagan on the pr for delinking and linking project resources * fetchProjectsWithBoundaryCodeAndName fucntion update * Update campaignValidators.ts --------- Co-authored-by: Jagankumar <[email protected]> * added code to add lat long in the project-factory apis (#1019) * Project staff mapping correction from uuid to userserviceuuid (#1022) * some correction of error after changes from microplan code merge * corrected for mapping of project staff * added changes for project-resource mapping (#1028) * added changes for project-resource mapping * changed the variable name to boundaryProjectMappingForProjectResourceCreation from newBoundaryProjectMapping * renamed the entity --------- Co-authored-by: Jagankumar <[email protected]> * Added logic to retry in project campaign create (#1031) * not needed to update every resource in update flow (#1036) * not needed to update every resource in update flow * added changes for if boundaries present in update flow all resources are mandate * Some checks enhancement (#1042) * Update genericApis.ts (#1043) * Update campaignValidators.ts (#1046) * consolidate resources array in update campaign flow (#1051) * consolidate resources array in update campaign flow * spelling correct * Search criteria object corrected (#1052) * consolidate resources array in update campaign flow * data search criteria id has to be an array of strings * spelling * some more corrections regarding search criteria body * Boundaries consolidate after creating child campaign (#1056) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * Boundaries correction (#1058) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * changes in extracing boundaries from campaign object * Missing resources in chid campaign to be added from parent camaig logic refactored (#1059) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * refactored logic for adding missing resources from parent campaign * Correction datatocreate column from status to userservice uuids (#1061) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * changed data to create column from user sheet * Hide Boundary and Target Old Columns (#1062) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * hide boundary code old and target old * Corrected target update flow (#1065) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * corrected target mapping in update flow * Total count of Campaigns if only is active true (#1066) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * count will be only of active campaigns * HCMPRE-1212:: migrated to point only to MMDS v2 api * Update index.ts * User/facility inactive (#1070) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * added logic for making exiting user facility inactive --------- Co-authored-by: Jagankumar <[email protected]> * Refactor facility mappings (#1072) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * refactored facility mappings * Created enity for boundary * updated the boundary relationship function * Update index.ts * fixed some localization issue (#1075) * fixed some localization issue * fixed * Target update while campaign update flow (#1078) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * logic for updating targets * some refactor for adding logs and index.ts * updated the boundary localisation name --------- Co-authored-by: Jagankumar <[email protected]> * fixed some localization issue (#1079) * fixed some localization issue * fixed * fixed a issue * reverted failed campaign is active true from false (#1080) * reverted failed campaign is active true from false * took constants from index * refactor * Merge branch 'project-factory-kafka-fix' into console * Changed hierarchyFectch to v2 (#1077) * Changed hierarchyFectch to v2 * Changed messages * Merge branch 'project-factory-kafka-fix' into hierarchyFetchV2 --------- Co-authored-by: Jagankumar <[email protected]> * calll generate when create completes for type boundary management * auto generate resource if there is no previous generated history * Fixed crashloop issue (#1084) * Fixed crashloop issue * Update dataManageService.ts --------- Co-authored-by: Jagankumar <[email protected]> * changed the master from hierarchyConfig to HierarchySchema (#1086) * getting boundaries split on logic change (#1088) * fixed some localization issue (#1090) * fixed some localization issue * fixed * fixed a issue * integrated microplan with console * fixxed index * fixed crashloop (#1091) * added validation for boundary bulk upload (#1092) Co-authored-by: Jagankumar <[email protected]> * refcatored diffferent tab separation (#1093) * added timeout (#1095) * Microplan integration :: set start date to tommorow (#1096) * set start date to tommorow * updated end date * Enhance PlanFacility object (#1099) * validation for update template in create flow (#1100) * removed await (#1103) * some correction (#1104) * logic for updating targets only when present in resources array in update flow (#1105) * updated (#1106) * updated * added fix for the redis error in logs --------- Co-authored-by: Jagankumar <[email protected]> * added error responder (#1107) * refactored download api (#1108) * Cache issue fix(#1109) * refactored download api * refactor --------- Co-authored-by: Jagankumar <[email protected]> * made disable of cache always during boundary generate (#1110) Co-authored-by: Jagankumar <[email protected]> * Redis cache key deleted (#1113) * removed await * delete cache from boundary relationship search * updated redis delete func * Revert "removed await" This reverts commit a5acb54. * Update redisUtils.ts --------- Co-authored-by: Jagankumar <[email protected]> * updated redis delete func (#1114) * removed cache from boundary relation create (#1115) * corrected params of auto generate after download api (#1116) * refactored consolidate (#1119) * fix on the fetch from microplan Update campaignUtils.ts (#1120) * Update microplanUtils.ts (#1123) * addded localization function (#1125) * Update SearchCriteria.ts * made createandtransfrom localization as await to upsert all localization in boundary management create flow (#1127) * added logs in handledropdownthings (#1128) * Fixed district missing issue (#1129) * Facility Village List For microplan and dropdown fix (#1130) * Facility Village List For microplan and dropdown fix * Optional chaining * Reverted recievedDropdown Changes * removed localization caceh in boundary generate flow for hierarchy module (#1133) * planFacility create Fix (#1132) * fixed the localisation cache on multiple data creates in boundary * Revert "fixed the localisation cache on multiple data creates in boundary" This reverts commit 94eb970. * Facility fix generation for microplan (#1134) * planFacility create Fix * Fixed Facility Generation for microplan * added the count info of the localisation upsert (#1144) Co-authored-by: Jagankumar <[email protected]> * Microplan integrated with console for facility , user & target (#1151) * set start date to tommorow * updated end date * added code for target sheet * fixed * added mdms call * microplan integration changes added for target ,facility & user * undo changes * Update microplanIntergration.ts * saving all the progress on the integration * project facility mapping done * Update microplanIntergration.ts * Update microplanIntergration.ts * Update microplanIntergration.ts * target & facility integration completed statically * completed facility & target file created based on microplan * added static for user * Added user related changes * added the user integartion * added target and facility in resources array of campaign from microplan * added user in resources array in campaign object * Update microplanIntergration.ts * revert the others * Update index.ts * Cleaned up code --------- Co-authored-by: ansh-egov <[email protected]> Co-authored-by: Jagankumar <[email protected]> Co-authored-by: nitish-egov <[email protected]> * added missing default tenantid (#1152) * Boundary locale fix (#1153) * planFacility create Fix * Fixed boundary validation for different locales --------- Co-authored-by: Jagankumar <[email protected]> * removed duplicate key (#1154) * Logs for reordering added (#1161) * added missing default tenantid * added logs for reordering before project creation * Update index.ts --------- Co-authored-by: Jagankumar <[email protected]> * Readme for microplans (#1160) * Readme for microplans * Fixed boolean type * Optimized isMicroplanRequest * Optimizing roles for microplan (#1164) * Improved some performance with huge campaign object (#1165) * Trying optimised code by chatgpt * added 4mb limit * Update app.ts * Updted the comments * Changes for pollutils and reorder * Update pollUtils.ts --------- Co-authored-by: Jagankumar <[email protected]> Co-authored-by: ashish-egov <[email protected]> * Added fixes for error during processing (#1172) * added missing default tenantid * added try catch * Update index.ts --------- Co-authored-by: Jagankumar <[email protected]> * fixed the hard codings in the code (#1170) * fixed the hard codings in the code * fixed * Added filter check for the fetch from microplan if it has already some resources * fixed hardcoding in target flow (#1175) * fixed hardcoding in target flow * fixed * fixed * Update campaignApis.ts (#1177) * Update campaignApis.ts * Update campaignApis.ts * Update campaignApis.ts * Update genericUtils.ts (#1178) * changed the campaig key to activity (#1180) * added missing default tenantid * Update campaignUtils.ts * Update index.ts --------- Co-authored-by: Jagankumar <[email protected]> * handled failed generations in downlaod api (#1185) * Change for roles name change (#1187) * added search before update in fetch all datas (#1190) * added seacrh before update in fetch all datas * Change for roles name change (#1187) --------- Co-authored-by: ashish-egov <[email protected]> Co-authored-by: Jagankumar <[email protected]> * formatted and made promise all to do a promise all to make calls parallely * filtered the plan facility response to have only facility which has only service boundarires * added hierarchy filteration from mdms (#1188) * added hierarchy filteration from mdms * did some hardcoding * fixed fetching of headers * added some logs * added extra loggers for fetch from microplan activities (#1193) * added extra loggers for fetch from microplan activities * Update microplanIntergration.ts --------- Co-authored-by: Jagankumar <[email protected]> * added retry in localization upsert (#1194) * Adding the additonal loggers to know more informs on microplan integration * Update health-services/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/project-factory/src/server/controllers/campaignManage/campaignManage.controller.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fixed integration (#1197) * Global handler (#1199) * Change for roles name change * Global exception handler integrated * String logger * Update app.ts * added heap memory log & created a env variable for incomingRequestPay… …loadLimit (#1201) * added heap memory log & created a env variable for incomingRequestPayloadLimit * Update index.ts --------- Co-authored-by: Jagankumar <[email protected]> * Set memory limit and added log off avaiable, max limits (#1202) * added logs to check current value * Update app.ts * Update Dockerfile * Update Dockerfile * Update app.ts --------- Co-authored-by: Jagankumar <[email protected]> * Handle for google sheet formulas (#1207) * Update microplanValidators.ts (#1213) * Update microplanValidators.ts * Update microplanValidators.ts * Update microplanValidators.ts * Localised roles (#1217) * added change log for admin console version 0.3 (#1224) * Pvar validation (#1225) * product variant validation added * Optimized validations * Refactored * Logger error fix * Refactor * Refactor * refactored project reosurce mapping logic (#1204) * refactored project reosurce mapping logic * added new function ot search project after campaign creation time * added reference id params in project search * added logic for adding resources only for newly created projects * refactored and code clean up for project resource mapppings in update and create flow * refactor getProjectMappingBody func * some condition check * correction * removed project departments * microplan save topic changes (#1231) * Update microplanUtils.ts * Update index.ts * Update campaignApis.ts (#1232) * Update campaignApis.ts * Update campaignApis.ts * Update campaignApis.ts * Update campaignValidators.ts * Revert boundaryProject Mapping * Cleaned up data configs (#1234) * Update index.ts * Update campaignUtils.ts * Update health-services/project-factory/src/server/utils/onGoingCampaignUpdateUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update app.ts * Update health-services/project-factory/src/server/utils/microplanUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * added changes for performance testing (#1236) * added changes for performance testing * microplan save topic changes (#1231) * Update microplanUtils.ts * Update index.ts * Update campaignApis.ts (#1232) * Update campaignApis.ts * Update campaignApis.ts * Update campaignApis.ts * Update campaignValidators.ts * Revert boundaryProject Mapping * Cleaned up data configs (#1234) * Update index.ts * Update campaignUtils.ts * try catch handling * Update health-services/project-factory/src/server/service/dataManageService.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: ashish-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: Jagankumar <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/project-factory/src/server/utils/onGoingCampaignUpdateUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update app.ts * Update health-services/project-factory/src/server/utils/microplanUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update campaignValidators.ts (#1244) * Update campaignValidators.ts * Update campaignValidators.ts * add * added new config values * Other configs (#1250) * add * added new config values * Update request.ts --------- Co-authored-by: Jagankumar <[email protected]> * Updating debug function for error handeling (#1243) * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/project-factory/src/server/service/dataManageService.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update dataManageService.ts * Applied code rabbit changes * refactored sheet consolidate logic (#1254) * refactored sheet consolidate logic * Applied code rabbit changes --------- Co-authored-by: Jagankumar <[email protected]> * refactor sheet consolidate for target (#1255) * Update package.json * Update health-services/project-factory/src/server/utils/onGoingCampaignUpdateUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * removed other ui workflows * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Update publishProjectFactory.yml * consolidate sheet handle logic change (#1256) * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: ashish-egov <[email protected]> Co-authored-by: ashish-egov <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ejagankumar <[email protected]> * Changed docker file * package changes * dockerfile revert * changed package json * Update package.json * reverted other folders * reverted * Update settings.json --------- Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: kavi_elrey@1993 <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: Sathish P <[email protected]> Co-authored-by: tanishi-egov <[email protected]> Co-authored-by: Palak Garg <[email protected]> Co-authored-by: Priyanka-eGov <[email protected]> Co-authored-by: Jagankumar <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ejagankumar <[email protected]>
jagankumar-egov
added a commit
that referenced
this pull request
Dec 10, 2024
* HLM service request, updated DataTypeEnum (#872) * Service request changelog 1.5 (#875) * Added changelog and upgraded the versions for household, individual and service request * Update core-services/service-request/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/individual/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * HLM fixed merge issues * HLM fixed merge issues * HCMPRE-413: updated the changelog as per code review comments * Update health-services/project/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: kavi_elrey@1993 <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * HCMPRE-424: fixed hrms call from pgr-service * HCMPRE-424: updated as per code review comments * Create branch-name-validator (#960) * Create branch-name-validator * Update branch-name-validator * Update .github/workflows/branch-name-validator Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update .github/workflows/branch-name-validator 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 branch-name-validator * Rename branch-name-validator to branch-name-validator.yml * Added census-service in build-config (#990) * [HCMPRE-658] Refractor resource-estimation-service to resource-generator (#910) Co-authored-by: Priyanka-eGov <[email protected]> * Update package.json * Update tsconfig.json * Added configs and env dependencies * dockerfile update * Update tsconfig.json * Update tsconfig.json * refactored * HCM Admin Console v0.3 Release code changes (#1082) * kafka fix for large messages * Update genericUtils.ts * Update campaignValidators.ts * Fixed the mdms search path keys * fix of migration script * fix on repeated key * Update campaignApis.ts * Update campaignApis.ts * Update campaignUtils.ts * Update campaignUtils.ts * Update campaignUtils.ts * Fix project target mapping * refactored migration files fro project-factory (#867) * refactored migration files fro project-factory * updated logic for unique username generation * updated format and id name for user name * removed hash logic for username generation * added indexing on columns * updated idgen seq format for user name in index.ts * Update health-services/project-factory/src/server/api/campaignApis.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * updated logic for regenerate if campaign type differs (#876) * id generation throw error update * Enhance generate template for user and facility in update ongoing campaign flow (#885) * commit for update-generate-template * updated campaign flow generate template enhancement * just if else changes * some reformatting * update index.ts * added additional valiadtion for parent campaign * updated logic for validating parent campaign * refcatored as per change requests * update index.ts * updated logic for same campaignnumber when paren is present * updated the campaign name logic along with handling isfailed status too (#888) * updating campaign name same as parent name and number too * updated target template for updating ongoing campaign (#893) * Microplan bulk user creation (#890) * Feat : initialised bulk user creation for microplan * Enhanced user bulk upload for microplan * Fixed configs * Merge fix with console * Feat : added columns in user sheet * Added userroles sheet for bulk user template in microplan * Added source microplan while resource creation * changed logic for isSourceMicroplan * Update campaignApis.ts * Update campaignValidators.ts * changes for campaign update flow * Update campaignUtils.ts * Integrated required error messages * added numeric check in microplan phone number * Implemented no data validation * added logic for creating projects , project facility and project staff on newly added boundaries (#917) * updated target template for updating ongoing campaign * update flow campaign mapping * updated flow campaign mapping * added logic for project, project facility and project staff creation on newly added boundaries * removed one useless func * removed await from a func * removed console.logs * added some minor enhancemnets * added one edge case scenario * changed request limit to 1 mb * Feat : added locksheet filter for user microplan creation * updated logic for regenerate if campaign type differs (#876) * Enhancement for microplan user creation (#940) * some modifications for edge cases (#930) * added commit for testing update campaign flow * some chenages related to type boundary in data create api * /* MODIFIED FOR LTS UPGRADE */ * Microplan user enhancement * Some changes regarding microplan user and boundary * added some null checks * /* Temporay fix for project creation of LLIN since the structure of delivery rules is getting changed */ * Revert "/* MODIFIED FOR LTS UPGRADE */" This reverts commit 52ed772. * added code to add lat long in the project-factory apis * Changed code based on comments * removed default campaignid * added code to add lat long in the project-factory apis (#951) * added code to add lat long in the project-factory apis * Changed code based on comments * removed default campaignid * Fixed code to manage create * fixed the build * added for field protection on sheet data * Facility microplan validation (#975) * Microplan facility validation * Enhancement in microplan validations * Microplan sheet lock * Enhanced for multiple sheetErrors in additionalDetails * Update campaignApis.ts * fixes for filestore and unfreezing boundary code mandatory columns (#984) * Update CODEOWNERS * Update campaignValidators.ts (#987) * some correction of error after changes from microplan code merge (#988) * some correction of error after changes from microplan code merge * added question mark * added localization fix (#993) Co-authored-by: ansh-egov <[email protected]> * Update campaignApis.ts (#994) * Added some fixes for the project transformation * Update projectTypeUtils.ts * Update campaignUtils.ts * Removed date Update projectTypeUtils.ts #1006 * HCEMPRE-809-Boundary-geometry-codes (#1011) * added localization fix * added logic for boundaryGeometryManagement * fixed some things * fixed campaign search * update project facility and staff mappings of exisitng facilities and users (#998) * some correction of error after changes from microplan code merge * added logic for updating mapping of existing facilitie and users * resolved comments by jagan on the pr for delinking and linking project resources * fetchProjectsWithBoundaryCodeAndName fucntion update * Update campaignValidators.ts --------- Co-authored-by: Jagankumar <[email protected]> * added code to add lat long in the project-factory apis (#1019) * Project staff mapping correction from uuid to userserviceuuid (#1022) * some correction of error after changes from microplan code merge * corrected for mapping of project staff * added changes for project-resource mapping (#1028) * added changes for project-resource mapping * changed the variable name to boundaryProjectMappingForProjectResourceCreation from newBoundaryProjectMapping * renamed the entity --------- Co-authored-by: Jagankumar <[email protected]> * Added logic to retry in project campaign create (#1031) * not needed to update every resource in update flow (#1036) * not needed to update every resource in update flow * added changes for if boundaries present in update flow all resources are mandate * Some checks enhancement (#1042) * Update genericApis.ts (#1043) * Update campaignValidators.ts (#1046) * consolidate resources array in update campaign flow (#1051) * consolidate resources array in update campaign flow * spelling correct * Search criteria object corrected (#1052) * consolidate resources array in update campaign flow * data search criteria id has to be an array of strings * spelling * some more corrections regarding search criteria body * Boundaries consolidate after creating child campaign (#1056) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * Boundaries correction (#1058) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * changes in extracing boundaries from campaign object * Missing resources in chid campaign to be added from parent camaig logic refactored (#1059) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * refactored logic for adding missing resources from parent campaign * Correction datatocreate column from status to userservice uuids (#1061) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * changed data to create column from user sheet * Hide Boundary and Target Old Columns (#1062) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * hide boundary code old and target old * Corrected target update flow (#1065) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * corrected target mapping in update flow * Total count of Campaigns if only is active true (#1066) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * count will be only of active campaigns * HCMPRE-1212:: migrated to point only to MMDS v2 api * Update index.ts * User/facility inactive (#1070) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * added logic for making exiting user facility inactive --------- Co-authored-by: Jagankumar <[email protected]> * Refactor facility mappings (#1072) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * refactored facility mappings * Created enity for boundary * updated the boundary relationship function * Update index.ts * fixed some localization issue (#1075) * fixed some localization issue * fixed * Target update while campaign update flow (#1078) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * logic for updating targets * some refactor for adding logs and index.ts * updated the boundary localisation name --------- Co-authored-by: Jagankumar <[email protected]> * fixed some localization issue (#1079) * fixed some localization issue * fixed * fixed a issue * reverted failed campaign is active true from false (#1080) * reverted failed campaign is active true from false * took constants from index * refactor * Merge branch 'project-factory-kafka-fix' into console * Changed hierarchyFectch to v2 (#1077) * Changed hierarchyFectch to v2 * Changed messages * Merge branch 'project-factory-kafka-fix' into hierarchyFetchV2 --------- Co-authored-by: Jagankumar <[email protected]> * calll generate when create completes for type boundary management * auto generate resource if there is no previous generated history * Fixed crashloop issue (#1084) * Fixed crashloop issue * Update dataManageService.ts --------- Co-authored-by: Jagankumar <[email protected]> * changed the master from hierarchyConfig to HierarchySchema (#1086) * getting boundaries split on logic change (#1088) * fixed some localization issue (#1090) * fixed some localization issue * fixed * fixed a issue * integrated microplan with console * fixxed index * fixed crashloop (#1091) * added validation for boundary bulk upload (#1092) Co-authored-by: Jagankumar <[email protected]> * refcatored diffferent tab separation (#1093) * added timeout (#1095) * Microplan integration :: set start date to tommorow (#1096) * set start date to tommorow * updated end date * Enhance PlanFacility object (#1099) * validation for update template in create flow (#1100) * removed await (#1103) * some correction (#1104) * logic for updating targets only when present in resources array in update flow (#1105) * updated (#1106) * updated * added fix for the redis error in logs --------- Co-authored-by: Jagankumar <[email protected]> * added error responder (#1107) * refactored download api (#1108) * Cache issue fix(#1109) * refactored download api * refactor --------- Co-authored-by: Jagankumar <[email protected]> * made disable of cache always during boundary generate (#1110) Co-authored-by: Jagankumar <[email protected]> * Redis cache key deleted (#1113) * removed await * delete cache from boundary relationship search * updated redis delete func * Revert "removed await" This reverts commit a5acb54. * Update redisUtils.ts --------- Co-authored-by: Jagankumar <[email protected]> * updated redis delete func (#1114) * removed cache from boundary relation create (#1115) * corrected params of auto generate after download api (#1116) * refactored consolidate (#1119) * fix on the fetch from microplan Update campaignUtils.ts (#1120) * Update microplanUtils.ts (#1123) * addded localization function (#1125) * Update SearchCriteria.ts * made createandtransfrom localization as await to upsert all localization in boundary management create flow (#1127) * added logs in handledropdownthings (#1128) * Fixed district missing issue (#1129) * Facility Village List For microplan and dropdown fix (#1130) * Facility Village List For microplan and dropdown fix * Optional chaining * Reverted recievedDropdown Changes * removed localization caceh in boundary generate flow for hierarchy module (#1133) * planFacility create Fix (#1132) * fixed the localisation cache on multiple data creates in boundary * Revert "fixed the localisation cache on multiple data creates in boundary" This reverts commit 94eb970. * Facility fix generation for microplan (#1134) * planFacility create Fix * Fixed Facility Generation for microplan * added the count info of the localisation upsert (#1144) Co-authored-by: Jagankumar <[email protected]> * Microplan integrated with console for facility , user & target (#1151) * set start date to tommorow * updated end date * added code for target sheet * fixed * added mdms call * microplan integration changes added for target ,facility & user * undo changes * Update microplanIntergration.ts * saving all the progress on the integration * project facility mapping done * Update microplanIntergration.ts * Update microplanIntergration.ts * Update microplanIntergration.ts * target & facility integration completed statically * completed facility & target file created based on microplan * added static for user * Added user related changes * added the user integartion * added target and facility in resources array of campaign from microplan * added user in resources array in campaign object * Update microplanIntergration.ts * revert the others * Update index.ts * Cleaned up code --------- Co-authored-by: ansh-egov <[email protected]> Co-authored-by: Jagankumar <[email protected]> Co-authored-by: nitish-egov <[email protected]> * added missing default tenantid (#1152) * Boundary locale fix (#1153) * planFacility create Fix * Fixed boundary validation for different locales --------- Co-authored-by: Jagankumar <[email protected]> * removed duplicate key (#1154) * Logs for reordering added (#1161) * added missing default tenantid * added logs for reordering before project creation * Update index.ts --------- Co-authored-by: Jagankumar <[email protected]> * Readme for microplans (#1160) * Readme for microplans * Fixed boolean type * Optimized isMicroplanRequest * Optimizing roles for microplan (#1164) * Improved some performance with huge campaign object (#1165) * Trying optimised code by chatgpt * added 4mb limit * Update app.ts * Updted the comments * Changes for pollutils and reorder * Update pollUtils.ts --------- Co-authored-by: Jagankumar <[email protected]> Co-authored-by: ashish-egov <[email protected]> * Added fixes for error during processing (#1172) * added missing default tenantid * added try catch * Update index.ts --------- Co-authored-by: Jagankumar <[email protected]> * fixed the hard codings in the code (#1170) * fixed the hard codings in the code * fixed * Added filter check for the fetch from microplan if it has already some resources * fixed hardcoding in target flow (#1175) * fixed hardcoding in target flow * fixed * fixed * Update campaignApis.ts (#1177) * Update campaignApis.ts * Update campaignApis.ts * Update campaignApis.ts * Update genericUtils.ts (#1178) * changed the campaig key to activity (#1180) * added missing default tenantid * Update campaignUtils.ts * Update index.ts --------- Co-authored-by: Jagankumar <[email protected]> * handled failed generations in downlaod api (#1185) * Change for roles name change (#1187) * added search before update in fetch all datas (#1190) * added seacrh before update in fetch all datas * Change for roles name change (#1187) --------- Co-authored-by: ashish-egov <[email protected]> Co-authored-by: Jagankumar <[email protected]> * formatted and made promise all to do a promise all to make calls parallely * filtered the plan facility response to have only facility which has only service boundarires * added hierarchy filteration from mdms (#1188) * added hierarchy filteration from mdms * did some hardcoding * fixed fetching of headers * added some logs * added extra loggers for fetch from microplan activities (#1193) * added extra loggers for fetch from microplan activities * Update microplanIntergration.ts --------- Co-authored-by: Jagankumar <[email protected]> * added retry in localization upsert (#1194) * Adding the additonal loggers to know more informs on microplan integration * Update health-services/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/project-factory/src/server/controllers/campaignManage/campaignManage.controller.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fixed integration (#1197) * Global handler (#1199) * Change for roles name change * Global exception handler integrated * String logger * Update app.ts * added heap memory log & created a env variable for incomingRequestPay… …loadLimit (#1201) * added heap memory log & created a env variable for incomingRequestPayloadLimit * Update index.ts --------- Co-authored-by: Jagankumar <[email protected]> * Set memory limit and added log off avaiable, max limits (#1202) * added logs to check current value * Update app.ts * Update Dockerfile * Update Dockerfile * Update app.ts --------- Co-authored-by: Jagankumar <[email protected]> * Handle for google sheet formulas (#1207) * Update microplanValidators.ts (#1213) * Update microplanValidators.ts * Update microplanValidators.ts * Update microplanValidators.ts * Localised roles (#1217) * added change log for admin console version 0.3 (#1224) * Pvar validation (#1225) * product variant validation added * Optimized validations * Refactored * Logger error fix * Refactor * Refactor * refactored project reosurce mapping logic (#1204) * refactored project reosurce mapping logic * added new function ot search project after campaign creation time * added reference id params in project search * added logic for adding resources only for newly created projects * refactored and code clean up for project resource mapppings in update and create flow * refactor getProjectMappingBody func * some condition check * correction * removed project departments * microplan save topic changes (#1231) * Update microplanUtils.ts * Update index.ts * Update campaignApis.ts (#1232) * Update campaignApis.ts * Update campaignApis.ts * Update campaignApis.ts * Update campaignValidators.ts * Revert boundaryProject Mapping * Cleaned up data configs (#1234) * Update index.ts * Update campaignUtils.ts * Update health-services/project-factory/src/server/utils/onGoingCampaignUpdateUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update app.ts * Update health-services/project-factory/src/server/utils/microplanUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * added changes for performance testing (#1236) * added changes for performance testing * microplan save topic changes (#1231) * Update microplanUtils.ts * Update index.ts * Update campaignApis.ts (#1232) * Update campaignApis.ts * Update campaignApis.ts * Update campaignApis.ts * Update campaignValidators.ts * Revert boundaryProject Mapping * Cleaned up data configs (#1234) * Update index.ts * Update campaignUtils.ts * try catch handling * Update health-services/project-factory/src/server/service/dataManageService.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: ashish-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: Jagankumar <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/project-factory/src/server/utils/onGoingCampaignUpdateUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update app.ts * Update health-services/project-factory/src/server/utils/microplanUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update campaignValidators.ts (#1244) * Update campaignValidators.ts * Update campaignValidators.ts * add * added new config values * Other configs (#1250) * add * added new config values * Update request.ts --------- Co-authored-by: Jagankumar <[email protected]> * Updating debug function for error handeling (#1243) * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/project-factory/src/server/service/dataManageService.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update dataManageService.ts * Applied code rabbit changes * refactored sheet consolidate logic (#1254) * refactored sheet consolidate logic * Applied code rabbit changes --------- Co-authored-by: Jagankumar <[email protected]> * refactor sheet consolidate for target (#1255) * Update package.json * Update health-services/project-factory/src/server/utils/onGoingCampaignUpdateUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * removed other ui workflows * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Update publishProjectFactory.yml * consolidate sheet handle logic change (#1256) * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: ashish-egov <[email protected]> Co-authored-by: ashish-egov <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ejagankumar <[email protected]> * Changed docker file * package changes * dockerfile revert * changed package json * Update package.json * reverted other folders * reverted * Update settings.json --------- Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: kavi_elrey@1993 <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: Sathish P <[email protected]> Co-authored-by: tanishi-egov <[email protected]> Co-authored-by: Palak Garg <[email protected]> Co-authored-by: Priyanka-eGov <[email protected]> Co-authored-by: Jagankumar <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ejagankumar <[email protected]>
kavi-egov
added a commit
that referenced
this pull request
Dec 12, 2024
* Enabled commands for debug remotely for project factory pod (#1249) * HLM service request, updated DataTypeEnum (#872) * Service request changelog 1.5 (#875) * Added changelog and upgraded the versions for household, individual and service request * Update core-services/service-request/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/individual/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * HLM fixed merge issues * HLM fixed merge issues * HCMPRE-413: updated the changelog as per code review comments * Update health-services/project/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: kavi_elrey@1993 <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * HCMPRE-424: fixed hrms call from pgr-service * HCMPRE-424: updated as per code review comments * Create branch-name-validator (#960) * Create branch-name-validator * Update branch-name-validator * Update .github/workflows/branch-name-validator Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update .github/workflows/branch-name-validator 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 branch-name-validator * Rename branch-name-validator to branch-name-validator.yml * Added census-service in build-config (#990) * [HCMPRE-658] Refractor resource-estimation-service to resource-generator (#910) Co-authored-by: Priyanka-eGov <[email protected]> * Update package.json * Update tsconfig.json * Added configs and env dependencies * dockerfile update * Update tsconfig.json * Update tsconfig.json * refactored * HCM Admin Console v0.3 Release code changes (#1082) * kafka fix for large messages * Update genericUtils.ts * Update campaignValidators.ts * Fixed the mdms search path keys * fix of migration script * fix on repeated key * Update campaignApis.ts * Update campaignApis.ts * Update campaignUtils.ts * Update campaignUtils.ts * Update campaignUtils.ts * Fix project target mapping * refactored migration files fro project-factory (#867) * refactored migration files fro project-factory * updated logic for unique username generation * updated format and id name for user name * removed hash logic for username generation * added indexing on columns * updated idgen seq format for user name in index.ts * Update health-services/project-factory/src/server/api/campaignApis.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * updated logic for regenerate if campaign type differs (#876) * id generation throw error update * Enhance generate template for user and facility in update ongoing campaign flow (#885) * commit for update-generate-template * updated campaign flow generate template enhancement * just if else changes * some reformatting * update index.ts * added additional valiadtion for parent campaign * updated logic for validating parent campaign * refcatored as per change requests * update index.ts * updated logic for same campaignnumber when paren is present * updated the campaign name logic along with handling isfailed status too (#888) * updating campaign name same as parent name and number too * updated target template for updating ongoing campaign (#893) * Microplan bulk user creation (#890) * Feat : initialised bulk user creation for microplan * Enhanced user bulk upload for microplan * Fixed configs * Merge fix with console * Feat : added columns in user sheet * Added userroles sheet for bulk user template in microplan * Added source microplan while resource creation * changed logic for isSourceMicroplan * Update campaignApis.ts * Update campaignValidators.ts * changes for campaign update flow * Update campaignUtils.ts * Integrated required error messages * added numeric check in microplan phone number * Implemented no data validation * added logic for creating projects , project facility and project staff on newly added boundaries (#917) * updated target template for updating ongoing campaign * update flow campaign mapping * updated flow campaign mapping * added logic for project, project facility and project staff creation on newly added boundaries * removed one useless func * removed await from a func * removed console.logs * added some minor enhancemnets * added one edge case scenario * changed request limit to 1 mb * Feat : added locksheet filter for user microplan creation * updated logic for regenerate if campaign type differs (#876) * Enhancement for microplan user creation (#940) * some modifications for edge cases (#930) * added commit for testing update campaign flow * some chenages related to type boundary in data create api * /* MODIFIED FOR LTS UPGRADE */ * Microplan user enhancement * Some changes regarding microplan user and boundary * added some null checks * /* Temporay fix for project creation of LLIN since the structure of delivery rules is getting changed */ * Revert "/* MODIFIED FOR LTS UPGRADE */" This reverts commit 52ed772. * added code to add lat long in the project-factory apis * Changed code based on comments * removed default campaignid * added code to add lat long in the project-factory apis (#951) * added code to add lat long in the project-factory apis * Changed code based on comments * removed default campaignid * Fixed code to manage create * fixed the build * added for field protection on sheet data * Facility microplan validation (#975) * Microplan facility validation * Enhancement in microplan validations * Microplan sheet lock * Enhanced for multiple sheetErrors in additionalDetails * Update campaignApis.ts * fixes for filestore and unfreezing boundary code mandatory columns (#984) * Update CODEOWNERS * Update campaignValidators.ts (#987) * some correction of error after changes from microplan code merge (#988) * some correction of error after changes from microplan code merge * added question mark * added localization fix (#993) Co-authored-by: ansh-egov <[email protected]> * Update campaignApis.ts (#994) * Added some fixes for the project transformation * Update projectTypeUtils.ts * Update campaignUtils.ts * Removed date Update projectTypeUtils.ts #1006 * HCEMPRE-809-Boundary-geometry-codes (#1011) * added localization fix * added logic for boundaryGeometryManagement * fixed some things * fixed campaign search * update project facility and staff mappings of exisitng facilities and users (#998) * some correction of error after changes from microplan code merge * added logic for updating mapping of existing facilitie and users * resolved comments by jagan on the pr for delinking and linking project resources * fetchProjectsWithBoundaryCodeAndName fucntion update * Update campaignValidators.ts --------- Co-authored-by: Jagankumar <[email protected]> * added code to add lat long in the project-factory apis (#1019) * Project staff mapping correction from uuid to userserviceuuid (#1022) * some correction of error after changes from microplan code merge * corrected for mapping of project staff * added changes for project-resource mapping (#1028) * added changes for project-resource mapping * changed the variable name to boundaryProjectMappingForProjectResourceCreation from newBoundaryProjectMapping * renamed the entity --------- Co-authored-by: Jagankumar <[email protected]> * Added logic to retry in project campaign create (#1031) * not needed to update every resource in update flow (#1036) * not needed to update every resource in update flow * added changes for if boundaries present in update flow all resources are mandate * Some checks enhancement (#1042) * Update genericApis.ts (#1043) * Update campaignValidators.ts (#1046) * consolidate resources array in update campaign flow (#1051) * consolidate resources array in update campaign flow * spelling correct * Search criteria object corrected (#1052) * consolidate resources array in update campaign flow * data search criteria id has to be an array of strings * spelling * some more corrections regarding search criteria body * Boundaries consolidate after creating child campaign (#1056) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * Boundaries correction (#1058) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * changes in extracing boundaries from campaign object * Missing resources in chid campaign to be added from parent camaig logic refactored (#1059) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * refactored logic for adding missing resources from parent campaign * Correction datatocreate column from status to userservice uuids (#1061) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * changed data to create column from user sheet * Hide Boundary and Target Old Columns (#1062) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * hide boundary code old and target old * Corrected target update flow (#1065) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * corrected target mapping in update flow * Total count of Campaigns if only is active true (#1066) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * count will be only of active campaigns * HCMPRE-1212:: migrated to point only to MMDS v2 api * Update index.ts * User/facility inactive (#1070) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * added logic for making exiting user facility inactive --------- Co-authored-by: Jagankumar <[email protected]> * Refactor facility mappings (#1072) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * refactored facility mappings * Created enity for boundary * updated the boundary relationship function * Update index.ts * fixed some localization issue (#1075) * fixed some localization issue * fixed * Target update while campaign update flow (#1078) * consolidate resources array in update campaign flow * boundaries consolidate after creating child campaign * logic for updating targets * some refactor for adding logs and index.ts * updated the boundary localisation name --------- Co-authored-by: Jagankumar <[email protected]> * fixed some localization issue (#1079) * fixed some localization issue * fixed * fixed a issue * reverted failed campaign is active true from false (#1080) * reverted failed campaign is active true from false * took constants from index * refactor * Merge branch 'project-factory-kafka-fix' into console * Changed hierarchyFectch to v2 (#1077) * Changed hierarchyFectch to v2 * Changed messages * Merge branch 'project-factory-kafka-fix' into hierarchyFetchV2 --------- Co-authored-by: Jagankumar <[email protected]> * calll generate when create completes for type boundary management * auto generate resource if there is no previous generated history * Fixed crashloop issue (#1084) * Fixed crashloop issue * Update dataManageService.ts --------- Co-authored-by: Jagankumar <[email protected]> * changed the master from hierarchyConfig to HierarchySchema (#1086) * getting boundaries split on logic change (#1088) * fixed some localization issue (#1090) * fixed some localization issue * fixed * fixed a issue * integrated microplan with console * fixxed index * fixed crashloop (#1091) * added validation for boundary bulk upload (#1092) Co-authored-by: Jagankumar <[email protected]> * refcatored diffferent tab separation (#1093) * added timeout (#1095) * Microplan integration :: set start date to tommorow (#1096) * set start date to tommorow * updated end date * Enhance PlanFacility object (#1099) * validation for update template in create flow (#1100) * removed await (#1103) * some correction (#1104) * logic for updating targets only when present in resources array in update flow (#1105) * updated (#1106) * updated * added fix for the redis error in logs --------- Co-authored-by: Jagankumar <[email protected]> * added error responder (#1107) * refactored download api (#1108) * Cache issue fix(#1109) * refactored download api * refactor --------- Co-authored-by: Jagankumar <[email protected]> * made disable of cache always during boundary generate (#1110) Co-authored-by: Jagankumar <[email protected]> * Redis cache key deleted (#1113) * removed await * delete cache from boundary relationship search * updated redis delete func * Revert "removed await" This reverts commit a5acb54. * Update redisUtils.ts --------- Co-authored-by: Jagankumar <[email protected]> * updated redis delete func (#1114) * removed cache from boundary relation create (#1115) * corrected params of auto generate after download api (#1116) * refactored consolidate (#1119) * fix on the fetch from microplan Update campaignUtils.ts (#1120) * Update microplanUtils.ts (#1123) * addded localization function (#1125) * Update SearchCriteria.ts * made createandtransfrom localization as await to upsert all localization in boundary management create flow (#1127) * added logs in handledropdownthings (#1128) * Fixed district missing issue (#1129) * Facility Village List For microplan and dropdown fix (#1130) * Facility Village List For microplan and dropdown fix * Optional chaining * Reverted recievedDropdown Changes * removed localization caceh in boundary generate flow for hierarchy module (#1133) * planFacility create Fix (#1132) * fixed the localisation cache on multiple data creates in boundary * Revert "fixed the localisation cache on multiple data creates in boundary" This reverts commit 94eb970. * Facility fix generation for microplan (#1134) * planFacility create Fix * Fixed Facility Generation for microplan * added the count info of the localisation upsert (#1144) Co-authored-by: Jagankumar <[email protected]> * Microplan integrated with console for facility , user & target (#1151) * set start date to tommorow * updated end date * added code for target sheet * fixed * added mdms call * microplan integration changes added for target ,facility & user * undo changes * Update microplanIntergration.ts * saving all the progress on the integration * project facility mapping done * Update microplanIntergration.ts * Update microplanIntergration.ts * Update microplanIntergration.ts * target & facility integration completed statically * completed facility & target file created based on microplan * added static for user * Added user related changes * added the user integartion * added target and facility in resources array of campaign from microplan * added user in resources array in campaign object * Update microplanIntergration.ts * revert the others * Update index.ts * Cleaned up code --------- Co-authored-by: ansh-egov <[email protected]> Co-authored-by: Jagankumar <[email protected]> Co-authored-by: nitish-egov <[email protected]> * added missing default tenantid (#1152) * Boundary locale fix (#1153) * planFacility create Fix * Fixed boundary validation for different locales --------- Co-authored-by: Jagankumar <[email protected]> * removed duplicate key (#1154) * Logs for reordering added (#1161) * added missing default tenantid * added logs for reordering before project creation * Update index.ts --------- Co-authored-by: Jagankumar <[email protected]> * Readme for microplans (#1160) * Readme for microplans * Fixed boolean type * Optimized isMicroplanRequest * Optimizing roles for microplan (#1164) * Improved some performance with huge campaign object (#1165) * Trying optimised code by chatgpt * added 4mb limit * Update app.ts * Updted the comments * Changes for pollutils and reorder * Update pollUtils.ts --------- Co-authored-by: Jagankumar <[email protected]> Co-authored-by: ashish-egov <[email protected]> * Added fixes for error during processing (#1172) * added missing default tenantid * added try catch * Update index.ts --------- Co-authored-by: Jagankumar <[email protected]> * fixed the hard codings in the code (#1170) * fixed the hard codings in the code * fixed * Added filter check for the fetch from microplan if it has already some resources * fixed hardcoding in target flow (#1175) * fixed hardcoding in target flow * fixed * fixed * Update campaignApis.ts (#1177) * Update campaignApis.ts * Update campaignApis.ts * Update campaignApis.ts * Update genericUtils.ts (#1178) * changed the campaig key to activity (#1180) * added missing default tenantid * Update campaignUtils.ts * Update index.ts --------- Co-authored-by: Jagankumar <[email protected]> * handled failed generations in downlaod api (#1185) * Change for roles name change (#1187) * added search before update in fetch all datas (#1190) * added seacrh before update in fetch all datas * Change for roles name change (#1187) --------- Co-authored-by: ashish-egov <[email protected]> Co-authored-by: Jagankumar <[email protected]> * formatted and made promise all to do a promise all to make calls parallely * filtered the plan facility response to have only facility which has only service boundarires * added hierarchy filteration from mdms (#1188) * added hierarchy filteration from mdms * did some hardcoding * fixed fetching of headers * added some logs * added extra loggers for fetch from microplan activities (#1193) * added extra loggers for fetch from microplan activities * Update microplanIntergration.ts --------- Co-authored-by: Jagankumar <[email protected]> * added retry in localization upsert (#1194) * Adding the additonal loggers to know more informs on microplan integration * Update health-services/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/project-factory/src/server/controllers/campaignManage/campaignManage.controller.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fixed integration (#1197) * Global handler (#1199) * Change for roles name change * Global exception handler integrated * String logger * Update app.ts * added heap memory log & created a env variable for incomingRequestPay… …loadLimit (#1201) * added heap memory log & created a env variable for incomingRequestPayloadLimit * Update index.ts --------- Co-authored-by: Jagankumar <[email protected]> * Set memory limit and added log off avaiable, max limits (#1202) * added logs to check current value * Update app.ts * Update Dockerfile * Update Dockerfile * Update app.ts --------- Co-authored-by: Jagankumar <[email protected]> * Handle for google sheet formulas (#1207) * Update microplanValidators.ts (#1213) * Update microplanValidators.ts * Update microplanValidators.ts * Update microplanValidators.ts * Localised roles (#1217) * added change log for admin console version 0.3 (#1224) * Pvar validation (#1225) * product variant validation added * Optimized validations * Refactored * Logger error fix * Refactor * Refactor * refactored project reosurce mapping logic (#1204) * refactored project reosurce mapping logic * added new function ot search project after campaign creation time * added reference id params in project search * added logic for adding resources only for newly created projects * refactored and code clean up for project resource mapppings in update and create flow * refactor getProjectMappingBody func * some condition check * correction * removed project departments * microplan save topic changes (#1231) * Update microplanUtils.ts * Update index.ts * Update campaignApis.ts (#1232) * Update campaignApis.ts * Update campaignApis.ts * Update campaignApis.ts * Update campaignValidators.ts * Revert boundaryProject Mapping * Cleaned up data configs (#1234) * Update index.ts * Update campaignUtils.ts * Update health-services/project-factory/src/server/utils/onGoingCampaignUpdateUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update app.ts * Update health-services/project-factory/src/server/utils/microplanUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * added changes for performance testing (#1236) * added changes for performance testing * microplan save topic changes (#1231) * Update microplanUtils.ts * Update index.ts * Update campaignApis.ts (#1232) * Update campaignApis.ts * Update campaignApis.ts * Update campaignApis.ts * Update campaignValidators.ts * Revert boundaryProject Mapping * Cleaned up data configs (#1234) * Update index.ts * Update campaignUtils.ts * try catch handling * Update health-services/project-factory/src/server/service/dataManageService.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: ashish-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: Jagankumar <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/project-factory/src/server/utils/onGoingCampaignUpdateUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update app.ts * Update health-services/project-factory/src/server/utils/microplanUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update campaignValidators.ts (#1244) * Update campaignValidators.ts * Update campaignValidators.ts * add * added new config values * Other configs (#1250) * add * added new config values * Update request.ts --------- Co-authored-by: Jagankumar <[email protected]> * Updating debug function for error handeling (#1243) * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/project-factory/src/server/service/dataManageService.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update dataManageService.ts * Applied code rabbit changes * refactored sheet consolidate logic (#1254) * refactored sheet consolidate logic * Applied code rabbit changes --------- Co-authored-by: Jagankumar <[email protected]> * refactor sheet consolidate for target (#1255) * Update package.json * Update health-services/project-factory/src/server/utils/onGoingCampaignUpdateUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * removed other ui workflows * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Update publishProjectFactory.yml * Update publishProjectFactory.yml * consolidate sheet handle logic change (#1256) * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: ashish-egov <[email protected]> Co-authored-by: ashish-egov <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ejagankumar <[email protected]> * Changed docker file * package changes * dockerfile revert * changed package json * Update package.json * reverted other folders * reverted * Update settings.json --------- Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: kavi_elrey@1993 <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: Sathish P <[email protected]> Co-authored-by: tanishi-egov <[email protected]> Co-authored-by: Palak Garg <[email protected]> Co-authored-by: Priyanka-eGov <[email protected]> Co-authored-by: Jagankumar <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ejagankumar <[email protected]> * changed package json for debug (#1258) * boundary code in update flow to be persisted in db (#1259) * chnaged header creation logic in generate flow (#1261) * made few changes for fetching boundaries from boundariesCombined (#1263) * some boundary bulk and microplan user changes (#1268) * some boundary bulk and microplan user changes * Some refactoring * localisation-cache-fix (#1270) * localisation-cache-fix * Refactor * Refactor * logger added * Microplan fix (#1269) * some boundary bulk and microplan user changes * Some refactoring * Fix for target * Facility fix * User Fix * Target valiodation for microplan --------- Co-authored-by: ashish-egov <[email protected]> Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: kavi_elrey@1993 <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: Sathish P <[email protected]> Co-authored-by: tanishi-egov <[email protected]> Co-authored-by: Palak Garg <[email protected]> Co-authored-by: Priyanka-eGov <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: ejagankumar <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary by CodeRabbit