From 5a14cb090b598b208b8ad692ab097ab720e267bf Mon Sep 17 00:00:00 2001 From: harish Date: Wed, 28 Aug 2024 16:39:30 +0530 Subject: [PATCH] update lookupdata endpoint --- .../net/gepafin/tendermanagement/dao/LookUpDataDao.java | 7 ++++--- .../tendermanagement/service/LookUpDataService.java | 2 +- .../service/impl/LookUpDataServiceImpl.java | 4 ++-- .../tendermanagement/web/rest/api/LookUpDataApi.java | 2 +- .../web/rest/api/impl/LookUpDataApiController.java | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/LookUpDataDao.java b/src/main/java/net/gepafin/tendermanagement/dao/LookUpDataDao.java index fe51facc..612b1d7b 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/LookUpDataDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/LookUpDataDao.java @@ -67,11 +67,12 @@ public class LookUpDataDao { return response; } - public List getLookUpDataByType(LookUpDataTypeEnum type) { - return lookUpDataRepository.findByType(type.getValue()) - .stream() + public List getLookUpDataByTypes(List types) { + return types.stream() + .flatMap(type -> lookUpDataRepository.findByType(type.getValue()).stream()) .map(this::convertLookUpDataEntityToResponseBean) .collect(Collectors.toList()); } + } diff --git a/src/main/java/net/gepafin/tendermanagement/service/LookUpDataService.java b/src/main/java/net/gepafin/tendermanagement/service/LookUpDataService.java index c7fde0f6..2a0ff7dc 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/LookUpDataService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/LookUpDataService.java @@ -16,5 +16,5 @@ public interface LookUpDataService { void deleteLookUpData(Long id); - List getLookUpDataByType(LookUpDataTypeEnum type); + List getLookUpDataByType(List type); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/LookUpDataServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/LookUpDataServiceImpl.java index bba01b91..a8f28d07 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/LookUpDataServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/LookUpDataServiceImpl.java @@ -36,7 +36,7 @@ public class LookUpDataServiceImpl implements LookUpDataService { lookUpDataDao.deleteLookUpData(id); } @Override - public List getLookUpDataByType(LookUpDataTypeEnum type) { - return lookUpDataDao.getLookUpDataByType(type); + public List getLookUpDataByType( List type) { + return lookUpDataDao.getLookUpDataByTypes(type); } } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/LookUpDataApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/LookUpDataApi.java index 5497d9a4..5a2cd19f 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/LookUpDataApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/LookUpDataApi.java @@ -77,5 +77,5 @@ public interface LookUpDataApi { @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE)}))}) @GetMapping(value = "/type", produces = "application/json") - ResponseEntity>> getLookUpDataByType(HttpServletRequest request, @RequestParam LookUpDataTypeEnum type); + ResponseEntity>> getLookUpDataByType(HttpServletRequest request, @RequestParam List types); } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/LookUpDataApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/LookUpDataApiController.java index f07f75e2..3f79198c 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/LookUpDataApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/LookUpDataApiController.java @@ -63,7 +63,7 @@ public class LookUpDataApiController implements LookUpDataApi { .body(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.LOOKUP_DATA_DELETED_SUCCESSFULLY))); } @Override - public ResponseEntity>> getLookUpDataByType(HttpServletRequest request, LookUpDataTypeEnum type) { + public ResponseEntity>> getLookUpDataByType(HttpServletRequest request, List type) { List responseBean = lookUpDataService.getLookUpDataByType(type); if (responseBean != null) { return ResponseEntity.status(HttpStatus.OK)