HLM Health-HRMS bug fix, user was set to null in hrms update as the t…

[kanishq-egov]

…enantid was not provided during internal search

Summary by CodeRabbit

• New Features

  • Enhanced employee update process to include tenant ID extraction and detailed employee information enrichment.

• Bug Fixes

  • Corrected user type assignment in individual service updates.

• Refactor

  • Simplified the create method in EmployeeController by removing the bindingResult parameter.

• Chores

  • Updated Dockerfiles across various health services to use a more recent base image and switched from CMD to ENTRYPOINT for migration scripts.

[coderabbitai]

Warning

Rate limit exceeded

@kanishq-egov has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 14 minutes and 6 seconds before requesting another review.

How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

Commits

Files that changed from the base of the PR and between 5d6ebf8 and c170e5e.

Walkthrough

The recent updates encompass enhancements across various services, focusing on optimizing employee data handling and Dockerfile configurations. Key changes include refining methods for extracting and using tenantId and UUIDs in EmployeeService, updating user type assignments in IndividualService, and modifying Dockerfiles to use a newer Flyway image and switching from CMD to ENTRYPOINT for running migration scripts.

Changes

Files/Paths	Change Summary
core-services/egov-hrms/.../EmployeeService.java	Extract tenantId from employeeRequest, enrich update requests with existing details, update user info, push to HRMS topic.
core-services/egov-hrms/.../IndividualService.java	Replace UserType value assignment with individual.getUserDetails().getUserType().
core-services/egov-hrms/.../EmployeeController.java	Remove bindingResult parameter from the create method signature.
health-services/.../db/Dockerfile	Update base image from egovio/flyway:4.1.2 to egovio/flyway:10.7.1, switch from CMD to ENTRYPOINT for migration script.

Sequence Diagram(s) (Beta)

sequenceDiagram
    participant Client
    participant EmployeeController
    participant EmployeeService
    participant HRMSTopic

    Client->>EmployeeController: create(EmployeeRequest)
    EmployeeController->>EmployeeService: processCreate(EmployeeRequest)
    EmployeeService->>EmployeeService: extractTenantId(EmployeeRequest)
    EmployeeService->>EmployeeService: searchExistingEmployees(UUIDs, tenantId)
    EmployeeService->>EmployeeService: enrichUpdateRequest(existingEmployeeDetails)
    EmployeeService->>EmployeeService: updateUserDetails()
    EmployeeService->>HRMSTopic: pushUpdateRequest()
    HRMSTopic->>EmployeeService: acknowledgeUpdate()
    EmployeeService->>EmployeeController: return Response
    EmployeeController->>Client: send Response

Loading

Poem

In the land of code, where changes flow,
Employee details now aglow.
From Docker's depths, a new base rise,
With ENTRYPOINT it now complies.
User types refined, requests so bright,
HRMS updates take their flight.
A rabbit cheers, with joy and glee,
For code that's clear and running free! 🐇✨

---

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?

Share

• X
• Mastodon
• Reddit
• LinkedIn

Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>.
  • Generate unit testing code for this file.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai generate interesting stats about this repository and render them as a table.
  • @coderabbitai show all the console.log statements in this repository.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

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)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[coderabbitai]

Actionable comments posted: 1

Review details

Configuration used: .coderabbit.yaml
Review profile: ASSERTIVE

Commits

Files that changed from the base of the PR and between a4c94e3 and 74a1d13.

Files selected for processing (1)

• core-services/egov-hrms/src/main/java/org/egov/hrms/service/EmployeeService.java (1 hunks)

Additional comments not posted (1)

core-services/egov-hrms/src/main/java/org/egov/hrms/service/EmployeeService.java (1)

357-357: Verify that the search method correctly uses the extracted tenant ID.

Verification successful

---

The search method in EmployeeService.java correctly uses the tenantId from the EmployeeSearchCriteria object. The tenantId is utilized in multiple places within the method, ensuring it is part of the search criteria.

