Merge pull request '[KC-168] 라벨링 툴 > 목록, 기본 페이징 API 지정uuid 페이징 계산 추가' (#221) from feat/infer_dev_260107 into develop

Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/221

src/main/java/com/kamco/cd/kamcoback/postgres/core/TrainingDataLabelCoreService.java

@@ -20,9 +20,8 @@ public class TrainingDataLabelCoreService {
 
   private final TrainingDataLabelRepository trainingDataLabelRepository;
 
-  public Page<LabelingListDto> findLabelingAssignedList(
+  public Page<LabelingListDto> findLabelingAssignedList(searchReq searchReq, String userId) {
-      searchReq searchReq, String userId, String status) {
+    return trainingDataLabelRepository.findLabelingAssignedList(searchReq, userId);
-    return trainingDataLabelRepository.findLabelingAssignedList(searchReq, userId, status);
   }
 
   public LabelingGeometryInfo findLabelingAssignedGeom(String assignmentUid) {
@@ -77,7 +76,7 @@ public class TrainingDataLabelCoreService {
     return trainingDataLabelRepository.getDetail(assignmentUid);
   }
 
-  public DefaultPaging getDefaultPagingNumber(String userId, Integer size) {
+  public DefaultPaging getDefaultPagingNumber(String userId, Integer size, String assignmentUid) {
-    return trainingDataLabelRepository.getDefaultPagingNumber(userId, size);
+    return trainingDataLabelRepository.getDefaultPagingNumber(userId, size, assignmentUid);
   }
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryCustom.java

@@ -13,7 +13,7 @@ import org.springframework.data.domain.Page;
 
 public interface TrainingDataLabelRepositoryCustom {
 
-  Page<LabelingListDto> findLabelingAssignedList(searchReq searchReq, String userId, String status);
+  Page<LabelingListDto> findLabelingAssignedList(searchReq searchReq, String userId);
 
   LabelingGeometryInfo findLabelingAssignedGeom(String assignmentUid);
 
@@ -30,5 +30,5 @@ public interface TrainingDataLabelRepositoryCustom {
 
   DetailRes getDetail(UUID assignmentUid);
 
-  DefaultPaging getDefaultPagingNumber(String userId, Integer size);
+  DefaultPaging getDefaultPagingNumber(String userId, Integer size, String assignmentUid);
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java

@@ -61,8 +61,7 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
   }
 
   @Override
-  public Page<LabelingListDto> findLabelingAssignedList(
+  public Page<LabelingListDto> findLabelingAssignedList(searchReq searchReq, String userId) {
-      searchReq searchReq, String userId, String status) {
 
     // 완료된 라벨은 오늘만, 나머지는 전체 조회
     LocalDate today = LocalDate.now(ZoneId.of("Asia/Seoul"));
@@ -106,9 +105,7 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
             .limit(pageable.getPageSize())
             .orderBy(
                 labelingAssignmentEntity.createdDate.asc(),
-                labelingAssignmentEntity.inferenceGeomUid
+                labelingAssignmentEntity.inferenceGeomUid.asc())
-                    .asc() // 008288b5-5911-41d5-b8fc-b8c8f33d5434 / 362
-                )
             .fetch();
 
     Long count =
@@ -560,7 +557,7 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
   }
 
   @Override
-  public DefaultPaging getDefaultPagingNumber(String userId, Integer size) {
+  public DefaultPaging getDefaultPagingNumber(String userId, Integer size, String assignmentUid) {
 
     ZoneId KST = ZoneId.of("Asia/Seoul");
     ZonedDateTime todayStart = ZonedDateTime.now(KST).toLocalDate().atStartOfDay(KST);
@@ -588,7 +585,9 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport
             .where(
                 labelingAssignmentEntity.workerUid.eq(userId),
                 stateCondition,
-                labelingAssignmentEntity.workState.eq(LabelState.ASSIGNED.getId()))
+                assignmentUid == null
+                    ? labelingAssignmentEntity.workState.eq(LabelState.ASSIGNED.getId())
+                    : labelingAssignmentEntity.assignmentUid.eq(UUID.fromString(assignmentUid)))
             .orderBy(
                 labelingAssignmentEntity.createdDate.asc(),
                 labelingAssignmentEntity.inferenceGeomUid.asc())

src/main/java/com/kamco/cd/kamcoback/trainingdata/TrainingDataLabelApiController.java

@@ -49,11 +49,9 @@ public class TrainingDataLabelApiController {
   public ApiResponseDto<Page<LabelingListDto>> findLabelingAssignedList(
       @RequestParam(defaultValue = "0") int page,
       @RequestParam(defaultValue = "20") int size,
-      @RequestParam(defaultValue = "01022223333") String userId,
+      @RequestParam(defaultValue = "01022223333") String userId) {
-      @RequestParam(defaultValue = "ASSIGNED,SKIP,DONE", required = false) String status) {
     TrainingDataLabelDto.searchReq searchReq = new TrainingDataLabelDto.searchReq(page, size, "");
-    return ApiResponseDto.ok(
+    return ApiResponseDto.ok(trainingDataLabelService.findLabelingAssignedList(searchReq, userId));
-        trainingDataLabelService.findLabelingAssignedList(searchReq, userId, status));
   }
 
   @Hidden
@@ -177,7 +175,11 @@ public class TrainingDataLabelApiController {
   public ApiResponseDto<TrainingDataLabelDto.DefaultPaging> getDefaultPagingNumber(
       @Parameter(description = "사번", example = "01022223333") @RequestParam String userId,
       @Parameter(description = "페이징 사이즈", example = "20") @RequestParam(defaultValue = "20")
-          Integer size) {
+          Integer size,
-    return ApiResponseDto.ok(trainingDataLabelService.getDefaultPagingNumber(userId, size));
+      @Parameter(description = "개별 UUID", example = "79bcdbbe-6ed4-4caa-b4a4-22f3cf2f9d25")
+          @RequestParam(required = false)
+          String assignmentUid) {
+    return ApiResponseDto.ok(
+        trainingDataLabelService.getDefaultPagingNumber(userId, size, assignmentUid));
   }
 }

src/main/java/com/kamco/cd/kamcoback/trainingdata/service/TrainingDataLabelService.java

@@ -26,9 +26,8 @@ public class TrainingDataLabelService {
     this.trainingDataLabelCoreService = trainingDataLabelCoreService;
   }
 
-  public Page<LabelingListDto> findLabelingAssignedList(
+  public Page<LabelingListDto> findLabelingAssignedList(searchReq searchReq, String userId) {
-      searchReq searchReq, String userId, String status) {
+    return trainingDataLabelCoreService.findLabelingAssignedList(searchReq, userId);
-    return trainingDataLabelCoreService.findLabelingAssignedList(searchReq, userId, status);
   }
 
   public LabelingGeometryInfo findLabelingAssignedGeom(String assignmentUid) {
@@ -85,7 +84,7 @@ public class TrainingDataLabelService {
     return trainingDataLabelCoreService.getDetail(assignmentUid);
   }
 
-  public DefaultPaging getDefaultPagingNumber(String userId, Integer size) {
+  public DefaultPaging getDefaultPagingNumber(String userId, Integer size, String assignmentUid) {
-    return trainingDataLabelCoreService.getDefaultPagingNumber(userId, size);
+    return trainingDataLabelCoreService.getDefaultPagingNumber(userId, size, assignmentUid);
   }
 }