patch changes #1058
Open
patch changes #1058
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
* Added postman scripts * Updated calculator API spec * Added expense calculator postman
* pfm-3154 * pfm-3245 * pfm-3229 * pfm-3255 * Update DeductionsTable.js * Update DeductionsTable.js
* cleanup and version chages * Update package.json
…d name stored in fatherName field (#1018) * PFm-3274:: Store individual husband name in father name param, Trimmed all names * PFM-3297:: project name added for all cards * Engage Wage Seeker Project name added
* Showing proper file name of other file in every module * pfm-3135
* pfm-3278 * pfm-3310 * pfm-3136
…-3116 3107 core issues fixed for sidebAR, HEADER CITY etc (#1023) * Bug bash v4 pfm-3278 pfm-3218 pfm-3310 pfm-3325 (#1021) * pfm-3278 * pfm-3310 * pfm-3136 * PFM-3116 3107 core issues fixed for sidebAR, HEADER CITY etc --------- Co-authored-by: Nipun Arora <[email protected]>
…r core css issue fixed (#1027)
… core css issue fixed and Generate supervision bill for each bill details(#1028) * Generate supervision bill for each bill details * Update index.scss * PFM-3142 :: HOme icon issue and other core css updated (#1029) * PFM-3278 :: FIx for Purchase bill duplicating the Line items and other core css issue fixed (#1027) * Update index.scss * Update package.json * Updated the core version * Updated the package .json for core module * Updated the core package versions * Updated the core packges --------- Co-authored-by: Jagankumar <[email protected]>
* Updated the core packges --------- Co-authored-by: Jagankumar <[email protected]>
…length >=2 (#1030) * PFM-3118:: CBO Org Number added for contracts in additional Details * Bills Footer for billList is greater than or equal to 2 * PDF download based on languages * Updated the core package versions * Updated the core packges --------- Co-authored-by: Jagankumar <[email protected]>
* pfm-3238 * pfm-3242 * pfm-3281 * pfm-3315 * Updated project Package version * Update package.json * Update index.js * Update index.js * updated masters version
* PFM-3309::Multiselect Dropdown enhancemengt with chips * Modified Multiselect Dropdown * PFM-3322 :: Logo issue fixees in all inbox (#1039) --------- Co-authored-by: Jagankumar <[email protected]>
* pfm-3172 * pfm-3209 removed table level round off in create and view estimate screen * pfm-3133 * pfm-3209 * Update ModifyWageSeekerForm.js * pfm-3362 * Updated version for masters module
…sentees on estimate (#1036)
* pfm-3152 * pfm-3246 * pfm-3226 * updated masters module version
* pfm-3401 * pfm-3401 * incremented package version for Masters
…, Bank name null fix, CBO Documents mapping in WO (#1048) * Test Org andEstimate * Revert "Test Org andEstimate" This reverts commit fc019e1. * Revert "Revert "Test Org andEstimate"" This reverts commit 9f91f06. * PFM-3192, PFM-3194 * Revert Estimate Plain Search * Sonar cloud Bug fixes * PFM-3367, PFM-3192 * Update package.json * Update package.json * Update package.json --------- Co-authored-by: Jagankumar <[email protected]>
…dropdown form state change on removal of tag (#1051) * PFM-3136::Multiselect dropdown change Form state on removal * PFM-3181::Valid daterange in Project selection
* PFM-4305 Login page issues * PFM-4305 updated css package version
|
SonarCloud Quality Gate failed.
|
* [PFM-4665] removed splitting of tenant ids from all services (#1509) * [PFM-4665] removed splitting of tenant ids from all services * [PFM-4665]-removed-multiple-mdms-calls-from-estimates * [PFM-4665] fixed multiple mdms calls in organization service * fixed multiple mdms calls for expense service * fixed test cases for estimate serrvice * [PFM-4665]-removed-multiple-mdms-calls-from-estimates * fixed the test cases * Update AttendanceServiceValidator.java * removed commented tenant ids * fixed * fixed user util * Update ifms-adapter.iml * Delete reference-adapters/ifms-adapter/ifms-adapter.iml * Update CODEOWNERS --------- Co-authored-by: Jagankumar <[email protected]> * Pfm 1778 update estimate service documentation (#1521) * [PFM-1778] Added new postman collection for estimate service * Delete backend/estimates/Estimate Service Collection.postman_collection.json * Update Estimate_Service_Collection.postman_collection.json * Estimate sor cherry pick old (#1527) * added estimate changes from sorid-updated-estimate branch * check rates only if category sor * added flyway migration script * removing validator for testing * adding mdms criteria models * removed estimate update validator * added check if estimateDetails measurements are 0 * Changed Estimate validator from mdmsv2/v2 to mdmsv2/v1 * changed mdms search url from v2 to v1 and mdmsRes to MdmsRes * added check for SOR for update call * added check for SOR for update call * PFM-4879-Order by query fix (#1489) * made changes in validator to throw proper error * [PFM-4891] added validations for all fields (#1495) * [PFM-4891] fixed test cases for estimate-sor-cherry-pick * [PFM-4892] added all the validations for sor, non sor and overheads (#1500) * [PFM-4892] added all the validations for sor, non sor and overheads * [PFM-4892] added required validations for multiple sors * Setting audit details for update call * refractored the code for estimate service (#1503) * reftactored the code for estimate * fixed the valid date logic for validator * refractored the code * fixed the comments in estimate service * fixed workflow * removed comments * added required validations in estimate service (#1524) * added required validations in estimate service * fixed validator * ii * removed commented code * fixed variable names --------- Co-authored-by: shubhang-egov <[email protected]> Co-authored-by: shubhang-eGov <[email protected]> * PFM-4762 Impact of MB on contract service (#1525) * fixed test case (#1530) * Mb registry and service (#1518) * Codegen for measurement service * Formated files * Created Service * Added rowmapper and querybuilder * Added validator * Updated measurement model * updated build config to measurement-service (#1367) * added build config file for measurment service * build config file * updated build config --------- Co-authored-by: admin1 <[email protected]> * Codegen for measurement-registry * fix : fixed postgres driver issue * feat : implemented create-update-search endpoints * Refactor : Measurement - registry * feat : implemented create-update-search endpoints in Measurement-Service * feat : implemented create-update-search endpoints in Measurement-Service * Refactor : refactored measurement-service enrichment * fixed additional details, and removed unused files * fixed additional details, and removed unused files and dependencies * fixed additional details, and removed unused files and dependencies * Feat : implemented validation if workflow status is rejected * Feat : refactored configuration and application properties * feat : user who is creating that measurement will be assigned to it if it's saving as a draft * Refactor : refactored configuration and application properties * Refactor : refactored MeasurementRegistry.java * Refactor : removed println lines * Refactor : added https in filestore host * Added with build config * Resolved Controllers during build * Added Consumer for elasticSearch indexing * Updated self assignee workflow * Refactor : implemented restTemplate instead of httpget, renamed msService to MeasurementService * Feat : Implemented update according to workFlow actions * Fix : Validation for SOR , NON-SOR line items * Fix : PFM-4794 & PFM-4791 * Feat : Implemented workflow status based create for MeasurementService * Refactor : refactored Utils and Validators * Refactor : refactored Search api functions, Configurations, removed unused files,made string constants for reusability * Refactor : Renamed files according to module names * Refactor : Removed unused imports from MBRegistry/Service and removed unused constants from ServiceConstants * PFM-4185-Added notification feature to measurement service * Updated models to services-common-2.0.0 * Pfm 4794 wrong error message (#1486) * PFM-4794-Changed wrong error message if contract is not present * PFM-4794-Added localisation code * PFM-4794-Added localisation code (#1491) * PFM-4879-Sort order ASC DESC fix (#1493) * PFM-4882 added check for tenantId null (#1494) * PFM-4875 Added check if WO is in accepted state (#1496) * PFM-4879 mb service search order * PFM-4747-Fetching estimate id from contract service change (#1497) * PFM-4882-TenantId MeasurementService validator (#1498) * PFM-4601 From and to date search (#1501) * Removed unwanted object creation * Pfm 4930 code refactoring (#1506) * PFM-4930 Removed importing of models that are present in common-services from digit-models. * PFM-4930 Removed hard coded tenantId * PFM-4930 Changed id field type from UUID to String with max size 64 * PFM-4930 Removed unused model Order * PFM-4930 Removed unnecessary conversion * PFM-4927 Fetching only active measure to add to cumulative value (#1502) * PFM-4927 Fetching only active measure to add to cumulative value * PFM-4927 Making searchCriteria isActive default value null * PFM-4927 Fix for null pointer exception when length, breadth, height or num of items is null of 0 * PFM-4799 added comments field in rowmapper (#1504) * PFM-4930 taking mdms tenants from state level tenant id instead of seperate configuration * PFM-4689 Enriched elastic payload with workflow assignee (#1507) * PFM-4927 Setting is active false when action is rejected (#1508) * PFM-4930 Added workflow validator * PFM-4930 Removed ErrorConfiguration class and instead throwing CustomException wherever required * PFM-4930 Removed ErrorConfiguration class and instead throwing CustomException wherever required for mb registry * PFM-4930 Removed ErrorConfiguration class and instead throwing CustomException wherever required for mb service * Revert "PFM-4930 Removed ErrorConfiguration class and instead throwing CustomException wherever required for mb registry" This reverts commit 388086c. * Revert "Merge remote-tracking branch 'origin/mb-registry-and-service' into mb-registry-and-service" This reverts commit b0ca3b0, reversing changes made to c4279e4. * Revert "Revert "Merge remote-tracking branch 'origin/mb-registry-and-service' into mb-registry-and-service"" This reverts commit ff996d7. * Revert "PFM-4930 Removed ErrorConfiguration class and instead throwing CustomException wherever required for mb service" This reverts commit 31622cb. * PFM-4930 Error config string in mb registry * PFM-4930 Removed ErrorConfiguration object creation * PFM-4930 Removed ErrorConfiguration object creation and consolidated all error strings in one file for mb service * PFM-4930 Removed Constants from MBServiceConfiguration and moved to constants file * PFM-4930 Removed unused object and made a function to reduce complexity for mb registry * PFM-4930 Renamed strings with correct regular expression and removed hard-coding * Pfm 4953 estimate validator (#1517) * PFM-4953 added estimate quantity validator * PFM-4953 used stream filter * null check for measurement response * All dimension value 0 fix and error message change * Referring contract LineItems reference number instead of id as targetId * changing contract business service check and quantity validation --------- Co-authored-by: Shailesh Pandey <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: admin1 <[email protected]> Co-authored-by: Rishabh-egov <[email protected]> Co-authored-by: ashish-egov <[email protected]> Co-authored-by: Lokendra Tyagi <[email protected]> * Mb refactor cherry pick (#1535) * changing contract business service check and added service constants * refactor code as per sonarlint * [PFM-4970] Change revision create/update search function requires line item (#1539) * PFM-4824 Impact of revised contract on MB, changed validator to check for accepted state instead of approve for revised contract. (#1551) * Pfm 4841 impact of revision estimate on mb (#1549) * fixed test case * [PFM-4841] Fixed Impact On MB * [PFM-4841] added required fields to models * Pfm 4801 revised estimate (#1536) * [PFM-4801] revision estimate * cherry pick develop * [PFM-4801] revision estimate * added migration script * estimate create api * Update Estimate API * Search Estimate API * PFM-4801 refractored the code and added validation for contract * added measurement validation * refractored code * fixed test case * refractored code * refractored code * fixed some changes * refractored code * removed mandatory buisness service * fixed code according to test cases * added * fixed workflow inactive * fixed * f * added rate validation * x * fixed test case and changed application prop. * fixed previos line id validation on update * fixed measurement validation * added max limit for revision estimate * fixed code according to sonarlint suggestions * removed measurement validation in case of Reject action * fixed a test case * fixed measurement validation * fixed measurement validation * renamed files * Pfm 4803 contract revision (#1550) * PFM-4803 Contract Revision create update and validate flows * PFM-4803 Added validator and cleanup * PFM-4803 Added logs and cleanup * PFM-4803 SonarLint changes * PFM-4803 measurement validator changes and status change * PFM-4803 change name of kafka classes and main * PFM-4824 Cumulative value check (#1553) * Pfm 4807 contract revision validation (#1554) * PFM-4807 Validation for start date * PFM-4807 Refactored code as per sonarLint * PFM-4807 Subtracted currentValue if wfStatus is not approved * PFM-4807 wfStatus check * PFM-4807 lineItemRef check * PFM-4807 removed overhead category check * PFM-4807-revision-estimate-validation (#1556) * fixed logic in measurement validator * fixed validation logic * Update README.md (#1573) * PFM-5086-Validations-for-estimate (#1569) * [PFM 5086] Did some validations for estimate service * fixed some validations and refractored the code * Pfm 4807 contract document validation (#1562) * PFM-4807 removed overhead category check * PFM-4807 document validator contextPath change * Adding sequence diagram and db schema * moved db diagram from workflow config to documents * moved db diagram from workflow configs * if bussinessService is null then set businessService to 'CONTRACT'. * created bff for deviation-statement pdf (#1567) * created bff for deviation-statement pdf * Refactored the code * Refactored the code * refactored * Refactored the code * Refactored the code * Refactored * added validatin whether it's a revised estimate * added tenantId to pdfData * added condition if it's not a revised estimate (#1576) * added check condition for square bracket (#1577) * Enriched Workflow in the consumer according to revision estimate service (#1581) * created bff for measurement-book pdf (#1584) * created bff for measurement-book pdf * Refactored the code * fixed consumedQuantity and estimatedQuantity * refactored * Update EnrichmentService.java (#1583) * PFM-4664-Tech-Debt-Code-lint-recommendations-across-all-modules-muster-roll (#1564) * fixed muster roll service according to code lint suggestions * fixed cognitive complexity * fixed constructor injection for tests * reduced cognitive complexity * PFM-4664-Changed Names of Main File * PFM-4664-Tech-Debt-Code-lint-recommendations-across-all-modules-Organization (#1565) * fixed code in organization according to codelint * fixed code in organization according to codelint * removed cognitive complexity * fixed cognitive complexity * PFM-4664 Changed Names of Files * PFM-4664-Tech-Debt-Code-lint-recommendations-across-all-modules-expense (#1566) * fixed code according to sonarlint * reduced cognitive complexity * fixed constructor injection * PFM-4664-Changed-the-name-of-producer-and-consumer * fixed code according to code changes * Updated attendance query (#1514) * Updated attendance query * PFM-4454-Fixed attendance register and staff join query and made changes according to sonarlint * PFM-4664-Tech-Debt-Code-lint-recommendations-across-all-modules-expense-calculator (#1571) * fixed expense calculator according to sonar lint * did some refractoring * PFM-4664-Changed name of Main File * deleted workflowutil file --------- Co-authored-by: Shailesh Pandey <[email protected]> * Pfm 4666 effective to and from dates in mdms 2 (#1520) * [PFM-4666] filtered all data in expense service according to dates * [PFM-4666] added single function for filtering mdms on fetching of data * fixed effective from and to in expense-calculator * fixed the code according to sonar lint * resolved conflicts * PFM-4468 Organisation encryption service (#1599) * fixed some issues in validator (#1601) * ignoring tests for encryption (#1603) * created bff for detailed estimate pdf (#1596) * created bff for detailed estimate pdf * fixed totalEstimatedAmount * Refactored * If Overhead and non-sor having null sorId assigned 0 to non-sor * updated key template * removed tenantid check for mobile search (#1607) * Enriched measurement period and project location in mb pdf (#1610) * Enriched measurement period and project location in mb pdf * refactored * PFM-5098 elastic workflow status issue fix (#1612) * Added json ignore in pagination and org search criteria (#1614) * Fixed consumedQuantity and currentQuantity in mb pdf (#1615) * Fixed consumedQuantity and currentQuantity in mb pdf * Refactored * PFM-5129 measurement document update (#1618) * Master to develop sync (#1621) * PFM-4305 Login page issues (#1477) * PFM-4305 Updated css version (#1478) * PFM-4305 Login page issues * PFM-4305 updated css package version * PFM-4305 updated css for login and landing page (#1482) * Fixed the fixed row number of the table in view muster roll screen (#1499) * Merging the measurement-ui changes to master branch (#1617) * updating publish sh file to incormorate measurement module (#1619) * updated the version of measurement module (#1620) --------- Co-authored-by: vamshikrishnakole-wtt-egov <[email protected]> Co-authored-by: Tulika-eGov <[email protected]> * Updated versions for works-1.0 release --------- Co-authored-by: ansh-egov <[email protected]> Co-authored-by: Jagankumar <[email protected]> Co-authored-by: shubhang-egov <[email protected]> Co-authored-by: shubhang-eGov <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: admin1 <[email protected]> Co-authored-by: Rishabh-egov <[email protected]> Co-authored-by: ashish-egov <[email protected]> Co-authored-by: Lokendra Tyagi <[email protected]> Co-authored-by: Lokendra-egov <[email protected]> Co-authored-by: vamshikrishnakole-wtt-egov <[email protected]> Co-authored-by: Tulika-eGov <[email protected]>
* Project and Estimate Service API automation collections * Added Contract service script and update estimate and project * Added Postman Automation Preparation test document * Update README.md * Updated the script and added environments * Added Regression test suit * Updated script * Added Individual service * Update Contract Service - Postman Test Suite.postman_collection.json (#1558) * Update Contract Service - Postman Test Suite.postman_collection.json * Update QA.postman_environment.json * Update Estimate Service - Postman Test Suite.postman_collection.json (#1552) * Update Estimate Service - Postman Test Suite.postman_collection.json * Update Estimate Service - Postman Test Suite.postman_collection.json * Update Estimate Service - Postman Test Suite.postman_collection.json * Update Estimate Service - Postman Test Suite.postman_collection.json * New changes in contract,added Measurement services, new environment c… (#1623) * New changes in contract,added Measurement services, new environment created. 1.made some changes in contracts collection. 2. Created a new environment -Dev 3. Created a collection of automated test cases for Measurement Book service. * updated, the collections and environment. updated both the collection and environment. * Collection Updated collection Updated.. * Measurement Book changes are now updated. Updated the Measurement Book. * Changes in MB and Contract services Changes were made in MB and contract services.. --------- Co-authored-by: Anuraj <[email protected]> --------- Co-authored-by: TI-LAP-348\Vasanth Arunachalam <[email protected]> Co-authored-by: Vasanth26-egov <[email protected]> Co-authored-by: Anuraj <[email protected]> Co-authored-by: Anuraj <[email protected]>
* PFM-5389-Mukta-adapter-build-config * Changed Name of mukta adapter
* HLM-4496, HLM-4207, HLM-4894 - HCM Attendance changes * updated application.properties * HLM-4496: update works related consumer * HLM-5076 : added changes for session configuration while creating a attendance register * Revert "HLM-5076 : added changes for session configuration while creating a attendance register" This reverts commit 8879ec8. * Added session related changes * HLM-4496: updated individual search useruuid to list * updated application.properties
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the 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 as PR comments)
Additionally, you can add CodeRabbit Configuration File (
|
|
* [PFM-4665] removed splitting of tenant ids from all services (#1509) * [PFM-4665] removed splitting of tenant ids from all services * [PFM-4665]-removed-multiple-mdms-calls-from-estimates * [PFM-4665] fixed multiple mdms calls in organization service * fixed multiple mdms calls for expense service * fixed test cases for estimate serrvice * [PFM-4665]-removed-multiple-mdms-calls-from-estimates * fixed the test cases * Update AttendanceServiceValidator.java * removed commented tenant ids * fixed * fixed user util * Update ifms-adapter.iml * Delete reference-adapters/ifms-adapter/ifms-adapter.iml * Update CODEOWNERS --------- Co-authored-by: Jagankumar <[email protected]> * Pfm 1778 update estimate service documentation (#1521) * [PFM-1778] Added new postman collection for estimate service * Delete backend/estimates/Estimate Service Collection.postman_collection.json * Update Estimate_Service_Collection.postman_collection.json * Estimate sor cherry pick old (#1527) * added estimate changes from sorid-updated-estimate branch * check rates only if category sor * added flyway migration script * removing validator for testing * adding mdms criteria models * removed estimate update validator * added check if estimateDetails measurements are 0 * Changed Estimate validator from mdmsv2/v2 to mdmsv2/v1 * changed mdms search url from v2 to v1 and mdmsRes to MdmsRes * added check for SOR for update call * added check for SOR for update call * PFM-4879-Order by query fix (#1489) * made changes in validator to throw proper error * [PFM-4891] added validations for all fields (#1495) * [PFM-4891] fixed test cases for estimate-sor-cherry-pick * [PFM-4892] added all the validations for sor, non sor and overheads (#1500) * [PFM-4892] added all the validations for sor, non sor and overheads * [PFM-4892] added required validations for multiple sors * Setting audit details for update call * refractored the code for estimate service (#1503) * reftactored the code for estimate * fixed the valid date logic for validator * refractored the code * fixed the comments in estimate service * fixed workflow * removed comments * added required validations in estimate service (#1524) * added required validations in estimate service * fixed validator * ii * removed commented code * fixed variable names --------- Co-authored-by: shubhang-egov <[email protected]> Co-authored-by: shubhang-eGov <[email protected]> * PFM-4762 Impact of MB on contract service (#1525) * fixed test case (#1530) * Mb registry and service (#1518) * Codegen for measurement service * Formated files * Created Service * Added rowmapper and querybuilder * Added validator * Updated measurement model * updated build config to measurement-service (#1367) * added build config file for measurment service * build config file * updated build config --------- Co-authored-by: admin1 <[email protected]> * Codegen for measurement-registry * fix : fixed postgres driver issue * feat : implemented create-update-search endpoints * Refactor : Measurement - registry * feat : implemented create-update-search endpoints in Measurement-Service * feat : implemented create-update-search endpoints in Measurement-Service * Refactor : refactored measurement-service enrichment * fixed additional details, and removed unused files * fixed additional details, and removed unused files and dependencies * fixed additional details, and removed unused files and dependencies * Feat : implemented validation if workflow status is rejected * Feat : refactored configuration and application properties * feat : user who is creating that measurement will be assigned to it if it's saving as a draft * Refactor : refactored configuration and application properties * Refactor : refactored MeasurementRegistry.java * Refactor : removed println lines * Refactor : added https in filestore host * Added with build config * Resolved Controllers during build * Added Consumer for elasticSearch indexing * Updated self assignee workflow * Refactor : implemented restTemplate instead of httpget, renamed msService to MeasurementService * Feat : Implemented update according to workFlow actions * Fix : Validation for SOR , NON-SOR line items * Fix : PFM-4794 & PFM-4791 * Feat : Implemented workflow status based create for MeasurementService * Refactor : refactored Utils and Validators * Refactor : refactored Search api functions, Configurations, removed unused files,made string constants for reusability * Refactor : Renamed files according to module names * Refactor : Removed unused imports from MBRegistry/Service and removed unused constants from ServiceConstants * PFM-4185-Added notification feature to measurement service * Updated models to services-common-2.0.0 * Pfm 4794 wrong error message (#1486) * PFM-4794-Changed wrong error message if contract is not present * PFM-4794-Added localisation code * PFM-4794-Added localisation code (#1491) * PFM-4879-Sort order ASC DESC fix (#1493) * PFM-4882 added check for tenantId null (#1494) * PFM-4875 Added check if WO is in accepted state (#1496) * PFM-4879 mb service search order * PFM-4747-Fetching estimate id from contract service change (#1497) * PFM-4882-TenantId MeasurementService validator (#1498) * PFM-4601 From and to date search (#1501) * Removed unwanted object creation * Pfm 4930 code refactoring (#1506) * PFM-4930 Removed importing of models that are present in common-services from digit-models. * PFM-4930 Removed hard coded tenantId * PFM-4930 Changed id field type from UUID to String with max size 64 * PFM-4930 Removed unused model Order * PFM-4930 Removed unnecessary conversion * PFM-4927 Fetching only active measure to add to cumulative value (#1502) * PFM-4927 Fetching only active measure to add to cumulative value * PFM-4927 Making searchCriteria isActive default value null * PFM-4927 Fix for null pointer exception when length, breadth, height or num of items is null of 0 * PFM-4799 added comments field in rowmapper (#1504) * PFM-4930 taking mdms tenants from state level tenant id instead of seperate configuration * PFM-4689 Enriched elastic payload with workflow assignee (#1507) * PFM-4927 Setting is active false when action is rejected (#1508) * PFM-4930 Added workflow validator * PFM-4930 Removed ErrorConfiguration class and instead throwing CustomException wherever required * PFM-4930 Removed ErrorConfiguration class and instead throwing CustomException wherever required for mb registry * PFM-4930 Removed ErrorConfiguration class and instead throwing CustomException wherever required for mb service * Revert "PFM-4930 Removed ErrorConfiguration class and instead throwing CustomException wherever required for mb registry" This reverts commit 388086c. * Revert "Merge remote-tracking branch 'origin/mb-registry-and-service' into mb-registry-and-service" This reverts commit b0ca3b0, reversing changes made to c4279e4. * Revert "Revert "Merge remote-tracking branch 'origin/mb-registry-and-service' into mb-registry-and-service"" This reverts commit ff996d7. * Revert "PFM-4930 Removed ErrorConfiguration class and instead throwing CustomException wherever required for mb service" This reverts commit 31622cb. * PFM-4930 Error config string in mb registry * PFM-4930 Removed ErrorConfiguration object creation * PFM-4930 Removed ErrorConfiguration object creation and consolidated all error strings in one file for mb service * PFM-4930 Removed Constants from MBServiceConfiguration and moved to constants file * PFM-4930 Removed unused object and made a function to reduce complexity for mb registry * PFM-4930 Renamed strings with correct regular expression and removed hard-coding * Pfm 4953 estimate validator (#1517) * PFM-4953 added estimate quantity validator * PFM-4953 used stream filter * null check for measurement response * All dimension value 0 fix and error message change * Referring contract LineItems reference number instead of id as targetId * changing contract business service check and quantity validation --------- Co-authored-by: Shailesh Pandey <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: admin1 <[email protected]> Co-authored-by: Rishabh-egov <[email protected]> Co-authored-by: ashish-egov <[email protected]> Co-authored-by: Lokendra Tyagi <[email protected]> * Mb refactor cherry pick (#1535) * changing contract business service check and added service constants * refactor code as per sonarlint * [PFM-4970] Change revision create/update search function requires line item (#1539) * PFM-4824 Impact of revised contract on MB, changed validator to check for accepted state instead of approve for revised contract. (#1551) * Pfm 4841 impact of revision estimate on mb (#1549) * fixed test case * [PFM-4841] Fixed Impact On MB * [PFM-4841] added required fields to models * Pfm 4801 revised estimate (#1536) * [PFM-4801] revision estimate * cherry pick develop * [PFM-4801] revision estimate * added migration script * estimate create api * Update Estimate API * Search Estimate API * PFM-4801 refractored the code and added validation for contract * added measurement validation * refractored code * fixed test case * refractored code * refractored code * fixed some changes * refractored code * removed mandatory buisness service * fixed code according to test cases * added * fixed workflow inactive * fixed * f * added rate validation * x * fixed test case and changed application prop. * fixed previos line id validation on update * fixed measurement validation * added max limit for revision estimate * fixed code according to sonarlint suggestions * removed measurement validation in case of Reject action * fixed a test case * fixed measurement validation * fixed measurement validation * renamed files * Pfm 4803 contract revision (#1550) * PFM-4803 Contract Revision create update and validate flows * PFM-4803 Added validator and cleanup * PFM-4803 Added logs and cleanup * PFM-4803 SonarLint changes * PFM-4803 measurement validator changes and status change * PFM-4803 change name of kafka classes and main * PFM-4824 Cumulative value check (#1553) * Pfm 4807 contract revision validation (#1554) * PFM-4807 Validation for start date * PFM-4807 Refactored code as per sonarLint * PFM-4807 Subtracted currentValue if wfStatus is not approved * PFM-4807 wfStatus check * PFM-4807 lineItemRef check * PFM-4807 removed overhead category check * PFM-4807-revision-estimate-validation (#1556) * fixed logic in measurement validator * fixed validation logic * Update README.md (#1573) * PFM-5086-Validations-for-estimate (#1569) * [PFM 5086] Did some validations for estimate service * fixed some validations and refractored the code * Pfm 4807 contract document validation (#1562) * PFM-4807 removed overhead category check * PFM-4807 document validator contextPath change * Adding sequence diagram and db schema * moved db diagram from workflow config to documents * moved db diagram from workflow configs * if bussinessService is null then set businessService to 'CONTRACT'. * created bff for deviation-statement pdf (#1567) * created bff for deviation-statement pdf * Refactored the code * Refactored the code * refactored * Refactored the code * Refactored the code * Refactored * added validatin whether it's a revised estimate * added tenantId to pdfData * added condition if it's not a revised estimate (#1576) * added check condition for square bracket (#1577) * Enriched Workflow in the consumer according to revision estimate service (#1581) * created bff for measurement-book pdf (#1584) * created bff for measurement-book pdf * Refactored the code * fixed consumedQuantity and estimatedQuantity * refactored * Update EnrichmentService.java (#1583) * PFM-4664-Tech-Debt-Code-lint-recommendations-across-all-modules-muster-roll (#1564) * fixed muster roll service according to code lint suggestions * fixed cognitive complexity * fixed constructor injection for tests * reduced cognitive complexity * PFM-4664-Changed Names of Main File * PFM-4664-Tech-Debt-Code-lint-recommendations-across-all-modules-Organization (#1565) * fixed code in organization according to codelint * fixed code in organization according to codelint * removed cognitive complexity * fixed cognitive complexity * PFM-4664 Changed Names of Files * PFM-4664-Tech-Debt-Code-lint-recommendations-across-all-modules-expense (#1566) * fixed code according to sonarlint * reduced cognitive complexity * fixed constructor injection * PFM-4664-Changed-the-name-of-producer-and-consumer * fixed code according to code changes * Updated attendance query (#1514) * Updated attendance query * PFM-4454-Fixed attendance register and staff join query and made changes according to sonarlint * PFM-4664-Tech-Debt-Code-lint-recommendations-across-all-modules-expense-calculator (#1571) * fixed expense calculator according to sonar lint * did some refractoring * PFM-4664-Changed name of Main File * deleted workflowutil file --------- Co-authored-by: Shailesh Pandey <[email protected]> * Pfm 4666 effective to and from dates in mdms 2 (#1520) * [PFM-4666] filtered all data in expense service according to dates * [PFM-4666] added single function for filtering mdms on fetching of data * fixed effective from and to in expense-calculator * fixed the code according to sonar lint * resolved conflicts * PFM-4468 Organisation encryption service (#1599) * fixed some issues in validator (#1601) * ignoring tests for encryption (#1603) * created bff for detailed estimate pdf (#1596) * created bff for detailed estimate pdf * fixed totalEstimatedAmount * Refactored * If Overhead and non-sor having null sorId assigned 0 to non-sor * updated key template * removed tenantid check for mobile search (#1607) * Enriched measurement period and project location in mb pdf (#1610) * Enriched measurement period and project location in mb pdf * refactored * PFM-5098 elastic workflow status issue fix (#1612) * Added json ignore in pagination and org search criteria (#1614) * Fixed consumedQuantity and currentQuantity in mb pdf (#1615) * Fixed consumedQuantity and currentQuantity in mb pdf * Refactored * PFM-5129 measurement document update (#1618) * Master to develop sync (#1621) * PFM-4305 Login page issues (#1477) * PFM-4305 Updated css version (#1478) * PFM-4305 Login page issues * PFM-4305 updated css package version * PFM-4305 updated css for login and landing page (#1482) * Fixed the fixed row number of the table in view muster roll screen (#1499) * Merging the measurement-ui changes to master branch (#1617) * updating publish sh file to incormorate measurement module (#1619) * updated the version of measurement module (#1620) --------- Co-authored-by: vamshikrishnakole-wtt-egov <[email protected]> Co-authored-by: Tulika-eGov <[email protected]> * Muster roll start date end date query fix (#1624) * Added logic to check cumulative value in estimate (#1633) * changed request info for cronjob (#1672) * changed request info for cronjob * changed request info for cronjob * Added userInfo directly * reverting userinfo changes --------- Co-authored-by: shubhang-egov <[email protected]> * Pfm 5103 ifms adapter sanction and allocation (#1667) * [PFM-5103] IFMS Create allocation and sanction flow * did some refractoring * created disburse create api * completed-ifms-disburse-revised-flow * added encryption in the service * added decryption of payment instruction service * PFM-5111-IFMS Adapter - PI status API's * fixed onsanction and onallocation flow * fixed connection of program service * added transactionid * changed api endpoint * changed migration file * fixed custom response from jit * fixed model * changed classpath loading * changed classpath loading * changed behaviour of insufficient fund error on disburse create * added transactionid for disbursement * removed encryption service * added validations and restructured onSanction and onAllocation request * added header validation * fixed funds search * changed enc client * added bankAccountCode * added message validation * added additional details in disbursement * fixed allocation payload * fixed allocation payload * fixed logic for getting sended id and reciever id * removed payment fetching * fixed some code in mdms utils * added statelevel tenantId search in exchange server pi search * added some more amount to allocations * changed user calling in ifms * Pfm 5103 issues fixes (#1671) * Updated allocation type in model * Added subract logic for fund after payment initiated * fixed the on disburse search * fixed validations * removed the signature and added some comments --------- Co-authored-by: Shailesh Pandey <[email protected]> * PFM-5633-MUKTA-IFIX-ADAPTER (#1669) * moved mukta ifix adapter from mukta-service-adapter to PFM-5633 * fixed the on disburse search * fixed the on disburse search * fixed the on disburse search * added exchange codes and encription * added logic to enrich random codes * added geographic segment codes * added decryption of disbursement * adding type in exchange code (#1674) * removed commented code from ifms adapter (#1687) * fixed application properties (#1690) * PFM-5961 : Changed DB migration for error message (#1689) * PFM-5961 : Changed DB migration for error message * fixed parsing of net amount and gross amount after enc --------- Co-authored-by: Shailesh Pandey <[email protected]> * reverted jit connection in ifms (#1688) * Added rest template config to disable SSL check (#1696) * Added rest template config to disable SSL check * Added special symbol removal logic and changed id for revised PI --------- Co-authored-by: Shailesh Pandey <[email protected]> * altered bank account code column for ifms (#1698) * changed ifms-adapter url filling logic (#1704) * changed ifms-adapter url filling logic * changed program service endpoint * Ifms adapter url changes (#1705) * changed ifms-adapter url filling logic * changed program service endpoint * changed program endpoint in config file * changed sender uri and reciever url (#1706) * removed signature validation from adapter (#1709) * added account type in disbursement (#1710) * changed sender uri and reciever url (#1708) * changed sender uri and reciever url * added account type in disbursement * removed some hardcoding * Added session time before calling ifms API (#1711) Co-authored-by: Shailesh Pandey <[email protected]> * changed sender uri and reciever url (#1712) * changed sender uri and reciever url * added account type in disbursement * removed some hardcoding * changed on disburse url * added beneficiary id in additional details of childrens (#1713) * added beneficiary id in additional details of childrens * fixed addtional details enrichment in pi * fixed beneficiary detail id * fixed payment updation on successful creation of disbursement * fixed benf id in beneficiary * fixed on disburse api * added some fields in additional details * Updated bill ids and ref ids for additional details --------- Co-authored-by: Shailesh Pandey <[email protected]> * Mukta beneficiary id fix (#1714) * added beneficiary id in additional details of childrens * fixed addtional details enrichment in pi * fixed beneficiary detail id * fixed payment updation on successful creation of disbursement * fixed benf id in beneficiary * fixed on disburse api * added some fields in additional details * changed benfLineItems to line items in benfMap * changed benfLineItems to line items in benfMap * updated payment status for payment (#1715) * added on disburse call for revised pi (#1717) * added on disburse call for revised pi * changed validation for mukta-ifix-adapter * added on disburse call for revised pi (#1718) * added on disburse call for revised pi * changed validation for mukta-ifix-adapter * changed status message * changed some logic for on disburse * changed some logic for on disburse * changed some logic for on disburse * changed payment updation on case of completed (#1721) * Disbursement payment update (#1722) * changed payment updation on case of completed * changed payment updation on case of completed * Disbursement payment update (#1723) * changed payment updation on case of completed * changed payment updation on case of completed * changed payment updation on case of completed * Disbursement payment update (#1724) * changed payment updation on case of completed * changed payment updation on case of completed * changed payment updation on case of completed * changed payment updation on case of completed * changed payment updation on case of completed (#1725) * Pfm 5934 works postman collectiom (#1728) * Project and Estimate Service API automation collections * Added Contract service script and update estimate and project * Added Postman Automation Preparation test document * Update README.md * Updated the script and added environments * Added Regression test suit * Updated script * Added Individual service * Update Contract Service - Postman Test Suite.postman_collection.json (#1558) * Update Contract Service - Postman Test Suite.postman_collection.json * Update QA.postman_environment.json * Update Estimate Service - Postman Test Suite.postman_collection.json (#1552) * Update Estimate Service - Postman Test Suite.postman_collection.json * Update Estimate Service - Postman Test Suite.postman_collection.json * Update Estimate Service - Postman Test Suite.postman_collection.json * Update Estimate Service - Postman Test Suite.postman_collection.json * Works Postman collection All the services of works , are available here. Full end to end automation of works platform. * Changes made due to some failures Changes were added. --------- Co-authored-by: TI-LAP-348\Vasanth Arunachalam <[email protected]> Co-authored-by: Vasanth26-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: Anuraj <[email protected]> * Updated secrets in ifms-adapter * Commented rest-template certificate bypass logic --------- Co-authored-by: Jagankumar <[email protected]> Co-authored-by: shubhang-egov <[email protected]> Co-authored-by: shubhang-eGov <[email protected]> Co-authored-by: Shailesh Pandey <[email protected]> Co-authored-by: nitish-egov <[email protected]> Co-authored-by: admin1 <[email protected]> Co-authored-by: Rishabh-egov <[email protected]> Co-authored-by: ashish-egov <[email protected]> Co-authored-by: Lokendra Tyagi <[email protected]> Co-authored-by: Lokendra-egov <[email protected]> Co-authored-by: vamshikrishnakole-wtt-egov <[email protected]> Co-authored-by: Tulika-eGov <[email protected]> Co-authored-by: Anuraj <[email protected]> Co-authored-by: TI-LAP-348\Vasanth Arunachalam <[email protected]> Co-authored-by: Vasanth26-egov <[email protected]> Co-authored-by: Anuraj <[email protected]>
#1746) * HLM-5539, 5361: updated attendance module, updated individual search parameters * Update CHANGELOG.md * Update pom.xml * Update CHANGELOG.md --------- Co-authored-by: kavi_elrey@1993 <[email protected]>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| spring.datasource.username=egov | ||
| spring.datasource.password=egov | ||
| spring.datasource.username=postgres | ||
| spring.datasource.password=1234 |
Check failure
Code scanning / SonarCloud
Credentials should not be hard-coded High
| spring.datasource.driver-class-name=org.postgresql.Driver | ||
| spring.datasource.url=jdbc:postgresql://localhost:5432/digit-works | ||
| spring.datasource.username=postgres | ||
| spring.datasource.password=1234 |
Check failure
Code scanning / SonarCloud
Credentials should not be hard-coded High
| spring.flyway.user=egov | ||
| spring.flyway.password=egov | ||
| spring.flyway.user=postgres | ||
| spring.flyway.password=1234 |
Check failure
Code scanning / SonarCloud
Credentials should not be hard-coded High
| spring.datasource.username=egov | ||
| spring.datasource.password=egov | ||
| spring.datasource.username=postgres | ||
| spring.datasource.password=1234 |
Check failure
Code scanning / SonarCloud
Credentials should not be hard-coded High
* added redis config in disbursement * added redis config in disbursement * added redis config in disbursement * added already created validation in consumer * Update DisbursementService.java Added functionality of saving pi in db beffore sending it to jit * Fixed shown disburement amount in pi Fixed shown disburement amount in pi * Update RedisService.java Added some log for redis * Update DisbursementService.java saved pi details before calling to JIT * added caching to check weather payment is already processed * added caching to check weather payment is already processed * Added test payment create and added better error handling in ifms * Added test payment create and added better error handling in ifms * Fixed issue of on disburse * rollback ifms service * added caching to check weather payment is already processed * removed ssl certification * removed ssl * added caching to check weather payment is already processed * Added error queue in ifms adapter. * fixed sort order in disburse query * Added queue for error * fixed disburse enrich * fixed on-disburse * fixed on-disburse * fixed disburse mukta ref id * fixed pi search * fixed disburse search * fixed disburse search * fixed disburse search --------- Co-authored-by: Shailesh Pandey <[email protected]>
Co-authored-by: Shailesh Pandey <[email protected]>
* HLM 2.9lts updated flyway for health attendance * Update pom.xml * Updated CHANGELOG.md * Updated CHANGELOG.md, added flyway migration update changelog * Update backend/attendance/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>
* HLM 2.9lts updated flyway for health attendance * Update pom.xml * Updated CHANGELOG.md * Updated CHANGELOG.md, added flyway migration update changelog * HLM added first staff insert check to validate the attendee for hcm use case --------- Co-authored-by: kavi_elrey@1993 <[email protected]>
* set limit to null (#1748) * set limit to null * removed workflow util * revert pagination limit * set limit to null in bank accounts * Updated coderabit config for develop (#1754) Co-authored-by: Shailesh Pandey <[email protected]> * PFM-5342 muster roll cherry pick (#1739) * PFM-5342 muster roll changes for sor migration * PFM-5342 added mdmsV2 host * PFM-4167-Rate analysis pdf (#1765) * PFM-4167-Rate analysis pdf transformation * added code for pdf * Added logic for pdf creation * changed host * Update config.js * changed end points * changed name * changed context path * c * added sorting of data for pdf * added sorting of data for pdf * added sorting of data for pdf * added not null tenant id criteria * added round off in amount * added round off in amount * added round off in amount * added round off in amount * added round off in amount * Pfm 4167 rate analysis pdf (#1766) * PFM-4167-Rate analysis pdf transformation * added code for pdf * Added logic for pdf creation * changed host * Update config.js * changed end points * changed name * changed context path * c * added sorting of data for pdf * added sorting of data for pdf * added sorting of data for pdf * added not null tenant id criteria * added round off in amount * added round off in amount * added round off in amount * added round off in amount * added round off in amount * added localization modules * Pfm 5343 labour migration cherry pick (#1740) * PFM-5343 Service changes to fetch rate from sor * PFM-5343 Changes rate details as a list in sor details * PFM-5343 added exceptions * PFM-5343 added mdms v2 host * changed validation time to string * PFM-5342 worflow model change * Updated version for works 1.1 relese (#1774) Co-authored-by: shailesh-egov <[email protected]> * Master to develop sync (#1775) * HLM-5539, 5361: updated attendance module, updated individual search … (#1746) * HLM-5539, 5361: updated attendance module, updated individual search parameters * Update CHANGELOG.md * Update pom.xml * Update CHANGELOG.md --------- Co-authored-by: kavi_elrey@1993 <[email protected]> * added rate analysis (#1747) * added redis config in disbursement (#1736) * added redis config in disbursement * added redis config in disbursement * added redis config in disbursement * added already created validation in consumer * Update DisbursementService.java Added functionality of saving pi in db beffore sending it to jit * Fixed shown disburement amount in pi Fixed shown disburement amount in pi * Update RedisService.java Added some log for redis * Update DisbursementService.java saved pi details before calling to JIT * added caching to check weather payment is already processed * added caching to check weather payment is already processed * Added test payment create and added better error handling in ifms * Added test payment create and added better error handling in ifms * Fixed issue of on disburse * rollback ifms service * added caching to check weather payment is already processed * removed ssl certification * removed ssl * added caching to check weather payment is already processed * Added error queue in ifms adapter. * fixed sort order in disburse query * Added queue for error * fixed disburse enrich * fixed on-disburse * fixed on-disburse * fixed disburse mukta ref id * fixed pi search * fixed disburse search * fixed disburse search * fixed disburse search --------- Co-authored-by: Shailesh Pandey <[email protected]> * Update build-config.yml (#1751) * Updated coderabit config for master (#1753) Co-authored-by: Shailesh Pandey <[email protected]> * HLM lts updated flyway for health attendance (#1749) * HLM 2.9lts updated flyway for health attendance * Update pom.xml * Updated CHANGELOG.md * Updated CHANGELOG.md, added flyway migration update changelog * Update backend/attendance/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> * Hcm lts master flyway imageupdate (#1764) * HLM 2.9lts updated flyway for health attendance * Update pom.xml * Updated CHANGELOG.md * Updated CHANGELOG.md, added flyway migration update changelog * HLM added first staff insert check to validate the attendee for hcm use case --------- Co-authored-by: kavi_elrey@1993 <[email protected]> --------- Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: kavi_elrey@1993 <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: Shailesh Pandey <[email protected]> Co-authored-by: manastanmay-eGov <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: Lokendra-egov <[email protected]> Co-authored-by: ansh-egov <[email protected]> Co-authored-by: Shailesh Pandey <[email protected]> Co-authored-by: shailesh-egov <[email protected]> Co-authored-by: kanishq-egov <[email protected]> Co-authored-by: kavi_elrey@1993 <[email protected]> Co-authored-by: manastanmay-eGov <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
|
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.
No description provided.