From 13ddfeaabf4b867436e433729e49bd0df11a26a2 Mon Sep 17 00:00:00 2001 From: harish Date: Sun, 20 Oct 2024 11:34:15 +0530 Subject: [PATCH] updated code --- .../gepafin/tendermanagement/dao/HubDao.java | 4 +++ .../tendermanagement/service/HubService.java | 1 + .../service/impl/HubServiceImpl.java | 5 ++++ .../tendermanagement/web/rest/api/HubApi.java | 15 ++++++++++- .../web/rest/api/impl/HubApiController.java | 27 ++++++++++--------- 5 files changed, 38 insertions(+), 14 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/HubDao.java b/src/main/java/net/gepafin/tendermanagement/dao/HubDao.java index 28c999ad..3d5d6e7d 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/HubDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/HubDao.java @@ -93,4 +93,8 @@ public class HubDao { return hubRepository.findByUniqueUuid(hubUuid).orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.HUB_NOT_FOUND))); } + + public HubResponseBean getHubByHubUuid(String uuid) { + return convertToHubResponseBean(getHubByUuid(uuid)); + } } diff --git a/src/main/java/net/gepafin/tendermanagement/service/HubService.java b/src/main/java/net/gepafin/tendermanagement/service/HubService.java index 61f203ea..397bc533 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/HubService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/HubService.java @@ -14,4 +14,5 @@ public interface HubService { List getAllHubs(); void deleteHub(Long hubId); HubEntity getHubByUuid(String hubUuid); + HubResponseBean getHubByHubUuid(String uuid); } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/HubServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/HubServiceImpl.java index 9301db7e..513a89e4 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/HubServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/HubServiceImpl.java @@ -51,4 +51,9 @@ public class HubServiceImpl implements HubService { public HubEntity getHubByUuid(String hubUuid) { return hubDao.getHubByUuid(hubUuid); } + + @Override + public HubResponseBean getHubByHubUuid(String uuid) { + return hubDao.getHubByHubUuid(uuid); + } } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/HubApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/HubApi.java index ea774ef7..de729daa 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/HubApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/HubApi.java @@ -64,7 +64,6 @@ public interface HubApi { @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) - @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')") @GetMapping(value = "/{hubId}", produces = "application/json") ResponseEntity> getHubById(HttpServletRequest request, @Parameter(description = "The hub id", required = true) @@ -97,4 +96,18 @@ public interface HubApi { ResponseEntity> deleteHub(HttpServletRequest request, @Parameter(description = "The hub id", required = true) @PathVariable("hubId") Long hubId); + + @Operation(summary = "API to get a hub by id", responses = { + @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) + }) + @GetMapping(value = "/uuid/{uuid}", produces = "application/json") + ResponseEntity> getHubByUuid(HttpServletRequest request, + @Parameter(description = "The hub id", required = true) + @PathVariable("uuid") String uuid); } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/HubApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/HubApiController.java index 72090f89..e08f9517 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/HubApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/HubApiController.java @@ -8,9 +8,10 @@ import net.gepafin.tendermanagement.model.request.HubReq; import net.gepafin.tendermanagement.model.response.HubResponseBean; import net.gepafin.tendermanagement.model.util.Response; import net.gepafin.tendermanagement.service.HubService; -import net.gepafin.tendermanagement.util.Validator; import net.gepafin.tendermanagement.web.rest.api.HubApi; import net.gepafin.tendermanagement.web.rest.api.errors.Status; + +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RestController; @@ -20,17 +21,11 @@ import java.util.List; @RestController public class HubApiController implements HubApi { - private final HubService hubService; - private final Validator validator; - - public HubApiController(HubService hubService, Validator validator) { - this.hubService = hubService; - this.validator = validator; - } + @Autowired + private HubService hubService; @Override public ResponseEntity> createHub(HttpServletRequest request, @Valid HubReq hubReq) { - validator.validateUser(request); HubResponseBean hubResponse = hubService.createHub(hubReq); return ResponseEntity.status(HttpStatus.CREATED) .body(new Response<>(hubResponse, Status.SUCCESS, Translator.toLocale(GepafinConstant.HUB_CREATE_SUCCESS))); @@ -38,7 +33,7 @@ public class HubApiController implements HubApi { @Override public ResponseEntity> updateHub(HttpServletRequest request, Long hubId, @Valid HubReq hubReq) { - validator.validateUser(request); + HubResponseBean hubResponse = hubService.updateHub(hubId, hubReq); if (hubResponse != null) { return ResponseEntity.status(HttpStatus.OK) @@ -51,7 +46,7 @@ public class HubApiController implements HubApi { @Override public ResponseEntity> getHubById(HttpServletRequest request, Long hubId) { - validator.validateUser(request); + HubResponseBean hubResponse = hubService.getHubById(hubId); if (hubResponse != null) { return ResponseEntity.status(HttpStatus.OK) @@ -64,7 +59,7 @@ public class HubApiController implements HubApi { @Override public ResponseEntity>> getAllHubs(HttpServletRequest request) { - validator.validateUser(request); + List hubs = hubService.getAllHubs(); return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(hubs, Status.SUCCESS, Translator.toLocale(GepafinConstant.HUB_GET_ALL_SUCCESS))); @@ -72,9 +67,15 @@ public class HubApiController implements HubApi { @Override public ResponseEntity> deleteHub(HttpServletRequest request, Long hubId) { - validator.validateUser(request); + hubService.deleteHub(hubId); return ResponseEntity.status(HttpStatus.OK) .body(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.HUB_DELETE_SUCCESS))); } + @Override + public ResponseEntity> getHubByUuid(HttpServletRequest request, String uuid) { + HubResponseBean hubResponse = hubService.getHubByHubUuid(uuid); + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(hubResponse, Status.SUCCESS, Translator.toLocale(GepafinConstant.HUB_GET_SUCCESS))); + } }