diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/FindLabelAdminController.java b/src/main/java/clap/server/adapter/inbound/web/admin/FindLabelAdminController.java deleted file mode 100644 index 5aa59862..00000000 --- a/src/main/java/clap/server/adapter/inbound/web/admin/FindLabelAdminController.java +++ /dev/null @@ -1,35 +0,0 @@ -package clap.server.adapter.inbound.web.admin; - -import clap.server.adapter.inbound.security.SecurityUserDetails; -import clap.server.adapter.inbound.web.dto.common.SliceResponse; -import clap.server.adapter.inbound.web.dto.label.FindLabelListResponse; -import clap.server.application.port.inbound.label.FindLabelListAdminUsecase; -import clap.server.application.port.inbound.label.FindLabelListUsecase; -import clap.server.common.annotation.architecture.WebAdapter; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.annotation.Secured; -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -import java.util.List; - -@Tag(name = "05. Admin") -@WebAdapter -@RequiredArgsConstructor -@RequestMapping("/api/managements/labels") -public class FindLabelAdminController { - - private final FindLabelListAdminUsecase findLabelListAdminUsecase; - - @Operation(summary = "구분 목록 조회 API") - @Secured({"ROLE_ADMIN"}) - @GetMapping - public ResponseEntity> findLabelList( - @AuthenticationPrincipal SecurityUserDetails userInfo) { - return ResponseEntity.ok(findLabelListAdminUsecase.findLabelListAdmin(userInfo.getUserId())); - } -} diff --git a/src/main/java/clap/server/adapter/inbound/web/label/FindLabelController.java b/src/main/java/clap/server/adapter/inbound/web/label/FindLabelController.java index 40761571..4b2c29cc 100644 --- a/src/main/java/clap/server/adapter/inbound/web/label/FindLabelController.java +++ b/src/main/java/clap/server/adapter/inbound/web/label/FindLabelController.java @@ -17,12 +17,11 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; -@Tag(name = "02. Task [검토자]") +@Tag(name = "02. Task [조회]", description = "담당자 및 관리자 공통으로 사용") @WebAdapter @RestController @RequiredArgsConstructor @@ -32,17 +31,10 @@ public class FindLabelController { private final FindLabelListUsecase findLabelListUsecase; @Operation(summary = "구분 목록 조회 API") - @Parameters({ - @Parameter(name = "page", description = "조회할 목록 페이지 번호(0부터 시작)", example = "0", required = false), - @Parameter(name = "size", description = "조회할 목록 페이지 당 개수", example = "5", required = false) - }) - @Secured({"ROLE_MANAGER"}) + @Secured({"ROLE_MANAGER", "ROLE_ADMIN"}) @GetMapping - public ResponseEntity> findLabelList( - @AuthenticationPrincipal SecurityUserDetails userInfo, - @RequestParam(defaultValue = "0") int page, - @RequestParam(defaultValue = "5") int size) { - Pageable pageable = PageRequest.of(page, size); - return ResponseEntity.ok(findLabelListUsecase.findLabelList(userInfo.getUserId(), pageable)); + public ResponseEntity> findLabelList( + @AuthenticationPrincipal SecurityUserDetails userInfo) { + return ResponseEntity.ok(findLabelListUsecase.findLabelList(userInfo.getUserId())); } } diff --git a/src/main/java/clap/server/adapter/outbound/persistense/LabelPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/LabelPersistenceAdapter.java index 520e522c..02887e0f 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/LabelPersistenceAdapter.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/LabelPersistenceAdapter.java @@ -1,21 +1,13 @@ package clap.server.adapter.outbound.persistense; -import clap.server.adapter.inbound.web.dto.common.SliceResponse; -import clap.server.adapter.inbound.web.dto.label.FindLabelListResponse; -import clap.server.adapter.inbound.web.dto.notification.FindNotificationListResponse; import clap.server.adapter.outbound.persistense.entity.task.LabelEntity; import clap.server.adapter.outbound.persistense.mapper.LabelPersistenceMapper; import clap.server.adapter.outbound.persistense.repository.task.LabelRepository; -import clap.server.application.mapper.LabelMapper; -import clap.server.application.mapper.NotificationMapper; import clap.server.application.port.outbound.task.CommandLabelPort; import clap.server.application.port.outbound.task.LoadLabelPort; import clap.server.common.annotation.architecture.PersistenceAdapter; -import clap.server.domain.model.notification.Notification; import clap.server.domain.model.task.Label; import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Slice; import java.util.List; import java.util.Optional; @@ -43,16 +35,6 @@ public List