Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Develop to master v1.0 for works-release (#1622)
* [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 <53823168+jagankumar-egov@users.noreply.github.com> * 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 <shubhang.dhanesha@egovernments.org> Co-authored-by: shubhang-eGov <70943369+shubhang-eGov@users.noreply.github.com> * 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 <nitish@egovernments.org> * 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 <110380977+shailesh-egov@users.noreply.github.com> Co-authored-by: nitish-egov <137176807+nitish-egov@users.noreply.github.com> Co-authored-by: admin1 <nitish@egovernments.org> Co-authored-by: Rishabh-egov <rishabh.jain@egovernments.org> Co-authored-by: ashish-egov <ashish.tiwari@egovernments.org> Co-authored-by: Lokendra Tyagi <lokendra.tyagi@egovernments.org> * 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 <110380977+shailesh-egov@users.noreply.github.com> * 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 <57343517+vamshikrishnakole-wtt-egov@users.noreply.github.com> Co-authored-by: Tulika-eGov <74046137+Tulika-eGov@users.noreply.github.com> * Updated versions for works-1.0 release --------- Co-authored-by: ansh-egov <137172017+ansh-egov@users.noreply.github.com> Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Co-authored-by: shubhang-egov <shubhang.dhanesha@egovernments.org> Co-authored-by: shubhang-eGov <70943369+shubhang-eGov@users.noreply.github.com> Co-authored-by: nitish-egov <137176807+nitish-egov@users.noreply.github.com> Co-authored-by: admin1 <nitish@egovernments.org> Co-authored-by: Rishabh-egov <rishabh.jain@egovernments.org> Co-authored-by: ashish-egov <ashish.tiwari@egovernments.org> Co-authored-by: Lokendra Tyagi <lokendra.tyagi@egovernments.org> Co-authored-by: Lokendra-egov <137176739+Lokendra-egov@users.noreply.github.com> Co-authored-by: vamshikrishnakole-wtt-egov <57343517+vamshikrishnakole-wtt-egov@users.noreply.github.com> Co-authored-by: Tulika-eGov <74046137+Tulika-eGov@users.noreply.github.com>
- Loading branch information
13 people
committed
Jan 2, 2024
1 parent
f2fa17c
commit 743b081