라벨 할당,이관 리턴형식 수정

src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java

@@ -1,5 +1,7 @@
 package com.kamco.cd.kamcoback.label.service;
 
+import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
+import com.kamco.cd.kamcoback.config.api.ApiResponseDto.ApiResponseCode;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelerDetail;
@@ -12,6 +14,7 @@ import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics;
 import com.kamco.cd.kamcoback.postgres.core.LabelAllocateCoreService;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -34,14 +37,16 @@ public class LabelAllocateService {
   /**
    * 도엽 기준 asc sorting 해서 할당 수만큼 배정하는 로직
    *
-   * @param autoType 자동/수동 배정 타입
+   * @param labelerAutoType 라벨러 자동/수동 배정 타입
+   * @param inspectorAutoType 검수자 자동/수동 배정 타입
    * @param stage 회차
    * @param targetUsers 라벨러 목록
    * @param targetInspectors 검수자 목록
    */
   @Transactional
-  public void allocateAsc(
-      String autoType,
+  public ApiResponseDto.ResponseObj allocateAsc(
+      String labelerAutoType,
+      String inspectorAutoType,
       Integer stage,
       List<TargetUser> targetUsers,
       List<TargetInspector> targetInspectors,
@@ -52,14 +57,14 @@ public class LabelAllocateService {
     // geom 잔여건수 조회
     Long chargeCnt =
         labelAllocateCoreService.findLabelUnAssignedCnt(stage, compareYyyy, targetYyyy);
-    //    Long totalDemand = targetUsers.stream().mapToLong(TargetUser::getDemand).sum();
-    //    if (!Objects.equals(chargeCnt, totalDemand)) {
-    //      log.info("chargeCnt != totalDemand");
-    //      return;
-    //    }
-
     if (chargeCnt <= 0) {
-      return;
+      return new ApiResponseDto.ResponseObj(ApiResponseCode.DUPLICATE_DATA, "이미 배정완료된 회차 입니다.");
+    }
+
+    Long totalDemand = targetUsers.stream().mapToLong(TargetUser::getDemand).sum();
+    if (!Objects.equals(chargeCnt, totalDemand)) {
+      return new ApiResponseDto.ResponseObj(
+          ApiResponseCode.BAD_REQUEST, "총 잔여건수와 요청 값의 합계가 맞지 않습니다.");
     }
 
     List<Long> allIds =
@@ -92,6 +97,8 @@ public class LabelAllocateService {
 
       from = to;
     }
+
+    return new ApiResponseDto.ResponseObj(ApiResponseCode.OK, "배정이 완료되었습니다.");
   }
 
   public List<UserList> availUserList(String role) {
@@ -162,7 +169,7 @@ public class LabelAllocateService {
     return labelAllocateCoreService.findInferenceDetail(compareYyyy, targetYyyy, stage);
   }
 
-  public void allocateMove(
+  public ApiResponseDto.ResponseObj allocateMove(
       String autoType,
       Integer stage,
       List<TargetUser> targetUsers,
@@ -173,7 +180,7 @@ public class LabelAllocateService {
     Long chargeCnt = targetUsers.stream().mapToLong(TargetUser::getDemand).sum();
 
     if (chargeCnt <= 0) {
-      return;
+      return new ApiResponseDto.ResponseObj(ApiResponseCode.BAD_REQUEST, "이관할 데이터를 입력해주세요.");
     }
 
     List<Long> allIds =
@@ -187,6 +194,8 @@ public class LabelAllocateService {
       labelAllocateCoreService.assignOwnerMove(sub, target.getUserId());
       index = end;
     }
+
+    return new ApiResponseDto.ResponseObj(ApiResponseCode.OK, "이관을 완료하였습니다.");
   }
 
   public LabelerDetail findLabelerDetail(