라벨링 작업할당 stage 조회 제거하기

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

@@ -27,9 +27,8 @@ public class LabelAllocateCoreService {
 
   private final LabelAllocateRepository labelAllocateRepository;
 
-  public List<AllocateInfoDto> fetchNextIds(
-      Long lastId, Long batchSize, Integer compareYyyy, Integer targetYyyy, Integer stage) {
-    return labelAllocateRepository.fetchNextIds(lastId, batchSize, compareYyyy, targetYyyy, stage);
+  public List<AllocateInfoDto> fetchNextIds(Long lastId, Long batchSize, UUID uuid) {
+    return labelAllocateRepository.fetchNextIds(lastId, batchSize, uuid);
   }
 
   public void assignOwner(List<AllocateInfoDto> ids, String userId, Long analUid) {
@@ -42,8 +41,8 @@ public class LabelAllocateCoreService {
         .toList();
   }
 
-  public Long findLabelUnAssignedCnt(Integer stage, Integer compareYyyy, Integer targetYyyy) {
-    return labelAllocateRepository.findLabelUnAssignedCnt(stage, compareYyyy, targetYyyy);
+  public Long findLabelUnAssignedCnt(UUID uuid) {
+    return labelAllocateRepository.findLabelUnAssignedCnt(uuid);
   }
 
   public void assignInspector(UUID assignmentUid, String inspectorUid) {
@@ -144,8 +143,8 @@ public class LabelAllocateCoreService {
     return detail;
   }
 
-  public Long findMapSheetAnalInferenceUid(Integer compareYyyy, Integer targetYyyy, Integer stage) {
-    return labelAllocateRepository.findMapSheetAnalInferenceUid(compareYyyy, targetYyyy, stage);
+  public Long findMapSheetAnalInferenceUid(UUID uuid) {
+    return labelAllocateRepository.findMapSheetAnalInferenceUid(uuid);
   }
 
   public void insertInspector(Long analUid, String inspector) {

src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryCustom.java

@@ -20,14 +20,13 @@ import org.springframework.data.domain.Page;
 
 public interface LabelAllocateRepositoryCustom {
 
-  List<AllocateInfoDto> fetchNextIds(
-      Long lastId, Long batchSize, Integer compareYyyy, Integer targetYyyy, Integer stage);
+  List<AllocateInfoDto> fetchNextIds(Long lastId, Long batchSize, UUID uuid);
 
   void assignOwner(List<AllocateInfoDto> ids, String userId, Long analUid);
 
   List<LabelingAssignmentEntity> findAssignedLabelerList(Long analUid);
 
-  Long findLabelUnAssignedCnt(Integer stage, Integer compareYyyy, Integer targetYyyy);
+  Long findLabelUnAssignedCnt(UUID uuid);
 
   void assignInspector(UUID assignmentUid, String userId);
 
@@ -74,7 +73,7 @@ public interface LabelAllocateRepositoryCustom {
   /** UUID로 analUid 조회 */
   Long findAnalUidByUuid(String uuid);
 
-  Long findMapSheetAnalInferenceUid(Integer compareYyyy, Integer targetYyyy, Integer stage);
+  Long findMapSheetAnalInferenceUid(UUID uuid);
 
   void insertInspector(Long analUid, String inspector);
 

src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java

@@ -66,8 +66,7 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
   @PersistenceContext private EntityManager em;
 
   @Override
-  public List<AllocateInfoDto> fetchNextIds(
-      Long lastId, Long batchSize, Integer compareYyyy, Integer targetYyyy, Integer stage) {
+  public List<AllocateInfoDto> fetchNextIds(Long lastId, Long batchSize, UUID uuid) {
 
     return queryFactory
         .select(
@@ -76,14 +75,17 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
                 mapSheetAnalDataInferenceGeomEntity.geoUid,
                 mapSheetAnalDataInferenceGeomEntity.mapSheetNum,
                 mapSheetAnalDataInferenceGeomEntity.pnu))
-        .from(mapSheetAnalDataInferenceGeomEntity)
-        .where(
-            lastId == null ? null : mapSheetAnalDataInferenceGeomEntity.geoUid.gt(lastId),
+        .from(mapSheetAnalInferenceEntity)
+        .innerJoin(mapSheetAnalDataInferenceEntity)
+        .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid))
+        .innerJoin(mapSheetAnalDataInferenceGeomEntity)
+        .on(
+            mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid),
             mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
-            mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(compareYyyy),
-            mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(targetYyyy),
-            mapSheetAnalDataInferenceGeomEntity.stage.eq(stage),
             mapSheetAnalDataInferenceGeomEntity.labelState.isNull())
+        .where(
+            mapSheetAnalInferenceEntity.uuid.eq(uuid),
+            lastId == null ? null : mapSheetAnalDataInferenceGeomEntity.geoUid.gt(lastId))
         .orderBy(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.asc())
         .limit(batchSize)
         .fetch();
@@ -177,17 +179,19 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
   }
 
   @Override
-  public Long findLabelUnAssignedCnt(Integer stage, Integer compareYyyy, Integer targetYyyy) {
+  public Long findLabelUnAssignedCnt(UUID uuid) {
 
     return queryFactory
         .select(mapSheetAnalDataInferenceGeomEntity.geoUid.count())
-        .from(mapSheetAnalDataInferenceGeomEntity)
-        .where(
+        .from(mapSheetAnalInferenceEntity)
+        .innerJoin(mapSheetAnalDataInferenceEntity)
+        .on(mapSheetAnalInferenceEntity.id.eq(mapSheetAnalDataInferenceEntity.analUid))
+        .innerJoin(mapSheetAnalDataInferenceGeomEntity)
+        .on(
+            mapSheetAnalDataInferenceEntity.id.eq(mapSheetAnalDataInferenceGeomEntity.dataUid),
             mapSheetAnalDataInferenceGeomEntity.pnu.isNotNull(),
-            mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(compareYyyy),
-            mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(targetYyyy),
-            mapSheetAnalDataInferenceGeomEntity.stage.eq(stage),
             mapSheetAnalDataInferenceGeomEntity.labelState.isNull())
+        .where(mapSheetAnalInferenceEntity.uuid.eq(uuid))
         .fetchOne();
   }
 
@@ -912,14 +916,11 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
   }
 
   @Override
-  public Long findMapSheetAnalInferenceUid(Integer compareYyyy, Integer targetYyyy, Integer stage) {
+  public Long findMapSheetAnalInferenceUid(UUID uuid) {
     return queryFactory
         .select(mapSheetAnalInferenceEntity.id)
         .from(mapSheetAnalInferenceEntity)
-        .where(
-            mapSheetAnalInferenceEntity.compareYyyy.eq(compareYyyy),
-            mapSheetAnalInferenceEntity.targetYyyy.eq(targetYyyy),
-            mapSheetAnalInferenceEntity.stage.eq(stage))
+        .where(mapSheetAnalInferenceEntity.uuid.eq(uuid))
         .fetchOne();
   }
 

src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java

@@ -138,7 +138,9 @@ public class LabelWorkRepositoryImpl implements LabelWorkRepositoryCustom {
                 mapSheetAnalDataInferenceGeomEntity
                     .pnu
                     .isNotNull()
-                    .and(mapSheetAnalDataInferenceGeomEntity.pnu.ne(0L))
+                    .and(
+                        mapSheetAnalDataInferenceGeomEntity.pnu
+                            .isNotNull()) // TODO: 이노팸 연동 후 0 이상이라고 해야할 듯
                     .and(mapSheetAnalDataInferenceGeomEntity.passYn.eq(Boolean.FALSE)))
             .then(1L)
             .otherwise(0L)