• userSearchCriteria.put(HRMSConstants.HRMS_USER_SEARCH_CRITERA_TENANTID, criteria.getTenantId()); (lines 150, 178, 205)

This confirms that the tenantId is correctly used in the search method.

Scripts executed

The following scripts were executed for the analysis:

---

Script:

#!/bin/bash
# Description: Verify that the search method uses the tenant ID correctly.

# Test: Search for the usage of `tenantId` in the `search` method call. Expect: Correct usage of tenant ID.
rg --type java $'search\\(EmployeeSearchCriteria.builder\\(\\).uuids\\(uuidList\\).tenantId\\(tenantId\\).build\\(\\),requestInfo\\)'

Length of output: 348

---

---

Script:

#!/bin/bash
# Locate the implementation of the `search` method in the codebase.
ast-grep --lang java --pattern $'public EmployeeResponse search($_, $_) { $$$ }'

Length of output: 81

---

---

Script:

#!/bin/bash
# Locate the definition of the `search` method in the codebase.
rg --type java 'public EmployeeResponse search'

Length of output: 222

---

---

Script:

#!/bin/bash
# Extract the implementation of the `search` method from EmployeeService.java.
ast-grep --lang java --pattern $'public EmployeeResponse search(EmployeeSearchCriteria criteria, RequestInfo requestInfo) { $$$ }' core-services/egov-hrms/src/main/java/org/egov/hrms/service/EmployeeService.java

Length of output: 12502

[coderabbitai]

Actionable comments posted: 1

Review details

Configuration used: .coderabbit.yaml
Review profile: ASSERTIVE

Commits

Files that changed from the base of the PR and between 74a1d13 and 01a1b82.

Files selected for processing (1)

• core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java (1 hunks)

[coderabbitai]

Actionable comments posted: 2

Review details

Configuration used: .coderabbit.yaml
Review profile: ASSERTIVE

Commits

Files that changed from the base of the PR and between 01a1b82 and 7b5216f.

Files selected for processing (1)

• core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java (2 hunks)

[coderabbitai]

Actionable comments posted: 0

Review details

Configuration used: .coderabbit.yaml
Review profile: ASSERTIVE

Commits

Files that changed from the base of the PR and between 7b5216f and 7a885fa.

Files selected for processing (3)

• core-services/egov-hrms/src/main/java/org/egov/hrms/service/EmployeeService.java (2 hunks)
• core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java (3 hunks)
• core-services/egov-hrms/src/main/java/org/egov/hrms/web/controller/EmployeeController.java (1 hunks)

Additional comments not posted (3)

core-services/egov-hrms/src/main/java/org/egov/hrms/web/controller/EmployeeController.java (1)

Line range hint 29-29: Ensure validation errors are still effectively managed after the removal of bindingResult.

Verification successful

---

The create method in EmployeeController includes a call to validator.validateCreateEmployee(employeeRequest), ensuring that validation is still effectively managed after the removal of bindingResult.

• create method:

  @PostMapping(value = "/_create")
  @ResponseBody
  public ResponseEntity<?> create(@RequestBody @Valid EmployeeRequest employeeRequest) {
      validator.validateCreateEmployee(employeeRequest);
      EmployeeResponse employeeResponse = employeeService.create(employeeRequest);
      return new ResponseEntity<>(employeeResponse, HttpStatus.ACCEPTED);
  }

This confirms that validation is handled by the validator.validateCreateEmployee method.

Scripts executed

The following scripts were executed for the analysis:

---

Script:

#!/bin/bash
# Description: Verify that validation errors are still effectively managed in the EmployeeController or elsewhere in the application.

# Test: Search for validation handling in the EmployeeController.
rg --type java 'validate' core-services/egov-hrms/src/main/java/org/egov/hrms/web/controller/EmployeeController.java

Length of output: 356

---

---

Script:

