HLM-5118 resource estimation service #736
Open
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
…ion service, adding comments
|
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the WalkthroughThe update introduces a new "resource-estimation-service" within the "health-services" module, including configurations, dependencies, and various service classes. It integrates Swagger with Spring Boot, handles Kafka messaging, processes different file types, and performs resource estimation. The changes also include Docker and Flyway configurations for database migrations. 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
Review Details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (40)
- build/build-config.yml (1 hunks)
- health-services/resource-estimation-service/README.md (1 hunks)
- health-services/resource-estimation-service/pom.xml (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/Main.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/config/Configuration.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/config/MainConfiguration.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/config/ServiceConstants.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/kafka/PlanConsumer.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/kafka/Producer.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/repository/ServiceRequestRepository.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/service/ExcelParser.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/service/FileParser.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/service/GeoJsonParser.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/service/ResourceEstimationService.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/service/ShapeFileParser.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/util/CalculationUtil.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/util/FilestoreUtil.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/util/MdmsUtil.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/util/ParsingUtil.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/util/PlanConfigurationUtil.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/controllers/FileController.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/Activity.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/Assumption.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/Condition.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/File.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/MetricDetail.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/Operation.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/Plan.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/PlanConfiguration.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/PlanConfigurationRequest.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/PlanConfigurationResponse.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/PlanConfigurationSearchCriteria.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/PlanConfigurationSearchRequest.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/PlanRequest.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/Resource.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/ResourceMapping.java (1 hunks)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/Target.java (1 hunks)
- health-services/resource-estimation-service/src/main/resources/application.properties (1 hunks)
- health-services/resource-estimation-service/src/main/resources/db/Dockerfile (1 hunks)
- health-services/resource-estimation-service/src/main/resources/db/migrate.sh (1 hunks)
Files not reviewed due to errors (4)
- health-services/resource-estimation-service/pom.xml (no review received)
- build/build-config.yml (no review received)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/util/FilestoreUtil.java (no review received)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/service/ExcelParser.java (no review received)
Files skipped from review due to trivial changes (6)
- health-services/resource-estimation-service/src/main/java/org/egov/processor/Main.java
- health-services/resource-estimation-service/src/main/java/org/egov/processor/config/ServiceConstants.java
- health-services/resource-estimation-service/src/main/java/org/egov/processor/kafka/Producer.java
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/PlanConfigurationSearchCriteria.java
- health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/Resource.java
- health-services/resource-estimation-service/src/main/resources/db/Dockerfile
Additional Context Used
LanguageTool (3)
health-services/resource-estimation-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/resource-estimation-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 (41)
health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/Condition.java (1)
1-40: TheConditionclass is well-structured with appropriate validation annotations and usage of Lombok for boilerplate code. No issues found.health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/PlanConfigurationResponse.java (1)
1-40: ThePlanConfigurationResponseclass is well-structured with appropriate validation annotations and usage of Lombok for boilerplate code. No issues found.health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/ResourceMapping.java (1)
1-43: TheResourceMappingclass is well-structured with appropriate validation annotations and usage of Lombok for boilerplate code. No issues found.health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/Activity.java (1)
1-48: TheActivityclass is well-structured with appropriate validation annotations and usage of Lombok for boilerplate code. No issues found.health-services/resource-estimation-service/src/main/java/org/egov/processor/config/Configuration.java (1)
1-47: TheConfigurationclass is well-structured with appropriate usage of Spring annotations and Lombok for boilerplate code. No issues found.health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/Assumption.java (1)
1-44: TheAssumptionclass is well-structured with appropriate validation annotations and usage of Lombok for boilerplate code. No issues found.health-services/resource-estimation-service/src/main/java/org/egov/processor/config/MainConfiguration.java (1)
1-38: TheMainConfigurationclass is well-structured with appropriate usage of Spring annotations. No issues found.health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/Plan.java (1)
1-63: ThePlanclass is well-structured with appropriate validation annotations and usage of Lombok for boilerplate code. No issues found.health-services/resource-estimation-service/src/main/java/org/egov/processor/kafka/PlanConsumer.java (1)
23-26: Constructor looks good.health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/File.java (3)
1-38: Class-level annotations and fields look good.
40-70: EnumInputFileTypeEnumis well-defined.
71-73: Class closing looks good.health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/Operation.java (3)
1-47: Class-level annotations and fields look good.
49-85: EnumOperatorEnumis well-defined.
86-88: Class closing looks good.health-services/resource-estimation-service/src/main/java/org/egov/processor/util/PlanConfigurationUtil.java (1)
29-33: Constructor looks good.health-services/resource-estimation-service/src/main/java/org/egov/processor/web/controllers/FileController.java (1)
32-38: Constructor looks good.health-services/resource-estimation-service/src/main/java/org/egov/processor/web/models/PlanConfiguration.java (3)
1-78: Class-level annotations and fields look good.
80-86: EnumStatusEnumis well-defined.
87-88: Class closing looks good.health-services/resource-estimation-service/src/main/resources/application.properties (4)
1-4: Server settings look good.
10-25: Database and Flyway configurations look good.
26-45: Kafka configurations look good.
47-64: Service URLs look good.health-services/resource-estimation-service/src/main/java/org/egov/processor/repository/ServiceRequestRepository.java (2)
30-34: Constructor looks good.
65-67: Method looks good.health-services/resource-estimation-service/src/main/java/org/egov/processor/util/MdmsUtil.java (2)
1-37: Constructor and class-level annotations look good.
60-70: ThegetMdmsRequestmethod looks good.health-services/resource-estimation-service/src/main/java/org/egov/processor/service/GeoJsonParser.java (2)
1-41: Constructor and class-level annotations look good.
53-74: TheparseFileDatamethod inFileParserinterface is correctly implemented.health-services/resource-estimation-service/src/main/java/org/egov/processor/service/ResourceEstimationService.java (2)
1-36: Constructor and class-level annotations look good.
64-72: ThegetInputFileTypeMapmethod looks good.health-services/resource-estimation-service/src/main/java/org/egov/processor/util/CalculationUtil.java (4)
28-38: ThecalculateOutputValuemethod looks good.
46-52: TheconvertAssumptionsToMapmethod looks good.
88-110: ThegetInputValueFromJsonFeaturemethod looks good.
113-119: ThecalculateResultmethod looks good.health-services/resource-estimation-service/src/main/java/org/egov/processor/service/ShapeFileParser.java (1)
1-45: Constructor and class-level annotations look good.health-services/resource-estimation-service/src/main/java/org/egov/processor/util/ParsingUtil.java (4)
66-83: The methodvalidateColumnNamesis well-structured and uses appropriate logging and exception handling.
91-104: The methodgetAttributeNameIndexFromExcelis clear and concise.
138-141: The methodgetFileFromByteArrayis straightforward and correctly utilizes thefilestoreUtil.
150-153: The methodconvertByteArrayToStringis simple and effective.
| @@ -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.
Double quote environment 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 |
|
|
||
| public interface FileParser { | ||
|
|
||
| Object parseFileData(PlanConfiguration planConfig, String fileStoreId); |
There was a problem hiding this comment.
Use a more specific return type or a generic type instead of Object for type safety.
- Object parseFileData(PlanConfiguration planConfig, String fileStoreId);
+ <T> T parseFileData(PlanConfiguration planConfig, String fileStoreId);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
| Object parseFileData(PlanConfiguration planConfig, String fileStoreId); | |
| <T> T parseFileData(PlanConfiguration planConfig, String fileStoreId); |
| public class PlanRequest { | ||
| @JsonProperty("RequestInfo") | ||
| @Valid | ||
| private RequestInfo requestInfo = null; |
There was a problem hiding this comment.
Remove unnecessary initialization to null for requestInfo and plan fields.
- private RequestInfo requestInfo = null;
- private Plan plan = null;
+ private RequestInfo requestInfo;
+ private Plan plan;Also applies to: 27-27
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
| private RequestInfo requestInfo = null; | |
| private RequestInfo requestInfo; | |
| private Plan plan; |
| 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 by adding the missing closing bracket.
- 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" before "simple".
- 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 |
Comment on lines
+28
to
+37
| @KafkaListener(topics = { "${plan.config.consumer.kafka.save.topic}", "${plan.config.consumer.kafka.update.topic}" }) | ||
| public void listen(Map<String, Object> consumerRecord, @Header(KafkaHeaders.RECEIVED_TOPIC) String topic) { | ||
| try { | ||
| PlanConfigurationRequest planConfigurationRequest = objectMapper.convertValue(consumerRecord, PlanConfigurationRequest.class); | ||
| if (planConfigurationRequest.getPlanConfiguration().getStatus().equals(PlanConfiguration.StatusEnum.GENERATED)) { | ||
| resourceEstimationService.estimateResources(planConfigurationRequest); | ||
| } | ||
| } catch (Exception exception) { | ||
| log.error("Error in Plan consumer", exception); | ||
| } |
There was a problem hiding this comment.
Improve error handling and logging for better traceability.
@KafkaListener(topics = { "${plan.config.consumer.kafka.save.topic}", "${plan.config.consumer.kafka.update.topic}" })
public void listen(Map<String, Object> consumerRecord, @Header(KafkaHeaders.RECEIVED_TOPIC) String topic) {
try {
PlanConfigurationRequest planConfigurationRequest = objectMapper.convertValue(consumerRecord, PlanConfigurationRequest.class);
if (planConfigurationRequest.getPlanConfiguration().getStatus().equals(PlanConfiguration.StatusEnum.GENERATED)) {
resourceEstimationService.estimateResources(planConfigurationRequest);
}
} catch (IllegalArgumentException e) {
log.error("Invalid message format: {}", consumerRecord, e);
} catch (Exception e) {
log.error("Error processing message from topic {}: {}", topic, consumerRecord, e);
}
}
Comment on lines
+35
to
+55
| public List<PlanConfiguration> search(PlanConfigurationSearchRequest planConfigurationSearchRequest) | ||
| { | ||
| List<PlanConfiguration> planConfigurationList = new ArrayList<>(); | ||
| PlanConfigurationResponse planConfigurationResponse = null; | ||
| Object response = new HashMap<>(); | ||
|
|
||
| StringBuilder uri = new StringBuilder(); | ||
| uri.append(config.getPlanConfigHost()).append(config.getPlanConfigEndPoint()); | ||
|
|
||
| try { | ||
| response = serviceRequestRepository.fetchResult(uri, planConfigurationSearchRequest); | ||
| planConfigurationResponse = mapper.convertValue(response, PlanConfigurationResponse.class); | ||
| } catch (Exception e) { | ||
| log.error(ERROR_WHILE_FETCHING_FROM_PLAN_SERVICE, e); | ||
| } | ||
|
|
||
|
|
||
| if(planConfigurationResponse != null) | ||
| return planConfigurationResponse.getPlanConfiguration(); | ||
| else | ||
| return planConfigurationList; |
There was a problem hiding this comment.
Improve error handling, logging, and remove redundant initialization of response.
public List<PlanConfiguration> search(PlanConfigurationSearchRequest planConfigurationSearchRequest) {
List<PlanConfiguration> planConfigurationList = new ArrayList<>();
PlanConfigurationResponse planConfigurationResponse = null;
StringBuilder uri = new StringBuilder();
uri.append(config.getPlanConfigHost()).append(config.getPlanConfigEndPoint());
try {
Object response = serviceRequestRepository.fetchResult(uri, planConfigurationSearchRequest);
planConfigurationResponse = mapper.convertValue(response, PlanConfigurationResponse.class);
} catch (IllegalArgumentException e) {
log.error("Invalid request format: {}", planConfigurationSearchRequest, e);
} catch (Exception e) {
log.error(ERROR_WHILE_FETCHING_FROM_PLAN_SERVICE, e);
}
if (planConfigurationResponse != null) {
return planConfigurationResponse.getPlanConfiguration();
} else {
return planConfigurationList;
}
}
Comment on lines
+40
to
+52
| @RequestMapping(value = "/config/_test", method = RequestMethod.POST) | ||
| public ResponseEntity<String> test() { | ||
|
|
||
| PlanConfigurationSearchCriteria planConfigurationSearchCriteria = PlanConfigurationSearchCriteria.builder() | ||
| .tenantId("mz").id("b1a23c4e-a402-4047-9388-e8ae2bf7c1a3").build(); | ||
|
|
||
| // id("533db2ad-cfa7-42ce-b9dc-c2877c7405ca") | ||
| PlanConfigurationSearchRequest planConfigurationSearchRequest = PlanConfigurationSearchRequest.builder().planConfigurationSearchCriteria(planConfigurationSearchCriteria).requestInfo(new RequestInfo()).build(); | ||
| List<PlanConfiguration> planConfigurationls = planConfigurationUtil.search(planConfigurationSearchRequest); | ||
|
|
||
| // parser.parseFileData(planConfigurationls.get(0)); | ||
| return ResponseEntity.status(HttpStatus.OK).body("Okay"); | ||
| } |
There was a problem hiding this comment.
Remove commented-out code and hardcoded values, and replace with proper test cases.
@RequestMapping(value = "/config/_test", method = RequestMethod.POST)
public ResponseEntity<String> test() {
PlanConfigurationSearchCriteria planConfigurationSearchCriteria = PlanConfigurationSearchCriteria.builder()
.tenantId("mz").id("b1a23c4e-a402-4047-9388-e8ae2bf7c1a3").build();
PlanConfigurationSearchRequest planConfigurationSearchRequest = PlanConfigurationSearchRequest.builder()
.planConfigurationSearchCriteria(planConfigurationSearchCriteria)
.requestInfo(new RequestInfo()).build();
List<PlanConfiguration> planConfigurationList = planConfigurationUtil.search(planConfigurationSearchRequest);
return ResponseEntity.status(HttpStatus.OK).body("Okay");
}
Comment on lines
+37
to
+48
| public Object fetchResult(StringBuilder uri, Object request) { | ||
| mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); | ||
| Object response = null; | ||
| try { | ||
| response = restTemplate.postForObject(uri.toString(), request, Map.class); | ||
| }catch(HttpClientErrorException e) { | ||
| log.error(EXTERNAL_SERVICE_EXCEPTION,e); | ||
| throw new ServiceCallException(e.getResponseBodyAsString()); | ||
| }catch(Exception e) { | ||
| log.error(SEARCHER_SERVICE_EXCEPTION,e); | ||
| } | ||
|
|
There was a problem hiding this comment.
Improve error handling and logging for better traceability.
public Object fetchResult(StringBuilder uri, Object request) {
mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
Object response = null;
try {
response = restTemplate.postForObject(uri.toString(), request, Map.class);
} catch (HttpClientErrorException e) {
log.error("HTTP error while fetching result from {}: {}", uri, e.getResponseBodyAsString(), e);
throw new ServiceCallException(e.getResponseBodyAsString());
} catch (Exception e) {
log.error("Error while fetching result from {}: {}", uri, e.getMessage(), e);
}
return response;
}
Comment on lines
+52
to
+62
| public Object fetchResultWithGET(StringBuilder uri) { | ||
| Object response = null; | ||
| try { | ||
| response = restTemplate.getForObject(uri.toString(), byte[].class); | ||
| } catch (HttpClientErrorException e) { | ||
| log.error(EXTERNAL_SERVICE_EXCEPTION, e); | ||
| throw new ServiceCallException(e.getResponseBodyAsString()); | ||
| } catch (Exception e) { | ||
| log.error(SEARCHER_SERVICE_EXCEPTION, e); | ||
| } | ||
| return response; |
There was a problem hiding this comment.
Improve error handling and logging for better traceability.
public Object fetchResultWithGET(StringBuilder uri) {
Object response = null;
try {
response = restTemplate.getForObject(uri.toString(), byte[].class);
} catch (HttpClientErrorException e) {
log.error("HTTP error while fetching result from {}: {}", uri, e.getResponseBodyAsString(), e);
throw new ServiceCallException(e.getResponseBodyAsString());
} catch (Exception e) {
log.error("Error while fetching result from {}: {}", uri, e.getMessage(), e);
}
return response;
}…esource HLM-5701-create-microplan changes
…vice' into HLM-5118-resource-estimation-service
jagankumar-egov
pushed a commit
that referenced
this pull request
May 30, 2024
* gate fixes validation, ui ux * gate fix --------- Co-authored-by: nabeelmd-eGov <nabeel.md@egovernments.com>
Hlm 6183 row wise validation
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>
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
Documentation
Configuration
Enhancements