Merge pull request #257 from TaskFlow-CLAP/CLAP-240

CLAP-240 구분 목록 조회 API 통합

Author: starboxxxx

src/main/java/clap/server/adapter/inbound/web/admin/FindLabelAdminController.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<SliceResponse<FindLabelListResponse>> 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<List<FindLabelListResponse>> findLabelList(
+            @AuthenticationPrincipal SecurityUserDetails userInfo) {
+        return ResponseEntity.ok(findLabelListUsecase.findLabelList(userInfo.getUserId()));
     }
 }

src/main/java/clap/server/adapter/inbound/web/label/FindLabelController.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<Label> findLabelList() {
                 .collect(Collectors.toList());
     }
 
-    @Override
-    public SliceResponse<FindLabelListResponse> findLabelListBySlice(Pageable pageable) {
-        Slice<Label> labelList = labelRepository.findByIsDeletedFalse(pageable)
-                .map(labelPersistenceMapper::toDomain);
-
-        return LabelMapper.toSliceOfFindNoticeListResponse(
-                labelList.map(LabelMapper::toFindLabelListResponse)
-        );
-    }
-
     @Override
     public void save(Label label) {
         LabelEntity labelEntity = labelPersistenceMapper.toEntity(label);

src/main/java/clap/server/adapter/outbound/persistense/LabelPersistenceAdapter.java

@@ -1,8 +1,6 @@
 package clap.server.adapter.outbound.persistense.repository.task;
 
 import clap.server.adapter.outbound.persistense.entity.task.LabelEntity;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Slice;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -13,5 +11,4 @@ public interface LabelRepository extends JpaRepository<LabelEntity, Long> {
 
     List<LabelEntity> findByIsDeletedFalse();
 
-    Slice<LabelEntity> findByIsDeletedFalse(Pageable pageable);
 }

src/main/java/clap/server/adapter/outbound/persistense/repository/task/LabelRepository.java

@@ -1,10 +1,7 @@
 package clap.server.application.mapper;
 
-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.domain.model.task.Label;
-import org.springframework.data.domain.Slice;
 
 public class LabelMapper {
 
@@ -19,13 +16,4 @@ public static FindLabelListResponse toFindLabelListResponse(Label label) {
                 label.getLabelColor()
         );
     }
-
-    public static SliceResponse<FindLabelListResponse> toSliceOfFindNoticeListResponse(Slice<FindLabelListResponse> slice) {
-        return new SliceResponse<>(
-                slice.getContent(),
-                slice.hasNext(),
-                slice.isFirst(),
-                slice.isLast()
-        );
-    }
 }

src/main/java/clap/server/application/mapper/LabelMapper.java

@@ -1,12 +1,10 @@
 package clap.server.application.port.inbound.label;
 
-import clap.server.adapter.inbound.web.dto.common.SliceResponse;
 import clap.server.adapter.inbound.web.dto.label.FindLabelListResponse;
-import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 
 public interface FindLabelListUsecase {
 
-    SliceResponse<FindLabelListResponse> findLabelList(Long memberId, Pageable pageable);
+    List<FindLabelListResponse> findLabelList(Long memberId);
 }

src/main/java/clap/server/application/port/inbound/label/FindLabelListAdminUsecase.java

@@ -14,9 +14,5 @@ public interface LoadLabelPort {
 
     List<Label> findLabelList();
 
-    SliceResponse<FindLabelListResponse> findLabelListBySlice(Pageable pageable);
-
-
-
 
 }

src/main/java/clap/server/application/port/inbound/label/FindLabelListUsecase.java

@@ -1,38 +1,26 @@
 package clap.server.application.service.label;
 
-import clap.server.adapter.inbound.web.dto.common.SliceResponse;
 import clap.server.adapter.inbound.web.dto.label.FindLabelListResponse;
 import clap.server.application.mapper.LabelMapper;
 import clap.server.application.port.inbound.domain.MemberService;
-import clap.server.application.port.inbound.label.FindLabelListAdminUsecase;
 import clap.server.application.port.inbound.label.FindLabelListUsecase;
 import clap.server.application.port.outbound.task.LoadLabelPort;
 import clap.server.common.annotation.architecture.ApplicationService;
-import clap.server.domain.model.member.Member;
-import clap.server.exception.ApplicationException;
-import clap.server.exception.code.MemberErrorCode;
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Pageable;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
 @ApplicationService
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
-public class FindLabelListService implements FindLabelListUsecase, FindLabelListAdminUsecase {
+public class FindLabelListService implements FindLabelListUsecase {
 
     private final LoadLabelPort loadLabelPort;
     private final MemberService memberService;
 
     @Override
-    public SliceResponse<FindLabelListResponse> findLabelList(Long memberId, Pageable pageable) {
-        Member member = memberService.findReviewer(memberId);
-        return loadLabelPort.findLabelListBySlice(pageable);
-    }
-
-    @Override
-    public List<FindLabelListResponse> findLabelListAdmin(Long userId) {
+    public List<FindLabelListResponse> findLabelList(Long userId) {
         memberService.findActiveMember(userId);
         return loadLabelPort.findLabelList()
                 .stream()