From eb3ab3ef4da8ce48f25b1c5a116a2c63bec54ddc Mon Sep 17 00:00:00 2001 From: yoshidakenji <181298858+kenjiyoshid-a@users.noreply.github.com> Date: Wed, 13 Nov 2024 12:00:22 +0900 Subject: [PATCH] =?UTF-8?q?=E6=A5=BD=E8=A6=B3=E3=83=AD=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=A8=E6=A8=A9=E9=99=90=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=82=92=E5=85=B1=E9=80=9A=E3=82=A8=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E3=83=8F=E3=83=B3=E3=83=89=E3=83=A9=E3=81=A7=E3=82=AD?= =?UTF-8?q?=E3=83=A3=E3=83=83=E3=83=81=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CatalogItemsController.java | 51 ++++++++----------- .../controller/CatalogItemsController.java | 2 +- .../ExceptionHandlerControllerAdvice.java | 22 ++++++-- ...LocalExceptionHandlerControllerAdvice.java | 18 ++++++- 4 files changed, 58 insertions(+), 35 deletions(-) diff --git a/samples/web-csr/dressca-backend/web-admin/src/main/java/com/dressca/web/admin/controller/CatalogItemsController.java b/samples/web-csr/dressca-backend/web-admin/src/main/java/com/dressca/web/admin/controller/CatalogItemsController.java index 59aa921ed..33ec079a6 100644 --- a/samples/web-csr/dressca-backend/web-admin/src/main/java/com/dressca/web/admin/controller/CatalogItemsController.java +++ b/samples/web-csr/dressca-backend/web-admin/src/main/java/com/dressca/web/admin/controller/CatalogItemsController.java @@ -4,7 +4,7 @@ import java.net.URI; import java.util.List; import java.util.stream.Collectors; -import com.dressca.applicationcore.applicationservice.CatalogManagementApplicationService; +import com.dressca.applicationcore.applicationservice.CatalogApplicationService; import com.dressca.applicationcore.authorization.PermissionDeniedException; import com.dressca.applicationcore.catalog.CatalogBrandNotFoundException; import com.dressca.applicationcore.catalog.CatalogCategoryNotFoundException; @@ -23,7 +23,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; @@ -54,7 +53,7 @@ public class CatalogItemsController { @Autowired - private CatalogManagementApplicationService service; + private CatalogApplicationService service; private static final Logger apLog = LoggerFactory.getLogger(SystemPropertyConstants.APPLICATION_LOG_LOGGER); @@ -104,7 +103,7 @@ public ResponseEntity getByQuery( @RequestParam(name = "page", defaultValue = "0") int page, @RequestParam(name = "pageSize", defaultValue = "20") int pageSize) { - List items = this.service.getCatalogItems(brandId, categoryId, page, pageSize).stream() + List items = this.service.getCatalogItemsByAdmin(brandId, categoryId, page, pageSize).stream() .map(CatalogItemMapper::convert).collect(Collectors.toList()); int totalCount = this.service.countCatalogItems(brandId, categoryId); @@ -117,6 +116,7 @@ public ResponseEntity getByQuery( * * @param postCatalogItemRequest 追加するカタログアイテム * @return 追加したカタログアイテム + * @throws PermissionDeniedException 認可エラー */ @Operation(summary = "カタログにアイテムを追加します。", description = "カタログにアイテムを追加します。") @ApiResponses(value = { @@ -124,17 +124,14 @@ public ResponseEntity getByQuery( @ApiResponse(responseCode = "401", description = "", content = @Content) }) @PostMapping - @PreAuthorize(value = "hasRole('ADMIN')") - public ResponseEntity postCatalogItem(@RequestBody PostCatalogItemRequest postCatalogItemRequest) { - try { - this.service.addItemToCatalog(postCatalogItemRequest.getName(), postCatalogItemRequest.getDescription(), - new BigDecimal(postCatalogItemRequest.getPrice()), postCatalogItemRequest.getProductCode(), - postCatalogItemRequest.getCatalogCategoryId(), postCatalogItemRequest.getCatalogBrandId()); - } catch (PermissionDeniedException e) { - apLog.info(e.getMessage()); - apLog.debug(ExceptionUtils.getStackTrace(e)); - return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(null); - } + @PreAuthorize(value = "hasAuthority('ROLE_ADMIN')") + public ResponseEntity postCatalogItem(@RequestBody PostCatalogItemRequest postCatalogItemRequest) + throws PermissionDeniedException { + + this.service.addItemToCatalog(postCatalogItemRequest.getName(), postCatalogItemRequest.getDescription(), + new BigDecimal(postCatalogItemRequest.getPrice()), postCatalogItemRequest.getProductCode(), + postCatalogItemRequest.getCatalogCategoryId(), postCatalogItemRequest.getCatalogBrandId()); + return ResponseEntity.created(URI.create("catalog-items")).build(); } @@ -143,6 +140,7 @@ public ResponseEntity postCatalogItem(@RequestBody PostCatalogItemR * * @param catalogItemId カタログアイテムID。 * @return なし。 + * @throws PermissionDeniedException 認可エラー */ @Operation(summary = "カタログから指定したカタログアイテム ID のアイテムを削除します。", description = "カタログから指定したカタログアイテム ID のアイテムを削除します。") @ApiResponses(value = { @@ -151,14 +149,11 @@ public ResponseEntity postCatalogItem(@RequestBody PostCatalogItemR @ApiResponse(responseCode = "404", description = "", content = @Content) }) @DeleteMapping("{catalogItemId}") - @PreAuthorize(value = "hasRole('ADMIN')") - public ResponseEntity deleteCatalogItem(@PathVariable("catalogItemId") long catalogItemId) { + @PreAuthorize(value = "hasAuthority('ROLE_ADMIN')") + public ResponseEntity deleteCatalogItem(@PathVariable("catalogItemId") long catalogItemId) + throws PermissionDeniedException { try { this.service.deleteItemFromCatalog(catalogItemId); - } catch (PermissionDeniedException e) { - apLog.info(e.getMessage()); - apLog.debug(ExceptionUtils.getStackTrace(e)); - return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(null); } catch (CatalogNotFoundException e) { apLog.info(e.getMessage()); apLog.debug(ExceptionUtils.getStackTrace(e)); @@ -173,6 +168,8 @@ public ResponseEntity deleteCatalogItem(@PathVariable("catalogItemI * @param catalogItemId カタログアイテムID。 * @param putCatalogItemRequest 更新するカタログアイテムの情報。 * @return なし。 + * @throws OptimisticLockingFailureException 楽観ロックエラー + * @throws PermissionDeniedException 認可エラー */ @Operation(summary = "指定したIDのカタログアイテムの情報を更新します。", description = "指定したIDのカタログアイテムの情報を更新します。") @ApiResponses(value = { @@ -182,19 +179,15 @@ public ResponseEntity deleteCatalogItem(@PathVariable("catalogItemI @ApiResponse(responseCode = "409", description = "更新の競合が発生。", content = @Content), }) @PutMapping("{catalogItemId}") - @PreAuthorize(value = "hasRole('ADMIN')") + @PreAuthorize(value = "hasAuthority('ROLE_ADMIN')") public ResponseEntity putCatalogItem(@PathVariable("catalogItemId") long catalogItemId, - @RequestBody PutCatalogItemRequest putCatalogItemRequest) { - + @RequestBody PutCatalogItemRequest putCatalogItemRequest) + throws PermissionDeniedException, OptimisticLockingFailureException { try { this.service.updateCatalogItem(catalogItemId, putCatalogItemRequest.getName(), putCatalogItemRequest.getDescription(), new BigDecimal(putCatalogItemRequest.getPrice()), putCatalogItemRequest.getProductCode(), putCatalogItemRequest.getCatalogCategoryId(), putCatalogItemRequest.getCatalogBrandId()); - } catch (PermissionDeniedException e) { - apLog.info(e.getMessage()); - apLog.debug(ExceptionUtils.getStackTrace(e)); - return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(null); } catch (CatalogNotFoundException e) { apLog.info(e.getMessage()); apLog.debug(ExceptionUtils.getStackTrace(e)); @@ -203,8 +196,6 @@ public ResponseEntity putCatalogItem(@PathVariable("catalogItemId") apLog.error(ExceptionUtils.getStackTrace(e)); // ここでは発生を想定していないので、システムエラーとする。 throw new SystemException(e, ExceptionIdConstant.E_SHARE0000, null, null); - } catch (OptimisticLockingFailureException e) { - return ResponseEntity.status(HttpStatus.CONFLICT).body(null); } return ResponseEntity.noContent().build(); } diff --git a/samples/web-csr/dressca-backend/web-consumer/src/main/java/com/dressca/web/consumer/controller/CatalogItemsController.java b/samples/web-csr/dressca-backend/web-consumer/src/main/java/com/dressca/web/consumer/controller/CatalogItemsController.java index bb602177b..24139cdba 100644 --- a/samples/web-csr/dressca-backend/web-consumer/src/main/java/com/dressca/web/consumer/controller/CatalogItemsController.java +++ b/samples/web-csr/dressca-backend/web-consumer/src/main/java/com/dressca/web/consumer/controller/CatalogItemsController.java @@ -52,7 +52,7 @@ public ResponseEntity getByQuery( @RequestParam(name = "categoryId", defaultValue = "0") long categoryId, @RequestParam(name = "page", defaultValue = "0") int page, @RequestParam(name = "pageSize", defaultValue = "20") int pageSize) { - List items = service.getCatalogItems(brandId, categoryId, page, pageSize).stream() + List items = service.getCatalogItemsByConsumer(brandId, categoryId, page, pageSize).stream() .map(CatalogItemMapper::convert) .collect(Collectors.toList()); int totalCount = service.countCatalogItems(brandId, categoryId); diff --git a/samples/web-csr/dressca-backend/web/src/main/java/com/dressca/web/controller/advice/ExceptionHandlerControllerAdvice.java b/samples/web-csr/dressca-backend/web/src/main/java/com/dressca/web/controller/advice/ExceptionHandlerControllerAdvice.java index 9b4ff0191..4e06ff56d 100644 --- a/samples/web-csr/dressca-backend/web/src/main/java/com/dressca/web/controller/advice/ExceptionHandlerControllerAdvice.java +++ b/samples/web-csr/dressca-backend/web/src/main/java/com/dressca/web/controller/advice/ExceptionHandlerControllerAdvice.java @@ -1,9 +1,11 @@ package com.dressca.web.controller.advice; import jakarta.servlet.http.HttpServletRequest; +import com.dressca.applicationcore.authorization.PermissionDeniedException; import com.dressca.systemcommon.constant.ExceptionIdConstant; import com.dressca.systemcommon.constant.SystemPropertyConstants; import com.dressca.systemcommon.exception.LogicException; +import com.dressca.systemcommon.exception.OptimisticLockingFailureException; import com.dressca.systemcommon.exception.SystemException; import com.dressca.web.constant.ProblemDetailsConstant; import com.dressca.web.log.ErrorMessageBuilder; @@ -41,7 +43,7 @@ public class ExceptionHandlerControllerAdvice extends ResponseEntityExceptionHan @ExceptionHandler(AuthenticationCredentialsNotFoundException.class) public ResponseEntity handleAuthenticationCredentialsNotFoundException( AuthenticationCredentialsNotFoundException e, HttpServletRequest req) { - apLog.error(ExceptionUtils.getStackTrace(e)); + apLog.warn(ExceptionUtils.getStackTrace(e)); return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build(); } @@ -52,13 +54,27 @@ public ResponseEntity handleAuthenticationCredentialsNotFoundException( * @param req リクエスト * @return ステータースコード404のレスポンス */ - @ExceptionHandler(AuthorizationDeniedException.class) + @ExceptionHandler({ AuthorizationDeniedException.class, PermissionDeniedException.class }) public ResponseEntity handleAuthorizationDeniedException( AuthorizationDeniedException e, HttpServletRequest req) { - apLog.error(ExceptionUtils.getStackTrace(e)); + apLog.warn(ExceptionUtils.getStackTrace(e)); return ResponseEntity.notFound().build(); } + /** + * 楽観ロックエラーをステータスコード409で返却する。 + * + * @param e 楽観ロックエラー + * @param req リクエスト + * @return ステータスコード409のレスポンス + */ + @ExceptionHandler(OptimisticLockingFailureException.class) + public ResponseEntity handleOptimisticLockingFailureException( + OptimisticLockingFailureException e, HttpServletRequest req) { + apLog.warn(ExceptionUtils.getStackTrace(e)); + return ResponseEntity.status(HttpStatus.CONFLICT).body(null); + } + /** * その他の業務エラーをステータースコード500で返却する（本番環境、テスト環境用）。 * diff --git a/samples/web-csr/dressca-backend/web/src/main/java/com/dressca/web/controller/advice/LocalExceptionHandlerControllerAdvice.java b/samples/web-csr/dressca-backend/web/src/main/java/com/dressca/web/controller/advice/LocalExceptionHandlerControllerAdvice.java index 97bcdca68..2bc494d27 100644 --- a/samples/web-csr/dressca-backend/web/src/main/java/com/dressca/web/controller/advice/LocalExceptionHandlerControllerAdvice.java +++ b/samples/web-csr/dressca-backend/web/src/main/java/com/dressca/web/controller/advice/LocalExceptionHandlerControllerAdvice.java @@ -14,9 +14,11 @@ import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; +import com.dressca.applicationcore.authorization.PermissionDeniedException; import com.dressca.systemcommon.constant.ExceptionIdConstant; import com.dressca.systemcommon.constant.SystemPropertyConstants; import com.dressca.systemcommon.exception.LogicException; +import com.dressca.systemcommon.exception.OptimisticLockingFailureException; import com.dressca.systemcommon.exception.SystemException; import com.dressca.web.constant.ProblemDetailsConstant; import com.dressca.web.log.ErrorMessageBuilder; @@ -52,13 +54,27 @@ public ResponseEntity handleAuthenticationCredentialsNotFoundException( * @param req リクエスト * @return ステータースコード404のレスポンス */ - @ExceptionHandler(AuthorizationDeniedException.class) + @ExceptionHandler({ AuthorizationDeniedException.class, PermissionDeniedException.class }) public ResponseEntity handleAuthorizationDeniedException( AuthorizationDeniedException e, HttpServletRequest req) { apLog.warn(ExceptionUtils.getStackTrace(e)); return ResponseEntity.notFound().build(); } + /** + * 楽観ロックエラーをステータスコード409で返却する。 + * + * @param e 楽観ロックエラー + * @param req リクエスト + * @return ステータスコード409のレスポンス + */ + @ExceptionHandler(OptimisticLockingFailureException.class) + public ResponseEntity handleOptimisticLockingFailureException( + OptimisticLockingFailureException e, HttpServletRequest req) { + apLog.warn(ExceptionUtils.getStackTrace(e)); + return ResponseEntity.status(HttpStatus.CONFLICT).body(null); + } + /** * その他の業務エラーをステータースコード500で返却する（開発環境用）。 *