diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/TrainingDataLabelCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/TrainingDataLabelCoreService.java index 6def8837..c3e32aa0 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/TrainingDataLabelCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/TrainingDataLabelCoreService.java @@ -20,9 +20,8 @@ public class TrainingDataLabelCoreService { private final TrainingDataLabelRepository trainingDataLabelRepository; - public Page findLabelingAssignedList( - searchReq searchReq, String userId, String status) { - return trainingDataLabelRepository.findLabelingAssignedList(searchReq, userId, status); + public Page findLabelingAssignedList(searchReq searchReq, String userId) { + return trainingDataLabelRepository.findLabelingAssignedList(searchReq, userId); } public LabelingGeometryInfo findLabelingAssignedGeom(String assignmentUid) { @@ -77,7 +76,7 @@ public class TrainingDataLabelCoreService { return trainingDataLabelRepository.getDetail(assignmentUid); } - public DefaultPaging getDefaultPagingNumber(String userId, Integer size) { - return trainingDataLabelRepository.getDefaultPagingNumber(userId, size); + public DefaultPaging getDefaultPagingNumber(String userId, Integer size, String assignmentUid) { + return trainingDataLabelRepository.getDefaultPagingNumber(userId, size, assignmentUid); } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryCustom.java index b7e0e8c0..e215afdd 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryCustom.java +++ b/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 findLabelingAssignedList(searchReq searchReq, String userId, String status); + Page 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); } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java index b6923620..8eccbfcd 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/trainingdata/TrainingDataLabelRepositoryImpl.java @@ -61,8 +61,7 @@ public class TrainingDataLabelRepositoryImpl extends QuerydslRepositorySupport } @Override - public Page findLabelingAssignedList( - searchReq searchReq, String userId, String status) { + public Page findLabelingAssignedList(searchReq searchReq, String userId) { // 완료된 라벨은 오늘만, 나머지는 전체 조회 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 - .asc() // 008288b5-5911-41d5-b8fc-b8c8f33d5434 / 362 - ) + labelingAssignmentEntity.inferenceGeomUid.asc()) .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()) diff --git a/src/main/java/com/kamco/cd/kamcoback/trainingdata/TrainingDataLabelApiController.java b/src/main/java/com/kamco/cd/kamcoback/trainingdata/TrainingDataLabelApiController.java index e75b4442..62dad56b 100644 --- a/src/main/java/com/kamco/cd/kamcoback/trainingdata/TrainingDataLabelApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/trainingdata/TrainingDataLabelApiController.java @@ -49,11 +49,9 @@ public class TrainingDataLabelApiController { public ApiResponseDto> findLabelingAssignedList( @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "20") int size, - @RequestParam(defaultValue = "01022223333") String userId, - @RequestParam(defaultValue = "ASSIGNED,SKIP,DONE", required = false) String status) { + @RequestParam(defaultValue = "01022223333") String userId) { TrainingDataLabelDto.searchReq searchReq = new TrainingDataLabelDto.searchReq(page, size, ""); - return ApiResponseDto.ok( - trainingDataLabelService.findLabelingAssignedList(searchReq, userId, status)); + return ApiResponseDto.ok(trainingDataLabelService.findLabelingAssignedList(searchReq, userId)); } @Hidden @@ -177,7 +175,11 @@ public class TrainingDataLabelApiController { public ApiResponseDto getDefaultPagingNumber( @Parameter(description = "사번", example = "01022223333") @RequestParam String userId, @Parameter(description = "페이징 사이즈", example = "20") @RequestParam(defaultValue = "20") - Integer size) { - return ApiResponseDto.ok(trainingDataLabelService.getDefaultPagingNumber(userId, size)); + Integer size, + @Parameter(description = "개별 UUID", example = "79bcdbbe-6ed4-4caa-b4a4-22f3cf2f9d25") + @RequestParam(required = false) + String assignmentUid) { + return ApiResponseDto.ok( + trainingDataLabelService.getDefaultPagingNumber(userId, size, assignmentUid)); } } diff --git a/src/main/java/com/kamco/cd/kamcoback/trainingdata/service/TrainingDataLabelService.java b/src/main/java/com/kamco/cd/kamcoback/trainingdata/service/TrainingDataLabelService.java index e36a6802..f2d7b9ab 100644 --- a/src/main/java/com/kamco/cd/kamcoback/trainingdata/service/TrainingDataLabelService.java +++ b/src/main/java/com/kamco/cd/kamcoback/trainingdata/service/TrainingDataLabelService.java @@ -26,9 +26,8 @@ public class TrainingDataLabelService { this.trainingDataLabelCoreService = trainingDataLabelCoreService; } - public Page findLabelingAssignedList( - searchReq searchReq, String userId, String status) { - return trainingDataLabelCoreService.findLabelingAssignedList(searchReq, userId, status); + public Page findLabelingAssignedList(searchReq searchReq, String userId) { + return trainingDataLabelCoreService.findLabelingAssignedList(searchReq, userId); } public LabelingGeometryInfo findLabelingAssignedGeom(String assignmentUid) { @@ -85,7 +84,7 @@ public class TrainingDataLabelService { return trainingDataLabelCoreService.getDetail(assignmentUid); } - public DefaultPaging getDefaultPagingNumber(String userId, Integer size) { - return trainingDataLabelCoreService.getDefaultPagingNumber(userId, size); + public DefaultPaging getDefaultPagingNumber(String userId, Integer size, String assignmentUid) { + return trainingDataLabelCoreService.getDefaultPagingNumber(userId, size, assignmentUid); } }