From f05bb612d2f92fc394c1c8642f4c8871a682bc90 Mon Sep 17 00:00:00 2001 From: Yash S <119652212+yashmsonkusare@users.noreply.github.com> Date: Tue, 6 Aug 2024 17:18:30 +0530 Subject: [PATCH 1/2] MOSIP-30099 Update MachineSpecificationService for the bug fix Signed-off-by: Yash S <119652212+yashmsonkusare@users.noreply.github.com> --- .../service/impl/MachineSpecificationServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/MachineSpecificationServiceImpl.java b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/MachineSpecificationServiceImpl.java index 591a4c7b830..26db3a9ee31 100644 --- a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/MachineSpecificationServiceImpl.java +++ b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/service/impl/MachineSpecificationServiceImpl.java @@ -124,7 +124,7 @@ public IdAndLanguageCodeID createMachineSpecification(MachineSpecificationDto ma try { - String uniqueId = generateId(); + String uniqueId = machineSpecification.getId() != null ? machineSpecification.getId() : generateId(); machineSpecification.setId(uniqueId); MachineSpecification entity = MetaDataUtils.setCreateMetaData(machineSpecification, MachineSpecification.class); From 18655b0cfcd400c5a26c0c51476f0a32c4282e14 Mon Sep 17 00:00:00 2001 From: Yash S <119652212+yashmsonkusare@users.noreply.github.com> Date: Fri, 9 Aug 2024 18:30:47 +0530 Subject: [PATCH 2/2] MOSIP-35163 Update UserDetailsController --- .../kernel/masterdata/controller/UserDetailsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/controller/UserDetailsController.java b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/controller/UserDetailsController.java index f47107e274f..8b9188ce7ac 100644 --- a/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/controller/UserDetailsController.java +++ b/admin/kernel-masterdata-service/src/main/java/io/mosip/kernel/masterdata/controller/UserDetailsController.java @@ -78,7 +78,7 @@ public ResponseWrapper getUserById(@PathVariable("id") St @GetMapping(value = "/users") public ResponseWrapper> getUsers(@RequestParam(value = "pageNumber", defaultValue = "0") @ApiParam(value = "page number for the requested data", defaultValue = "0") int page, @RequestParam(value = "pageSize", defaultValue = "1") @ApiParam(value = "page size for the request data", defaultValue = "1") int size, - @RequestParam(value = "orderBy", defaultValue = "cr_dtimes") @ApiParam(value = "sort the requested data based on param value", defaultValue = "createdDateTime") String orderBy, + @RequestParam(value = "orderBy", defaultValue = "createdDateTime") @ApiParam(value = "sort the requested data based on param value", defaultValue = "createdDateTime") String orderBy, @RequestParam(value = "direction", defaultValue = "DESC") @ApiParam(value = "order the requested data based on param", defaultValue = "DESC") String direction) { ResponseWrapper> responseWrapper = new ResponseWrapper<>(); responseWrapper.setResponse(userDetailsService.getUsers(page, size, orderBy, direction));