#!/bin/bash
# Description: Extract the `create` method from EmployeeController and check for validation method invocations.

# Test: Extract the `create` method.
ast-grep --lang java --pattern $'public ResponseEntity<?> create($_) {
  $$$
}' core-services/egov-hrms/src/main/java/org/egov/hrms/web/controller/EmployeeController.java

Length of output: 171

---

---

Script:

#!/bin/bash
# Description: Refine the search pattern to extract the `create` method from EmployeeController and check for validation method invocations.

# Test: Extract the `create` method with a refined pattern.
ast-grep --lang java --pattern $'public ResponseEntity<?> create($_) {
  $$$
}' core-services/egov-hrms/src/main/java/org/egov/hrms/web/controller/EmployeeController.java

# If the above fails, try a more general search for methods in the class.
if [ $? -ne 0 ]; then
  ast-grep --lang java --pattern $'public $_ create($_) {
    $$$
  }' core-services/egov-hrms/src/main/java/org/egov/hrms/web/controller/EmployeeController.java
fi

Length of output: 189

---

---

Script:

#!/bin/bash
# Description: List all methods in the EmployeeController class to locate the `create` method.

# Test: List all methods in the EmployeeController class.
ast-grep --lang java --pattern $'public $_ $_($_) {
  $$$
}' core-services/egov-hrms/src/main/java/org/egov/hrms/web/controller/EmployeeController.java

Length of output: 152

---

---

Script:

#!/bin/bash
# Description: Search for the `create` method by its name directly in the EmployeeController class.

# Test: Search for the `create` method by its name.
rg --type java 'create' core-services/egov-hrms/src/main/java/org/egov/hrms/web/controller/EmployeeController.java

Length of output: 385

---

---

Script:

#!/bin/bash
# Description: Extract the full content of the `create` method to check for validation method invocations.

# Test: Extract the full content of the `create` method.
rg --type java -A 20 'public ResponseEntity<?> create\(@RequestBody @Valid EmployeeRequest employeeRequest\)' core-services/egov-hrms/src/main/java/org/egov/hrms/web/controller/EmployeeController.java

Length of output: 202

---

---

Script:

#!/bin/bash
# Description: Extract the full content of the `create` method by increasing the number of lines to search after the match.

# Test: Extract the full content of the `create` method.
rg --type java -A 50 'public ResponseEntity<?> create\(@RequestBody @Valid EmployeeRequest employeeRequest\)' core-services/egov-hrms/src/main/java/org/egov/hrms/web/controller/EmployeeController.java

Length of output: 202

---

---

Script:

#!/bin/bash
# Description: Search for the `create` method by its name directly and extract the surrounding lines.

# Test: Search for the `create` method by its name and extract the surrounding lines.
rg --type java -C 10 'create' core-services/egov-hrms/src/main/java/org/egov/hrms/web/controller/EmployeeController.java

Length of output: 1011

core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java (1)

73-126: Verify the handling of tenant IDs and the accuracy of user updates in the updateUser method.

Verification successful

---

The tenantId is correctly fetched from the userRequest object and used in various parts of the IndividualService class, including the updateUser method. The handling of tenant IDs appears consistent and accurate.

• tenantId is fetched from userRequest.getUser().getTenantId() and used in the getIndividualResponse method.
• The tenantId is also used in constructing the URI for the update endpoint and in the mapToIndividualUpdateRequest method.

Scripts executed

The following scripts were executed for the analysis:

---

Script:

#!/bin/bash
# Description: Verify the handling of tenant IDs and the accuracy of user updates in the `updateUser` method.

# Test: Search for tenant ID handling and user update logic in the IndividualService.
rg --type java 'tenantId' core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java

Length of output: 845

core-services/egov-hrms/src/main/java/org/egov/hrms/service/EmployeeService.java (1)

345-386: Verify the handling of tenant IDs in the update method to ensure robustness and correctness.

Verification successful

