From 78e0e49673616fe375ccd72ef69b66627e477044 Mon Sep 17 00:00:00 2001 From: taeyeon Date: Mon, 27 May 2024 13:51:38 +0900 Subject: [PATCH 1/2] =?UTF-8?q?add=20::=20id=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/order/presentation/dto/response/OrdersResponse.java | 1 + .../v2/domain/order/service/impl/GetBookOrdersServiceImpl.java | 3 +-- .../server/v2/domain/order/util/impl/OrdersConverterImpl.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/mindway/server/v2/domain/order/presentation/dto/response/OrdersResponse.java b/src/main/java/com/mindway/server/v2/domain/order/presentation/dto/response/OrdersResponse.java index 9cae077..7e6737c 100644 --- a/src/main/java/com/mindway/server/v2/domain/order/presentation/dto/response/OrdersResponse.java +++ b/src/main/java/com/mindway/server/v2/domain/order/presentation/dto/response/OrdersResponse.java @@ -6,6 +6,7 @@ @Getter @Builder public class OrdersResponse { + private Long id; private String title; private String author; private String book_url; diff --git a/src/main/java/com/mindway/server/v2/domain/order/service/impl/GetBookOrdersServiceImpl.java b/src/main/java/com/mindway/server/v2/domain/order/service/impl/GetBookOrdersServiceImpl.java index 8a0e964..53f424f 100644 --- a/src/main/java/com/mindway/server/v2/domain/order/service/impl/GetBookOrdersServiceImpl.java +++ b/src/main/java/com/mindway/server/v2/domain/order/service/impl/GetBookOrdersServiceImpl.java @@ -24,8 +24,7 @@ public class GetBookOrdersServiceImpl implements GetBookOrdersService { public List execute() { User user = userUtil.getCurrentUser(); - if (user.getAuthority() != Authority.ROLE_TEACHER - && user.getAuthority() != Authority.ROLE_HELPER) { + if (user.getAuthority() == Authority.ROLE_STUDENT) { throw new NotAccessStudentException(); } diff --git a/src/main/java/com/mindway/server/v2/domain/order/util/impl/OrdersConverterImpl.java b/src/main/java/com/mindway/server/v2/domain/order/util/impl/OrdersConverterImpl.java index 1d29739..a6c99db 100644 --- a/src/main/java/com/mindway/server/v2/domain/order/util/impl/OrdersConverterImpl.java +++ b/src/main/java/com/mindway/server/v2/domain/order/util/impl/OrdersConverterImpl.java @@ -22,6 +22,7 @@ public Orders toEntity(OrderRequest bookRequest, User user) { @Override public OrdersResponse toDto(Orders orders) { return OrdersResponse.builder() + .id(orders.getId()) .title(orders.getTitle()) .author(orders.getAuthor()) .book_url(orders.getBookURL()) From ab48bf6c616db5bb7f50184b6fc5e3cc3a105674 Mon Sep 17 00:00:00 2001 From: taeyeon Date: Mon, 27 May 2024 13:52:07 +0900 Subject: [PATCH 2/2] =?UTF-8?q?update=20::=20Orders=20config=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/v2/global/security/config/SecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/mindway/server/v2/global/security/config/SecurityConfig.java b/src/main/java/com/mindway/server/v2/global/security/config/SecurityConfig.java index 83a8363..4b5e836 100644 --- a/src/main/java/com/mindway/server/v2/global/security/config/SecurityConfig.java +++ b/src/main/java/com/mindway/server/v2/global/security/config/SecurityConfig.java @@ -61,7 +61,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .requestMatchers(HttpMethod.POST, "/api/v2/order").authenticated() .requestMatchers(HttpMethod.DELETE, "/api/v2/order/{order_id}").authenticated() .requestMatchers(HttpMethod.PATCH, "/api/v2/order/{order_id}").authenticated() - .requestMatchers(HttpMethod.GET, "/api/v2/order").authenticated() + .requestMatchers(HttpMethod.GET, "/api/v2/order").hasAnyAuthority(Authority.ROLE_TEACHER.name(), Authority.ROLE_HELPER.name()) // goal .requestMatchers(HttpMethod.POST, "/api/v2/goal").authenticated()