HLM-5117 Plan service Changes #734
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ile for plan service
…validateTemplateIdentifierAgainstResourceMapping
…dms-validations HLM-5117 changes in operation input validation against mdms data
…dms-validations HLM-5117 changes in operation input validation with section and filetype checks
WalkthroughThe recent updates involve significant enhancements to the Changes
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 (
|
|
@coderabbitai review |
Actions PerformedReview triggered.
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 31
Out of diff range and nitpick comments (4)
health-services/plan-service/src/main/java/digit/kafka/Producer.java (1)
8-8: Clarify or automate the change from CustomKafkaTemplate to KafkaTemplate if tracer is disabled.Consider using a configuration property to switch between CustomKafkaTemplate and KafkaTemplate automatically.
health-services/plan-service/src/main/java/digit/kafka/Consumer.java (1)
11-15: Document or remove the commented-out KafkaListener.If the KafkaListener is intended to be used, provide instructions on how to enable it. Otherwise, consider removing it to keep the code clean.
health-services/plan-service/README.md (2)
16-16: Avoid using bare URLs.Consider using markdown syntax for the URL:
[http://localhost:8080/](http://localhost:8080/).
18-18: Ensure the file ends with a single newline character.Add a newline character at the end of the file.
Review Details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (55)
- build/17/maven/Dockerfile (1 hunks)
- build/build-config.yml (1 hunks)
- health-services/plan-service/README.md (1 hunks)
- health-services/plan-service/pom.xml (1 hunks)
- health-services/plan-service/src/main/java/digit/Main.java (1 hunks)
- health-services/plan-service/src/main/java/digit/config/Configuration.java (1 hunks)
- health-services/plan-service/src/main/java/digit/config/MainConfiguration.java (1 hunks)
- health-services/plan-service/src/main/java/digit/config/ServiceConstants.java (1 hunks)
- health-services/plan-service/src/main/java/digit/kafka/Consumer.java (1 hunks)
- health-services/plan-service/src/main/java/digit/kafka/Producer.java (1 hunks)
- health-services/plan-service/src/main/java/digit/repository/PlanConfigurationRepository.java (1 hunks)
- health-services/plan-service/src/main/java/digit/repository/PlanRepository.java (1 hunks)
- health-services/plan-service/src/main/java/digit/repository/ServiceRequestRepository.java (1 hunks)
- health-services/plan-service/src/main/java/digit/repository/impl/PlanConfigurationRepositoryImpl.java (1 hunks)
- health-services/plan-service/src/main/java/digit/repository/impl/PlanRepositoryImpl.java (1 hunks)
- health-services/plan-service/src/main/java/digit/repository/querybuilder/PlanConfigQueryBuilder.java (1 hunks)
- health-services/plan-service/src/main/java/digit/repository/querybuilder/PlanQueryBuilder.java (1 hunks)
- health-services/plan-service/src/main/java/digit/repository/rowmapper/PlanConfigRowMapper.java (1 hunks)
- health-services/plan-service/src/main/java/digit/repository/rowmapper/PlanRowMapper.java (1 hunks)
- health-services/plan-service/src/main/java/digit/service/PlanConfigurationService.java (1 hunks)
- health-services/plan-service/src/main/java/digit/service/PlanEnricher.java (1 hunks)
- health-services/plan-service/src/main/java/digit/service/PlanService.java (1 hunks)
- health-services/plan-service/src/main/java/digit/service/PlanValidator.java (1 hunks)
- health-services/plan-service/src/main/java/digit/service/enrichment/EnrichmentService.java (1 hunks)
- health-services/plan-service/src/main/java/digit/service/validator/PlanConfigurationValidator.java (1 hunks)
- health-services/plan-service/src/main/java/digit/util/MdmsUtil.java (1 hunks)
- health-services/plan-service/src/main/java/digit/util/QueryUtil.java (1 hunks)
- health-services/plan-service/src/main/java/digit/util/ResponseInfoFactory.java (1 hunks)
- health-services/plan-service/src/main/java/digit/util/WorkflowUtil.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/controllers/PlanConfigController.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/controllers/PlanController.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/Activity.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/Assumption.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/Condition.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/File.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/MetricDetail.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/Operation.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/Plan.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/PlanConfiguration.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/PlanConfigurationRequest.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/PlanConfigurationResponse.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/PlanConfigurationSearchCriteria.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/PlanConfigurationSearchRequest.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/PlanRequest.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/PlanResponse.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/PlanSearchCriteria.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/PlanSearchRequest.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/Resource.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/ResourceMapping.java (1 hunks)
- health-services/plan-service/src/main/java/digit/web/models/Target.java (1 hunks)
- health-services/plan-service/src/main/resources/application.properties (1 hunks)
- health-services/plan-service/src/main/resources/db/Dockerfile (1 hunks)
- health-services/plan-service/src/main/resources/db/migrate.sh (1 hunks)
- health-services/plan-service/src/main/resources/db/migration/main/V20240305113045__plan_configuration_create_ddl.sql (1 hunks)
- health-services/plan-service/src/main/resources/db/migration/main/V20240305113047__plan_create_ddl.sql (1 hunks)
Files not processed due to max files limit (7)
- health-services/plan-service/src/main/resources/db/migration/main/V20240404113045__plan_configuration_add_filestoreid_ddl.sql
- health-services/plan-service/src/main/resources/db/migration/main/V20240404150000__plan_configuration_add_template_identifier_ddl.sql
- health-services/plan-service/src/main/resources/db/migration/main/V20241604150000__plan_configuration_add_status_ddl.sql
- health-services/plan-service/src/test/java/digit/TestConfiguration.java
- health-services/plan-service/src/test/java/digit/web/controllers/CreateApiControllerTest.java
- health-services/plan-service/src/test/java/digit/web/controllers/PlanConfigControllerTest.java
- health-services/project/src/main/java/org/egov/project/validator/project/ProjectValidator.java
Files skipped from review due to trivial changes (4)
- health-services/plan-service/src/main/java/digit/Main.java
- health-services/plan-service/src/main/java/digit/repository/PlanConfigurationRepository.java
- health-services/plan-service/src/main/java/digit/web/controllers/PlanController.java
- health-services/plan-service/src/main/resources/db/Dockerfile
Additional Context Used
LanguageTool (3)
health-services/plan-service/README.md (3)
Near line 11: Unpaired symbol: ‘]’ seems to be missing
Context: ...ry integrating swagger to SpringBoot is [springfox](https://github.com/springfox/...
Near line 13: Use “a” instead of ‘an’ if the following word doesn’t start with a vowel sound, e.g. ‘a sentence’, ‘a university’.
Context: ...gfox/springfox) Start your server as an simple java application You can view...
Near line 18: You might be missing the article “the” here.
Context: ...g to http://localhost:8080/ Change default port value in application.properties
ShellCheck (5)
health-services/plan-service/src/main/resources/db/migrate.sh (5)
[info] 3-3: Double quote to prevent globbing and word splitting.
[info] 3-3: Double quote to prevent globbing and word splitting.
[info] 3-3: Double quote to prevent globbing and word splitting.
[info] 3-3: Double quote to prevent globbing and word splitting.
[info] 3-3: Double quote to prevent globbing and word splitting.
Additional comments not posted (97)
health-services/plan-service/src/main/java/digit/repository/PlanRepository.java (1)
1-16: Interface methods look good.health-services/plan-service/src/main/java/digit/web/models/PlanRequest.java (1)
1-30: Model class looks good.health-services/plan-service/src/main/java/digit/web/models/PlanResponse.java (1)
1-31: Model class looks good.health-services/plan-service/src/main/java/digit/web/models/PlanSearchRequest.java (1)
1-30: Model class looks good.health-services/plan-service/src/main/java/digit/web/models/PlanConfigurationRequest.java (1)
1-31: ThePlanConfigurationRequestclass is well-defined with appropriate annotations and fields. No issues found.health-services/plan-service/src/main/java/digit/web/models/PlanConfigurationSearchRequest.java (1)
1-30: ThePlanConfigurationSearchRequestclass is well-defined with appropriate annotations and fields. No issues found.health-services/plan-service/src/main/java/digit/web/models/Target.java (1)
1-37: TheTargetclass is well-defined with appropriate annotations and fields. No issues found.build/17/maven/Dockerfile (1)
1-34: The Dockerfile is well-structured and follows best practices. No issues found.health-services/plan-service/src/main/java/digit/web/models/Condition.java (1)
1-40: TheConditionclass is well-defined with appropriate annotations and fields. No issues found.health-services/plan-service/src/main/java/digit/web/models/Resource.java (1)
1-39: TheResourceclass is well-defined with appropriate annotations and fields. No issues found.health-services/plan-service/src/main/java/digit/web/models/PlanSearchCriteria.java (1)
1-46: ThePlanSearchCriteriaclass is well-defined with appropriate annotations and fields. No issues found.health-services/plan-service/src/main/java/digit/web/models/PlanConfigurationSearchCriteria.java (2)
1-20: Class-level annotations and imports look good.
21-44: Field annotations and JSON properties are correctly applied.health-services/plan-service/src/main/java/digit/web/models/ResourceMapping.java (2)
1-23: Class-level annotations and imports look good.
24-42: Field annotations and JSON properties are correctly applied.health-services/plan-service/src/main/java/digit/web/models/PlanConfigurationResponse.java (3)
1-21: Class-level annotations and imports look good.
22-33: Field annotations and JSON properties are correctly applied.
35-41: MethodaddPlanConfigurationResponseItemis correctly implemented.health-services/plan-service/src/main/java/digit/web/models/Activity.java (2)
1-24: Class-level annotations and imports look good.
25-49: Field annotations and JSON properties are correctly applied.health-services/plan-service/src/main/java/digit/web/models/Assumption.java (2)
1-25: Class-level annotations and imports look good.
26-43: Field annotations and JSON properties are correctly applied.health-services/plan-service/src/main/java/digit/repository/ServiceRequestRepository.java (3)
1-19: Class-level annotations and imports look good.
21-27: Field declarations and constructor look good.
31-44: MethodfetchResultis correctly implemented with proper error handling.health-services/plan-service/src/main/java/digit/web/models/Plan.java (2)
1-23: Class-level annotations and imports look good.
24-62: Field annotations and JSON properties are correctly applied.health-services/plan-service/src/main/java/digit/config/MainConfiguration.java (6)
1-18: Class-level annotations and imports look good.
20-21: Field declaration looks good.
23-26: Methodinitializeis correctly implemented.
28-31: MethodobjectMapperis correctly implemented.
33-39: MethodjacksonConverteris correctly implemented.
41-44: MethodsingleColumnRowMapperis correctly implemented.health-services/plan-service/src/main/java/digit/config/Configuration.java (1)
1-59: Configuration properties and annotations are correctly defined. The use of Lombok annotations simplifies the code.health-services/plan-service/src/main/java/digit/web/models/Operation.java (1)
1-86: The fields are correctly annotated for validation. The enum is well-defined with JSON serialization and deserialization methods.health-services/plan-service/src/main/resources/db/migration/main/V20240305113047__plan_create_ddl.sql (1)
1-74: The table definitions include primary keys, foreign keys, and appropriate data types. The use of JSONB for additional details is appropriate.health-services/plan-service/src/main/java/digit/web/models/File.java (1)
1-77: The fields are correctly annotated for validation. The enum is well-defined with JSON serialization and deserialization methods.health-services/plan-service/src/main/java/digit/web/models/MetricDetail.java (1)
1-74: The fields are correctly annotated for validation. The enum is well-defined with JSON serialization and deserialization methods.health-services/plan-service/src/main/java/digit/web/models/PlanConfiguration.java (1)
1-88: The fields are correctly annotated for validation. The enum is well-defined. The use ofAuditDetailsis appropriate.health-services/plan-service/src/main/resources/application.properties (1)
1-74: The configuration properties are correctly defined. The use of placeholders for sensitive information is appropriate.health-services/plan-service/src/main/java/digit/service/PlanService.java (1)
1-89: The methods are well-defined and follow a clear structure. The use of validators and enrichers ensures data integrity.health-services/plan-service/src/main/java/digit/util/QueryUtil.java (2)
28-34: Consider usingStringBuilderfor appending strings in a loop.
[PERFORMANCE]
UsingStringBuilderfor appending strings in a loop can improve performance by reducing the number of intermediate string objects created.public static void addClauseIfRequired(StringBuilder query, List<Object> preparedStmtList){ if(preparedStmtList.isEmpty()){ query.append(" WHERE "); }else{ query.append(" AND "); } }
42-52: Consider usingStringBuilderfor creating the query string.
[PERFORMANCE]
UsingStringBuilderfor creating the query string can improve performance by reducing the number of intermediate string objects created.public static String createQuery(Integer size) { StringBuilder builder = new StringBuilder(); IntStream.range(0, size).forEach(i -> { builder.append(" ?"); if (i != size - 1) builder.append(","); }); return builder.toString(); }health-services/plan-service/pom.xml (4)
8-12: Java version correctly set to 17.
13-17: Spring Boot starter parent version is appropriate.
18-26: Build configuration is standard and correctly set up.
27-91: Dependencies are appropriate and necessary for the project.health-services/plan-service/src/main/java/digit/service/enrichment/EnrichmentService.java (6)
18-23: Constructor correctly initializes theconfigfield.
31-37:enrichCreatemethod correctly enriches the request and handles missing user information.
43-60:enrichPlanConfigurationmethod correctly generates IDs for the plan configuration and its components.
67-71:enrichAuditDetailsmethod correctly enriches the audit details.
79-85:enrichUpdatemethod correctly handles the enrichment and validation processes for updating a plan configuration.
91-121:enrichPlanConfigurationForUpdatemethod correctly generates IDs for components if they are empty.health-services/plan-service/src/main/java/digit/config/ServiceConstants.java (1)
1-122: Constants are well-defined and cover necessary aspects of the service.health-services/plan-service/src/main/java/digit/util/WorkflowUtil.java (6)
30-37: Field declarations and constructor are standard and correctly set up.
49-65:getBusinessServicemethod correctly constructs the search URL, fetches the result, and handles parsing errors.
79-87:updateWorkflowStatusmethod correctly updates the workflow status and returns the updated status.
96-104:getSearchURLWithParamsmethod correctly constructs the search URL with the provided parameters.
117-142:getProcessInstanceForWorkflowmethod correctly enriches theProcessInstanceobject with the provided parameters.
180-186:callWorkFlowmethod correctly calls the workflow service and sets the resultant status.build/build-config.yml (1)
171-177: Build configuration forplan-serviceis correctly set up and follows the standard format.health-services/plan-service/src/main/java/digit/repository/querybuilder/PlanQueryBuilder.java (4)
13-19: Constructor correctly initializes theconfigfield.
36-50:getPlanQueryandbuildPlanQuerymethods correctly construct and build the query for fetching plans.
52-99:getPlanSearchQueryandbuildPlanSearchQuerymethods correctly construct and build the query for searching plans.
101-113:getPaginatedQuerymethod correctly handles pagination by appending offset and limit parameters.health-services/plan-service/src/main/java/digit/repository/querybuilder/PlanConfigQueryBuilder.java (2)
11-18: Constructor correctly initializes theconfigfield.
42-103:getPlanConfigSearchQueryandbuildPlanConfigSearchQuerymethods correctly construct and build the query for searching plan configurations.health-services/plan-service/src/main/java/digit/repository/rowmapper/PlanRowMapper.java (7)
1-27: No issues found in the class-level elements and constructor.
29-72: No issues found in theextractDatamethod.
74-118: No issues found in theaddActivitiesmethod.
120-153: No issues found in theaddActivityConditionsmethod.
155-189: No issues found in theaddResourcesmethod.
191-230: No issues found in theaddTargetsmethod.
232-245: No issues found in thegetAdditionalDetailmethod.health-services/plan-service/src/main/java/digit/service/PlanValidator.java (11)
1-30: No issues found in the class-level elements and constructor.
32-59: No issues found in thevalidatePlanCreatemethod.
61-71: No issues found in thevalidateActivityDependenciesmethod.
73-88: No issues found in thecheckForCycleInActivityDependenciesmethod.
90-109: No issues found in thevalidateDependentActivityCodesmethod.
118-152: No issues found in thevalidateActivitiesmethod.
154-165: No issues found in thevalidatePlanConfigurationExistencemethod.
167-189: No issues found in thevalidateResourcesmethod.
192-210: No issues found in thevalidateResourceActivityLinkagemethod.
212-229: No issues found in thevalidateTargetActivityLinkagemethod.
231-266: No issues found in thevalidatePlanUpdatemethod.health-services/plan-service/src/main/java/digit/service/validator/PlanConfigurationValidator.java (12)
1-37: No issues found in the class-level elements and constructor.
39-54: No issues found in thevalidateCreatemethod.
56-72: No issues found in thevalidateAssumptionValuemethod.
74-100: No issues found in thevalidateAssumptionKeyAgainstMDMSmethod.
102-118: No issues found in thevalidateFilestoreIdmethod.
120-148: No issues found in thevalidateTemplateIdentifierAgainstMDMSmethod.
150-186: No issues found in thevalidateOperationsInputAgainstMDMSmethod.
188-207: No issues found in thegetRuleConfigInputsFromSchemamethod.
211-222: No issues found in thevalidateMappedToForLocalitymethod.
226-245: No issues found in thevalidateMappedTomethod.
249-255: No issues found in thevalidateSearchRequestmethod.
257-265: No issues found in thevalidateSearchCriteriamethod.
| Long ts = null; | ||
| if (requestInfo != null) | ||
| ts = requestInfo.getTs(); | ||
| final String resMsgId = RES_MSG_ID; // FIXME : Hard-coded |
There was a problem hiding this comment.
Avoid hard-coding values. Consider using a configuration property or a constant defined elsewhere.
- final String resMsgId = RES_MSG_ID; // FIXME : Hard-coded
+ final String resMsgId = requestInfo != null ? requestInfo.getResMsgId() : RES_MSG_ID;Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.
Suggested change
| final String resMsgId = RES_MSG_ID; // FIXME : Hard-coded | |
| final String resMsgId = requestInfo != null ? requestInfo.getResMsgId() : RES_MSG_ID; |
| @@ -0,0 +1,3 @@ | |||
| #!/bin/sh | |||
|
|
|||
| flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true -ignoreMissingMigrations=true migrate | |||
There was a problem hiding this comment.
Properly quote variables to prevent globbing and word splitting.
- flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true -ignoreMissingMigrations=true migrate
+ flyway -url="$DB_URL" -table="$SCHEMA_TABLE" -user="$FLYWAY_USER" -password="$FLYWAY_PASSWORD" -locations="$FLYWAY_LOCATIONS" -baselineOnMigrate=true -outOfOrder=true -ignoreMissingMigrations=true migrateCommittable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.
Suggested change
| flyway -url=$DB_URL -table=$SCHEMA_TABLE -user=$FLYWAY_USER -password=$FLYWAY_PASSWORD -locations=$FLYWAY_LOCATIONS -baselineOnMigrate=true -outOfOrder=true -ignoreMissingMigrations=true migrate | |
| flyway -url="$DB_URL" -table="$SCHEMA_TABLE" -user="$FLYWAY_USER" -password="$FLYWAY_PASSWORD" -locations="$FLYWAY_LOCATIONS" -baselineOnMigrate=true -outOfOrder=true -ignoreMissingMigrations=true migrate |
| By using the [OpenAPI-Spec](https://github.com/swagger-api/swagger-core), you can easily generate a server stub. | ||
| This is an example of building a swagger-enabled server in Java using the SpringBoot framework. | ||
|
|
||
| The underlying library integrating swagger to SpringBoot is [springfox](https://github.com/springfox/springfox) |
There was a problem hiding this comment.
Fix the unpaired symbol.
- The underlying library integrating swagger to SpringBoot is [springfox](https://github.com/springfox/springfox)
+ The underlying library integrating swagger to SpringBoot is [springfox](https://github.com/springfox/springfox).Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.
Suggested change
| The underlying library integrating swagger to SpringBoot is [springfox](https://github.com/springfox/springfox) | |
| The underlying library integrating swagger to SpringBoot is [springfox](https://github.com/springfox/springfox). |
|
|
||
| The underlying library integrating swagger to SpringBoot is [springfox](https://github.com/springfox/springfox) | ||
|
|
||
| Start your server as an simple java application |
There was a problem hiding this comment.
Use "a" instead of "an".
- Start your server as an simple java application
+ Start your server as a simple java applicationCommittable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.
Suggested change
| Start your server as an simple java application | |
| Start your server as a simple java application |
| Start your server as an simple java application | ||
|
|
||
| You can view the api documentation in swagger-ui by pointing to | ||
| http://localhost:8080/ |
There was a problem hiding this comment.
Add "the" before "default port value".
- Change default port value in application.properties
+ Change the default port value in application.propertiesCommittable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.
Suggested change
| http://localhost:8080/ |
Comment on lines
+79
to
+88
| public PlanConfigurationResponse update(PlanConfigurationRequest request) { | ||
| validator.validateUpdateRequest(request); | ||
| enrichmentService.enrichUpdate(request); | ||
| repository.update(request); | ||
|
|
||
| // Build and return response back to controller | ||
| return PlanConfigurationResponse.builder() | ||
| .responseInfo(ResponseInfoUtil.createResponseInfoFromRequestInfo(request.getRequestInfo(), Boolean.TRUE)) | ||
| .planConfiguration(Collections.singletonList(request.getPlanConfiguration())) | ||
| .build(); |
There was a problem hiding this comment.
Consider adding logging for the update process.
Adding logging for the update process can help in debugging and monitoring.
log.info("Updating plan configuration: {}", request);
validator.validateUpdateRequest(request);
enrichmentService.enrichUpdate(request);
repository.update(request);
log.info("Updated plan configuration: {}", request);
return PlanConfigurationResponse.builder()
.responseInfo(ResponseInfoUtil.createResponseInfoFromRequestInfo(request.getRequestInfo(), Boolean.TRUE))
.planConfiguration(Collections.singletonList(request.getPlanConfiguration()))
.build();
Comment on lines
+47
to
+48
| producer.push(config.getPlanConfigCreateTopic(), planConfigurationRequest); | ||
| } |
There was a problem hiding this comment.
Ensure the topic name is configurable.
Hardcoding the topic name can make the code less flexible. Consider making the topic name configurable through application properties.
producer.push(config.getPlanConfigCreateTopic(), planConfigurationRequest);
Comment on lines
+89
to
+90
| producer.push(config.getPlanConfigUpdateTopic(), planConfigurationRequest); | ||
| } |
There was a problem hiding this comment.
Ensure the topic name is configurable.
Hardcoding the topic name can make the code less flexible. Consider making the topic name configurable through application properties.
producer.push(config.getPlanConfigUpdateTopic(), planConfigurationRequest);
Comment on lines
+22
to
+55
| public void enrichPlanCreate(PlanRequest body) { | ||
| // Generate id for plan | ||
| UUIDEnrichmentUtil.enrichRandomUuid(body.getPlan(), "id"); | ||
|
|
||
| // Generate id for activities | ||
| body.getPlan().getActivities().forEach(activity -> UUIDEnrichmentUtil.enrichRandomUuid(activity, "id")); | ||
|
|
||
| // Generate id for activity conditions | ||
| body.getPlan().getActivities().forEach(activity -> { | ||
| if(!CollectionUtils.isEmpty(activity.getConditions())) { | ||
| UUIDEnrichmentUtil.enrichRandomUuid(activity.getConditions(), "id"); | ||
| } | ||
| }); | ||
|
|
||
| // Set empty value in dependencies list when it is empty or null | ||
| body.getPlan().getActivities().forEach(activity -> { | ||
| if(CollectionUtils.isEmpty(activity.getDependencies())) { | ||
| List<String> emptyStringList = new ArrayList<>(); | ||
| emptyStringList.add(""); | ||
| activity.setDependencies(emptyStringList); | ||
| } | ||
| }); | ||
|
|
||
| // Generate id for resources | ||
| body.getPlan().getResources().forEach(resource -> UUIDEnrichmentUtil.enrichRandomUuid(resource, "id")); | ||
|
|
||
| // Generate id for targets | ||
| body.getPlan().getTargets().forEach(target -> UUIDEnrichmentUtil.enrichRandomUuid(target, "id")); | ||
|
|
||
| // Enrich audit details | ||
| body.getPlan().setAuditDetails(AuditDetailsEnrichmentUtil | ||
| .prepareAuditDetails(body.getPlan().getAuditDetails(), body.getRequestInfo(), Boolean.TRUE)); | ||
|
|
||
| } |
There was a problem hiding this comment.
Consider adding logging for the enrichment process.
Adding logging for the enrichment process can help in debugging and monitoring.
log.info("Enriching plan create request: {}", body);
UUIDEnrichmentUtil.enrichRandomUuid(body.getPlan(), "id");
body.getPlan().getActivities().forEach(activity -> UUIDEnrichmentUtil.enrichRandomUuid(activity, "id"));
body.getPlan().getActivities().forEach(activity -> {
if(!CollectionUtils.isEmpty(activity.getConditions())) {
UUIDEnrichmentUtil.enrichRandomUuid(activity.getConditions(), "id");
}
});
body.getPlan().getActivities().forEach(activity -> {
if(CollectionUtils.isEmpty(activity.getDependencies())) {
List<String> emptyStringList = new ArrayList<>();
emptyStringList.add("");
activity.setDependencies(emptyStringList);
}
});
UUIDEnrichmentUtil.enrichRandomUuid(body.getPlan().getResources(), "id");
UUIDEnrichmentUtil.enrichRandomUuid(body.getPlan().getTargets(), "id");
body.getPlan().setAuditDetails(AuditDetailsEnrichmentUtil.prepareAuditDetails(body.getPlan().getAuditDetails(), body.getRequestInfo(), Boolean.TRUE));
log.info("Enriched plan create request: {}", body);
Comment on lines
+61
to
+103
| public void enrichPlanUpdate(PlanRequest body) { | ||
| // Generate uuid for new activities | ||
| Set<String> newActivityUuids = new HashSet<>(); | ||
| body.getPlan().getActivities().forEach(activity -> { | ||
| if(ObjectUtils.isEmpty(activity.getId())) { | ||
| UUIDEnrichmentUtil.enrichRandomUuid(activity, "id"); | ||
| newActivityUuids.add(activity.getId()); | ||
| } | ||
| }); | ||
|
|
||
| // Generate uuid for new activity conditions | ||
| body.getPlan().getActivities().forEach(activity -> { | ||
| if(!CollectionUtils.isEmpty(activity.getConditions()) && newActivityUuids.contains(activity.getId())) { | ||
| activity.getConditions().forEach(condition -> { | ||
| if(ObjectUtils.isEmpty(condition.getId())) { | ||
| UUIDEnrichmentUtil.enrichRandomUuid(condition, "id"); | ||
| } | ||
| }); | ||
| } | ||
| }); | ||
|
|
||
| // Set empty value in dependencies list when it is empty or null | ||
| body.getPlan().getActivities().forEach(activity -> { | ||
| if(CollectionUtils.isEmpty(activity.getDependencies())) { | ||
| List<String> emptyStringList = new ArrayList<>(); | ||
| emptyStringList.add(""); | ||
| activity.setDependencies(emptyStringList); | ||
| } | ||
| }); | ||
|
|
||
| // Generate uuid for new resources | ||
| body.getPlan().getResources().forEach(resource -> { | ||
| if(ObjectUtils.isEmpty(resource.getId())) { | ||
| UUIDEnrichmentUtil.enrichRandomUuid(resource, "id"); | ||
| } | ||
| }); | ||
|
|
||
| // Generate uuid for new targets | ||
| body.getPlan().getTargets().forEach(target -> { | ||
| if(ObjectUtils.isEmpty(target.getId())) { | ||
| UUIDEnrichmentUtil.enrichRandomUuid(target, "id"); | ||
| } | ||
| }); |
There was a problem hiding this comment.
Consider adding logging for the enrichment process.
Adding logging for the enrichment process can help in debugging and monitoring.
log.info("Enriching plan update request: {}", body);
Set<String> newActivityUuids = new HashSet<>();
body.getPlan().getActivities().forEach(activity -> {
if(ObjectUtils.isEmpty(activity.getId())) {
UUIDEnrichmentUtil.enrichRandomUuid(activity, "id");
newActivityUuids.add(activity.getId());
}
});
body.getPlan().getActivities().forEach(activity -> {
if(!CollectionUtils.isEmpty(activity.getConditions()) && newActivityUuids.contains(activity.getId())) {
activity.getConditions().forEach(condition -> {
if(ObjectUtils.isEmpty(condition.getId())) {
UUIDEnrichmentUtil.enrichRandomUuid(condition, "id");
}
});
}
});
body.getPlan().getActivities().forEach(activity -> {
if(CollectionUtils.isEmpty(activity.getDependencies())) {
List<String> emptyStringList = new ArrayList<>();
emptyStringList.add("");
activity.setDependencies(emptyStringList);
}
});
body.getPlan().getResources().forEach(resource -> {
if(ObjectUtils.isEmpty(resource.getId())) {
UUIDEnrichmentUtil.enrichRandomUuid(resource, "id");
}
});
body.getPlan().getTargets().forEach(target -> {
if(ObjectUtils.isEmpty(target.getId())) {
UUIDEnrichmentUtil.enrichRandomUuid(target, "id");
}
});
log.info("Enriched plan update request: {}", body);
jagankumar-egov
added a commit
that referenced
this pull request
May 30, 2024
Co-authored-by: Jagankumar <53823168+jagankumar-egov@users.noreply.github.com>
kavi-egov
pushed a commit
that referenced
this pull request
Jun 20, 2024
…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>
kavi-egov
added a commit
that referenced
this pull request
Jun 27, 2024
* 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>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary by CodeRabbit
New Features
Enhancements
Documentation
Configuration