Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 11 commits into from
Jun 4, 2024
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
74a1d13
HLM Health-HRMS bug fix, user was set to null in hrms update as the t…
kanishq-egov May 31, 2024
01a1b82
HLM updated hrms user type
kanishq-egov May 31, 2024
7b5216f
updated type from individual create
kanishq-egov May 31, 2024
4912482
Addressed code review comments
kanishq-egov Jun 3, 2024
7a885fa
Added code comments and fixme todo as per code review comments
kanishq-egov Jun 3, 2024
1f1167e
HLM updated flyway migration docker version
kanishq-egov Jun 4, 2024
50743e1
Revert "HLM updated flyway migration docker version"
kanishq-egov Jun 4, 2024
f22dfeb
Updated code comments on EmployeeService update method
kanishq-egov Jun 4, 2024
5d6ebf8
Update EmployeeService.java
kavi-egov Jun 4, 2024
f91f703
Updated code comments on EmployeeService, added changes for NPE handling
kanishq-egov Jun 4, 2024
c170e5e
Merge branch 'HLM-Health-HRMS-User' of https://github.com/egovernment…
kanishq-egov Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion core-services/egov-hrms/src/main/java/org/egov/hrms/service/EmployeeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,11 +343,18 @@ public Long getPosition() {
*/
public EmployeeResponse update(EmployeeRequest employeeRequest) {
RequestInfo requestInfo = employeeRequest.getRequestInfo();

String tenantId = null;
if (!CollectionUtils.isEmpty(employeeRequest.getEmployees())) {
tenantId = employeeRequest.getEmployees().get(0).getTenantId();
}
kanishq-egov marked this conversation as resolved.
Show resolved Hide resolved

List <String> uuidList= new ArrayList<>();
for(Employee employee: employeeRequest.getEmployees()) {
uuidList.add(employee.getUuid());
}
EmployeeResponse existingEmployeeResponse = search(EmployeeSearchCriteria.builder().uuids(uuidList).build(),requestInfo);

EmployeeResponse existingEmployeeResponse = search(EmployeeSearchCriteria.builder().uuids(uuidList).tenantId(tenantId).build(),requestInfo);
List <Employee> existingEmployees = existingEmployeeResponse.getEmployees();
employeeRequest.getEmployees().stream().forEach(employee -> {
enrichUpdateRequest(employee, requestInfo, existingEmployees);
Expand Down
2 changes: 1 addition & 1 deletion core-services/egov-hrms/src/main/java/org/egov/hrms/service/IndividualService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private IndividualRequest mapToIndividualUpdateRequest(Individual individual, Us
.tenantId(userRequest.getUser().getTenantId())
.description(role.getDescription())
.build()).collect(Collectors.toList()))
.userType(UserType.fromValue(userRequest.getUser().getType()))
.userType(individual.getUserDetails().getUserType())
kanishq-egov marked this conversation as resolved.
Show resolved Hide resolved
.build())
.isDeleted(Boolean.FALSE)
.clientAuditDetails(AuditDetails.builder()
Expand Down
Loading