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

MOSIP-30099 Update MachineSpecificationService for the bug fix #1044

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

MOSIP-30099 Update MachineSpecificationService for the bug fix #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f05bb61
MOSIP-30099 Update MachineSpecificationService for the bug fix
yashmsonkusare Aug 6, 2024
18655b0
MOSIP-35163 Update UserDetailsController
yashmsonkusare Aug 9, 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
2 changes: 1 addition & 1 deletion ...ta-service/src/main/java/io/mosip/kernel/masterdata/controller/UserDetailsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public ResponseWrapper<UserDetailsGetExtnDto> getUserById(@PathVariable("id") St
@GetMapping(value = "/users")
public ResponseWrapper<PageDto<UserDetailsExtnDto>> 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<PageDto<UserDetailsExtnDto>> responseWrapper = new ResponseWrapper<>();
responseWrapper.setResponse(userDetailsService.getUsers(page, size, orderBy, direction));
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/io/mosip/kernel/masterdata/service/impl/MachineSpecificationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down