-
Notifications
You must be signed in to change notification settings - Fork 16
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Master flyway imageupdate #791
Conversation
…nges to get all … (#769) * HLM Health-HRMS bug fix, user was set to null in hrms update as the t… (#761) * HLM Health-HRMS bug fix, user was set to null in hrms update as the tenantid was not provided during internal search * HLM updated hrms user type * updated type from individual create * Addressed code review comments * Added code comments and fixme todo as per code review comments * HLM updated flyway migration docker version * Revert "HLM updated flyway migration docker version" This reverts commit 1f1167e. * Updated code comments on EmployeeService update method * Update EmployeeService.java * Updated code comments on EmployeeService, added changes for NPE handling --------- Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com> * HLM-6196: updated GenericQueryBuilder.java, added changes to get all the fields except Object class * hlm-6196: update common library reference for dev testing" * HLM-6196: updated health-service-common version to 1.0.17-SNAPSHOT and added default for included deleted * HLM-6196: updated genericrepository * HLM-6196: fixed testcases * HLM-6196: fixed individual search query error * taskresource additional fields column added * HLM-6196: updated health services models TaskResource, added AdditionalField * HLM-6196: hfreferral, referral, sideeffect - edge case fix * HLM-6196: removed todo from urlparams --------- Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com> Co-authored-by: Vishal <sarasani.vishalreddy@egovernments.org>
* HLM-6196: updated @component in validators for client reference id validation * HLM-6196: fixed testcases for stock and individual * HLM-6196: added missing migration file * HLM-6196: updated IndividualSearch model, added exclude annotation on individual name * HLM-6196: rectifying egov-hrms individual search object commit * HLM-6196: updated health services common for model exclude field fix * Revert "HLM-6196: updated @component in validators for client reference id validation" This reverts commit 6e915a0. * Revert "HLM-6196: fixed testcases for stock and individual" This reverts commit ce90104. * HLM-6196: added comments as per code review * Update IndividualSearch.java --------- Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com>
#781) * HLM-6196: updated @component in validators for client reference id validation * HLM-6196: fixed testcases for stock and individual * HLM-6196: added missing migration file * HLM-6196: updated IndividualSearch model, added exclude annotation on individual name * HLM-6196: rectifying egov-hrms individual search object commit * HLM-6196: updated health services common for model exclude field fix * Revert "HLM-6196: updated @component in validators for client reference id validation" This reverts commit 6e915a0. * Revert "HLM-6196: fixed testcases for stock and individual" This reverts commit ce90104. * Revert "Revert "HLM-6196: updated @component in validators for client reference id validation"" This reverts commit 2218ad3. * Revert "Revert "HLM-6196: fixed testcases for stock and individual"" This reverts commit 083c516. * HLM-6196: replaced RuntimeException with CustomException * HLM-6196: updated to get only message from exception * HLM-6196: updated individual search as it was with exclude annotation
WalkthroughThe recent updates span multiple modules within the health services project, addressing functionality and compatibility improvements. Major changes include upgrades to dependencies like PostgreSQL driver, Flyway versions, and migrating Java base images for Dockerfiles. Notably, method parameter validations and package structure refinements have been added, alongside adjustments in the search class functionality and enhanced test logging for entity validation. Changes
Poem
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 Configration File (
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 17
Outside diff range comments (6)
health-services/product/CHANGELOG.md (1)
Line range hint
7-7
: Ensure the file ends with a single newline character.Tools
Markdownlint
1-1: null (MD041, first-line-heading, first-line-h1)
First line in a file should be a top-level headinghealth-services/product/README.md (1)
Line range hint
30-36
: Consider revising the repetitive sentence structure for clarity and engagement.- * POST `/v1/_search` - Search Product, This API is used to search existing product. - * POST `/variant/v1/_create` - Create Product variant, This API is used to create/add a new product variant. - * POST `/variant/v1/_update` - Update Product variant, This API is used to update the details of an existing product variant. - * POST `/variant/v1/_search` - Search Product variant, This API is used to search existing product variant. + * POST `/v1/_search` - Search for an existing product. + * POST `/variant/v1/_create` - Add a new product variant. + * POST `/variant/v1/_update` - Update an existing product variant. + * POST `/variant/v1/_search` - Search for an existing product variant.health-services/individual/src/main/java/org/egov/individual/validators/INonExistentEntityValidator.java (1)
Line range hint
76-91
: The exception handling logic is clear and appropriate. However, consider adding more detailed logging before throwingCustomException
to aid in debugging.try { // Existing code... } catch (Exception e) { log.error("Search failed for Individual with error: {}", e.getMessage(), e); throw new CustomException("INDIVIDUAL_SEARCH_FAILED", "Search Failed for Individual, " + e.getMessage()); }health-services/individual/src/main/java/org/egov/individual/repository/IndividualRepository.java (3)
Line range hint
69-70
: Consider parameterizing SQL queries to prevent SQL injection risks.- String individualQuery = String.format(getQuery("SELECT * FROM individual WHERE %s IN (:ids)", includeDeleted), idColumn); + String individualQuery = getQuery(String.format("SELECT * FROM individual WHERE %s IN (:ids)", idColumn), includeDeleted);
Line range hint
107-108
: Refactor method to reduce complexity and improve maintainability.Consider breaking down this method into smaller, more focused methods, each handling a specific part of the search logic.
Line range hint
152-154
: Avoid direct manipulation of SQL query strings to enhance maintainability and prevent potential errors.- query = query.replace("LIMIT :limit OFFSET :offset", ""); + // Use a parameterized approach or a dedicated method to modify queries
Review details
Configuration used: .coderabbit.yaml
Review profile: ASSERTIVE
Files ignored due to path filters (2)
core-services/attendance/src/main/resources/attendance-service-db-schema.png
is excluded by!**/*.png
core-services/attendance/src/main/resources/attendance-service-test-coverage-report.png
is excluded by!**/*.png
Files selected for processing (55)
- core-services/egov-hrms/pom.xml (1 hunks)
- core-services/egov-hrms/src/main/java/org/egov/hrms/service/EmployeeService.java (3 hunks)
- core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java (3 hunks)
- core-services/egov-hrms/src/main/java/org/egov/hrms/web/controller/EmployeeController.java (1 hunks)
- core-services/egov-hrms/src/main/java/org/egov/hrms/web/models/IndividualSearch.java (1 hunks)
- core-services/egov-hrms/src/main/java/org/egov/hrms/web/validator/EmployeeValidator.java (1 hunks)
- core-services/egov-hrms/src/main/resources/db/Dockerfile (1 hunks)
- core-services/egov-hrms/src/main/resources/db/migrate.sh (1 hunks)
- core-services/egov-hrms/src/test/resources/db/Dockerfile (1 hunks)
- core-services/egov-hrms/src/test/resources/db/migrate.sh (1 hunks)
- core-services/egov-survey-services/src/main/resources/db/Dockerfile (1 hunks)
- core-services/egov-survey-services/src/main/resources/db/migrate.sh (1 hunks)
- core-services/pgr-services/pom.xml (1 hunks)
- core-services/pgr-services/src/main/resources/db/Dockerfile (1 hunks)
- core-services/pgr-services/src/main/resources/db/migrate.sh (1 hunks)
- core-services/service-request/pom.xml (1 hunks)
- core-services/service-request/src/main/resources/db/Dockerfile (1 hunks)
- core-services/service-request/src/main/resources/db/migrate.sh (1 hunks)
- health-services/facility/pom.xml (2 hunks)
- health-services/facility/src/main/java/org/egov/facility/validator/FBoundaryValidator.java (1 hunks)
- health-services/facility/src/main/resources/db/Dockerfile (1 hunks)
- health-services/facility/src/main/resources/db/migrate.sh (1 hunks)
- health-services/household/pom.xml (1 hunks)
- health-services/household/src/main/java/org/egov/household/household/member/validators/HmExistentEntityValidator.java (2 hunks)
- health-services/household/src/main/java/org/egov/household/household/member/validators/HmNonExistentEntityValidator.java (4 hunks)
- health-services/household/src/main/java/org/egov/household/validators/household/HBoundaryValidator.java (1 hunks)
- health-services/household/src/main/java/org/egov/household/validators/household/HExistentEntityValidator.java (2 hunks)
- health-services/household/src/main/java/org/egov/household/validators/household/HNonExistentEntityValidator.java (2 hunks)
- health-services/household/src/main/resources/db/migrate.sh (1 hunks)
- health-services/individual/pom.xml (1 hunks)
- health-services/individual/src/main/java/org/egov/individual/repository/IndividualRepository.java (1 hunks)
- health-services/individual/src/main/java/org/egov/individual/validators/IBoundaryValidator.java (1 hunks)
- health-services/individual/src/main/java/org/egov/individual/validators/IExistentEntityValidator.java (2 hunks)
- health-services/individual/src/main/java/org/egov/individual/validators/INonExistentEntityValidator.java (3 hunks)
- health-services/individual/src/main/java/org/egov/individual/validators/NonExistentEntityValidator.java (2 hunks)
- health-services/individual/src/main/resources/db/Dockerfile (1 hunks)
- health-services/individual/src/main/resources/db/migrate.sh (1 hunks)
- health-services/individual/src/test/java/org/egov/individual/validator/NonExistentEntityValidatorTest.java (4 hunks)
- health-services/libraries/health-services-common/pom.xml (1 hunks)
- health-services/libraries/health-services-common/src/main/java/org/egov/common/data/query/builder/GenericQueryBuilder.java (4 hunks)
- health-services/libraries/health-services-common/src/main/java/org/egov/common/data/query/builder/QueryFieldChecker.java (2 hunks)
- health-services/libraries/health-services-common/src/main/java/org/egov/common/data/repository/GenericRepository.java (1 hunks)
- health-services/libraries/health-services-common/src/test/java/org/egov/common/data/query/GenericQueryBuilderTest.java (3 hunks)
- health-services/libraries/health-services-models/src/main/java/org/egov/common/models/core/URLParams.java (2 hunks)
- health-services/libraries/health-services-models/src/main/java/org/egov/common/models/individual/IndividualSearch.java (1 hunks)
- health-services/libraries/health-services-models/src/main/java/org/egov/common/models/project/TaskResource.java (2 hunks)
- health-services/product/CHANGELOG.md (1 hunks)
- health-services/product/README.md (1 hunks)
- health-services/product/pom.xml (2 hunks)
- health-services/product/src/main/java/org/egov/product/repository/rowmapper/ProductRowMapper.java (1 hunks)
- health-services/product/src/main/java/org/egov/product/repository/rowmapper/ProductVariantRowMapper.java (1 hunks)
- health-services/product/src/main/java/org/egov/product/web/controllers/ProductApiController.java (4 hunks)
- health-services/product/src/main/java/org/egov/product/web/models/ProductSearch.java (1 hunks)
- health-services/product/src/main/java/org/egov/product/web/models/ProductVariantSearch.java (1 hunks)
- health-services/product/src/main/resources/db/Dockerfile (1 hunks)
Files not processed due to max files limit (36)
- health-services/product/src/main/resources/db/migrate.sh
- health-services/product/src/test/java/org/egov/product/service/ProductServiceSearchTest.java
- health-services/product/src/test/java/org/egov/product/web/controllers/ProductVariantApiControllerTest.java
- health-services/project/pom.xml
- health-services/project/src/main/java/org/egov/project/repository/rowmapper/TaskResourceRowMapper.java
- health-services/project/src/main/java/org/egov/project/util/BoundaryV2Util.java
- health-services/project/src/main/java/org/egov/project/validator/beneficiary/PbExistentEntityValidator.java
- health-services/project/src/main/java/org/egov/project/validator/beneficiary/PbNonExistentEntityValidator.java
- health-services/project/src/main/java/org/egov/project/validator/task/PtExistentEntityValidator.java
- health-services/project/src/main/java/org/egov/project/validator/task/PtNonExistentEntityValidator.java
- health-services/project/src/main/resources/db/Dockerfile
- health-services/project/src/main/resources/db/migrate.sh
- health-services/project/src/main/resources/db/migration/main/V20231121145400__task_resource_quantity_type_ddl.sql
- health-services/project/src/main/resources/db/migration/main/V20231127145800__task_resource_additional_fields_ddl.sql
- health-services/referralmanagement/pom.xml
- health-services/referralmanagement/src/main/java/org/egov/referralmanagement/repository/HFReferralRepository.java
- health-services/referralmanagement/src/main/java/org/egov/referralmanagement/repository/ReferralRepository.java
- health-services/referralmanagement/src/main/java/org/egov/referralmanagement/repository/SideEffectRepository.java
- health-services/referralmanagement/src/main/java/org/egov/referralmanagement/validator/RmExistentEntityValidator.java
- health-services/referralmanagement/src/main/java/org/egov/referralmanagement/validator/RmNonExistentEntityValidator.java
- health-services/referralmanagement/src/main/java/org/egov/referralmanagement/validator/hfreferral/HfrExistentEntityValidator.java
- health-services/referralmanagement/src/main/java/org/egov/referralmanagement/validator/hfreferral/HfrNonExistentEntityValidator.java
- health-services/referralmanagement/src/main/java/org/egov/referralmanagement/validator/sideeffect/SeExistentEntityValidator.java
- health-services/referralmanagement/src/main/java/org/egov/referralmanagement/validator/sideeffect/SeNonExistentEntityValidator.java
- health-services/referralmanagement/src/main/resources/db/Dockerfile
- health-services/referralmanagement/src/main/resources/db/migrate.sh
- health-services/stock/pom.xml
- health-services/stock/src/main/java/org/egov/stock/validator/stock/SExistentEntityValidator.java
- health-services/stock/src/main/java/org/egov/stock/validator/stock/SNonExistentValidator.java
- health-services/stock/src/main/java/org/egov/stock/validator/stockreconciliation/SrExistentEntityValidator.java
- health-services/stock/src/main/java/org/egov/stock/validator/stockreconciliation/SrNonExistentValidator.java
- health-services/stock/src/main/resources/db/Dockerfile
- health-services/stock/src/main/resources/db/migrate.sh
- health-services/stock/src/test/java/org/egov/stock/validator/NonExistentEntityValidatorTest.java
- health-services/transformer/pom.xml
- health-services/transformer/src/main/java/org/egov/transformer/service/ProjectService.java
Additional context used
Learnings (1)
core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java (2)
User: kanishq-egov PR: egovernments/health-campaign-services#761 File: core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java:348-348 Timestamp: 2024-06-04T08:00:00.249Z Learning: In the `IndividualService.java` and related files, `common.UserDetails` contains `UserType` as an Enum, while `hrms.User` contains type as a String. The conversion between these types is handled properly.
User: kanishq-egov PR: egovernments/health-campaign-services#761 File: core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java:167-167 Timestamp: 2024-06-04T08:00:20.464Z Learning: In the `IndividualService` class within the `egov-hrms` module, `common.UserDetails` uses `UserType` as an enum, whereas `hrms.User` uses type as a string. The conversion between these types is handled appropriately in the code.
Markdownlint
health-services/product/CHANGELOG.md
1-1: null (MD041, first-line-heading, first-line-h1)
First line in a file should be a top-level heading
7-7: null (MD047, single-trailing-newline)
Files should end with a single newline characterhealth-services/product/README.md
3-3: Expected: h2; Actual: h3 (MD001, heading-increment)
Heading levels should only increment by one level at a time
26-26: Expected: dash; Actual: asterisk (MD004, ul-style)
Unordered list style
28-28: Expected: dash; Actual: asterisk (MD004, ul-style)
Unordered list style
30-30: Expected: dash; Actual: asterisk (MD004, ul-style)
Unordered list style
32-32: Expected: dash; Actual: asterisk (MD004, ul-style)
Unordered list style
34-34: Expected: dash; Actual: asterisk (MD004, ul-style)
Unordered list style
36-36: Expected: dash; Actual: asterisk (MD004, ul-style)
Unordered list style
10-10: Expected: 1; Actual: 2 (MD012, no-multiple-blanks)
Multiple consecutive blank lines
45-45: Expected: 1; Actual: 2 (MD012, no-multiple-blanks)
Multiple consecutive blank lines
3-3: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
11-11: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
14-14: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
21-21: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
12-12: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
8-8: Element: img (MD033, no-inline-html)
Inline HTML
17-17: null (MD034, no-bare-urls)
Bare URL used
Shellcheck
core-services/egov-hrms/src/main/resources/db/migrate.sh
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
core-services/egov-hrms/src/test/resources/db/migrate.sh
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
core-services/egov-survey-services/src/main/resources/db/migrate.sh
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
core-services/pgr-services/src/main/resources/db/migrate.sh
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
core-services/service-request/src/main/resources/db/migrate.sh
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
health-services/facility/src/main/resources/db/migrate.sh
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
health-services/household/src/main/resources/db/migrate.sh
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
health-services/individual/src/main/resources/db/migrate.sh
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
LanguageTool
health-services/product/README.md
[style] ~30-~30: Three successive sentences begin with the same word. Consider rewording the sentence or use a thesaurus to find a synonym. (ENGLISH_WORD_REPEAT_BEGINNING_RULE)
Context: ... the details of an existing product. * POST/v1/_search
- Search Product, This AP...
[style] ~32-~32: Three successive sentences begin with the same word. Consider rewording the sentence or use a thesaurus to find a synonym. (ENGLISH_WORD_REPEAT_BEGINNING_RULE)
Context: ... is used to search existing product. * POST/variant/v1/_create
- Create Product ...
[style] ~34-~34: Three successive sentences begin with the same word. Consider rewording the sentence or use a thesaurus to find a synonym. (ENGLISH_WORD_REPEAT_BEGINNING_RULE)
Context: ...to create/add a new product variant. * POST/variant/v1/_update
- Update Product ...
[style] ~36-~36: Three successive sentences begin with the same word. Consider rewording the sentence or use a thesaurus to find a synonym. (ENGLISH_WORD_REPEAT_BEGINNING_RULE)
Context: ...ails of an existing product variant. * POST/variant/v1/_search
- Search Product ...
[uncategorized] ~36-~36: The grammatical number of this noun doesn’t look right. Consider replacing it. (AI_EN_LECTOR_REPLACEMENT_NOUN_NUMBER)
Context: ... API is used to search existing product variant. ### Kafka Producers - save-product-t...
Additional comments not posted (61)
core-services/egov-hrms/src/main/resources/db/Dockerfile (2)
9-9
: Switched from CMD to ENTRYPOINT for initiating the migration script. This change ensures that the container runs as an executable.
1-1
: Updated base image toegovio/flyway:10.7.1
. Ensure compatibility with the new version.core-services/egov-hrms/src/test/resources/db/Dockerfile (2)
1-1
: Updated base image toegovio/flyway:10.7.1
for consistency with the main service Dockerfile.
9-9
: ENTRYPOINT change mirrors the main Dockerfile, ensuring uniform behavior across production and test environments.core-services/egov-survey-services/src/main/resources/db/Dockerfile (2)
1-1
: Updated base image toegovio/flyway:10.7.1
. Consistency across services helps in maintaining uniformity in deployment and migration strategies.
9-9
: Using ENTRYPOINT to standardize the startup process across different services.core-services/pgr-services/src/main/resources/db/Dockerfile (2)
9-9
: Changed fromCMD
toENTRYPOINT
to always execute the migration script. This enhances predictability but reduces flexibility in container usage.
1-1
: Updated the base image toegovio/flyway:10.7.1
. Ensure compatibility with existing migrations.core-services/service-request/src/main/resources/db/Dockerfile (2)
9-9
: Changed fromCMD
toENTRYPOINT
to always execute the migration script. This enhances predictability but reduces flexibility in container usage.
1-1
: Updated the base image toegovio/flyway:10.7.1
. Ensure compatibility with existing migrations.health-services/facility/src/main/resources/db/Dockerfile (2)
9-9
: Changed fromCMD
toENTRYPOINT
to always execute the migration script. This enhances predictability but reduces flexibility in container usage.
1-1
: Updated the base image toegovio/flyway:10.7.1
. Ensure compatibility with existing migrations.health-services/individual/src/main/resources/db/Dockerfile (2)
9-9
: Changed fromCMD
toENTRYPOINT
to always execute the migration script. This enhances predictability but reduces flexibility in container usage.
1-1
: Updated the base image toegovio/flyway:10.7.1
. Ensure compatibility with existing migrations.#!/bin/bash # Description: Verify that the new base image supports all current migrations without issues. # Test: Run a test migration using the new image. docker run --rm -v $(pwd)/sql:/flyway/sql egovio/flyway:10.7.1 migratehealth-services/product/src/main/resources/db/Dockerfile (2)
9-9
: Confirm the intent behind changing from CMD to ENTRYPOINT to ensure it aligns with operational requirements.
1-1
: Verify compatibility and behavior changes due to the base image update.Verification successful
The base image update to
egovio/flyway:10.7.1
and the changes in the Dockerfile have been reviewed. No breaking changes or issues were found.
Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Check for any compatibility issues or changes in behavior after the base image update. # Test: Search for any known issues or breaking changes in the new version. curl -s https://egovio/flyway/releases/tag/10.7.1 | grep 'breaking change'Length of output: 76
Script:
#!/bin/bash # Description: Fetch and analyze Flyway 10.7.1 release notes for major changes or deprecations. # Fetch the release notes for Flyway version 10.7.1 curl -s https://raw.githubusercontent.com/flyway/flyway/v10.7.1/release-notes.txt > flyway-release-notes-10.7.1.txt # Check for any mentions of major changes or deprecations grep -iE 'major change|deprecation|breaking change' flyway-release-notes-10.7.1.txtLength of output: 169
Script:
#!/bin/bash # Description: Fetch and display the entire Dockerfile content for review. # Display the content of the Dockerfile cat health-services/product/src/main/resources/db/DockerfileLength of output: 230
core-services/egov-hrms/src/test/resources/db/migrate.sh (1)
3-3
: Quote variables to prevent globbing and word splitting as recommended by Shellcheck.Tools
Shellcheck
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
core-services/egov-survey-services/src/main/resources/db/migrate.sh (1)
3-3
: Quote variables to prevent globbing and word splitting as recommended by Shellcheck.Tools
Shellcheck
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
[info] 3-3: Double quote to prevent globbing and word splitting. (SC2086)
health-services/libraries/health-services-common/src/main/java/org/egov/common/data/query/builder/QueryFieldChecker.java (2)
4-4
: Updated import to reflect the new package structure forExclude
annotation.
15-15
: Clear documentation on the source of theExclude
annotation.health-services/product/src/main/java/org/egov/product/web/models/ProductSearch.java (1)
35-35
: Fields updated to accept single strings instead of lists, ensure this change is clearly communicated to API clients.Also applies to: 38-38
health-services/product/src/main/java/org/egov/product/web/models/ProductVariantSearch.java (1)
33-34
: UpdatedproductId
to accept a single string with size constraints, ensure this change is clearly communicated to API clients.health-services/product/src/main/java/org/egov/product/repository/rowmapper/ProductRowMapper.java (1)
6-6
: Ensure the import forAdditionalFields
matches the updated package structure.health-services/product/src/main/java/org/egov/product/repository/rowmapper/ProductVariantRowMapper.java (1)
6-6
: Ensure the import forAdditionalFields
matches the updated package structure.health-services/libraries/health-services-models/src/main/java/org/egov/common/models/core/URLParams.java (1)
60-62
: Correct implementation of@Builder.Default
to ensureincludeDeleted
defaults toBoolean.FALSE
.core-services/egov-hrms/src/main/java/org/egov/hrms/web/models/IndividualSearch.java (1)
52-52
: Proper use of@Exclude
annotations to prevent fields from being included in dynamic SQL queries.Also applies to: 56-56, 59-61, 65-65, 69-69, 74-74, 78-78, 82-82, 86-86, 90-90, 94-94
health-services/libraries/health-services-models/src/main/java/org/egov/common/models/individual/IndividualSearch.java (1)
53-53
: Consistent and correct application of@Exclude
annotations across various fields to ensure they are not included in SQL generation.Also applies to: 57-57, 60-62, 66-66, 70-70, 75-75, 79-79, 83-83, 87-87, 91-91, 96-96
health-services/household/src/main/java/org/egov/household/validators/household/HExistentEntityValidator.java (1)
29-31
: Correct use of Spring and Lombok annotations to enhance functionality and maintainability of the validator class.health-services/individual/src/main/java/org/egov/individual/validators/IExistentEntityValidator.java (3)
29-31
: Annotations@Component
,@Order
, and@Slf4j
are correctly used to designate the class as a Spring bean, specify the load order, and enable logging. Good practice for clarity and maintainability.
Line range hint
36-38
: Constructor correctly initializes theindividualRepository
. It's good to see dependency injection used effectively to manage dependencies.
Line range hint
44-63
: Thevalidate
method is well-implemented with clear logic for filtering, mapping, and checking the database for existing entities. Use of Java Streams for processing collections is efficient and clean.health-services/household/src/main/java/org/egov/household/household/member/validators/HmExistentEntityValidator.java (3)
30-32
: Annotations@Component
,@Order
, and@Slf4j
are correctly applied, ensuring the class is managed by Spring, ordered appropriately, and logging is enabled.
Line range hint
37-39
: Constructor properly initializes thehouseholdMemberRepository
with dependency injection, which is vital for accessing database operations related to household members.
Line range hint
45-64
: Thevalidate
method effectively uses Java Streams for collection processing and correctly interacts with the repository to check for existing entities. This maintains consistency and efficiency in validation logic.health-services/individual/src/test/java/org/egov/individual/validator/NonExistentEntityValidatorTest.java (2)
11-11
: Import statements are correctly organized and include all necessary libraries for unit testing, mocking, and assertions. Good practice to keep tests robust and maintainable.Also applies to: 32-32
70-76
: Test methodsshouldNotGiveErrorWhenEntityExists
andshouldGiveErrorWhenEntityDoesNotExist
are well-implemented. They effectively use Mockito to mock repository behavior and correctly assert the outcomes based on the validator's logic.Also applies to: 88-89
health-services/product/pom.xml (1)
47-47
: Updated versions forflyway-core
,postgresql
,health-services-common
, andhealth-services-models
are correctly specified. Ensure these versions are compatible with other project dependencies to avoid conflicts.Also applies to: 52-52, 79-79, 84-84
health-services/individual/src/main/java/org/egov/individual/validators/INonExistentEntityValidator.java (1)
17-17
: Import ofCustomException
is correctly added to handle exceptions in database queries.health-services/household/pom.xml (1)
48-48
: Version update forhealth-services-common
to1.0.17-SNAPSHOT
aligns with the project's versioning strategy as described in the PR summary.core-services/service-request/pom.xml (1)
44-51
: The version updates forflyway-core
andpostgresql
are correctly applied according to the versions specified in the PR summary.health-services/household/src/main/java/org/egov/household/validators/household/HNonExistentEntityValidator.java (1)
18-18
: Import ofCustomException
is correctly added to handle exceptions in database queries.health-services/facility/pom.xml (3)
48-48
: Update tohealth-services-common
version1.0.17-SNAPSHOT
aligns with project-wide version updates.
64-64
: Update toflyway-core
version9.22.3
is consistent with updates in other modules, ensuring compatibility across services.
69-69
: Update topostgresql
version42.7.1
is crucial for maintaining compatibility with the latest database features and security patches.health-services/household/src/main/java/org/egov/household/household/member/validators/HmNonExistentEntityValidator.java (2)
17-17
: Import ofCustomException
is appropriate for handling specific error scenarios in the validation logic.
Line range hint
84-100
: The addition of exception handling for the household member search operation enhances robustness by ensuring that any runtime exceptions are caught and handled gracefully.health-services/individual/pom.xml (1)
56-56
: Update tohealth-services-common
version1.0.17-SNAPSHOT
is consistent with updates in other modules, ensuring compatibility.core-services/pgr-services/pom.xml (2)
121-121
: Review the release notes of Flyway version9.22.3
for any breaking changes or new features that could affect the project.
110-110
: Ensure compatibility of PostgreSQL version42.7.1
with other project dependencies.core-services/egov-hrms/pom.xml (1)
42-42
: Review the release notes of Flyway version9.22.3
for any breaking changes or new features that could affect the project.health-services/libraries/health-services-common/pom.xml (1)
11-11
: Version update to 1.0.17-SNAPSHOT is noted.Ensure that this version update aligns with the overall project versioning strategy and dependencies are compatible with this new version.
health-services/libraries/health-services-common/src/main/java/org/egov/common/data/query/builder/GenericQueryBuilder.java (1)
159-168
: Addition ofgetAllDeclaredFields
method.This method efficiently retrieves all declared fields from a given class and its superclasses, excluding those from the
Object
class. Ensure that this method is utilized properly wherever reflection is needed to avoid redundant code.health-services/libraries/health-services-common/src/test/java/org/egov/common/data/query/GenericQueryBuilderTest.java (3)
91-91
: The expected query string update is correct and improves the clarity of the SQL statement by removing unnecessary spaces.
105-105
: The update to the expected query string is consistent with the changes made elsewhere in the test cases, ensuring uniformity across the test suite.
138-138
: The simplification of the expected query string in this test case is aligned with the other changes, ensuring that the SQL statements are consistently formatted without trailing spaces.health-services/product/src/main/java/org/egov/product/web/controllers/ProductApiController.java (3)
27-34
: The addition of validation constraints (@Max
,@Min
,@NotNull
,@Size
) on the request parameters is a significant improvement. It enhances the robustness of the API by ensuring that the inputs adhere to expected formats and limits before processing.
77-82
: The methodproductV1SearchPost
now includes detailed parameter validation, which is crucial for maintaining data integrity and preventing invalid data operations. This enhancement aligns with best practices in API development.
130-134
: Similar to theproductV1SearchPost
method, the addition of validation annotations in theproductVariantV1SearchPost
method ensures that the API endpoint adheres to the specified input constraints, enhancing reliability and security.health-services/libraries/health-services-common/src/main/java/org/egov/common/data/repository/GenericRepository.java (1)
256-256
: The logic to replace "AND" with "WHERE" in SQL queries is crucial for ensuring the correctness of the SQL syntax. This change is necessary when dynamically building queries based on various conditions.core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java (2)
167-167
: The use ofindividual.getUserDetails().getUserType()
aligns with the project's standards of handling user types, as previously noted in related files. This consistency is crucial for maintaining the integrity of data types across different modules.
348-348
: The conversion of the user type from the enum to a string is consistent with the project's handling of user types, ensuring compatibility across different system components.
core-services/egov-hrms/src/main/java/org/egov/hrms/web/validator/EmployeeValidator.java
Outdated
Show resolved
Hide resolved
...raries/health-services-models/src/main/java/org/egov/common/models/project/TaskResource.java
Outdated
Show resolved
Hide resolved
core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java
Show resolved
Hide resolved
...ehold/src/main/java/org/egov/household/validators/household/HNonExistentEntityValidator.java
Outdated
Show resolved
Hide resolved
health-services/individual/src/main/java/org/egov/individual/validators/IBoundaryValidator.java
Show resolved
Hide resolved
health-services/facility/src/main/java/org/egov/facility/validator/FBoundaryValidator.java
Show resolved
Hide resolved
...ices/household/src/main/java/org/egov/household/validators/household/HBoundaryValidator.java
Show resolved
Hide resolved
…tor/EmployeeValidator.java Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 0
Review details
Configuration used: .coderabbit.yaml
Review profile: ASSERTIVE
Files selected for processing (1)
- core-services/egov-hrms/src/main/java/org/egov/hrms/web/validator/EmployeeValidator.java (1 hunks)
Additional comments not posted (1)
core-services/egov-hrms/src/main/java/org/egov/hrms/web/validator/EmployeeValidator.java (1)
151-152
: Enhanced error handling ingetBoundaryList
method by logging the exception stack trace and customizing the error message.
…ng, delivery type integarted (#790) * Update campaignValidators.ts (#655) * fixes-> cyclenumber issue, hover issue, dropdown height issue, * css * fixes-> cyclenumber issue, hover issue, dropdown height issue, (#656) * fixes-> cyclenumber issue, hover issue, dropdown height issue, * css --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Update campaignUtils.ts * fixed HLM-5970 * Feat : added boundary validation at data level * fixes * local add * Added boundary validation * Refactor * fixed HLM-5935 and HLM-5749 * Refactor * Feat : updated table * change campaignid in payload * Feat : added campaignId * Update campaignApis.ts * Update campaignValidators.ts * refactored * Refactor * assigned campaignId * Refactor * updated createRequest Schema * Feat : invalid Status Persist * status fix * version-fix * Update CODEOWNERS * core version updated and css fix for language dropdown * refactor (#676) * Uat signoff (#678) * change in filter recursive * lowest level * added validation related to target sheet headers * HLM-5916 * download button fixes in summary (#682) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Hlm 5927 (#687) * change in filter recursive * lowest level * added validation for boundary codes to be invalid other than that selected from UI in target upload * Added Delivery and cycle config for LLIN and SMC both (#688) * no of cycle and deivery drafted changes * fixes * add localisation code for boundaries * fixes * fixes * Value localise in summary screen, api error change * fixes * genarate api call fix * font size change for summary * login css change * HLM-5718: SMC delivery config enhancement * config update * added config for in between * fix config for llin * added mdms integration --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Fixed HLM-5988_warning message (#689) Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> * download filename fixes (#693) * download button fixes in summary * download filename with custom name changes added --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * download filename fixes (#694) * download button fixes in summary * download filename with custom name changes added * config fix for llin --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * successful toast message is fixed (#695) * successful toast message is fixed * Update UploadData.js * HLM-5991: Alert Pop UP CR (#696) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * HLM-5718 changes (#703) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Localization cache (#706) * change in filter recursive * lowest level * refactored localization cache logic * Update README.md (#707) * Update README.md * Update README.md * Update utilities/project-factory/README.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update README.md --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * HLM-5985_made lowest level changes (#708) * HLM-5985_made lowest level changes * resolved codeRabbit comments * Create LOCALSETUP.md (#709) * Create LOCALSETUP.md * Refactored config * Update LOCALSETUP.md * Update utilities/project-factory/LOCALSETUP.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/LOCALSETUP.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/LOCALSETUP.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/LOCALSETUP.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update LOCALSETUP.md --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * updated the localisation module config * Refactor config (#713) * Refactor config * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update postman_collection.json (#714) * Update postman_collection.json * Update postman_collection.json * Delete utilities/project-factory/project_factory_swagger.yml (#715) * Feat : removed campaignId validation for boundary upload (#718) * updated the delay for boundary relationship * added logger for request TODO TEST will be reverted * Revert "added logger for request TODO TEST" This reverts commit d5c2bf5. * Schema validation (#719) * Feat : removed campaignId validation for boundary upload * Feat : added schema validation * Fixed mdms host * updated the logger messages * updated the loggers * delivery new changes, toast fix, error fix (#716) * delivery new changes, toast fix, error fix * new fixes * fixes * change text component to field component * added hierarchy * fix * fix * fix * fix * passing hierarchy from props --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Schema validation2 (#721) * Feat : removed campaignId validation for boundary upload * Feat : added schema validation * Fixed mdms host * Feat : added boundary validation * Feat : optimized product search * Fix : project mapping fixed (#722) * Fixed project search (#723) * smc fixes (#724) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Feat : added boundary confirmation (#727) * Fix: fixed processing boundary * Refactor * fixed HLM-6109 (#729) * gate fixes validation, ui ux (#731) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * integrated panelcard component (#732) * integrated panelcard component * Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/Response.js Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update genericUtils.ts (#733) * updated the folder structure * Create CHANGELOG.md (#717) * updated the versions * Update .gitignore * Update request.ts (#735) * fixed generate api issue (#734) Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * Create CHANGELOG.md * gate fixes (#736) * gate fixes validation, ui ux * gate fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * added loader in the selecting boundaries (#737) * Update createAndSearch.ts (#738) * fix (#739) * fix * fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Patch 3 (#740) * change in filter recursive * lowest level * trimmed underscore and empty spaces * boundary fix (#742) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Update genericUtils.ts (#746) * fixed the delivery products issue * Fixed delivery conditions issue * Update campaignApis.ts (#747) * fixed warning toast (#748) * fixed warning toast * Update UploadData.js * fix (#749) * fix * fx * fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * core -update (#751) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * fixed stepper issue (#752) * fixed stepper issue * Update index.html * Feat : added user validation via individual (#753) * fixes (#754) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * code fix nabeel (#756) * fixes * fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Updated few loggers (#759) * updated few loggers flow * Update utilities/project-factory/src/server/api/campaignApis.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/campaignMappingUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/campaignUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/api/campaignApis.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/campaignMappingUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/genericUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Updated the user Password generation logic #761 * Update Listener.ts (#730) * Update Listener.ts * added try catch logic in producer * Feat : added parallel batch execution (#767) * Feat : added parallel batch execution * Refactor * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fixed the stepper (#765) * changes config (#769) * Project type config and added loggers for process of campaign (#772) * Feat : added themes in generate template (#773) * fixed the ajv package version for build issue * Feat : removed xlsx (#776) * HLM-6177: PARALLEL SEARCH IMPLEMENT, DELIVERY TYPE IMPLEMENT (#778) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * css update (#780) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * HLM-6179 and HLM-6180 (#777) * HLM-6179 and HLM-6180 * campaign name changes --------- Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * Feat : fixed target generation (#781) * fixed tenantId issue (#784) * fix: resolved AJV-related Jenkins build issue reference #783 #786 (#787) * module ui fix * updated all the package version for build fixes * fixed kafka-error at target generation (#789) * updated core version (#791) * updated core version * updated css also * Update campaignValidators.ts (#794) * Updated the excel generation logic and files * added changes for configurable column in target sheet (#779) * change in filter recursive * lowest level * made target headers genearte through mdms schema * changed config index.ts * changed config index.ts * changes for now * added configurable column logic from schema HLM-6169 * updated validate of target columns through schema * added masterForColumnSchema in index.ts * formatted dataManageService * refactored lock TargetFields func * removed console.log * User creation performance improved (#800) * Feat : Improved user creation performance * Change status color * Update utilities/project-factory/src/server/utils/campaignUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update genericUtils.ts (#801) * Hlm 6170 (#802) * change in filter recursive * lowest level * HLM -6170 added logic for only village level data in target sheet and some refactoring * updated css (#804) * fixed button issue (#805) * HLM 6177: Error card implementation in summary screen (#806) * HLM-6177: PARALLEL SEARCH IMPLEMENT, DELIVERY TYPE IMPLEMENT * Added Error Cards in summary screen and redirection --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * added error button styles (#807) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * updated popUp css (#808) * HLM 6178: Implementing New Pop up screen in boundaries (#809) * added error button styles * Implementing New Pop up screen in boundaries --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Facility changes (#812) * Feat : changed facility Template * Feat : locked target templates * fixed colour issue (#813) * Updated the project type conversion logic for the "deliveryType" dont1 and n config * Unique field added (#814) * Feat : changed facility Template * Feat : locked target templates * Feat : added unique check logic * Target schema update (#815) * change in filter recursive * lowest level * updated shcema of target columns to be configurable * removed empty spaces from config index.ts * Active mapping (#817) * Feat : changed facility Template * Feat : locked target templates * Feat : added unique check logic * Feat : added mapping via active field * changes in the schema validation (#816) * Updated the workbench and css module version * Feat : added active inactive boundary check (#818) * Update campaignValidators.ts (#819) * added active inactive validation (#820) * changed api call time (#826) * Feat : added target sum mapping (#825) * added campaign type as filter (#827) * Update genericApis.ts (#828) * Update excelUtils.ts (#829) * UI issue fixes, icon fix in summary error (#831) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Target columns (#830) * change in filter recursive * lowest level * commit * Feat : target flow fixed for LLIN-mz * uat to dev --------- Co-authored-by: admin1 <nitish@egovernments.org> * Feat : freezed target columns (#833) * Target mr dn (#834) * change in filter recursive * lowest level * Feat : skipped validation temporarily * changes in the target validation (#835) * fixed error info (#837) * Added roboto font (#840) * Feat : added roboto font * Fixed config * target validation based on diff campaign types (#843) * change in filter recursive * lowest level * updated validation of target based on campaign type * fixed validation issue (#844) * Updated the workbench package version * fixed validation logic (#846) * fixed validation logic * Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Error messages improved (#848) * Feat : imporved error messages and initilised utils for tracking process * Fix ; unused variables fixed * Feat : improved error messages * Fix : download error fix (#850) * Update campaignUtils.ts (#851) * Update campaignUtils.ts * Update utilities/project-factory/src/server/utils/campaignUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update campaignValidators.ts (#853) * HLM 6210: Toast, error focus fix and project type reset delivery data fix (#854) * HLM-6210: campaign type change reset delivery data fix, summary error focus fix * summary error focus fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * HLM-6225_added time out according to data (#855) * Update campaignValidators.ts (#859) * HLM 6210 (#858) * HLM-6210: campaign type change reset delivery data fix, summary error focus fix * summary error focus fix * parallel search fixes --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Remove validation (#852) * change in filter recursive * lowest level * removed unnecessary validation for target * spacing refactor * Update campaignValidators.ts (#863) * Header validation (#861) * change in filter recursive * lowest level * removed unnecessary validation for target * changed the logic of header validation * space refactor * Update campaignUtils.ts (#864) * fixed ui error (#865) * Read me (#867) * change in filter recursive * lowest level * removed unnecessary validation for target * changed the logic of header validation * fixed portugese language error * space refactoring * Update Dockerfile * Update Dockerfile * Update migrate.sh * Update Dockerfile * Update campaignValidators.ts (#868) * HLM 6210:campaign type change reset fix (#869) * HLM-6210: campaign type change reset delivery data fix, summary error focus fix * summary error focus fix * parallel search fixes * campaign type change reset fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Update excelUtils.ts for sheetHeaders wraping (#870) * Update package.json * updated error messages (#871) * feat : added jaeger-client tracing (#872) * updated the table config * Update campaignApis.ts (#875) * removed the schema and updated the db name * fixing generate API call, file auto delete, date error (#877) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Trim resource (#878) * Feat : trimmed resource persist message * Refactor * Removed reject error in produce message * fixed min time, draft logic (#879) * Update index.ts (#880) * added min ui error and facility usage (#883) * added min ui error and facility usage * changes * Update campaignUtils.ts (#884) * HLM 6007 (#885) * fixing generate API call, file auto delete, date error * generate api fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Update Dockerfile * Feat : docker config update (#886) * Update Dockerfile (#887) * Create buildWorkbenchUI.yml * Update README.md (#917) * Update buildWorkbenchUI.yml * Update README.md * Updated the DB Schema issue of Project-factory * fixed hierarchy order (#919) * User flag hcm (#920) * Feat : docker config update * Feat : added user create flag * Refactored * Update campaignUtils.ts * Update campaignMappingUtils.ts (#922) * Ashish egov patch 2 (#921) * Update index.ts * Update campaignApis.ts * Fixed the project type conversion and product duplicate issue * Update campaignApis.ts (#924) * Update campaignMappingUtils.ts (#925) * Update campaignMappingUtils.ts * Refactored * Update publishProjectFactory.yml * Update buildWorkbenchUI.yml * Update campaignMappingUtils.ts (#926) * Update request.ts (#928) * Update request.ts * Feat : updated httprequest * Feat : warning response added * Refactor * added start and enddate in cycles * Update campaignApis.ts (#930) * Update request.ts (#932) * fixed generate issue (#933) * Fixed project-type resources duplication * updated target error messages (#936) * fixed stepper from draft (#937) * Update Listener.ts * delivery type disable fix, product sku name change (#939) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * fixed error message issue (#941) * Redis integration (#940) * Feat : added redis * Feat : added redis retry * updated migration * fixed * updated migration * Delete .vscode/launch.json * Delete .vscode/settings.json --------- Co-authored-by: ashish-egov <137176738+ashish-egov@users.noreply.github.com> Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> Co-authored-by: Bhavya-egov <bhavya.mangal@egovernments.org> Co-authored-by: ashish-egov <ashish.tiwari@egovernments.org> Co-authored-by: nitish-egov <137176807+nitish-egov@users.noreply.github.com> Co-authored-by: Bhavya-egov <137176879+Bhavya-egov@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Swathi-eGov <137176788+Swathi-eGov@users.noreply.github.com> Co-authored-by: admin1 <nitish@egovernments.org>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
…/org/egov/common/models/project/TaskResource.java Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 1
Outside diff range comments (12)
health-services/transformer/CHANGELOG.md (1)
Line range hint
1-1
: Ensure that headings are surrounded by blank lines to comply with Markdown standards and improve readability.+ # CHANGELOG + + +Also applies to: 3-3, 10-10
Tools
Markdownlint
10-10: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
11-11: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lineshealth-services/facility/CHANGELOG.md (1)
Line range hint
1-1
: Ensure that headings are surrounded by blank lines to comply with Markdown standards and improve readability.+ # CHANGELOG + +Also applies to: 3-3
Tools
Markdownlint
4-4: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lineshealth-services/libraries/health-services-common/CHANGELOG.md (1)
Line range hint
1-1
: Ensure proper Markdown formatting by adding necessary blank lines and removing multiple consecutive blank lines.+ # CHANGELOG + + + -Also applies to: 3-3, 11-11, 14-14
Tools
Markdownlint
11-11: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
12-12: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lineshealth-services/household/CHANGELOG.md (5)
Line range hint
15-15
: Remove the trailing space at the end of this line to adhere to Markdown best practices.- - MDMS v2 integration + - MDMS v2 integrationTools
Markdownlint
13-13: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
14-14: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
Line range hint
27-27
: Reduce multiple consecutive blank lines to a single blank line to maintain clean and consistent formatting.- -Also applies to: 32-32
Tools
Markdownlint
13-13: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
14-14: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
Line range hint
3-3
: Ensure there are blank lines above and below all headings for proper Markdown formatting.+ ## 1.1.3 - 2024-05-29 + - Integrated Core 2.9LTS ... + ## 1.1.2 - 2024-05-10 + - Integrated Boundary v2 functionality ... + ## 1.1.1 - 2023-11-15 +Also applies to: 13-13, 16-16
Tools
Markdownlint
13-13: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
14-14: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
Line range hint
4-4
: Add blank lines around list items to comply with Markdown formatting rules.+ - Integrated Core 2.9LTS + - Client reference ID validation added ... + - Integrated Boundary v2 functionality + ... + - Added total count for household +Also applies to: 14-14, 15-15
Tools
Markdownlint
13-13: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
14-14: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
Line range hint
1-1
: The first line of the file should be a top-level heading.+ # Changelog
Tools
Markdownlint
13-13: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
14-14: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lineshealth-services/individual/CHANGELOG.md (4)
Line range hint
16-16
: Remove the trailing spaces at the end of these lines to adhere to Markdown best practices.- - Integrated Boundary v2 functionality + - Integrated Boundary v2 functionality - +Also applies to: 17-17
Tools
Markdownlint
14-14: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
15-15: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
Line range hint
29-29
: Reduce multiple consecutive blank lines to a single blank line to maintain clean and consistent formatting.- -Also applies to: 34-34
Tools
Markdownlint
14-14: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
15-15: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
Line range hint
4-4
: Ensure there are blank lines above and below all headings for proper Markdown formatting.+ ## 1.1.5 - 2024-05-29 + - Integrated Core 2.9LTS ... + ## 1.1.4 - 2024-05-10 + ... + ## 1.1.3 + ... + ## 1.1.2 +Also applies to: 14-14, 17-17, 20-20
Tools
Markdownlint
14-14: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
15-15: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
Line range hint
5-5
: Add blank lines around list items to comply with Markdown formatting rules.+ - Integrated Core 2.9LTS + - Client reference ID validation added ... + - Integrated Boundary v2 functionality + ... + - upgraded version from beta +Also applies to: 15-15, 16-16, 18-18, 21-21
Tools
Markdownlint
14-14: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
15-15: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
Review details
Configuration used: .coderabbit.yaml
Review profile: ASSERTIVE
Files selected for processing (12)
- core-services/egov-hrms/CHANGELOG.md (1 hunks)
- health-services/facility/CHANGELOG.md (1 hunks)
- health-services/household/CHANGELOG.md (1 hunks)
- health-services/individual/CHANGELOG.md (1 hunks)
- health-services/libraries/health-services-common/CHANGELOG.md (1 hunks)
- health-services/libraries/health-services-models/CHANGELOG.md (1 hunks)
- health-services/libraries/health-services-models/src/main/java/org/egov/common/models/project/TaskResource.java (2 hunks)
- health-services/product/CHANGELOG.md (1 hunks)
- health-services/project/CHANGELOG.md (1 hunks)
- health-services/referralmanagement/CHANGELOG.md (1 hunks)
- health-services/stock/CHANGELOG.md (1 hunks)
- health-services/transformer/CHANGELOG.md (1 hunks)
Files not reviewed due to errors (2)
- health-services/stock/CHANGELOG.md (no review received)
- health-services/referralmanagement/CHANGELOG.md (no review received)
Additional context used
Markdownlint
health-services/product/CHANGELOG.md
1-1: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
8-8: null (MD047, single-trailing-newline)
Files should end with a single newline characterhealth-services/transformer/CHANGELOG.md
3-3: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
10-10: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
4-4: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
11-11: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
1-1: null (MD041, first-line-heading, first-line-h1)
First line in a file should be a top-level headinghealth-services/facility/CHANGELOG.md
3-3: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
4-4: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
1-1: null (MD041, first-line-heading, first-line-h1)
First line in a file should be a top-level headinghealth-services/libraries/health-services-common/CHANGELOG.md
14-14: Expected: 1; Actual: 2 (MD012, no-multiple-blanks)
Multiple consecutive blank lines
3-3: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
11-11: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
15-15: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
4-4: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
12-12: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
16-16: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
1-1: null (MD041, first-line-heading, first-line-h1)
First line in a file should be a top-level headinghealth-services/household/CHANGELOG.md
15-15: Expected: 0 or 2; Actual: 1 (MD009, no-trailing-spaces)
Trailing spaces
27-27: Expected: 1; Actual: 2 (MD012, no-multiple-blanks)
Multiple consecutive blank lines
32-32: Expected: 1; Actual: 2 (MD012, no-multiple-blanks)
Multiple consecutive blank lines
3-3: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
13-13: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
16-16: Expected: 1; Actual: 0; Above (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
4-4: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
14-14: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
15-15: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
1-1: null (MD041, first-line-heading, first-line-h1)
First line in a file should be a top-level headinghealth-services/individual/CHANGELOG.md
16-16: Expected: 0 or 2; Actual: 1 (MD009, no-trailing-spaces)
Trailing spaces
17-17: Expected: 0 or 2; Actual: 1 (MD009, no-trailing-spaces)
Trailing spaces
3-3: Expected: 1; Actual: 2 (MD012, no-multiple-blanks)
Multiple consecutive blank lines
29-29: Expected: 1; Actual: 2 (MD012, no-multiple-blanks)
Multiple consecutive blank lines
34-34: Expected: 1; Actual: 2 (MD012, no-multiple-blanks)
Multiple consecutive blank lines
4-4: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
14-14: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
17-17: Expected: 1; Actual: 0; Above (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
17-17: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
20-20: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
5-5: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
15-15: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
16-16: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
18-18: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
21-21: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
1-1: null (MD041, first-line-heading, first-line-h1)
First line in a file should be a top-level headinghealth-services/stock/CHANGELOG.md
16-16: Expected: 0; Actual: 2 (MD007, ul-indent)
Unordered list indentation
19-19: Expected: 0; Actual: 2 (MD007, ul-indent)
Unordered list indentation
22-22: Expected: 0; Actual: 2 (MD007, ul-indent)
Unordered list indentation
25-25: Expected: 0; Actual: 2 (MD007, ul-indent)
Unordered list indentation
27-27: Expected: 1; Actual: 2 (MD012, no-multiple-blanks)
Multiple consecutive blank lines
3-3: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
12-12: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
15-15: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
18-18: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
21-21: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
24-24: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
4-4: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
13-13: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
16-16: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
19-19: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
22-22: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
25-25: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
1-1: null (MD041, first-line-heading, first-line-h1)
First line in a file should be a top-level headinghealth-services/referralmanagement/CHANGELOG.md
18-18: Expected: 0; Actual: 2 (MD007, ul-indent)
Unordered list indentation
21-21: Expected: 0; Actual: 2 (MD007, ul-indent)
Unordered list indentation
22-22: Expected: 0; Actual: 2 (MD007, ul-indent)
Unordered list indentation
1-1: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
4-4: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
14-14: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
17-17: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
20-20: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
5-5: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
15-15: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
18-18: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
21-21: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lineshealth-services/libraries/health-services-models/CHANGELOG.md
27-27: Expected: 1; Actual: 2 (MD012, no-multiple-blanks)
Multiple consecutive blank lines
3-3: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
9-9: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
13-13: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
16-16: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
20-20: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
24-24: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
28-28: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
4-4: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
10-10: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
14-14: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
17-17: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
21-21: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
25-25: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
29-29: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
1-1: null (MD041, first-line-heading, first-line-h1)
First line in a file should be a top-level headinghealth-services/project/CHANGELOG.md
23-23: Expected: 0; Actual: 2 (MD007, ul-indent)
Unordered list indentation
26-26: Expected: 0; Actual: 2 (MD007, ul-indent)
Unordered list indentation
29-29: Expected: 0; Actual: 2 (MD007, ul-indent)
Unordered list indentation
20-20: Expected: 0 or 2; Actual: 1 (MD009, no-trailing-spaces)
Trailing spaces
3-3: Expected: 1; Actual: 2 (MD012, no-multiple-blanks)
Multiple consecutive blank lines
31-31: Expected: 1; Actual: 2 (MD012, no-multiple-blanks)
Multiple consecutive blank lines
32-32: Expected: 1; Actual: 3 (MD012, no-multiple-blanks)
Multiple consecutive blank lines
4-4: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
15-15: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
19-19: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
22-22: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
25-25: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
28-28: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
5-5: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
16-16: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
20-20: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
23-23: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
26-26: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
29-29: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
1-1: null (MD041, first-line-heading, first-line-h1)
First line in a file should be a top-level headingcore-services/egov-hrms/CHANGELOG.md
23-23: Expected: 0; Actual: 1 (MD007, ul-indent)
Unordered list indentation
26-26: Expected: 0; Actual: 1 (MD007, ul-indent)
Unordered list indentation
27-27: Expected: 0; Actual: 1 (MD007, ul-indent)
Unordered list indentation
28-28: Expected: 0; Actual: 1 (MD007, ul-indent)
Unordered list indentation
1-1: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
4-4: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
9-9: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
16-16: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
19-19: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
22-22: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
25-25: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
30-30: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
33-33: Expected: 1; Actual: 0; Below (MD022, blanks-around-headings)
Headings should be surrounded by blank lines
5-5: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
10-10: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
17-17: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
20-20: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
23-23: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
26-26: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
31-31: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
34-34: null (MD032, blanks-around-lists)
Lists should be surrounded by blank lines
LanguageTool
health-services/household/CHANGELOG.md
[uncategorized] ~23-~23: This expression is usually spelled with a hyphen. (BASED_HYPHEN)
Context: ...ientReferenceId ## 1.1.1-beta - Added proximity based search support ## 1.1.0 ## 1.0.0 - ...health-services/individual/CHANGELOG.md
[uncategorized] ~25-~25: This expression is usually spelled with a hyphen. (BASED_HYPHEN)
Context: ...rsion from beta ## 1.1.2-beta - Added proximity based search support ## 1.1.0 ## 1.0.0 - ...health-services/referralmanagement/CHANGELOG.md
[misspelling] ~22-~22: Did you mean “Side-Effects” (=adverse effect, unintended consequence)? Open compounds are not hyphenated. (AFFECT_EFFECT)
Context: ...ase version - Added functionality for Side-Effects and Refferal managementcore-services/egov-hrms/CHANGELOG.md
[uncategorized] ~10-~10: Did you mean “too”? (TOO_JJ_TO)
Context: ...- 2024-03-06 - Added client Referenceid to Individual to avoid errors during down ...
[grammar] ~38-~38: This phrase is duplicated. You should probably use “Upgraded to” only once. (PHRASE_REPETITION)
Context: ...ation feature ## 1.1.0 - 2020-05-27 - Upgraded totracer:2.0.0-SNAPSHOT
- Upgraded toSpring boot 2.2.6
- Renamed `Referenc...
Additional comments not posted (6)
health-services/household/CHANGELOG.md (1)
9-11
: Upgraded PostgreSQL Driver, Flyway base image, and Flyway-Core versions are correctly documented.health-services/individual/CHANGELOG.md (1)
10-12
: Upgraded PostgreSQL Driver, Flyway base image, and Flyway-Core versions are correctly documented.health-services/libraries/health-services-models/CHANGELOG.md (1)
7-7
: Updated Dockerfile base image for Java 17. Ensure that the Dockerfile is correctly updated across all relevant locations.Verification successful
The verification indicates that multiple Dockerfiles in the repository have been checked, and several of them are confirmed to be using the Java 17 base image. This aligns with the changelog entry stating the update to the Dockerfile for Java 17.
build/17/maven/Dockerfile
health-services/libraries/health-services-common/Dockerfile
health-services/libraries/health-services-models/Dockerfile
These files explicitly show the base image update to Java 17, confirming the changelog entry.
Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify that the Dockerfile is updated correctly across the repository. # Test: Search for Dockerfile updates in the repository. Expect: Consistent updates across all Dockerfiles. rg --type Dockerfile 'FROM.*:17'Length of output: 69
Script:
#!/bin/bash # Description: Find Dockerfiles and verify that the base image is updated to Java 17. # Locate all Dockerfiles in the repository fd -t f -p Dockerfile | while read -r file; do echo "Checking $file" rg 'FROM.*:17' "$file" doneLength of output: 4986
health-services/project/CHANGELOG.md (1)
11-13
: Updated PostgreSQL Driver, Flyway base image, and Flyway-Core versions. Ensure these versions are compatible with existing configurations.core-services/egov-hrms/CHANGELOG.md (1)
7-7
: Updated Flyway base image version for DB Migration. Ensure that the Flyway base image is updated correctly across all relevant locations.Verification successful
The Flyway base image version has been consistently updated to
10.7.1
across multiple Dockerfiles in the repository, including those relevant to theegov-hrms
module.
core-services/egov-hrms/src/test/resources/db/Dockerfile
core-services/egov-hrms/src/main/resources/db/Dockerfile
This confirms that the changelog entry accurately reflects the update.
Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify that the Flyway base image is updated correctly across the repository. # Test: Search for Flyway base image updates in the repository. Expect: Consistent updates across all relevant files. rg --type Dockerfile 'FROM.*flyway:10.7.1'Length of output: 79
Script:
#!/bin/bash # Description: Verify that the Flyway base image is updated correctly across the repository. # Test: Search for Flyway base image updates in the repository. Expect: Consistent updates across all relevant files. rg --glob '**/Dockerfile' 'FROM.*flyway:10.7.1'Length of output: 1080
health-services/libraries/health-services-models/src/main/java/org/egov/common/models/project/TaskResource.java (1)
68-73
: AddedadditionalFields
property with appropriate documentation and validation. Good job on maintaining clear and concise documentation.
…e validation duplicate entry
…nments/health-campaign-services into master-flyway-imageupdate
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 2
Outside diff range comments (1)
health-services/individual/src/main/java/org/egov/individual/validators/INonExistentEntityValidator.java (1)
Line range hint
76-92
: Optimize the process of extracting IDs and handling exceptions to ensure the system's efficiency and robustness.
Review details
Configuration used: .coderabbit.yaml
Review profile: ASSERTIVE
Files selected for processing (12)
- health-services/household/src/main/java/org/egov/household/household/member/validators/HmNonExistentEntityValidator.java (4 hunks)
- health-services/household/src/main/java/org/egov/household/validators/household/HNonExistentEntityValidator.java (2 hunks)
- health-services/individual/src/main/java/org/egov/individual/validators/INonExistentEntityValidator.java (3 hunks)
- health-services/individual/src/main/java/org/egov/individual/validators/NonExistentEntityValidator.java (2 hunks)
- health-services/project/src/main/java/org/egov/project/validator/beneficiary/PbNonExistentEntityValidator.java (2 hunks)
- health-services/project/src/main/java/org/egov/project/validator/task/PtNonExistentEntityValidator.java (2 hunks)
- health-services/referralmanagement/src/main/java/org/egov/referralmanagement/validator/RmNonExistentEntityValidator.java (2 hunks)
- health-services/referralmanagement/src/main/java/org/egov/referralmanagement/validator/hfreferral/HfrNonExistentEntityValidator.java (2 hunks)
- health-services/referralmanagement/src/main/java/org/egov/referralmanagement/validator/sideeffect/SeNonExistentEntityValidator.java (2 hunks)
- health-services/stock/src/main/java/org/egov/stock/validator/stock/SNonExistentValidator.java (2 hunks)
- health-services/stock/src/main/java/org/egov/stock/validator/stockreconciliation/SrNonExistentValidator.java (2 hunks)
- health-services/stock/src/test/java/org/egov/stock/validator/NonExistentEntityValidatorTest.java (6 hunks)
Additional comments not posted (17)
health-services/stock/src/main/java/org/egov/stock/validator/stock/SNonExistentValidator.java (1)
50-73
: The addition of detailed logging and structured exception handling enhances maintainability and robustness. Ensure that the custom exceptionSTOCK_SEARCH_FAILED
is properly documented and handled upstream.health-services/referralmanagement/src/main/java/org/egov/referralmanagement/validator/RmNonExistentEntityValidator.java (1)
57-82
: The structured exception handling and detailed logging are excellent practices. However, ensure that the custom exceptionREFERRAL_SEARCH_FAILED
is documented and appropriately handled in the calling code.health-services/stock/src/main/java/org/egov/stock/validator/stockreconciliation/SrNonExistentValidator.java (1)
50-73
: The improvements in logging and exception handling are commendable. Verify that the exceptionSTOCK_RECONCILIANTION_SEARCH_FAILED
is correctly spelled in all relevant parts of the codebase and handled appropriately.health-services/referralmanagement/src/main/java/org/egov/referralmanagement/validator/sideeffect/SeNonExistentEntityValidator.java (1)
57-80
: The addition of structured exception handling and detailed logging enhances the clarity and robustness of the code. Ensure that the custom exceptionSIDE_EFFECT_SEARCH_FAILED
is well-documented and handled appropriately in the upstream code.health-services/project/src/main/java/org/egov/project/validator/beneficiary/PbNonExistentEntityValidator.java (1)
69-75
: Proper exception handling and detailed logging are implemented, which is good for debugging and maintaining the system.health-services/referralmanagement/src/main/java/org/egov/referralmanagement/validator/hfreferral/HfrNonExistentEntityValidator.java (1)
83-89
: Exception handling is robust, aiding in clear error identification and system resilience.health-services/individual/src/main/java/org/egov/individual/validators/INonExistentEntityValidator.java (1)
91-92
: Effective logging and exception handling are in place, which enhances the system's debuggability and reliability.health-services/household/src/main/java/org/egov/household/validators/household/HNonExistentEntityValidator.java (1)
92-93
: The detailed logging before throwingCustomException
is beneficial for traceability and debugging.health-services/household/src/main/java/org/egov/household/household/member/validators/HmNonExistentEntityValidator.java (3)
17-17
: Ensure proper usage ofCustomException
throughout your error handling.
100-101
: Enhanced error handling with detailed logging is a good practice, ensuring that failures in database operations are adequately reported.
84-86
: The implementation of error handling within the database query is robust, enhancing the reliability of the application by preventing it from crashing due to unhandled exceptions.Also applies to: 100-101
health-services/stock/src/test/java/org/egov/stock/validator/NonExistentEntityValidatorTest.java (4)
58-59
: Proper exception handling in test scenarios ensures that any issues with the query builder are caught and handled gracefully.
75-76
: Good practice to catch and handle exceptions in test cases, ensuring that the tests remain robust under various failure scenarios.
94-95
: Exception handling in tests is crucial for identifying issues during the testing phase, preventing runtime errors in production.
113-114
: Effective use of exception handling in test methods ensures that errors are not silently ignored, improving the quality of tests.health-services/project/src/main/java/org/egov/project/validator/task/PtNonExistentEntityValidator.java (1)
79-81
: The implementation of detailed error handling within the database query ensures robustness, preventing the application from crashing due to unhandled exceptions.health-services/individual/src/main/java/org/egov/individual/validators/NonExistentEntityValidator.java (1)
83-84
: The implementation of detailed error handling within the database query is commendable, enhancing the robustness of the application.
// Lists to store IDs and client reference IDs | ||
List<String> idList = new ArrayList<>(); | ||
List<String> clientReferenceIdList = new ArrayList<>(); | ||
// Extract IDs and client reference IDs from Project Beneficiary entities | ||
projectBeneficiaries.forEach(entity -> { | ||
idList.add(entity.getId()); | ||
clientReferenceIdList.add(entity.getClientReferenceId()); | ||
}); | ||
if (!iMap.isEmpty()) { | ||
List<String> beneficiaryIds = new ArrayList<>(iMap.keySet()); | ||
List<ProjectBeneficiary> existingProjectBeneficiaries = projectBeneficiaryRepository | ||
.findById(beneficiaryIds, false, getIdFieldName(idMethod)); | ||
ProjectBeneficiarySearch projectBeneficiarySearch = ProjectBeneficiarySearch.builder() | ||
.clientReferenceId(clientReferenceIdList) | ||
.id(idList) | ||
.build(); | ||
|
||
List<ProjectBeneficiary> existingProjectBeneficiaries; | ||
try { | ||
// Query the repository to find existing entities | ||
existingProjectBeneficiaries = projectBeneficiaryRepository.find(projectBeneficiarySearch, projectBeneficiaries.size(), 0, | ||
projectBeneficiaries.get(0).getTenantId(), null, false).getResponse(); | ||
} catch (Exception e) { | ||
// Handle query builder exception | ||
log.error("Search failed for ProjectBeneficiary with error: {}", e.getMessage(), e); | ||
throw new CustomException("PROJECT_BENEFICIARY_SEARCH_FAILED", "Search Failed for ProjectBeneficiary, " + e.getMessage()); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider using more efficient data structures or methods for extracting IDs and client reference IDs to reduce the complexity and improve performance.
// Lists to store IDs and client reference IDs | ||
List<String> idList = new ArrayList<>(); | ||
List<String> clientReferenceIdList = new ArrayList<>(); | ||
// Extract IDs and client reference IDs from HfReferral entities | ||
hfReferrals.forEach(entity -> { | ||
idList.add(entity.getId()); | ||
clientReferenceIdList.add(entity.getClientReferenceId()); | ||
}); | ||
if (!iMap.isEmpty()) { | ||
List<String> referralIds = new ArrayList<>(iMap.keySet()); | ||
List<HFReferral> existingReferrals = hfReferralRepository | ||
.findById(referralIds, false, getIdFieldName(idMethod)); | ||
HFReferralSearch hfReferralSearch = HFReferralSearch.builder() | ||
.clientReferenceId(clientReferenceIdList) | ||
.id(idList) | ||
.build(); | ||
|
||
List<HFReferral> existingReferrals; | ||
try { | ||
// Query the repository to find existing entities | ||
existingReferrals = hfReferralRepository.find(hfReferralSearch, hfReferrals.size(), 0, | ||
hfReferrals.get(0).getTenantId(), null, false); | ||
} catch (Exception e) { | ||
// Handle query builder exception | ||
log.error("Search failed for HFReferral with error: {}", e.getMessage(), e); | ||
throw new CustomException("HFREFERRAL_SEARCH_FAILED", "Search Failed for HFReferral, " + e.getMessage()); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ensure that the logic for extracting IDs and handling exceptions is optimized and follows best practices for error management.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kavi-egov, thanks for the update! If there's anything else you need, feel free to ask. Happy coding! 🚀
If you found this review helpful, would you consider giving us a shout-out on X?
Thank you for using CodeRabbit!
core-services/egov-hrms/src/main/java/org/egov/hrms/service/EmployeeService.java
Show resolved
Hide resolved
// Lists to store IDs and client reference IDs | ||
List<String> idList = new ArrayList<>(); | ||
List<String> clientReferenceIdList = new ArrayList<>(); | ||
// Extract IDs and client reference IDs from HfReferral entities | ||
hfReferrals.forEach(entity -> { | ||
idList.add(entity.getId()); | ||
clientReferenceIdList.add(entity.getClientReferenceId()); | ||
}); | ||
if (!iMap.isEmpty()) { | ||
List<String> referralIds = new ArrayList<>(iMap.keySet()); | ||
List<HFReferral> existingReferrals = hfReferralRepository | ||
.findById(referralIds, false, getIdFieldName(idMethod)); | ||
HFReferralSearch hfReferralSearch = HFReferralSearch.builder() | ||
.clientReferenceId(clientReferenceIdList) | ||
.id(idList) | ||
.build(); | ||
|
||
List<HFReferral> existingReferrals; | ||
try { | ||
// Query the repository to find existing entities | ||
existingReferrals = hfReferralRepository.find(hfReferralSearch, hfReferrals.size(), 0, | ||
hfReferrals.get(0).getTenantId(), null, false); | ||
} catch (Exception e) { | ||
// Handle query builder exception | ||
log.error("Search failed for HFReferral with error: {}", e.getMessage(), e); | ||
throw new CustomException("HFREFERRAL_SEARCH_FAILED", "Search Failed for HFReferral, " + e.getMessage()); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
* HLM Health-HRMS bug fix, user was set to null in hrms update as the t… (#761) * HLM Health-HRMS bug fix, user was set to null in hrms update as the tenantid was not provided during internal search * HLM updated hrms user type * updated type from individual create * Addressed code review comments * Added code comments and fixme todo as per code review comments * HLM updated flyway migration docker version * Revert "HLM updated flyway migration docker version" This reverts commit 1f1167e. * Updated code comments on EmployeeService update method * Update EmployeeService.java * Updated code comments on EmployeeService, added changes for NPE handling --------- Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com> * HLM-6185: Added null check for the project task resources list (#767) * HLM-6185: Added null check for the project task resources list * HLM-6185: updated transformer logic for project task with beneficiary task and status population * microplan-ui (#782) * microplan-ui * adding HLM-6172 changes * hiding unique identifier column * Update build-config.yml * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile * adding digti frontend pr 934 changes * Update build-config.yml * removing pl tl and template files * removed unnecessary code * Delete frontend/microplan-ui/Jenkinsfile * updating operation to match api changes * updating operation to match api changes * Update README.md * Update README.md * microplan-ui adding uploadguidelines and removing unnecessary files --------- Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Co-authored-by: SriPadma8997-egov <112681948+SriPadma8997-egov@users.noreply.github.com> * Admin console Improved performance, sheets freezed, implemented caching, delivery type integarted (#790) * Update campaignValidators.ts (#655) * fixes-> cyclenumber issue, hover issue, dropdown height issue, * css * fixes-> cyclenumber issue, hover issue, dropdown height issue, (#656) * fixes-> cyclenumber issue, hover issue, dropdown height issue, * css --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Update campaignUtils.ts * fixed HLM-5970 * Feat : added boundary validation at data level * fixes * local add * Added boundary validation * Refactor * fixed HLM-5935 and HLM-5749 * Refactor * Feat : updated table * change campaignid in payload * Feat : added campaignId * Update campaignApis.ts * Update campaignValidators.ts * refactored * Refactor * assigned campaignId * Refactor * updated createRequest Schema * Feat : invalid Status Persist * status fix * version-fix * Update CODEOWNERS * core version updated and css fix for language dropdown * refactor (#676) * Uat signoff (#678) * change in filter recursive * lowest level * added validation related to target sheet headers * HLM-5916 * download button fixes in summary (#682) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Hlm 5927 (#687) * change in filter recursive * lowest level * added validation for boundary codes to be invalid other than that selected from UI in target upload * Added Delivery and cycle config for LLIN and SMC both (#688) * no of cycle and deivery drafted changes * fixes * add localisation code for boundaries * fixes * fixes * Value localise in summary screen, api error change * fixes * genarate api call fix * font size change for summary * login css change * HLM-5718: SMC delivery config enhancement * config update * added config for in between * fix config for llin * added mdms integration --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Fixed HLM-5988_warning message (#689) Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> * download filename fixes (#693) * download button fixes in summary * download filename with custom name changes added --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * download filename fixes (#694) * download button fixes in summary * download filename with custom name changes added * config fix for llin --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * successful toast message is fixed (#695) * successful toast message is fixed * Update UploadData.js * HLM-5991: Alert Pop UP CR (#696) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * HLM-5718 changes (#703) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Localization cache (#706) * change in filter recursive * lowest level * refactored localization cache logic * Update README.md (#707) * Update README.md * Update README.md * Update utilities/project-factory/README.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update README.md --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * HLM-5985_made lowest level changes (#708) * HLM-5985_made lowest level changes * resolved codeRabbit comments * Create LOCALSETUP.md (#709) * Create LOCALSETUP.md * Refactored config * Update LOCALSETUP.md * Update utilities/project-factory/LOCALSETUP.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/LOCALSETUP.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/LOCALSETUP.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/LOCALSETUP.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update LOCALSETUP.md --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * updated the localisation module config * Refactor config (#713) * Refactor config * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update postman_collection.json (#714) * Update postman_collection.json * Update postman_collection.json * Delete utilities/project-factory/project_factory_swagger.yml (#715) * Feat : removed campaignId validation for boundary upload (#718) * updated the delay for boundary relationship * added logger for request TODO TEST will be reverted * Revert "added logger for request TODO TEST" This reverts commit d5c2bf5. * Schema validation (#719) * Feat : removed campaignId validation for boundary upload * Feat : added schema validation * Fixed mdms host * updated the logger messages * updated the loggers * delivery new changes, toast fix, error fix (#716) * delivery new changes, toast fix, error fix * new fixes * fixes * change text component to field component * added hierarchy * fix * fix * fix * fix * passing hierarchy from props --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Schema validation2 (#721) * Feat : removed campaignId validation for boundary upload * Feat : added schema validation * Fixed mdms host * Feat : added boundary validation * Feat : optimized product search * Fix : project mapping fixed (#722) * Fixed project search (#723) * smc fixes (#724) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Feat : added boundary confirmation (#727) * Fix: fixed processing boundary * Refactor * fixed HLM-6109 (#729) * gate fixes validation, ui ux (#731) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * integrated panelcard component (#732) * integrated panelcard component * Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/Response.js Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update genericUtils.ts (#733) * updated the folder structure * Create CHANGELOG.md (#717) * updated the versions * Update .gitignore * Update request.ts (#735) * fixed generate api issue (#734) Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * Create CHANGELOG.md * gate fixes (#736) * gate fixes validation, ui ux * gate fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * added loader in the selecting boundaries (#737) * Update createAndSearch.ts (#738) * fix (#739) * fix * fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Patch 3 (#740) * change in filter recursive * lowest level * trimmed underscore and empty spaces * boundary fix (#742) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Update genericUtils.ts (#746) * fixed the delivery products issue * Fixed delivery conditions issue * Update campaignApis.ts (#747) * fixed warning toast (#748) * fixed warning toast * Update UploadData.js * fix (#749) * fix * fx * fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * core -update (#751) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * fixed stepper issue (#752) * fixed stepper issue * Update index.html * Feat : added user validation via individual (#753) * fixes (#754) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * code fix nabeel (#756) * fixes * fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Updated few loggers (#759) * updated few loggers flow * Update utilities/project-factory/src/server/api/campaignApis.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/campaignMappingUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/campaignUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/api/campaignApis.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/campaignMappingUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update utilities/project-factory/src/server/utils/genericUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Updated the user Password generation logic #761 * Update Listener.ts (#730) * Update Listener.ts * added try catch logic in producer * Feat : added parallel batch execution (#767) * Feat : added parallel batch execution * Refactor * Update utilities/project-factory/src/server/validators/campaignValidators.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fixed the stepper (#765) * changes config (#769) * Project type config and added loggers for process of campaign (#772) * Feat : added themes in generate template (#773) * fixed the ajv package version for build issue * Feat : removed xlsx (#776) * HLM-6177: PARALLEL SEARCH IMPLEMENT, DELIVERY TYPE IMPLEMENT (#778) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * css update (#780) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * HLM-6179 and HLM-6180 (#777) * HLM-6179 and HLM-6180 * campaign name changes --------- Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> * Feat : fixed target generation (#781) * fixed tenantId issue (#784) * fix: resolved AJV-related Jenkins build issue reference #783 #786 (#787) * module ui fix * updated all the package version for build fixes * fixed kafka-error at target generation (#789) * updated core version (#791) * updated core version * updated css also * Update campaignValidators.ts (#794) * Updated the excel generation logic and files * added changes for configurable column in target sheet (#779) * change in filter recursive * lowest level * made target headers genearte through mdms schema * changed config index.ts * changed config index.ts * changes for now * added configurable column logic from schema HLM-6169 * updated validate of target columns through schema * added masterForColumnSchema in index.ts * formatted dataManageService * refactored lock TargetFields func * removed console.log * User creation performance improved (#800) * Feat : Improved user creation performance * Change status color * Update utilities/project-factory/src/server/utils/campaignUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update genericUtils.ts (#801) * Hlm 6170 (#802) * change in filter recursive * lowest level * HLM -6170 added logic for only village level data in target sheet and some refactoring * updated css (#804) * fixed button issue (#805) * HLM 6177: Error card implementation in summary screen (#806) * HLM-6177: PARALLEL SEARCH IMPLEMENT, DELIVERY TYPE IMPLEMENT * Added Error Cards in summary screen and redirection --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * added error button styles (#807) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * updated popUp css (#808) * HLM 6178: Implementing New Pop up screen in boundaries (#809) * added error button styles * Implementing New Pop up screen in boundaries --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Facility changes (#812) * Feat : changed facility Template * Feat : locked target templates * fixed colour issue (#813) * Updated the project type conversion logic for the "deliveryType" dont1 and n config * Unique field added (#814) * Feat : changed facility Template * Feat : locked target templates * Feat : added unique check logic * Target schema update (#815) * change in filter recursive * lowest level * updated shcema of target columns to be configurable * removed empty spaces from config index.ts * Active mapping (#817) * Feat : changed facility Template * Feat : locked target templates * Feat : added unique check logic * Feat : added mapping via active field * changes in the schema validation (#816) * Updated the workbench and css module version * Feat : added active inactive boundary check (#818) * Update campaignValidators.ts (#819) * added active inactive validation (#820) * changed api call time (#826) * Feat : added target sum mapping (#825) * added campaign type as filter (#827) * Update genericApis.ts (#828) * Update excelUtils.ts (#829) * UI issue fixes, icon fix in summary error (#831) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Target columns (#830) * change in filter recursive * lowest level * commit * Feat : target flow fixed for LLIN-mz * uat to dev --------- Co-authored-by: admin1 <nitish@egovernments.org> * Feat : freezed target columns (#833) * Target mr dn (#834) * change in filter recursive * lowest level * Feat : skipped validation temporarily * changes in the target validation (#835) * fixed error info (#837) * Added roboto font (#840) * Feat : added roboto font * Fixed config * target validation based on diff campaign types (#843) * change in filter recursive * lowest level * updated validation of target based on campaign type * fixed validation issue (#844) * Updated the workbench package version * fixed validation logic (#846) * fixed validation logic * Update micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UploadData.js Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Error messages improved (#848) * Feat : imporved error messages and initilised utils for tracking process * Fix ; unused variables fixed * Feat : improved error messages * Fix : download error fix (#850) * Update campaignUtils.ts (#851) * Update campaignUtils.ts * Update utilities/project-factory/src/server/utils/campaignUtils.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update campaignValidators.ts (#853) * HLM 6210: Toast, error focus fix and project type reset delivery data fix (#854) * HLM-6210: campaign type change reset delivery data fix, summary error focus fix * summary error focus fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * HLM-6225_added time out according to data (#855) * Update campaignValidators.ts (#859) * HLM 6210 (#858) * HLM-6210: campaign type change reset delivery data fix, summary error focus fix * summary error focus fix * parallel search fixes --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Remove validation (#852) * change in filter recursive * lowest level * removed unnecessary validation for target * spacing refactor * Update campaignValidators.ts (#863) * Header validation (#861) * change in filter recursive * lowest level * removed unnecessary validation for target * changed the logic of header validation * space refactor * Update campaignUtils.ts (#864) * fixed ui error (#865) * Read me (#867) * change in filter recursive * lowest level * removed unnecessary validation for target * changed the logic of header validation * fixed portugese language error * space refactoring * Update Dockerfile * Update Dockerfile * Update migrate.sh * Update Dockerfile * Update campaignValidators.ts (#868) * HLM 6210:campaign type change reset fix (#869) * HLM-6210: campaign type change reset delivery data fix, summary error focus fix * summary error focus fix * parallel search fixes * campaign type change reset fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Update excelUtils.ts for sheetHeaders wraping (#870) * Update package.json * updated error messages (#871) * feat : added jaeger-client tracing (#872) * updated the table config * Update campaignApis.ts (#875) * removed the schema and updated the db name * fixing generate API call, file auto delete, date error (#877) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Trim resource (#878) * Feat : trimmed resource persist message * Refactor * Removed reject error in produce message * fixed min time, draft logic (#879) * Update index.ts (#880) * added min ui error and facility usage (#883) * added min ui error and facility usage * changes * Update campaignUtils.ts (#884) * HLM 6007 (#885) * fixing generate API call, file auto delete, date error * generate api fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * Update Dockerfile * Feat : docker config update (#886) * Update Dockerfile (#887) * Create buildWorkbenchUI.yml * Update README.md (#917) * Update buildWorkbenchUI.yml * Update README.md * Updated the DB Schema issue of Project-factory * fixed hierarchy order (#919) * User flag hcm (#920) * Feat : docker config update * Feat : added user create flag * Refactored * Update campaignUtils.ts * Update campaignMappingUtils.ts (#922) * Ashish egov patch 2 (#921) * Update index.ts * Update campaignApis.ts * Fixed the project type conversion and product duplicate issue * Update campaignApis.ts (#924) * Update campaignMappingUtils.ts (#925) * Update campaignMappingUtils.ts * Refactored * Update publishProjectFactory.yml * Update buildWorkbenchUI.yml * Update campaignMappingUtils.ts (#926) * Update request.ts (#928) * Update request.ts * Feat : updated httprequest * Feat : warning response added * Refactor * added start and enddate in cycles * Update campaignApis.ts (#930) * Update request.ts (#932) * fixed generate issue (#933) * Fixed project-type resources duplication * updated target error messages (#936) * fixed stepper from draft (#937) * Update Listener.ts * delivery type disable fix, product sku name change (#939) Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> * fixed error message issue (#941) * Redis integration (#940) * Feat : added redis * Feat : added redis retry * updated migration * fixed * updated migration * Delete .vscode/launch.json * Delete .vscode/settings.json --------- Co-authored-by: ashish-egov <137176738+ashish-egov@users.noreply.github.com> Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> Co-authored-by: Bhavya-egov <bhavya.mangal@egovernments.org> Co-authored-by: ashish-egov <ashish.tiwari@egovernments.org> Co-authored-by: nitish-egov <137176807+nitish-egov@users.noreply.github.com> Co-authored-by: Bhavya-egov <137176879+Bhavya-egov@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Swathi-eGov <137176788+Swathi-eGov@users.noreply.github.com> Co-authored-by: admin1 <nitish@egovernments.org> * Master flyway imageupdate (#794) * flyway base image updated * reverted product changes and removed duplicate attendance code (#768) * flyway version update * updated psql version for core services and facility * flyway update * HLM throwing custom exception when boundary service call throw an error (#775) * HLM-6196: Search failing, updated GenericQueryBuilder.java, added changes to get all … (#769) * HLM Health-HRMS bug fix, user was set to null in hrms update as the t… (#761) * HLM Health-HRMS bug fix, user was set to null in hrms update as the tenantid was not provided during internal search * HLM updated hrms user type * updated type from individual create * Addressed code review comments * Added code comments and fixme todo as per code review comments * HLM updated flyway migration docker version * Revert "HLM updated flyway migration docker version" This reverts commit 1f1167e. * Updated code comments on EmployeeService update method * Update EmployeeService.java * Updated code comments on EmployeeService, added changes for NPE handling --------- Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com> * HLM-6196: updated GenericQueryBuilder.java, added changes to get all the fields except Object class * hlm-6196: update common library reference for dev testing" * HLM-6196: updated health-service-common version to 1.0.17-SNAPSHOT and added default for included deleted * HLM-6196: updated genericrepository * HLM-6196: fixed testcases * HLM-6196: fixed individual search query error * taskresource additional fields column added * HLM-6196: updated health services models TaskResource, added AdditionalField * HLM-6196: hfreferral, referral, sideeffect - edge case fix * HLM-6196: removed todo from urlparams --------- Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com> Co-authored-by: Vishal <sarasani.vishalreddy@egovernments.org> * Hlm 6196 hrms employee search by names fix (#785) * HLM-6196: updated @component in validators for client reference id validation * HLM-6196: fixed testcases for stock and individual * HLM-6196: added missing migration file * HLM-6196: updated IndividualSearch model, added exclude annotation on individual name * HLM-6196: rectifying egov-hrms individual search object commit * HLM-6196: updated health services common for model exclude field fix * Revert "HLM-6196: updated @component in validators for client reference id validation" This reverts commit 6e915a0. * Revert "HLM-6196: fixed testcases for stock and individual" This reverts commit ce90104. * HLM-6196: added comments as per code review * Update IndividualSearch.java --------- Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com> * HLM-6196: updated @component in validators for client reference id va… (#781) * HLM-6196: updated @component in validators for client reference id validation * HLM-6196: fixed testcases for stock and individual * HLM-6196: added missing migration file * HLM-6196: updated IndividualSearch model, added exclude annotation on individual name * HLM-6196: rectifying egov-hrms individual search object commit * HLM-6196: updated health services common for model exclude field fix * Revert "HLM-6196: updated @component in validators for client reference id validation" This reverts commit 6e915a0. * Revert "HLM-6196: fixed testcases for stock and individual" This reverts commit ce90104. * Revert "Revert "HLM-6196: updated @component in validators for client reference id validation"" This reverts commit 2218ad3. * Revert "Revert "HLM-6196: fixed testcases for stock and individual"" This reverts commit 083c516. * HLM-6196: replaced RuntimeException with CustomException * HLM-6196: updated to get only message from exception * HLM-6196: updated individual search as it was with exclude annotation * Update core-services/egov-hrms/src/main/java/org/egov/hrms/web/validator/EmployeeValidator.java Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * updated changelog for HCM v1.4 release * updated changelog for HCM v1.4 release * Update health-services/product/CHANGELOG.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update health-services/libraries/health-services-models/src/main/java/org/egov/common/models/project/TaskResource.java Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * HLM added error stack strace whenever custom exception is thrown while validation duplicate entry --------- Co-authored-by: kavi_elrey <25226238+kavi-egov@users.noreply.github.com> Co-authored-by: Vishal <sarasani.vishalreddy@egovernments.org> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Adding plan-service folder for master merge (#783) * Adding plan-service folder for master merge * code review comment. --------- Co-authored-by: devdatta-egov <nilesh.s@egovernments.org> * Microplan UI (#793) * microplan-ui * adding HLM-6172 changes * hiding unique identifier column * Update build-config.yml * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile * adding digti frontend pr 934 changes * Update build-config.yml * removing pl tl and template files * removed unnecessary code * Delete frontend/microplan-ui/Jenkinsfile * updating operation to match api changes * updating operation to match api changes * Update README.md * Update README.md * microplan-ui adding uploadguidelines and removing unnecessary files * adding microplan to micro-ui * adding microplan folder in microui/web * Update setupProxy.js * review changes * adding review changes * review changes * Update Mapping.js * Update Upload.js * Update geojsonValidations.js * Update CreateMicroplan.js * Update MicroplanPreview.js * Update MicroplanPreview.js * Update CreateMicroplan.js * adding review comments, updage campaign service, removed hardcoded tenent and removed logout util * removing microplan-ui folder * Update index.js * adding review changes, reducing functional complexcity * updaing microplan css pkg version * Update jsonToExcelBlob.js * Update MicroplanCreatedScreen.js * Update UICustomizations.js * Update uploadUtils.js * Update build-config.yml --------- Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Co-authored-by: SriPadma8997-egov <112681948+SriPadma8997-egov@users.noreply.github.com> --------- Co-authored-by: kavi_elrey@1993 <25226238+kavi-egov@users.noreply.github.com> Co-authored-by: siddhant-nawale-egov <162107530+siddhant-nawale-egov@users.noreply.github.com> Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com> Co-authored-by: SriPadma8997-egov <112681948+SriPadma8997-egov@users.noreply.github.com> Co-authored-by: ashish-egov <137176738+ashish-egov@users.noreply.github.com> Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com> Co-authored-by: nabeelmd-eGov <94039229+nabeelmd-eGov@users.noreply.github.com> Co-authored-by: Bhavya-egov <bhavya.mangal@egovernments.org> Co-authored-by: ashish-egov <ashish.tiwari@egovernments.org> Co-authored-by: nitish-egov <137176807+nitish-egov@users.noreply.github.com> Co-authored-by: Bhavya-egov <137176879+Bhavya-egov@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Swathi-eGov <137176788+Swathi-eGov@users.noreply.github.com> Co-authored-by: admin1 <nitish@egovernments.org> Co-authored-by: Vishal <sarasani.vishalreddy@egovernments.org> Co-authored-by: Priyanka-eGov <74049060+Priyanka-eGov@users.noreply.github.com> Co-authored-by: devdatta-egov <nilesh.s@egovernments.org>
Summary by CodeRabbit
New Features
Bug Fixes
Chores
ENTRYPOINT
instead ofCMD
.Enhancements