---

The search results show multiple instances of tenantId handling in the EmployeeService class. The key points include initializing tenantId, extracting it from employeeRequest, using it in EmployeeSearchCriteria, and handling it in getEmployeeCountResponse. These instances appear to be correctly implemented, ensuring that tenantId is properly managed during employee updates.

• tenantId is initialized to null.
• It is extracted from the first employee in employeeRequest if the request is not null and contains employees.
• It is used in EmployeeSearchCriteria to search for existing employees.
• It is also handled in the getEmployeeCountResponse method.

These steps ensure that tenantId is correctly extracted and used during the update process, maintaining robustness and correctness.

Scripts executed

The following scripts were executed for the analysis:

---

Script:

#!/bin/bash
# Description: Verify the handling of tenant IDs in the `update` method to ensure robustness and correctness.

# Test: Search for tenant ID handling in the EmployeeService.
rg --type java 'tenantId' core-services/egov-hrms/src/main/java/org/egov/hrms/service/EmployeeService.java

Length of output: 730

[coderabbitai]

Actionable comments posted: 0

Review details

Configuration used: .coderabbit.yaml
Review profile: ASSERTIVE

Commits

Files that changed from the base of the PR and between 7a885fa and 1f1167e.

Files selected for processing (5)

• health-services/facility/src/main/resources/db/Dockerfile (1 hunks)
• health-services/individual/src/main/resources/db/Dockerfile (1 hunks)
• health-services/project/src/main/resources/db/Dockerfile (1 hunks)
• health-services/referralmanagement/src/main/resources/db/Dockerfile (1 hunks)
• health-services/stock/src/main/resources/db/Dockerfile (1 hunks)

Additional comments not posted (10)

health-services/facility/src/main/resources/db/Dockerfile (2)

1-1: Updated base image to egovio/flyway:10.7.1 to leverage newer features and security patches.

---

9-9: Changed from CMD to ENTRYPOINT to ensure the migration script is the default executable.

health-services/individual/src/main/resources/db/Dockerfile (2)

1-1: Updated base image to egovio/flyway:10.7.1 to leverage newer features and security patches.

---

9-9: Changed from CMD to ENTRYPOINT to ensure the migration script is the default executable.

health-services/project/src/main/resources/db/Dockerfile (2)

1-1: Updated base image to egovio/flyway:10.7.1 to leverage newer features and security patches.

---

9-9: Changed from CMD to ENTRYPOINT to ensure the migration script is the default executable.

health-services/referralmanagement/src/main/resources/db/Dockerfile (2)

1-1: Updated base image to egovio/flyway:10.7.1 to leverage newer features and security patches.

---

9-9: Changed from CMD to ENTRYPOINT to ensure the migration script is the default executable.

health-services/stock/src/main/resources/db/Dockerfile (2)

1-1: Updated base image to egovio/flyway:10.7.1 to leverage newer features and security patches.

---

9-9: Changed from CMD to ENTRYPOINT to ensure the migration script is the default executable.

[coderabbitai]

Actionable comments posted: 3

Review details

Configuration used: .coderabbit.yaml
Review profile: ASSERTIVE

Commits

Files that changed from the base of the PR and between 1f1167e and f22dfeb.

Files selected for processing (1)

• core-services/egov-hrms/src/main/java/org/egov/hrms/service/EmployeeService.java (2 hunks)

[coderabbitai]

Actionable comments posted: 4

Review details

Configuration used: .coderabbit.yaml
Review profile: ASSERTIVE

Commits

Files that changed from the base of the PR and between f22dfeb and 5d6ebf8.

Files selected for processing (1)

• core-services/egov-hrms/src/main/java/org/egov/hrms/service/EmployeeService.java (3 hunks)

[kanishq-egov]

common.UserDetails contain UserType as UserType Enum
while hrms.User contain type as String
the conversion is done property hence marking coderabbitai review comments as resolved.