diff --git a/build.gradle b/build.gradle index 7b8d8e8..897cca9 100644 --- a/build.gradle +++ b/build.gradle @@ -50,19 +50,14 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-validation' implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.11" - //ortools-java CP-SAT Solver를 사용하기 위함 - implementation "com.google.ortools:ortools-java:9.15.6755" - compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' developmentOnly 'org.springframework.boot:spring-boot-devtools' testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.security:spring-security-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/src/main/java/com/kri/p6/ncrc/pairing/NcrcPairingApplication.java b/src/main/java/com/kri/p6/ncrc/pairing/NcrcPairingApplication.java index d7e7500..cc597ca 100644 --- a/src/main/java/com/kri/p6/ncrc/pairing/NcrcPairingApplication.java +++ b/src/main/java/com/kri/p6/ncrc/pairing/NcrcPairingApplication.java @@ -1,8 +1,5 @@ package com.kri.p6.ncrc.pairing; -import lombok.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; @@ -11,9 +8,6 @@ import org.springframework.boot.context.properties.ConfigurationPropertiesScan; @ConfigurationPropertiesScan public class NcrcPairingApplication { - @Generated - private static final Logger log = LoggerFactory.getLogger(NcrcPairingApplication.class); - public static void main(String[] args) { SpringApplication.run(NcrcPairingApplication.class, args); } diff --git a/src/main/java/com/kri/p6/ncrc/pairing/common/consts/PairingConstant.java b/src/main/java/com/kri/p6/ncrc/pairing/common/consts/PairingConstant.java index 0aba631..a464097 100644 --- a/src/main/java/com/kri/p6/ncrc/pairing/common/consts/PairingConstant.java +++ b/src/main/java/com/kri/p6/ncrc/pairing/common/consts/PairingConstant.java @@ -5,21 +5,9 @@ public final class PairingConstant { public static final String SHEET_MEMBER = "위원정보"; public static final String SHEET_MUNICIPALITY = "지자체 정보"; public static final String SHEET_CENTER = "센터정보"; - public static final String SHEET_MEMBER_REGION_CODE = "위원 지역 코드표"; public static final String SHEET_CENTER_ADJACENT_REGION = "센터 인접지역표"; public static final String SHEET_PREFERENCE_MATCH = "희망지역 매칭표"; - public static final String RESULT_SHEET_ASSIGNMENT = "배정결과"; - public static final String RESULT_SHEET_UNASSIGNED_CENTER = "미배정센터"; - public static final String RESULT_SHEET_UNUSED_MEMBER = "미사용위원"; - public static final String RESULT_SHEET_SUMMARY = "처리요약"; - public static final String RESULT_SHEET_AB_PAIR = "AB페어목록"; - public static final String RESULT_SHEET_CANDIDATE_SUMMARY = "후보요약"; - public static final String RESULT_SHEET_VALIDATION_ERROR = "검증오류"; - public static final String RESULT_SHEET_RULE_CHECK = "규칙위반검사"; - - public static final String RESULT_SHEET_APPLIED_SETTING = "적용설정"; - private PairingConstant() { } } diff --git a/src/main/java/com/kri/p6/ncrc/pairing/config/OrToolsConfig.java b/src/main/java/com/kri/p6/ncrc/pairing/config/OrToolsConfig.java deleted file mode 100644 index a8d3de9..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/config/OrToolsConfig.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.kri.p6.ncrc.pairing.config; - -import com.google.ortools.Loader; -import jakarta.annotation.PostConstruct; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class OrToolsConfig { - - @PostConstruct - public void init() { - Loader.loadNativeLibraries(); - } -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/config/PairingProperties.java b/src/main/java/com/kri/p6/ncrc/pairing/config/PairingProperties.java index bc0687c..eae9de3 100644 --- a/src/main/java/com/kri/p6/ncrc/pairing/config/PairingProperties.java +++ b/src/main/java/com/kri/p6/ncrc/pairing/config/PairingProperties.java @@ -11,11 +11,7 @@ public class PairingProperties { private Excel excel = new Excel(); private Code code = new Code(); - private Rule rule = new Rule(); private Preference preference = new Preference(); - private Objective objective = new Objective(); - private Candidate candidate = new Candidate(); - private Solver solver = new Solver(); @Getter @Setter @@ -28,51 +24,13 @@ public class PairingProperties { public static class Code { private int regionCodeLength = 2; private int residenceCodeLength = 5; - private int residenceMatchPrefixLength = 3; private String anyRegionCode = "00"; } - @Getter - @Setter - public static class Rule { - private int maxCentersPerPairPerDay = 3; - private int maxCounterpartsPerMember = 3; - private int maxMemberVisitAverageRatioPercent = 130; - } - @Getter @Setter public static class Preference { private int anywhereRank = 0; private int ignoredRank = 99; - private boolean activeWildcardFallbackEnabled = false; - private long wildcardFallbackScoreBonus = 25_000L; - } - - @Getter - @Setter - public static class Objective { - private long assignmentWeight = 1_000_000L; - private long preferenceBaseWeight = 30_000L; - private long preferenceRankPenalty = 1_000L; - private long residenceMatchWeight = 10_000L; - private long memberBalanceWeight = 20_000L; - } - - @Getter - @Setter - public static class Candidate { - private int maxPairCandidatesPerMember = 0; - private int maxDispatchRegionsPerPair = 0; - private int maxAssignmentsPerCenter = 1_000; - private int maxAssignmentsPerMember = 3_000; - private int maxDatesPerAssignmentCandidate = 80; - } - - @Getter - @Setter - public static class Solver { - private double maxTimeSeconds = 30.0; - private int numSearchWorkers = Math.max(1, Runtime.getRuntime().availableProcessors() - 1); } } diff --git a/src/main/java/com/kri/p6/ncrc/pairing/controller/CacheAdminController.java b/src/main/java/com/kri/p6/ncrc/pairing/controller/CacheAdminController.java deleted file mode 100644 index e7b1745..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/controller/CacheAdminController.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.kri.p6.ncrc.pairing.controller; - -import com.kri.common.feature.web.BusinessException; -import com.kri.p6.ncrc.pairing.common.cache.DatagoHolidayCache; -import com.kri.p6.ncrc.pairing.common.external.datago.HolidayDto; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import java.util.List; -import java.util.Set; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/api/v1/admin-cache") -@RequiredArgsConstructor -@Tag(name = "Admin Cache", description = "캐시 관리 API") -public class CacheAdminController { - - private final DatagoHolidayCache datagoHolidayCache; - - @Operation(summary = "국공휴일 캐시 조회") - @GetMapping("/holiday/{year}") - public List getHolidays( - @PathVariable String year - ) { - if (year.length() != 4) { - throw BusinessException.badRequest("INVALID_YEAR_FORMAT", "년도 형식이 올바르지 않습니다."); - } - - Set years = Set.of(year); - return datagoHolidayCache.getHolidays(years); - } -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/controller/PairingController.java b/src/main/java/com/kri/p6/ncrc/pairing/controller/PairingController.java index fefa1f8..c543f76 100644 --- a/src/main/java/com/kri/p6/ncrc/pairing/controller/PairingController.java +++ b/src/main/java/com/kri/p6/ncrc/pairing/controller/PairingController.java @@ -5,7 +5,6 @@ import com.kri.p6.ncrc.pairing.common.util.ExcelResponseBuilder; import com.kri.p6.ncrc.pairing.service.PairingExcelService; import com.kri.p6.ncrc.pairing.service.PairingService; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -14,48 +13,20 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @RestController -@RequestMapping({"/api/v1/pairing"}) +@RequestMapping("/api/v1/pairing") @RequiredArgsConstructor -@Tag( - name = "Pairing", - description = "위원/센터 매칭 API" -) +@Tag(name = "Pairing", description = "위원/센터 배정 API") public class PairingController { private final PairingService pairingService; private final PairingExcelService pairingExcelService; - @PostMapping(value = "/run", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - @Operation( - summary = "업로드된 파일로 위원과 센터를 매칭" - ) - public ResponseEntity pairingMemberByCenter( - @RequestParam("file") MultipartFile file - ) { - String fileName = file.getOriginalFilename() == null ? "pairing" : file.getOriginalFilename(); - - try { - byte[] bytes = pairingService.pairingMemberByCenter(file); - return ExcelResponseBuilder.buildExcelResponse(fileName + " 결과.xlsx", bytes); - } catch (BusinessException e) { - if (e.getStatus() != HttpStatus.BAD_REQUEST) { - throw e; - } else { - byte[] bytes = pairingExcelService.writeValidationError(e.getCode(), e.getMessage()); - return ExcelResponseBuilder.buildExcelResponse(fileName + " 오류.xlsx", bytes); - } - } - } - - @PostMapping(value = "/run/new1", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - @Operation( - summary = "업로드된 파일로 위원과 센터를 매칭" - ) + @PostMapping(value = "/run/new", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + @Operation(summary = "업로드된 엑셀 파일로 위원과 센터를 배정") public ResponseEntity pairingMemberByCenterNew( @RequestParam("file") MultipartFile file ) { @@ -67,10 +38,10 @@ public class PairingController { } catch (BusinessException e) { if (e.getStatus() != HttpStatus.BAD_REQUEST) { throw e; - } else { - byte[] bytes = pairingExcelService.writeValidationError(e.getCode(), e.getMessage()); - return ExcelResponseBuilder.buildExcelResponse(fileName + " 오류.xlsx", bytes); } + + byte[] bytes = pairingExcelService.writeValidationError(e.getCode(), e.getMessage()); + return ExcelResponseBuilder.buildExcelResponse(fileName + " 오류.xlsx", bytes); } } } diff --git a/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/input/MemberRegionCodeExcelDto.java b/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/input/MemberRegionCodeExcelDto.java deleted file mode 100644 index 41f0f5a..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/input/MemberRegionCodeExcelDto.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.kri.p6.ncrc.pairing.dto.excel.input; - -import com.kri.common.feature.excel.ExcelColumn; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -public class MemberRegionCodeExcelDto { - - @ExcelColumn(header = "시도", order = 0, width = 15) - private String sido; - - @ExcelColumn(header = "시군구", order = 1, width = 15) - private String sigungu; - - @ExcelColumn(header = "권역코드", order = 2, width = 12) - private String regionCode; - - @ExcelColumn(header = "세부권역코드(중간 1자리)", order = 3, width = 25) - private String detailRegionCode; - - @ExcelColumn(header = "세부지역코드(마지막2자리)", order = 4, width = 25) - private String detailAreaCode; - - @ExcelColumn(header = "지역 코드", order = 5, width = 12) - private String fullRegionCode; -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/input/PairingWorkbookData.java b/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/input/PairingWorkbookData.java index c83c66a..2b6a5d8 100644 --- a/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/input/PairingWorkbookData.java +++ b/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/input/PairingWorkbookData.java @@ -11,7 +11,6 @@ public class PairingWorkbookData { private final List members; private final List municipalities; private final List centers; - private final List memberRegionCodes; private final List centerAdjacentRegions; private final List preferenceMatchRules; } diff --git a/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/ABPairExcelDto.java b/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/ABPairExcelDto.java deleted file mode 100644 index 093340a..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/ABPairExcelDto.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.kri.p6.ncrc.pairing.dto.excel.output; - -import com.kri.common.feature.excel.ExcelColumn; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class ABPairExcelDto { - - @ExcelColumn(header = "AB 그룹", order = 0, width = 12) - private String groupId; - - @ExcelColumn(header = "A 현장위원 id", order = 1, width = 18) - private String aFieldMemberId; - - @ExcelColumn(header = "A 외부위원 id", order = 2, width = 18) - private String aExternalMemberId; - - @ExcelColumn(header = "B 현장위원 id", order = 3, width = 18) - private String bFieldMemberId; - - @ExcelColumn(header = "B 외부위원 id", order = 4, width = 18) - private String bExternalMemberId; - - @ExcelColumn(header = "공유 파견 권역", order = 5, width = 15) - private String sharedDispatchRegion; - - @ExcelColumn(header = "A 배정일", order = 6, width = 25) - private String aAssignmentDates; - - @ExcelColumn(header = "B 배정일", order = 7, width = 25) - private String bAssignmentDates; - - @ExcelColumn(header = "날짜 겹침 여부", order = 8, width = 15) - private String dateOverlapped; -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/AppliedSettingExcelDto.java b/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/AppliedSettingExcelDto.java deleted file mode 100644 index b38b190..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/AppliedSettingExcelDto.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.kri.p6.ncrc.pairing.dto.excel.output; - -import com.kri.common.feature.excel.ExcelColumn; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class AppliedSettingExcelDto { - - @ExcelColumn(header = "설정명", order = 0, width = 38) - private String name; - - @ExcelColumn(header = "설정에 대한 설명", order = 1, width = 70) - private String description; - - @ExcelColumn(header = "값", order = 2, width = 24) - private String value; -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/AssignmentResultExcelDto.java b/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/AssignmentResultExcelDto.java deleted file mode 100644 index b4a84f5..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/AssignmentResultExcelDto.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.kri.p6.ncrc.pairing.dto.excel.output; - -import com.kri.common.feature.excel.ExcelColumn; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class AssignmentResultExcelDto { - - @ExcelColumn(header = "일자", order = 0, width = 15) - private String date; - - @ExcelColumn(header = "현장위원 id", order = 1, width = 15) - private String fieldMemberId; - - @ExcelColumn(header = "현장위원 성별", order = 2, width = 12) - private String fieldMemberGender; - - @ExcelColumn(header = "현장위원 경력", order = 3, width = 12) - private String fieldMemberExperience; - - @ExcelColumn(header = "현장위원 거주지", order = 4, width = 15) - private String fieldMemberResidenceCode; - - @ExcelColumn(header = "현장위원 활동지역", order = 5, width = 15) - private String fieldMemberActivityRegion; - - @ExcelColumn(header = "현장위원 희망지역 순위", order = 6, width = 18) - private String fieldMemberPreferenceRank; - - @ExcelColumn(header = "외부위원 id", order = 7, width = 15) - private String externalMemberId; - - @ExcelColumn(header = "외부위원 성별", order = 8, width = 12) - private String externalMemberGender; - - @ExcelColumn(header = "외부위원 경력", order = 9, width = 12) - private String externalMemberExperience; - - @ExcelColumn(header = "외부위원 거주지", order = 10, width = 15) - private String externalMemberResidenceCode; - - @ExcelColumn(header = "외부위원 활동지역", order = 11, width = 15) - private String externalMemberActivityRegion; - - @ExcelColumn(header = "외부위원 희망지역 순위", order = 12, width = 18) - private String externalMemberPreferenceRank; - - @ExcelColumn(header = "센터 id", order = 13, width = 15) - private String centerId; - - @ExcelColumn(header = "지자체 id", order = 14, width = 15) - private String municipalityId; - - @ExcelColumn(header = "여성 위원만", order = 15, width = 12) - private String centerWomenOnly; - - @ExcelColumn(header = "파견 권역", order = 16, width = 12) - private String dispatchRegion; - - @ExcelColumn(header = "인접지역 분류", order = 17, width = 15) - private String adjacentRegionClassification; - - @ExcelColumn(header = "희망지역 매칭 순위", order = 18, width = 18) - private String preferencePriority; - - @ExcelColumn(header = "AB 그룹", order = 19, width = 12) - private String abGroup; - - @ExcelColumn(header = "대체 현장위원 id", order = 20, width = 18) - private String backupFieldMemberId; - - @ExcelColumn(header = "대체 외부위원 id", order = 21, width = 18) - private String backupExternalMemberId; -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/PairingSummaryExcelDto.java b/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/PairingSummaryExcelDto.java deleted file mode 100644 index a13bc62..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/PairingSummaryExcelDto.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.kri.p6.ncrc.pairing.dto.excel.output; - -import com.kri.common.feature.excel.ExcelColumn; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class PairingSummaryExcelDto { - - @ExcelColumn(header = "항목", order = 0, width = 25) - private String name; - - @ExcelColumn(header = "값", order = 1, width = 20) - private String value; -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/UnassignedCenterExcelDto.java b/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/UnassignedCenterExcelDto.java deleted file mode 100644 index dc017ad..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/UnassignedCenterExcelDto.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.kri.p6.ncrc.pairing.dto.excel.output; - -import com.kri.common.feature.excel.ExcelColumn; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class UnassignedCenterExcelDto { - - @ExcelColumn(header = "센터 id", order = 0, width = 15) - private String centerId; - - @ExcelColumn(header = "지자체 id", order = 1, width = 15) - private String municipalityId; - - @ExcelColumn(header = "사유", order = 2, width = 40) - private String reason; -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/UnusedMemberExcelDto.java b/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/UnusedMemberExcelDto.java deleted file mode 100644 index ac0fb8f..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/dto/excel/output/UnusedMemberExcelDto.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.kri.p6.ncrc.pairing.dto.excel.output; - -import com.kri.common.feature.excel.ExcelColumn; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class UnusedMemberExcelDto { - - @ExcelColumn(header = "위원 id", order = 0, width = 15) - private String memberId; - - @ExcelColumn(header = "현장/외부 구분", order = 1, width = 15) - private String role; - - @ExcelColumn(header = "사유", order = 2, width = 40) - private String reason; -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/model/ABPairMatch.java b/src/main/java/com/kri/p6/ncrc/pairing/model/ABPairMatch.java deleted file mode 100644 index d019e4b..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/model/ABPairMatch.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.kri.p6.ncrc.pairing.model; - -import lombok.Builder; -import lombok.Getter; - -@Getter -@Builder -public class ABPairMatch { - - private final String groupId; - private final String fieldMemberId; - private final String externalMemberId; - private final String counterpartFieldMemberId; - private final String counterpartExternalMemberId; - -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/model/AssignmentCandidate.java b/src/main/java/com/kri/p6/ncrc/pairing/model/AssignmentCandidate.java deleted file mode 100644 index 3651838..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/model/AssignmentCandidate.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.kri.p6.ncrc.pairing.model; - -import java.time.LocalDate; -import lombok.Builder; -import lombok.Getter; - -@Getter -@Builder -public class AssignmentCandidate { - - private final String fieldMemberId; - private final String externalMemberId; - private final String centerId; - private final String municipalityId; - private final LocalDate date; - private final String dispatchRegion; - private final String adjacentRegionClassification; - private final int preferencePriority; - private final int fieldMemberPreferenceRank; - private final int externalMemberPreferenceRank; - private final int residenceMatchScore; - -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/model/DispatchRegionCandidate.java b/src/main/java/com/kri/p6/ncrc/pairing/model/DispatchRegionCandidate.java deleted file mode 100644 index 65bc9b3..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/model/DispatchRegionCandidate.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.kri.p6.ncrc.pairing.model; - -import lombok.Builder; -import lombok.Getter; - -@Getter -@Builder -public class DispatchRegionCandidate { - - private final String fieldMemberId; - private final String externalMemberId; - private final String dispatchRegion; - private final int preferencePriority; - private final int fieldMemberPreferenceRank; - private final int externalMemberPreferenceRank; - -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/model/MemberRegionCode.java b/src/main/java/com/kri/p6/ncrc/pairing/model/MemberRegionCode.java deleted file mode 100644 index e6da6fe..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/model/MemberRegionCode.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.kri.p6.ncrc.pairing.model; - -import lombok.Builder; -import lombok.Getter; - -@Getter -@Builder -public class MemberRegionCode { - - private final String sido; - private final String sigungu; - private final String regionCode; - private final String detailRegionCode; - private final String detailAreaCode; - private final String fullRegionCode; - -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/model/PairCandidate.java b/src/main/java/com/kri/p6/ncrc/pairing/model/PairCandidate.java deleted file mode 100644 index ff48d20..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/model/PairCandidate.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.kri.p6.ncrc.pairing.model; - -import lombok.Builder; -import lombok.Getter; - -@Getter -@Builder -public class PairCandidate { - - private final String fieldMemberId; - private final String externalMemberId; - private final int residenceMatchScore; - -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/model/PairingCandidates.java b/src/main/java/com/kri/p6/ncrc/pairing/model/PairingCandidates.java deleted file mode 100644 index ae93051..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/model/PairingCandidates.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.kri.p6.ncrc.pairing.model; - -import java.util.List; -import java.util.Map; -import java.util.Set; -import lombok.Builder; -import lombok.Getter; - -@Getter -@Builder -public class PairingCandidates { - - private final List pairCandidates; - private final List dispatchRegionCandidates; - private final List assignmentCandidates; - private final Map> unassignedCenterReasons; - -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/model/PairingData.java b/src/main/java/com/kri/p6/ncrc/pairing/model/PairingData.java index 6729724..2b6f385 100644 --- a/src/main/java/com/kri/p6/ncrc/pairing/model/PairingData.java +++ b/src/main/java/com/kri/p6/ncrc/pairing/model/PairingData.java @@ -13,7 +13,6 @@ public class PairingData { private final List members; private final List municipalities; private final List
centers; - private final List memberRegionCodes; private final List centerAdjacentRegions; private final List preferenceMatchRules; private final Set commonUnavailableDates; diff --git a/src/main/java/com/kri/p6/ncrc/pairing/model/PairingResult.java b/src/main/java/com/kri/p6/ncrc/pairing/model/PairingResult.java deleted file mode 100644 index 7737d98..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/model/PairingResult.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.kri.p6.ncrc.pairing.model; - -import com.kri.p6.ncrc.pairing.dto.excel.output.ABPairExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.AppliedSettingExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.AssignmentResultExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.CandidateSummaryExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.PairingSummaryExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.RuleViolationExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.UnassignedCenterExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.UnusedMemberExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.ValidationErrorExcelDto; -import java.util.List; -import lombok.Builder; -import lombok.Getter; - -@Getter -@Builder -public class PairingResult { - - private final List assignments; - private final List unassignedCenters; - private final List unusedMembers; - private final List summaries; - private final List abPairs; - private final List candidateSummaries; - private final List appliedSettings; - private final List validationErrors; - private final List ruleViolations; - -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingCandidateService.java b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingCandidateService.java deleted file mode 100644 index 5313ede..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingCandidateService.java +++ /dev/null @@ -1,801 +0,0 @@ -package com.kri.p6.ncrc.pairing.service; - -import com.kri.p6.ncrc.pairing.common.enums.Gender; -import com.kri.p6.ncrc.pairing.common.enums.MemberRole; -import com.kri.p6.ncrc.pairing.config.PairingProperties; -import com.kri.p6.ncrc.pairing.model.AssignmentCandidate; -import com.kri.p6.ncrc.pairing.model.Center; -import com.kri.p6.ncrc.pairing.model.CenterAdjacentRegion; -import com.kri.p6.ncrc.pairing.model.DispatchRegionCandidate; -import com.kri.p6.ncrc.pairing.model.Member; -import com.kri.p6.ncrc.pairing.model.Municipality; -import com.kri.p6.ncrc.pairing.model.PairCandidate; -import com.kri.p6.ncrc.pairing.model.PairingCandidates; -import com.kri.p6.ncrc.pairing.model.PairingData; -import com.kri.p6.ncrc.pairing.model.PreferenceMatchRule; -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.PriorityQueue; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class PairingCandidateService { - - private final PairingProperties pairingProperties; - - public PairingCandidates generate(PairingData data) { - // 후보 생성은 "가능한 조합을 넓게 만들고, 명백히 불가능한 조합만 제거"하는 단계입니다. - // 이후 PairingScheduleService가 이 후보들 중 실제 방문 일정을 선택합니다. - List pairCandidates = trimPairCandidates( - createPairCandidates(data.getMembers()), data.getMembers()); - List dispatchRegionCandidates = trimDispatchRegionCandidates( - createDispatchRegionCandidates(data, pairCandidates)); - Map> unassignedCenterReasons = createInitialCenterReasonMap(data); - List rawAssignmentCandidates = createAssignmentCandidates(data, - pairCandidates, dispatchRegionCandidates, unassignedCenterReasons); - List residencePreferredCandidates = preferResidenceMatchesByCenter( - rawAssignmentCandidates, unassignedCenterReasons); - List assignmentCandidates = trimAssignmentCandidates( - residencePreferredCandidates, - data.getCenters(), unassignedCenterReasons); - return PairingCandidates.builder().pairCandidates(pairCandidates) - .dispatchRegionCandidates(dispatchRegionCandidates) - .assignmentCandidates(assignmentCandidates).unassignedCenterReasons(unassignedCenterReasons) - .build(); - } - - private List createPairCandidates(List members) { - // 현장위원 1명 + 외부위원 1명을 기본 조로 봅니다. - // 두 위원의 활동 가능 기간이 전혀 겹치지 않으면 이후 센터 배정이 불가능하므로 제외합니다. - List fieldMembers = members.stream() - .filter(member -> member.getRole() == MemberRole.FIELD).toList(); - List externalMembers = members.stream() - .filter(member -> member.getRole() == MemberRole.EXTERNAL).toList(); - List candidates = new ArrayList<>(); - - for (Member fieldMember : fieldMembers) { - for (Member externalMember : externalMembers) { - if (hasDateOverlap(fieldMember, externalMember)) { - candidates.add(PairCandidate.builder().fieldMemberId(fieldMember.getId()) - .externalMemberId(externalMember.getId()) - .residenceMatchScore(calculateResidenceMatchScore(fieldMember, externalMember)) - .build()); - } - } - } - - return candidates; - } - - private List createDispatchRegionCandidates(PairingData data, - List pairCandidates) { - // 조가 갈 수 있는 파견 권역 후보를 만듭니다. - // 상피제(위원 활동지역과 파견 권역 일치)는 여기서 제거합니다. - Map memberMap = toMemberMap(data.getMembers()); - Set dispatchRegions = data.getCenterAdjacentRegions().stream() - .map(CenterAdjacentRegion::getDispatchRegion).collect(Collectors.toSet()); - List candidates = new ArrayList<>(); - - for (PairCandidate pairCandidate : pairCandidates) { - Member fieldMember = memberMap.get(pairCandidate.getFieldMemberId()); - Member externalMember = memberMap.get(pairCandidate.getExternalMemberId()); - - for (String dispatchRegion : dispatchRegions) { - if (!isConflictRegion(fieldMember, externalMember, dispatchRegion)) { - int fieldRank = findPreferenceRank(fieldMember, dispatchRegion); - int externalRank = findPreferenceRank(externalMember, dispatchRegion); - - Optional matchRule = findPreferenceMatchRule( - data.getPreferenceMatchRules(), fieldRank, externalRank); - - // fieldRank/externalRank가 -1이어도 희망지역 매칭표의 99(wildcard) 규칙은 적용될 수 있습니다. - // 99는 "해당 위원의 희망지역을 고려하지 않음"이라는 후순위 fallback입니다. - candidates.add(DispatchRegionCandidate.builder().fieldMemberId(fieldMember.getId()) - .externalMemberId(externalMember.getId()).dispatchRegion(dispatchRegion) - .preferencePriority(matchRule.map(PreferenceMatchRule::getPriority) - .orElse(fallbackPreferencePriority(data.getPreferenceMatchRules()))) - .fieldMemberPreferenceRank(fieldRank).externalMemberPreferenceRank(externalRank) - .build()); - } - } - } - - return candidates; - } - - private List createAssignmentCandidates( - PairingData data, - List pairCandidates, - List dispatchRegionCandidates, - Map> unassignedCenterReasons - ) { - // 파견 권역 후보를 실제 센터와 날짜 후보로 확장합니다. - // 여성전용, 기방문센터, 위원/지자체/센터 불가능일, 공휴일/주말은 이 단계에서 제외합니다. - Map memberMap = toMemberMap(data.getMembers()); - Map municipalityMap = data.getMunicipalities().stream() - .collect(Collectors.toMap(Municipality::getId, Function.identity(), (left, right) -> left)); - Map pairMap = pairCandidates.stream() - .collect(Collectors.toMap(this::pairKey, Function.identity(), (left, right) -> left)); - Map> adjacentClassificationsByDispatchRegion = data.getCenterAdjacentRegions() - .stream().collect(Collectors.groupingBy(CenterAdjacentRegion::getDispatchRegion, - Collectors.mapping(CenterAdjacentRegion::getAdjacentRegionClassification, - Collectors.toSet()))); - Map> centersByAdjacentClassification = data.getCenters().stream() - .collect(Collectors.groupingBy(Center::getAdjacentRegionClassification, - LinkedHashMap::new, Collectors.toList())); - Set commonUnavailableDates = commonUnavailableDates(data); - - Map> centerCandidateBuckets = new LinkedHashMap<>(); - Map> memberCandidateBuckets = new LinkedHashMap<>(); - - for (DispatchRegionCandidate dispatchCandidate : dispatchRegionCandidates) { - Member fieldMember = memberMap.get(dispatchCandidate.getFieldMemberId()); - Member externalMember = memberMap.get(dispatchCandidate.getExternalMemberId()); - PairCandidate pairCandidate = pairMap.get( - pairKey(dispatchCandidate.getFieldMemberId(), - dispatchCandidate.getExternalMemberId())); - Set adjacentClassifications = adjacentClassificationsByDispatchRegion - .getOrDefault(dispatchCandidate.getDispatchRegion(), Set.of()); - - for (Center center : centersForDispatch(adjacentClassifications, - centersByAdjacentClassification)) { - if (!adjacentClassifications.contains(center.getAdjacentRegionClassification())) { - addReason(unassignedCenterReasons, center.getId(), "파견 권역과 센터 인접지역 분류 불일치"); - } else { - Municipality municipality = municipalityMap.get( - center.getMunicipalityId()); - List centerReasons = findCenterHardRuleReasons(fieldMember, externalMember, - center); - if (!centerReasons.isEmpty()) { - centerReasons.forEach( - reason -> addReason(unassignedCenterReasons, center.getId(), reason)); - } else { - List assignableDates = findAssignableDates(fieldMember, - externalMember, municipality, center, commonUnavailableDates); - if (assignableDates.isEmpty()) { - addReason(unassignedCenterReasons, center.getId(), - "위원/지자체/센터 일정 또는 국공휴일 조건 불일치"); - } else { - for (LocalDate assignableDate : assignableDates) { - addBoundedAssignmentCandidate(centerCandidateBuckets, memberCandidateBuckets, - AssignmentCandidate.builder().fieldMemberId(fieldMember.getId()) - .externalMemberId(externalMember.getId()).centerId(center.getId()) - .municipalityId(center.getMunicipalityId()).date(assignableDate) - .dispatchRegion(dispatchCandidate.getDispatchRegion()) - .adjacentRegionClassification(center.getAdjacentRegionClassification()) - .preferencePriority(dispatchCandidate.getPreferencePriority()) - .fieldMemberPreferenceRank(dispatchCandidate.getFieldMemberPreferenceRank()) - .externalMemberPreferenceRank(dispatchCandidate.getExternalMemberPreferenceRank()) - .residenceMatchScore( - pairCandidate == null ? 0 : pairCandidate.getResidenceMatchScore()).build()); - } - } - } - } - } - } - - return mergeAssignmentCandidateBuckets(centerCandidateBuckets, memberCandidateBuckets); - } - - private List preferResidenceMatchesByCenter( - List candidates, Map> unassignedCenterReasons) { - // 위원 전원 조편성이 0순위 HARD 룰이므로 거주지 유사도는 후보 제거 조건으로 쓰지 않습니다. - // 거주지 3자리/2자리 일치 여부는 solver 점수로만 반영합니다. - return candidates; - } - - private List trimDispatchRegionCandidates( - List candidates) { - int limit = maxDispatchRegionsPerPair(); - if (limit <= 0) { - return candidates; - } - - return candidates.stream() - .collect(Collectors.groupingBy(this::pairKey, LinkedHashMap::new, Collectors.toList())) - .values() - .stream() - .flatMap(group -> group.stream() - .sorted(dispatchRegionCandidateComparator()) - .limit(limit)) - .toList(); - } - - private List trimPairCandidates(List candidates, - List members) { - int limit = maxPairCandidatesPerMember(); - if (limit <= 0) { - return candidates; - } - - Map memberMap = toMemberMap(members); - Map memberUsage = new HashMap<>(); - List selected = new ArrayList<>(); - Set selectedKeys = new LinkedHashSet<>(); - - for (PairCandidate candidate : candidates.stream() - .sorted(pairCandidateComparator(memberMap)) - .toList()) { - int fieldCount = memberUsage.getOrDefault(candidate.getFieldMemberId(), 0); - int externalCount = memberUsage.getOrDefault(candidate.getExternalMemberId(), 0); - if (fieldCount < limit && externalCount < limit) { - addPairCandidate(selected, selectedKeys, memberUsage, candidate); - } - } - - Set missingMemberIds = candidates.stream() - .flatMap(candidate -> java.util.stream.Stream.of(candidate.getFieldMemberId(), - candidate.getExternalMemberId())) - .filter(memberId -> memberUsage.getOrDefault(memberId, 0) == 0) - .collect(Collectors.toCollection(LinkedHashSet::new)); - - for (PairCandidate candidate : candidates.stream() - .sorted(pairCandidateComparator(memberMap)) - .toList()) { - if (missingMemberIds.isEmpty()) { - break; - } - if (selectedKeys.contains(pairKey(candidate))) { - continue; - } - if (!missingMemberIds.contains(candidate.getFieldMemberId()) - && !missingMemberIds.contains(candidate.getExternalMemberId())) { - continue; - } - - addPairCandidate(selected, selectedKeys, memberUsage, candidate); - missingMemberIds.remove(candidate.getFieldMemberId()); - missingMemberIds.remove(candidate.getExternalMemberId()); - } - - return selected; - } - - private void addPairCandidate(List selected, Set selectedKeys, - Map memberUsage, PairCandidate candidate) { - selected.add(candidate); - selectedKeys.add(pairKey(candidate)); - memberUsage.merge(candidate.getFieldMemberId(), 1, Integer::sum); - memberUsage.merge(candidate.getExternalMemberId(), 1, Integer::sum); - } - - private List
centersForDispatch(Set adjacentClassifications, - Map> centersByAdjacentClassification) { - return adjacentClassifications.stream() - .flatMap(adjacentClassification -> centersByAdjacentClassification - .getOrDefault(adjacentClassification, List.of()).stream()) - .toList(); - } - - private void addBoundedAssignmentCandidate( - Map> centerCandidateBuckets, - Map> memberCandidateBuckets, - AssignmentCandidate candidate) { - // 후보 수가 너무 커지면 처리 시간이 급격히 늘어납니다. - // 센터별/위원별 후보 상한을 두되, 0이면 제한하지 않습니다. - addBounded(centerCandidateBuckets, candidate.getCenterId(), candidate, - maxAssignmentsPerCenter()); - addBounded(memberCandidateBuckets, candidate.getFieldMemberId(), candidate, - maxAssignmentsPerMember()); - addBounded(memberCandidateBuckets, candidate.getExternalMemberId(), candidate, - maxAssignmentsPerMember()); - } - - private void addBounded(Map> buckets, String key, - AssignmentCandidate candidate, int limit) { - PriorityQueue bucket = buckets.computeIfAbsent(key, - ignored -> new PriorityQueue<>(worstAssignmentComparator())); - if (limit <= 0 || bucket.size() < limit) { - bucket.add(candidate); - return; - } - - AssignmentCandidate worstCandidate = bucket.peek(); - if (worstCandidate != null - && assignmentCandidateComparator().compare(candidate, worstCandidate) < 0) { - bucket.poll(); - bucket.add(candidate); - } - } - - private List mergeAssignmentCandidateBuckets( - Map> centerCandidateBuckets, - Map> memberCandidateBuckets) { - Map merged = new LinkedHashMap<>(); - centerCandidateBuckets.values().forEach(bucket -> bucket.forEach(candidate -> - merged.putIfAbsent(assignmentKey(candidate), candidate))); - memberCandidateBuckets.values().forEach(bucket -> bucket.forEach(candidate -> - merged.putIfAbsent(assignmentKey(candidate), candidate))); - return merged.values().stream() - .sorted(assignmentCandidateComparator()) - .toList(); - } - - private List trimAssignmentCandidates(List candidates, - List
centers, Map> unassignedCenterReasons) { - List trimmedByCenter = trimAssignmentsPerCenter(candidates); - List trimmedByMember = trimAssignmentsPerMember(trimmedByCenter); - List memberPreservedCandidates = preserveMinimumMemberCandidates( - candidates, new ArrayList<>(trimmedByMember), memberUsage(trimmedByMember), - maxAssignmentsPerMember()); - addTrimmedCenterReasons(candidates, memberPreservedCandidates, centers, unassignedCenterReasons); - return memberPreservedCandidates; - } - - private List trimAssignmentsPerCenter(List candidates) { - int limit = maxAssignmentsPerCenter(); - if (limit <= 0) { - return candidates; - } - - return candidates.stream() - .collect(Collectors.groupingBy(AssignmentCandidate::getCenterId, LinkedHashMap::new, - Collectors.toList())) - .values() - .stream() - .flatMap(group -> group.stream() - .sorted(assignmentCandidateComparator()) - .limit(limit)) - .toList(); - } - - private List trimAssignmentsPerMember(List candidates) { - int limit = maxAssignmentsPerMember(); - if (limit <= 0) { - return candidates; - } - - Map memberUsage = new HashMap<>(); - List selected = new ArrayList<>(); - - for (AssignmentCandidate candidate : candidates.stream() - .sorted(assignmentCandidateComparator()) - .toList()) { - int fieldCount = memberUsage.getOrDefault(candidate.getFieldMemberId(), 0); - int externalCount = memberUsage.getOrDefault(candidate.getExternalMemberId(), 0); - if (fieldCount < limit && externalCount < limit) { - addAssignmentCandidate(selected, memberUsage, candidate); - } - } - - return preserveMinimumMemberCandidates(candidates, selected, memberUsage, limit); - } - - private List preserveMinimumMemberCandidates( - List candidates, List selected, - Map memberUsage, int limit) { - Set selectedKeys = selected.stream() - .map(this::assignmentKey) - .collect(Collectors.toSet()); - Set missingMemberIds = candidates.stream() - .flatMap(candidate -> java.util.stream.Stream.of(candidate.getFieldMemberId(), - candidate.getExternalMemberId())) - .filter(memberId -> memberUsage.getOrDefault(memberId, 0) == 0) - .collect(Collectors.toCollection(LinkedHashSet::new)); - - for (AssignmentCandidate candidate : candidates.stream() - .sorted(assignmentCandidateComparator()) - .toList()) { - if (missingMemberIds.isEmpty()) { - break; - } - if (selectedKeys.contains(assignmentKey(candidate))) { - continue; - } - if (!missingMemberIds.contains(candidate.getFieldMemberId()) - && !missingMemberIds.contains(candidate.getExternalMemberId())) { - continue; - } - - int fieldCount = memberUsage.getOrDefault(candidate.getFieldMemberId(), 0); - int externalCount = memberUsage.getOrDefault(candidate.getExternalMemberId(), 0); - if (fieldCount < limit && externalCount < limit) { - addAssignmentCandidate(selected, memberUsage, candidate); - selectedKeys.add(assignmentKey(candidate)); - missingMemberIds.remove(candidate.getFieldMemberId()); - missingMemberIds.remove(candidate.getExternalMemberId()); - } - } - - return selected; - } - - private void addAssignmentCandidate(List selected, - Map memberUsage, AssignmentCandidate candidate) { - selected.add(candidate); - memberUsage.merge(candidate.getFieldMemberId(), 1, Integer::sum); - memberUsage.merge(candidate.getExternalMemberId(), 1, Integer::sum); - } - - private Map memberUsage(List candidates) { - Map memberUsage = new HashMap<>(); - candidates.forEach(candidate -> { - memberUsage.merge(candidate.getFieldMemberId(), 1, Integer::sum); - memberUsage.merge(candidate.getExternalMemberId(), 1, Integer::sum); - }); - return memberUsage; - } - - private void addTrimmedCenterReasons(List originalCandidates, - List trimmedCandidates, List
centers, - Map> unassignedCenterReasons) { - Set originalCenterIds = originalCandidates.stream() - .map(AssignmentCandidate::getCenterId) - .collect(Collectors.toSet()); - Set trimmedCenterIds = trimmedCandidates.stream() - .map(AssignmentCandidate::getCenterId) - .collect(Collectors.toSet()); - - for (Center center : centers) { - if (originalCenterIds.contains(center.getId()) && !trimmedCenterIds.contains(center.getId())) { - addReason(unassignedCenterReasons, center.getId(), - "후보 축소 과정에서 상위 후보에 들지 못함"); - } - } - } - - private boolean hasDateOverlap(Member fieldMember, Member externalMember) { - LocalDate latestStart = max(fieldMember.getAvailableStartDate(), - externalMember.getAvailableStartDate()); - LocalDate earliestEnd = min(fieldMember.getAvailableEndDate(), - externalMember.getAvailableEndDate()); - return !latestStart.isAfter(earliestEnd); - } - - private int calculateResidenceMatchScore(Member fieldMember, Member externalMember) { - if (isSameResidencePrefix(fieldMember, externalMember, residenceMatchPrefixLength())) { - return 2; - } - - if (isSameResidencePrefix(fieldMember, externalMember, secondaryResidenceMatchPrefixLength())) { - return 1; - } - - return 0; - } - - private boolean isSameResidencePrefix(Member fieldMember, Member externalMember, int length) { - String fieldPrefix = prefix(fieldMember.getResidenceCode(), length); - String externalPrefix = prefix(externalMember.getResidenceCode(), length); - return !fieldPrefix.isBlank() && fieldPrefix.equals(externalPrefix); - } - - private boolean isConflictRegion(Member fieldMember, Member externalMember, - String dispatchRegion) { - return hasActivityRegion(fieldMember, dispatchRegion) || hasActivityRegion(externalMember, - dispatchRegion); - } - - private boolean hasActivityRegion(Member member, String dispatchRegion) { - return java.util.Arrays.stream(member.getActivityRegion().split(",")) - .map(String::trim) - .anyMatch(dispatchRegion::equals); - } - - private int findPreferenceRank(Member member, String dispatchRegion) { - List preferences = member.getPreferenceRegions(); - - for (int i = 0; i < preferences.size(); ++i) { - String preference = preferences.get(i); - if (dispatchRegion.equals(preference)) { - return i + 1; - } - - if (anyRegionCode().equals(preference)) { - return anywherePreferenceRank(); - } - } - - return -1; - } - - private Optional findPreferenceMatchRule(List rules, - int fieldRank, int externalRank) { - // 99 규칙은 wildcard입니다. 예를 들어 fieldRank가 -1이어도 - // 매칭표에 99/1 규칙이 있으면 "현장위원 선호지역 고려하지 않음 + 외부위원 1순위"로 인정합니다. - return rules.stream().filter( - rule -> matchesPreferenceRank(rule.getFieldMemberPreferenceRank(), fieldRank) - ) - .filter(rule -> matchesPreferenceRank(rule.getExternalMemberPreferenceRank(), externalRank)) - .min(Comparator.comparingInt(PreferenceMatchRule::getPriority)) - ; - } - - private int fallbackPreferencePriority(List rules) { - return rules.stream() - .mapToInt(PreferenceMatchRule::getPriority) - .max() - .orElse(0) + 1000; - } - - private boolean matchesPreferenceRank(int ruleRank, int memberRank) { - return ruleRank == ignoredPreferenceRank() || ruleRank == memberRank; - } - - private List findCenterHardRuleReasons(Member fieldMember, Member externalMember, - Center center) { - List reasons = new ArrayList<>(); - if (center.isWomenOnly() && (fieldMember.getGender() != Gender.FEMALE - || externalMember.getGender() != Gender.FEMALE)) { - reasons.add("여성 전용 센터 조건 불충족"); - } - - if (fieldMember.getHistoryCenterIds().contains(center.getId()) - || externalMember.getHistoryCenterIds().contains(center.getId())) { - reasons.add("2023년 진행 센터 재배정 제외"); - } - - return reasons; - } - - private List findAssignableDates(Member fieldMember, Member externalMember, - Municipality municipality, Center center, Set commonUnavailableDates) { - List dates = new ArrayList<>(); - LocalDate start = max( - max(fieldMember.getAvailableStartDate(), externalMember.getAvailableStartDate()), - max(municipality.getAvailableStartDate(), center.getAvailableStartDate())); - LocalDate end = min( - min(fieldMember.getAvailableEndDate(), externalMember.getAvailableEndDate()), - min(municipality.getAvailableEndDate(), center.getAvailableEndDate())); - if (!start.isAfter(end)) { - for (LocalDate date = start; !date.isAfter(end); date = date.plusDays(1L)) { - if (isAvailableOn(date, fieldMember, externalMember, municipality, center, - commonUnavailableDates)) { - dates.add(date); - } - } - } - - return spreadDates(dates, maxDatesPerAssignmentCandidate()); - } - - private List spreadDates(List dates, int limit) { - if (limit <= 0 || dates.size() <= limit) { - return dates; - } - if (limit == 1) { - return List.of(dates.get(0)); - } - - List spread = new ArrayList<>(); - for (int i = 0; i < limit; i++) { - int index = (int) Math.round((double) i * (dates.size() - 1) / (limit - 1)); - LocalDate date = dates.get(index); - if (!spread.contains(date)) { - spread.add(date); - } - } - return spread; - } - - private boolean isAvailableOn(LocalDate date, Member fieldMember, Member externalMember, - Municipality municipality, Center center, Set commonUnavailableDates) { - return !fieldMember.getUnavailableDates().contains(date) - && !externalMember.getUnavailableDates().contains(date) - && !municipality.getUnavailableDates().contains(date) && !center.getUnavailableDates() - .contains(date) && !commonUnavailableDates.contains(date); - } - - private Map> createInitialCenterReasonMap(PairingData data) { - Map> reasons = new HashMap<>(); - data.getCenters().forEach(center -> reasons.put(center.getId(), new LinkedHashSet<>())); - return reasons; - } - - private void addReason(Map> reasons, String centerId, String reason) { - reasons.computeIfAbsent(centerId, key -> new LinkedHashSet<>()).add(reason); - } - - private Set commonUnavailableDates(PairingData data) { - return data.getCommonUnavailableDates() == null ? Set.of() : data.getCommonUnavailableDates(); - } - - private Map toMemberMap(List members) { - return members.stream() - .collect(Collectors.toMap(Member::getId, Function.identity(), (left, right) -> left)); - } - - private String pairKey(PairCandidate pairCandidate) { - return pairKey(pairCandidate.getFieldMemberId(), pairCandidate.getExternalMemberId()); - } - - private String pairKey(DispatchRegionCandidate dispatchRegionCandidate) { - return pairKey(dispatchRegionCandidate.getFieldMemberId(), - dispatchRegionCandidate.getExternalMemberId()); - } - - private String pairKey(String fieldMemberId, String externalMemberId) { - return fieldMemberId + "|" + externalMemberId; - } - - private String assignmentKey(AssignmentCandidate candidate) { - return candidate.getFieldMemberId() + "|" + candidate.getExternalMemberId() + "|" - + candidate.getCenterId() + "|" + candidate.getDate(); - } - - private String prefix(String value) { - return prefix(value, residenceMatchPrefixLength()); - } - - private String prefix(String value, int length) { - return value.substring(0, Math.min(length, value.length())); - } - - private String anyRegionCode() { - return pairingProperties.getCode().getAnyRegionCode(); - } - - private int anywherePreferenceRank() { - return pairingProperties.getPreference().getAnywhereRank(); - } - - private int ignoredPreferenceRank() { - return pairingProperties.getPreference().getIgnoredRank(); - } - - private int residenceMatchPrefixLength() { - return pairingProperties.getCode().getResidenceMatchPrefixLength(); - } - - private int secondaryResidenceMatchPrefixLength() { - return Math.max(1, residenceMatchPrefixLength() - 1); - } - - private int maxDispatchRegionsPerPair() { - return pairingProperties.getCandidate().getMaxDispatchRegionsPerPair(); - } - - private int maxAssignmentsPerCenter() { - return pairingProperties.getCandidate().getMaxAssignmentsPerCenter(); - } - - private int maxAssignmentsPerMember() { - return pairingProperties.getCandidate().getMaxAssignmentsPerMember(); - } - - private int maxPairCandidatesPerMember() { - return pairingProperties.getCandidate().getMaxPairCandidatesPerMember(); - } - - private int maxDatesPerAssignmentCandidate() { - return pairingProperties.getCandidate().getMaxDatesPerAssignmentCandidate(); - } - - private Comparator pairCandidateComparator(Map memberMap) { - return Comparator.comparingInt((PairCandidate candidate) -> pairCandidateScore(candidate, - memberMap)) - .reversed() - .thenComparing(PairCandidate::getFieldMemberId) - .thenComparing(PairCandidate::getExternalMemberId); - } - - private Comparator dispatchRegionCandidateComparator() { - return Comparator.comparingInt(this::dispatchRegionCandidateScore).reversed() - .thenComparing(DispatchRegionCandidate::getDispatchRegion); - } - - private Comparator assignmentCandidateComparator() { - return Comparator.comparingInt(this::assignmentCandidateScore).reversed() - .thenComparing(AssignmentCandidate::getDate) - .thenComparing(AssignmentCandidate::getCenterId) - .thenComparing(AssignmentCandidate::getFieldMemberId) - .thenComparing(AssignmentCandidate::getExternalMemberId); - } - - private Comparator worstAssignmentComparator() { - return Comparator.comparingInt(this::assignmentCandidateScore) - .thenComparing(AssignmentCandidate::getDate, Comparator.reverseOrder()) - .thenComparing(AssignmentCandidate::getCenterId, Comparator.reverseOrder()) - .thenComparing(AssignmentCandidate::getFieldMemberId, Comparator.reverseOrder()) - .thenComparing(AssignmentCandidate::getExternalMemberId, Comparator.reverseOrder()); - } - - private int dispatchRegionCandidateScore(DispatchRegionCandidate candidate) { - return preferenceScore(candidate.getPreferencePriority()) - + preferenceRankBonus(candidate.getFieldMemberPreferenceRank()) - + preferenceRankBonus(candidate.getExternalMemberPreferenceRank()); - } - - private int pairCandidateScore(PairCandidate candidate, Map memberMap) { - Member fieldMember = memberMap.get(candidate.getFieldMemberId()); - Member externalMember = memberMap.get(candidate.getExternalMemberId()); - return preferenceIntersectionScore(fieldMember, externalMember) - + candidate.getResidenceMatchScore() * 10; - } - - private int preferenceIntersectionScore(Member fieldMember, Member externalMember) { - if (fieldMember == null || externalMember == null) { - return 0; - } - - Set externalPreferences = new LinkedHashSet<>(externalMember.getPreferenceRegions()); - int score = 0; - for (String preference : fieldMember.getPreferenceRegions()) { - if (ignoredPreferenceCode(preference)) { - continue; - } - if (anyRegionCode().equals(preference) && externalPreferences.contains(preference)) { - score += 10; - } else if (externalPreferences.contains(preference)) { - score += 100; - } - } - return score; - } - - private boolean ignoredPreferenceCode(String preference) { - return String.valueOf(ignoredPreferenceRank()).equals(preference); - } - - private int assignmentCandidateScore(AssignmentCandidate candidate) { - return preferenceScore(candidate.getPreferencePriority()) - + preferenceRankBonus(candidate.getFieldMemberPreferenceRank()) - + preferenceRankBonus(candidate.getExternalMemberPreferenceRank()) - + wildcardFallbackBonus(candidate) - + candidate.getResidenceMatchScore() * (int) pairingProperties.getObjective() - .getResidenceMatchWeight(); - } - - private int wildcardFallbackBonus(AssignmentCandidate candidate) { - // wildcard 적극 사용 옵션입니다. true이면 99 규칙으로 살아난 후보가 - // 후보 축소 단계에서 너무 쉽게 밀려나지 않도록 보너스를 줍니다. - if (!activeWildcardFallbackEnabled()) { - return 0; - } - if (!usesWildcardFallback(candidate)) { - return 0; - } - return (int) Math.min(Integer.MAX_VALUE, wildcardFallbackScoreBonus()); - } - - private int preferenceScore(int priority) { - return (int) Math.max(0L, pairingProperties.getObjective().getPreferenceBaseWeight() - - priority * pairingProperties.getObjective().getPreferenceRankPenalty()); - } - - private int preferenceRankBonus(int rank) { - if (rank == anywherePreferenceRank()) { - return 1; - } - - if (rank <= 0 || rank == ignoredPreferenceRank()) { - return 0; - } - - return Math.max(0, 10 - rank); - } - - private boolean usesWildcardFallback(AssignmentCandidate candidate) { - return candidate.getFieldMemberPreferenceRank() < 0 - || candidate.getExternalMemberPreferenceRank() < 0; - } - - private boolean activeWildcardFallbackEnabled() { - return pairingProperties.getPreference().isActiveWildcardFallbackEnabled(); - } - - private long wildcardFallbackScoreBonus() { - return pairingProperties.getPreference().getWildcardFallbackScoreBonus(); - } - - private LocalDate max(LocalDate left, LocalDate right) { - return left.isAfter(right) ? left : right; - } - - private LocalDate min(LocalDate left, LocalDate right) { - return left.isBefore(right) ? left : right; - } -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingExcelService.java b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingExcelService.java index 929e319..5b261b0 100644 --- a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingExcelService.java +++ b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingExcelService.java @@ -1,18 +1,8 @@ package com.kri.p6.ncrc.pairing.service; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_AB_PAIR; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_APPLIED_SETTING; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_ASSIGNMENT; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_CANDIDATE_SUMMARY; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_RULE_CHECK; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_SUMMARY; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_UNASSIGNED_CENTER; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_UNUSED_MEMBER; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_VALIDATION_ERROR; import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.SHEET_CENTER; import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.SHEET_CENTER_ADJACENT_REGION; import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.SHEET_MEMBER; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.SHEET_MEMBER_REGION_CODE; import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.SHEET_MUNICIPALITY; import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.SHEET_PREFERENCE_MATCH; @@ -22,13 +12,9 @@ import com.kri.p6.ncrc.pairing.config.PairingProperties; import com.kri.p6.ncrc.pairing.dto.excel.input.CenterAdjacentRegionExcelDto; import com.kri.p6.ncrc.pairing.dto.excel.input.CenterExcelDto; import com.kri.p6.ncrc.pairing.dto.excel.input.MemberExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.input.MemberRegionCodeExcelDto; import com.kri.p6.ncrc.pairing.dto.excel.input.MunicipalityExcelDto; import com.kri.p6.ncrc.pairing.dto.excel.input.PairingWorkbookData; import com.kri.p6.ncrc.pairing.dto.excel.input.PreferenceMatchExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.ABPairExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.AppliedSettingExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.AssignmentResultExcelDto; import com.kri.p6.ncrc.pairing.dto.excel.output.CandidateSummaryExcelDto; import com.kri.p6.ncrc.pairing.dto.excel.output.NewAdjacentRegionExcelDto; import com.kri.p6.ncrc.pairing.dto.excel.output.NewCenterExcelDto; @@ -36,13 +22,9 @@ import com.kri.p6.ncrc.pairing.dto.excel.output.NewFinalAssignmentExcelDto; import com.kri.p6.ncrc.pairing.dto.excel.output.NewFinalAssignmentWithCenterExcelDto; import com.kri.p6.ncrc.pairing.dto.excel.output.NewPairResultExcelDto; import com.kri.p6.ncrc.pairing.dto.excel.output.NewPairScoreGuideExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.PairingSummaryExcelDto; import com.kri.p6.ncrc.pairing.dto.excel.output.RuleViolationExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.UnassignedCenterExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.UnusedMemberExcelDto; import com.kri.p6.ncrc.pairing.dto.excel.output.ValidationErrorExcelDto; import com.kri.p6.ncrc.pairing.model.NewPairingResult; -import com.kri.p6.ncrc.pairing.model.PairingResult; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -72,8 +54,6 @@ public class PairingExcelService { .members(readSheet(workbook, MemberExcelDto.class, SHEET_MEMBER)) .municipalities(readSheet(workbook, MunicipalityExcelDto.class, SHEET_MUNICIPALITY)) .centers(readSheet(workbook, CenterExcelDto.class, SHEET_CENTER)) - .memberRegionCodes(readSheet(workbook, MemberRegionCodeExcelDto.class, - SHEET_MEMBER_REGION_CODE)) .centerAdjacentRegions(readSheet(workbook, CenterAdjacentRegionExcelDto.class, SHEET_CENTER_ADJACENT_REGION)) .preferenceMatchRules(readSheet(workbook, PreferenceMatchExcelDto.class, @@ -87,36 +67,6 @@ public class PairingExcelService { } } - public byte[] write(PairingResult result) { - try (Workbook workbook = ExcelMapper.writeToWorkbook(result.getAssignments(), - AssignmentResultExcelDto.class, RESULT_SHEET_ASSIGNMENT); - ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) { - - ExcelMapper.appendSheetToWorkbook(workbook, result.getUnassignedCenters(), - UnassignedCenterExcelDto.class, RESULT_SHEET_UNASSIGNED_CENTER, headerRowIndex()); - ExcelMapper.appendSheetToWorkbook(workbook, result.getUnusedMembers(), - UnusedMemberExcelDto.class, RESULT_SHEET_UNUSED_MEMBER, headerRowIndex()); - ExcelMapper.appendSheetToWorkbook(workbook, result.getSummaries(), - PairingSummaryExcelDto.class, RESULT_SHEET_SUMMARY, headerRowIndex()); - ExcelMapper.appendSheetToWorkbook(workbook, result.getAbPairs(), ABPairExcelDto.class, - RESULT_SHEET_AB_PAIR, headerRowIndex()); - ExcelMapper.appendSheetToWorkbook(workbook, result.getCandidateSummaries(), - CandidateSummaryExcelDto.class, RESULT_SHEET_CANDIDATE_SUMMARY, headerRowIndex()); - ExcelMapper.appendSheetToWorkbook(workbook, result.getAppliedSettings(), - AppliedSettingExcelDto.class, RESULT_SHEET_APPLIED_SETTING, headerRowIndex()); - ExcelMapper.appendSheetToWorkbook(workbook, result.getValidationErrors(), - ValidationErrorExcelDto.class, RESULT_SHEET_VALIDATION_ERROR, headerRowIndex()); - ExcelMapper.appendSheetToWorkbook(workbook, result.getRuleViolations(), - RuleViolationExcelDto.class, RESULT_SHEET_RULE_CHECK, headerRowIndex()); - - workbook.write(outputStream); - return outputStream.toByteArray(); - } catch (IOException e) { - throw BusinessException.badRequest("PAIRING_EXCEL_WRITE_FAILED", - "결과 엑셀 파일을 생성하는 중 오류가 발생했습니다: " + e.getMessage()); - } - } - public byte[] writeNew(NewPairingResult result) { try (Workbook workbook = ExcelMapper.writeToWorkbook(result.getPairs(), NewPairResultExcelDto.class, "페어결과"); @@ -126,7 +76,6 @@ public class PairingExcelService { NewFinalAssignmentExcelDto.class, "최종 배정", headerRowIndex()); ExcelMapper.appendSheetToWorkbook(workbook, result.getFinalAssignmentsWithCenters(), NewFinalAssignmentWithCenterExcelDto.class, "최종 배정 with 센터", headerRowIndex()); - ExcelMapper.appendSheetToWorkbook(workbook, result.getAdjacentRegions(), NewAdjacentRegionExcelDto.class, "인접지역목록", headerRowIndex()); ExcelMapper.appendSheetToWorkbook(workbook, result.getCenters(), @@ -147,18 +96,16 @@ public class PairingExcelService { } public byte[] writeValidationError(String code, String message) { - PairingResult result = PairingResult.builder() - .assignments(List.of()) - .unassignedCenters(List.of()) - .unusedMembers(List.of()) - .summaries(List.of(new PairingSummaryExcelDto("처리 상태", "검증 실패"))) - .abPairs(List.of()) - .candidateSummaries(List.of()) - .appliedSettings(appliedSettings()) - .validationErrors(List.of(new ValidationErrorExcelDto(code, message, "ERROR"))) - .ruleViolations(List.of()) - .build(); - return write(result); + try (Workbook workbook = ExcelMapper.writeToWorkbook( + List.of(new ValidationErrorExcelDto(code, message, "ERROR")), + ValidationErrorExcelDto.class, "검증오류"); + ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) { + workbook.write(outputStream); + return outputStream.toByteArray(); + } catch (IOException e) { + throw BusinessException.badRequest("PAIRING_EXCEL_WRITE_FAILED", + "오류 엑셀 파일을 생성하는 중 오류가 발생했습니다: " + e.getMessage()); + } } private List readSheet(Workbook workbook, Class type, String sheetName) { @@ -176,76 +123,6 @@ public class PairingExcelService { return pairingProperties.getExcel().getHeaderRowIndex(); } - private List appliedSettings() { - PairingProperties.Excel excel = pairingProperties.getExcel(); - PairingProperties.Code code = pairingProperties.getCode(); - PairingProperties.Rule rule = pairingProperties.getRule(); - PairingProperties.Preference preference = pairingProperties.getPreference(); - PairingProperties.Objective objective = pairingProperties.getObjective(); - PairingProperties.Candidate candidate = pairingProperties.getCandidate(); - PairingProperties.Solver solver = pairingProperties.getSolver(); - return List.of( - setting("pairing.excel.header-row-index", "엑셀 헤더로 사용하는 행 인덱스", - excel.getHeaderRowIndex()), - setting("pairing.code.region-code-length", "지역코드 정규화 길이", - code.getRegionCodeLength()), - setting("pairing.code.residence-code-length", "거주지코드 정규화 길이", - code.getResidenceCodeLength()), - setting("pairing.code.residence-match-prefix-length", "거주지 일치 판단에 사용하는 앞자리 길이", - code.getResidenceMatchPrefixLength()), - setting("pairing.code.any-region-code", "희망지역 anywhere로 처리하는 코드", - code.getAnyRegionCode()), - setting("pairing.rule.max-centers-per-pair-per-day", "같은 페어가 하루에 방문할 수 있는 최대 센터 수", - rule.getMaxCentersPerPairPerDay()), - setting("pairing.rule.max-counterparts-per-member", "위원 1명당 허용하는 상대 위원 최대 수", - rule.getMaxCounterpartsPerMember()), - setting("pairing.rule.max-member-visit-average-ratio-percent", - "위원별 방문 수 상한을 평균 대비 몇 %까지 허용할지", - rule.getMaxMemberVisitAverageRatioPercent()), - setting("pairing.preference.anywhere-rank", "희망지역 anywhere를 의미하는 순위", - preference.getAnywhereRank()), - setting("pairing.preference.ignored-rank", "희망지역 고려하지 않음을 의미하는 순위", - preference.getIgnoredRank()), - setting("pairing.preference.active-wildcard-fallback-enabled", - "희망지역 고려하지 않음을 wildcard로 적극 사용할지", - preference.isActiveWildcardFallbackEnabled()), - setting("pairing.preference.wildcard-fallback-score-bonus", "wildcard 후보에 추가하는 점수", - preference.getWildcardFallbackScoreBonus()), - setting("pairing.objective.assignment-weight", "센터 하나를 배정하는 것에 부여하는 기본 점수", - objective.getAssignmentWeight()), - setting("pairing.objective.preference-base-weight", "희망지역 매칭 1건마다 부여하는 기본 점수", - objective.getPreferenceBaseWeight()), - setting("pairing.objective.preference-rank-penalty", "희망 순위가 낮아질 때 감점하는 점수", - objective.getPreferenceRankPenalty()), - setting("pairing.objective.residence-match-weight", "거주지 유사도 점수에 곱하는 가중치", - objective.getResidenceMatchWeight()), - setting("pairing.objective.member-balance-weight", - "방문 수가 많은 위원이 계속 선택되지 않도록 감점하는 가중치", - objective.getMemberBalanceWeight()), - setting("pairing.candidate.max-pair-candidates-per-member", - "위원별 페어 후보 축소 상한, 0이면 무제한", - candidate.getMaxPairCandidatesPerMember()), - setting("pairing.candidate.max-dispatch-regions-per-pair", - "페어별 파견 권역 후보 축소 상한, 0이면 무제한", - candidate.getMaxDispatchRegionsPerPair()), - setting("pairing.candidate.max-assignments-per-center", "센터별 배정 후보 축소 상한", - candidate.getMaxAssignmentsPerCenter()), - setting("pairing.candidate.max-assignments-per-member", "위원별 배정 후보 축소 상한", - candidate.getMaxAssignmentsPerMember()), - setting("pairing.candidate.max-dates-per-assignment-candidate", - "하나의 페어-센터 조합에서 확장할 날짜 후보 상한", - candidate.getMaxDatesPerAssignmentCandidate()), - setting("pairing.solver.max-time-seconds", "CP-SAT 사용 시 허용할 최대 탐색 시간", - solver.getMaxTimeSeconds()), - setting("pairing.solver.num-search-workers", "CP-SAT 사용 시 사용할 worker 수", - solver.getNumSearchWorkers()) - ); - } - - private AppliedSettingExcelDto setting(String name, String description, Object value) { - return new AppliedSettingExcelDto(name, description, String.valueOf(value)); - } - private boolean isBlankRow(Object row) { return Arrays.stream(row.getClass().getDeclaredFields()) .allMatch(field -> isBlankField(row, field)); diff --git a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingHolidayService.java b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingHolidayService.java index c755d6f..8dd9677 100644 --- a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingHolidayService.java +++ b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingHolidayService.java @@ -24,7 +24,7 @@ public class PairingHolidayService { Set holidays = datagoHolidayCache.getHolidays(years).stream() .map(this::toHolidayDate).collect(Collectors.toSet()); return PairingData.builder().members(data.getMembers()).municipalities(data.getMunicipalities()) - .centers(data.getCenters()).memberRegionCodes(data.getMemberRegionCodes()) + .centers(data.getCenters()) .centerAdjacentRegions(data.getCenterAdjacentRegions()) .preferenceMatchRules(data.getPreferenceMatchRules()).commonUnavailableDates(holidays) .build(); diff --git a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingMemberPairService.java b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingMemberPairService.java deleted file mode 100644 index d2154d4..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingMemberPairService.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.kri.p6.ncrc.pairing.service; - -import com.kri.p6.ncrc.pairing.config.PairingProperties; -import com.kri.p6.ncrc.pairing.model.Member; -import com.kri.p6.ncrc.pairing.model.PairCandidate; -import com.kri.p6.ncrc.pairing.model.PairingData; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class PairingMemberPairService { - - private final PairingProperties pairingProperties; - - public PairSelection select(PairingData data, List pairCandidates) { - return select(data, pairCandidates, Map.of()); - } - - public PairSelection select(PairingData data, List pairCandidates, - Map assignmentCountByPair) { - // 0순위 전제: 모든 위원은 최소 1개 이상의 조에 포함되어야 합니다. - // 그래서 센터 배정 전에 먼저 조편성만 수행합니다. - Set allMemberIds = data.getMembers().stream() - .map(Member::getId) - .collect(Collectors.toCollection(LinkedHashSet::new)); - Map> counterpartsByMember = createCounterpartMap(allMemberIds); - List selectedPairs = new ArrayList<>(); - List sortedCandidates = pairCandidates.stream() - .sorted(pairComparator(assignmentCountByPair)) - .toList(); - - boolean changed; - do { - // 아직 조가 없는 위원을 우선 포함시키는 greedy 방식입니다. - // assignmentCountByPair가 큰 조는 실제 센터 후보가 많다는 뜻이므로 먼저 선택합니다. - changed = false; - Set unmatchedMemberIds = unmatchedMemberIds(allMemberIds, counterpartsByMember); - for (PairCandidate candidate : sortedCandidates) { - if (unmatchedMemberIds.isEmpty()) { - break; - } - if (!coversUnmatchedMember(candidate, unmatchedMemberIds)) { - continue; - } - if (!canAddPair(candidate, counterpartsByMember)) { - continue; - } - - addPair(selectedPairs, counterpartsByMember, candidate); - unmatchedMemberIds.remove(candidate.getFieldMemberId()); - unmatchedMemberIds.remove(candidate.getExternalMemberId()); - changed = true; - } - } while (changed && !unmatchedMemberIds(allMemberIds, counterpartsByMember).isEmpty()); - - Set unmatchedMemberIds = unmatchedMemberIds(allMemberIds, counterpartsByMember); - if (!unmatchedMemberIds.isEmpty()) { - return new PairSelection(false, selectedPairs, - "페어링되지 않은 위원이 있습니다: " + String.join(", ", unmatchedMemberIds)); - } - - selectedPairs.sort(Comparator.comparing(PairCandidate::getFieldMemberId) - .thenComparing(PairCandidate::getExternalMemberId)); - return new PairSelection(true, selectedPairs, "GREEDY_PAIRED"); - } - - private Map> createCounterpartMap(Set memberIds) { - Map> counterpartsByMember = new HashMap<>(); - memberIds.forEach(memberId -> counterpartsByMember.put(memberId, new HashSet<>())); - return counterpartsByMember; - } - - private Set unmatchedMemberIds(Set allMemberIds, - Map> counterpartsByMember) { - return allMemberIds.stream() - .filter(memberId -> counterpartsByMember.getOrDefault(memberId, Set.of()).isEmpty()) - .collect(Collectors.toCollection(LinkedHashSet::new)); - } - - private boolean coversUnmatchedMember(PairCandidate candidate, Set unmatchedMemberIds) { - return unmatchedMemberIds.contains(candidate.getFieldMemberId()) - || unmatchedMemberIds.contains(candidate.getExternalMemberId()); - } - - private boolean canAddPair(PairCandidate candidate, - Map> counterpartsByMember) { - if (counterpartsByMember.get(candidate.getFieldMemberId()) - .contains(candidate.getExternalMemberId())) { - return false; - } - return counterpartsByMember.get(candidate.getFieldMemberId()).size() < maxCounterpartsPerMember() - && counterpartsByMember.get(candidate.getExternalMemberId()).size() - < maxCounterpartsPerMember(); - } - - private void addPair(List selectedPairs, - Map> counterpartsByMember, PairCandidate candidate) { - selectedPairs.add(candidate); - counterpartsByMember.get(candidate.getFieldMemberId()).add(candidate.getExternalMemberId()); - counterpartsByMember.get(candidate.getExternalMemberId()).add(candidate.getFieldMemberId()); - } - - private Comparator pairComparator(Map assignmentCountByPair) { - // 1순위: 해당 조가 갈 수 있는 센터/날짜 후보 수 - // 2순위: 거주지 유사도 - // 이후 id 정렬은 같은 점수일 때 결과가 매번 흔들리지 않게 하기 위한 tie-breaker입니다. - return Comparator.comparingLong((PairCandidate candidate) -> - assignmentCountByPair.getOrDefault(pairKey(candidate), 0L)) - .reversed() - .thenComparing(Comparator.comparingInt(this::unmatchedPairScore).reversed()) - .thenComparing(PairCandidate::getFieldMemberId) - .thenComparing(PairCandidate::getExternalMemberId); - } - - private int unmatchedPairScore(PairCandidate candidate) { - return candidate.getResidenceMatchScore(); - } - - private int maxCounterpartsPerMember() { - return pairingProperties.getRule().getMaxCounterpartsPerMember(); - } - - private String pairKey(PairCandidate candidate) { - return candidate.getFieldMemberId() + "|" + candidate.getExternalMemberId(); - } - - public record PairSelection(boolean hasSolution, List selectedPairs, - String status) { - } -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingNormalizeService.java b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingNormalizeService.java index 0bed16b..ab364ff 100644 --- a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingNormalizeService.java +++ b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingNormalizeService.java @@ -8,21 +8,19 @@ import com.kri.p6.ncrc.pairing.config.PairingProperties; import com.kri.p6.ncrc.pairing.dto.excel.input.CenterAdjacentRegionExcelDto; import com.kri.p6.ncrc.pairing.dto.excel.input.CenterExcelDto; import com.kri.p6.ncrc.pairing.dto.excel.input.MemberExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.input.MemberRegionCodeExcelDto; import com.kri.p6.ncrc.pairing.dto.excel.input.MunicipalityExcelDto; import com.kri.p6.ncrc.pairing.dto.excel.input.PairingWorkbookData; import com.kri.p6.ncrc.pairing.dto.excel.input.PreferenceMatchExcelDto; import com.kri.p6.ncrc.pairing.model.Center; import com.kri.p6.ncrc.pairing.model.CenterAdjacentRegion; import com.kri.p6.ncrc.pairing.model.Member; -import com.kri.p6.ncrc.pairing.model.MemberRegionCode; import com.kri.p6.ncrc.pairing.model.Municipality; import com.kri.p6.ncrc.pairing.model.PairingData; import com.kri.p6.ncrc.pairing.model.PreferenceMatchRule; import java.time.LocalDate; import java.time.ZonedDateTime; -import java.time.format.DateTimeParseException; import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashSet; @@ -41,21 +39,20 @@ public class PairingNormalizeService { public PairingData normalize(PairingWorkbookData workbookData) { return PairingData.builder() - .members(workbookData.getMembers().stream().map(this::toMember).toList()).municipalities( - workbookData.getMunicipalities().stream().map(this::toMunicipality).toList()) - .centers(workbookData.getCenters().stream().map(this::toCenter).toList()).memberRegionCodes( - workbookData.getMemberRegionCodes().stream().map(this::toMemberRegionCode).toList()) - .centerAdjacentRegions( - workbookData.getCenterAdjacentRegions().stream().map(this::toCenterAdjacentRegion) - .toList()).preferenceMatchRules( - workbookData.getPreferenceMatchRules().stream().map(this::toPreferenceMatchRule) - .toList()).commonUnavailableDates(Set.of()).build(); + .members(workbookData.getMembers().stream().map(this::toMember).toList()) + .municipalities(workbookData.getMunicipalities().stream().map(this::toMunicipality).toList()) + .centers(workbookData.getCenters().stream().map(this::toCenter).toList()) + .centerAdjacentRegions(workbookData.getCenterAdjacentRegions().stream() + .map(this::toCenterAdjacentRegion).toList()) + .preferenceMatchRules(workbookData.getPreferenceMatchRules().stream() + .map(this::toPreferenceMatchRule).toList()) + .commonUnavailableDates(Set.of()) + .build(); } - - private Member toMember(MemberExcelDto row) { - return Member.builder().id(required(row.getId(), "위원 id")) + return Member.builder() + .id(required(row.getId(), "위원 id")) .gender(parseGender(row.getGender())) .experienceType(parseExperienceType(row.getExperience())) .role(parseMemberRole(row.getRole())) @@ -63,70 +60,63 @@ public class PairingNormalizeService { .availableEndDate(parseDate(row.getAvailableEndDate(), "위원 진행 종료일")) .unavailableDates(parseDateSet(row.getUnavailableDates(), "위원 진행 불가 일자")) .activityRegion(normalizeCsvCodes(row.getActivityRegion(), regionCodeLength(), "위원 활동지역")) - .historyCenterIds(parseHistoryCenterIds(row.getHistoryCenters())).residenceCode( - normalizeOptionalCode(row.getResidenceCode(), residenceCodeLength(), "위원 거주지")) - .preferenceRegions(normalizePreferenceRegions(row)).build(); + .historyCenterIds(parseHistoryCenterIds(row.getHistoryCenters())) + .residenceCode(normalizeOptionalCode(row.getResidenceCode(), residenceCodeLength(), "위원 거주지")) + .preferenceRegions(normalizePreferenceRegions(row)) + .build(); } private Municipality toMunicipality(MunicipalityExcelDto row) { - return Municipality.builder().id(required(row.getId(), "지자체 id")) + return Municipality.builder() + .id(required(row.getId(), "지자체 id")) .availableStartDate(parseDate(row.getAvailableStartDate(), "지자체 진행 시작일")) .availableEndDate(parseDate(row.getAvailableEndDate(), "지자체 진행 종료일")) - .unavailableDates(parseDateSet(row.getUnavailableDates(), "지자체 진행 불가 일자")).build(); + .unavailableDates(parseDateSet(row.getUnavailableDates(), "지자체 진행 불가 일자")) + .build(); } private Center toCenter(CenterExcelDto row) { - return Center.builder().id(required(row.getId(), "센터 id")) + return Center.builder() + .id(required(row.getId(), "센터 id")) .municipalityId(required(row.getMunicipalityId(), "센터 지자체 id")) - .womenOnly(parseBooleanFlag(row.getWomenOnly(), "센터 여성 위원만")) - .adjacentRegionClassification( - required(row.getAdjacentRegionClassification(), "센터 인접지역 분류")) + .womenOnly(parseBooleanFlag(row.getWomenOnly())) + .adjacentRegionClassification(required(row.getAdjacentRegionClassification(), "센터 인접지역 분류")) .availableStartDate(parseDate(row.getAvailableStartDate(), "센터 진행 시작일")) .availableEndDate(parseDate(row.getAvailableEndDate(), "센터 진행 종료일")) - .unavailableDates(parseDateSet(row.getUnavailableDates(), "센터 진행 불가 일자")).build(); - } - - private MemberRegionCode toMemberRegionCode(MemberRegionCodeExcelDto row) { - String regionCode = normalizeCode(row.getRegionCode(), regionCodeLength(), "권역코드"); - String detailRegionCode = normalizeCode(row.getDetailRegionCode(), 1, "세부권역코드"); - String detailAreaCode = normalizeCode(row.getDetailAreaCode(), 2, "세부지역코드"); - return MemberRegionCode.builder().sido(clean(row.getSido())) - .sigungu(clean(row.getSigungu())).regionCode(regionCode) - .detailRegionCode(detailRegionCode).detailAreaCode(detailAreaCode).fullRegionCode( - normalizeFullRegionCode(row.getFullRegionCode(), regionCode, detailRegionCode, - detailAreaCode)).build(); + .unavailableDates(parseDateSet(row.getUnavailableDates(), "센터 진행 불가 일자")) + .build(); } private CenterAdjacentRegion toCenterAdjacentRegion(CenterAdjacentRegionExcelDto row) { - return CenterAdjacentRegion.builder().dispatchRegion( - normalizeCode(row.getDispatchRegion(), regionCodeLength(), "센터 인접지역표 권역")) - .adjacentRegionClassification( - required(row.getAdjacentRegionClassification(), "인접지역 분류")).build(); + return CenterAdjacentRegion.builder() + .dispatchRegion(normalizeCode(row.getDispatchRegion(), regionCodeLength(), "파견 권역")) + .adjacentRegionClassification(required(row.getAdjacentRegionClassification(), "인접지역 분류")) + .build(); } private PreferenceMatchRule toPreferenceMatchRule(PreferenceMatchExcelDto row) { - return PreferenceMatchRule.builder().priority(parseInt(row.getPriority(), "매칭 순위")) + return PreferenceMatchRule.builder() + .priority(parseInt(row.getPriority(), "매칭 순위")) .fieldMemberPreferenceRank(parseInt(row.getFieldMemberPreferenceRank(), "현장위원 선호 순위")) - .externalMemberPreferenceRank( - parseInt(row.getExternalMemberPreferenceRank(), "외부위원 선호 순위")).build(); + .externalMemberPreferenceRank(parseInt(row.getExternalMemberPreferenceRank(), "외부위원 선호 순위")) + .build(); } private List normalizePreferenceRegions(MemberExcelDto row) { List preferences = new ArrayList<>(Arrays.asList( - normalizeCode(row.getPreferenceRegion1(), regionCodeLength(), "선호 지역1"), - normalizeCode(row.getPreferenceRegion2(), regionCodeLength(), "선호 지역2"), - normalizeCode(row.getPreferenceRegion3(), regionCodeLength(), "선호 지역3"), - normalizeCode(row.getPreferenceRegion4(), regionCodeLength(), "선호 지역4"))); + normalizeCode(row.getPreferenceRegion1(), regionCodeLength(), "선호 지역"), + normalizeCode(row.getPreferenceRegion2(), regionCodeLength(), "선호 지역"), + normalizeCode(row.getPreferenceRegion3(), regionCodeLength(), "선호 지역"), + normalizeCode(row.getPreferenceRegion4(), regionCodeLength(), "선호 지역"))); boolean anyRegionAppeared = false; - for (int i = 0; i < preferences.size(); ++i) { + for (int i = 0; i < preferences.size(); i++) { if (anyRegionAppeared) { preferences.set(i, anyRegionCode()); } else if (anyRegionCode().equals(preferences.get(i))) { anyRegionAppeared = true; } } - return preferences; } @@ -135,43 +125,45 @@ public class PairingNormalizeService { if ("여성".equals(cleaned) || "여".equals(cleaned) || "F".equalsIgnoreCase(cleaned) || "FEMALE".equalsIgnoreCase(cleaned)) { return Gender.FEMALE; - } else if ("남성".equals(cleaned) || "남".equals(cleaned) || "M".equalsIgnoreCase(cleaned) + } + if ("남성".equals(cleaned) || "남".equals(cleaned) || "M".equalsIgnoreCase(cleaned) || "MALE".equalsIgnoreCase(cleaned)) { return Gender.MALE; - } else { - throw BusinessException.badRequest("PAIRING_INVALID_GENDER", "성별 값이 올바르지 않습니다: " + value); } + throw BusinessException.badRequest("PAIRING_INVALID_GENDER", "성별 값이 올바르지 않습니다: " + value); } + private ExperienceType parseExperienceType(String value) { - String cleaned = required(value, "경력여부"); + String cleaned = required(value, "경력 여부"); if ("경력".equals(cleaned) || "경력자".equals(cleaned) || "EXPERIENCED".equalsIgnoreCase(cleaned)) { return ExperienceType.EXPERIENCED; - } else if ("신규".equals(cleaned) || "NEW".equalsIgnoreCase(cleaned)) { - return ExperienceType.NEW; - } else { - throw BusinessException.badRequest("PAIRING_INVALID_EXPERIENCE", - "경력여부 값이 올바르지 않습니다: " + value); } + if ("신규".equals(cleaned) || "NEW".equalsIgnoreCase(cleaned)) { + return ExperienceType.NEW; + } + throw BusinessException.badRequest("PAIRING_INVALID_EXPERIENCE", + "경력 여부 값이 올바르지 않습니다: " + value); } + private MemberRole parseMemberRole(String value) { String cleaned = required(value, "현장/외부 구분"); if ("현장".equals(cleaned) || "FIELD".equalsIgnoreCase(cleaned)) { return MemberRole.FIELD; - } else if ("외부".equals(cleaned) || "EXTERNAL".equalsIgnoreCase(cleaned)) { - return MemberRole.EXTERNAL; - } else { - throw BusinessException.badRequest("PAIRING_INVALID_MEMBER_ROLE", - "현장/외부 구분 값이 올바르지 않습니다: " + value); } + if ("외부".equals(cleaned) || "EXTERNAL".equalsIgnoreCase(cleaned)) { + return MemberRole.EXTERNAL; + } + throw BusinessException.badRequest("PAIRING_INVALID_MEMBER_ROLE", + "현장/외부 구분 값이 올바르지 않습니다: " + value); } - private boolean parseBooleanFlag(String value, String fieldName) { - String cleaned = required(value, fieldName); - return "1".equals(cleaned); + + private boolean parseBooleanFlag(String value) { + return "1".equals(required(value, "여성위원만")); } + private LocalDate parseDate(String value, String fieldName) { String cleaned = required(value, fieldName); - try { return LocalDate.parse(cleaned); } catch (DateTimeParseException ignored) { @@ -202,14 +194,6 @@ public class PairingNormalizeService { return cleaned.startsWith("=") || cleaned.matches("[A-Za-z]+\\(.*"); } - private Set parseCsv(String value) { - String cleaned = clean(value); - return (cleaned.isBlank() ? new LinkedHashSet<>() - : Arrays.stream(cleaned.split(",")).map(String::trim) - .filter(token -> !token.isBlank()) - .collect(Collectors.toCollection(LinkedHashSet::new))); - } - private Set parseHistoryCenterIds(String value) { return parseCsv(value).stream() .map(this::normalizeExcelIdText) @@ -226,10 +210,9 @@ public class PairingNormalizeService { private int parseInt(String value, String fieldName) { String cleaned = required(value, fieldName); - try { return Integer.parseInt(cleaned); - } catch (NumberFormatException var5) { + } catch (NumberFormatException e) { throw BusinessException.badRequest("PAIRING_INVALID_NUMBER", fieldName + " 숫자 형식이 올바르지 않습니다: " + value); } @@ -240,16 +223,15 @@ public class PairingNormalizeService { if (cleaned.endsWith(".0")) { cleaned = cleaned.substring(0, cleaned.length() - 2); } - if (!cleaned.matches("\\d+")) { throw BusinessException.badRequest("PAIRING_INVALID_CODE", - fieldName + " 코드는 숫자만 허용됩니다: " + value); - } else if (cleaned.length() > length) { + fieldName + " 코드는 숫자만 허용합니다: " + value); + } + if (cleaned.length() > length) { throw BusinessException.badRequest("PAIRING_INVALID_CODE", fieldName + " 코드 길이가 올바르지 않습니다: " + value); - } else { - return cleaned.length() == length ? cleaned : "0".repeat(length - cleaned.length()) + cleaned; } + return cleaned.length() == length ? cleaned : "0".repeat(length - cleaned.length()) + cleaned; } private String normalizeOptionalCode(String value, int length, String fieldName) { @@ -263,11 +245,15 @@ public class PairingNormalizeService { .collect(Collectors.joining(",")); } - private String normalizeFullRegionCode(String value, String regionCode, String detailRegionCode, - String detailAreaCode) { + private Set parseCsv(String value) { String cleaned = clean(value); - return cleaned.matches("\\d+") ? normalizeCode(cleaned, 5, "지역 코드") - : regionCode + detailRegionCode + detailAreaCode; + if (cleaned.isBlank()) { + return new LinkedHashSet<>(); + } + return Arrays.stream(cleaned.split(",")) + .map(String::trim) + .filter(token -> !token.isBlank()) + .collect(Collectors.toCollection(LinkedHashSet::new)); } private String required(String value, String fieldName) { @@ -275,9 +261,8 @@ public class PairingNormalizeService { if (cleaned.isBlank()) { throw BusinessException.badRequest("PAIRING_REQUIRED_VALUE_MISSING", "필수 값이 없습니다: " + fieldName); - } else { - return cleaned; } + return cleaned; } private String clean(String value) { @@ -295,5 +280,4 @@ public class PairingNormalizeService { private String anyRegionCode() { return pairingProperties.getCode().getAnyRegionCode(); } - } diff --git a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingScheduleService.java b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingScheduleService.java deleted file mode 100644 index a0a07b7..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingScheduleService.java +++ /dev/null @@ -1,1011 +0,0 @@ -package com.kri.p6.ncrc.pairing.service; - -import com.kri.p6.ncrc.pairing.config.PairingProperties; -import com.kri.p6.ncrc.pairing.dto.excel.output.CandidateSummaryExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.PairingSummaryExcelDto; -import com.kri.p6.ncrc.pairing.model.AssignmentCandidate; -import com.kri.p6.ncrc.pairing.model.Member; -import com.kri.p6.ncrc.pairing.model.PairCandidate; -import com.kri.p6.ncrc.pairing.model.PairingCandidates; -import com.kri.p6.ncrc.pairing.model.PairingData; -import com.kri.p6.ncrc.pairing.model.PairingResult; -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class PairingScheduleService { - - private final PairingCandidateService pairingCandidateService; - private final PairingMemberPairService pairingMemberPairService; - private final PairingSolverService pairingSolverService; - private final PairingProperties pairingProperties; - - public PairingResult schedule(PairingData originData) { - // 전체 배정 흐름: - // 1. 가능한 후보를 생성한다. - // 2. 모든 위원이 조에 포함되도록 조편성을 먼저 확정한다. - // 3. 확정된 조를 기준으로 센터를 greedy 방식으로 배정한다. - // 4. 미배정 센터를 줄이고 방문 수를 균형화하기 위한 repair pass를 순서대로 수행한다. - PairingCandidates candidates = pairingCandidateService.generate(originData); - PairingMemberPairService.PairSelection pairSelection = pairingMemberPairService.select( - originData, candidates.getPairCandidates(), assignmentCountByPair(candidates)); - List selectedPairs = pairSelection.selectedPairs(); - GreedyIndex index = GreedyIndex.of(candidates.getAssignmentCandidates()); - GreedyState state = GreedyState.of(originData, selectedPairs, maxMemberVisitCount(originData)); - List selectedAssignments = new ArrayList<>(); - - String centerStatus = pairSelection.hasSolution() - ? assignRemainingCenters(index, state, selectedAssignments) - : pairSelection.status(); - - -// if (pairSelection.hasSolution()) { -// RepairResult repairResult = repairUnassignedCenters(originData, selectedPairs, index, state, -// selectedAssignments); -// state = repairResult.state(); -// selectedAssignments = repairResult.selectedAssignments(); -// RepairResult lowVisitRepairResult = repairLowVisitMembers(originData, selectedPairs, index, -// state, selectedAssignments); -// state = lowVisitRepairResult.state(); -// selectedAssignments = lowVisitRepairResult.selectedAssignments(); -// RepairResult donorSwapRepairResult = repairByDonorSwap(originData, selectedPairs, index, -// state, selectedAssignments); -// state = donorSwapRepairResult.state(); -// selectedAssignments = donorSwapRepairResult.selectedAssignments(); -// RepairResult wildcardRepairResult = repairWildcardFallbackCenters(originData, selectedPairs, -// index, state, selectedAssignments); -// state = wildcardRepairResult.state(); -// selectedAssignments = wildcardRepairResult.selectedAssignments(); -// centerStatus = remainingCenterStatus(state) + ", repairCount=" + repairResult.repairCount() -// + ", lowVisitRepairCount=" + lowVisitRepairResult.repairCount() -// + ", donorSwapRepairCount=" + donorSwapRepairResult.repairCount() -// + ", wildcardRepairCount=" + wildcardRepairResult.repairCount(); -// } - - String status = pairSelection.hasSolution() - ? "GREEDY_PAIRING_COMPLETED, " + centerStatus - : "GREEDY_FAILED_MEMBER_PAIRING, " + centerStatus; - PairingResult result = pairingSolverService.buildResult(originData, candidates, - selectedAssignments, status, pairedMemberIds(selectedPairs)); - return appendGreedySummaries(result, state, originData.getCenters().size()); - } - - private Map assignmentCountByPair(PairingCandidates candidates) { - return candidates.getAssignmentCandidates().stream() - .collect(Collectors.groupingBy(this::pairKey, Collectors.counting())); - } - - private int maxMemberVisitCount(PairingData data) { - if (data.getMembers().isEmpty()) { - return 0; - } - double fullAssignmentAverage = (double) data.getCenters().size() * 2D - / data.getMembers().size(); - return Math.max(1, (int) Math.ceil(fullAssignmentAverage - * pairingProperties.getRule().getMaxMemberVisitAverageRatioPercent() / 100D)); - } - - private List expandPairsForCoverage(List mandatoryPairs, - PairingCandidates candidates) { - Map assignmentCountByPair = candidates.getAssignmentCandidates().stream() - .collect(Collectors.groupingBy(this::pairKey, Collectors.counting())); - List selectedPairs = new ArrayList<>(mandatoryPairs); - Set selectedPairKeys = selectedPairs.stream() - .map(this::pairKey) - .collect(Collectors.toCollection(LinkedHashSet::new)); - Map> counterpartsByMember = new HashMap<>(); - selectedPairs.forEach(pair -> addCounterpart(counterpartsByMember, pair)); - - candidates.getPairCandidates().stream() - .filter(pair -> !selectedPairKeys.contains(pairKey(pair))) - .filter(pair -> assignmentCountByPair.getOrDefault(pairKey(pair), 0L) > 0) - .sorted(Comparator.comparingLong((PairCandidate pair) -> - assignmentCountByPair.getOrDefault(pairKey(pair), 0L)) - .reversed() - .thenComparing(PairCandidate::getFieldMemberId) - .thenComparing(PairCandidate::getExternalMemberId)) - .forEach(pair -> { - if (canAddCounterpart(counterpartsByMember, pair)) { - selectedPairs.add(pair); - selectedPairKeys.add(pairKey(pair)); - addCounterpart(counterpartsByMember, pair); - } - }); - - return selectedPairs; - } - - private boolean canAddCounterpart(Map> counterpartsByMember, - PairCandidate pair) { - Set fieldCounterparts = counterpartsByMember.getOrDefault(pair.getFieldMemberId(), - Set.of()); - Set externalCounterparts = counterpartsByMember.getOrDefault(pair.getExternalMemberId(), - Set.of()); - return (fieldCounterparts.contains(pair.getExternalMemberId()) - || fieldCounterparts.size() < maxCounterpartsPerMember()) - && (externalCounterparts.contains(pair.getFieldMemberId()) - || externalCounterparts.size() < maxCounterpartsPerMember()); - } - - private void addCounterpart(Map> counterpartsByMember, PairCandidate pair) { - counterpartsByMember.computeIfAbsent(pair.getFieldMemberId(), key -> new HashSet<>()) - .add(pair.getExternalMemberId()); - counterpartsByMember.computeIfAbsent(pair.getExternalMemberId(), key -> new HashSet<>()) - .add(pair.getFieldMemberId()); - } - - private PairingCandidates filterCandidatesByPairs(PairingCandidates candidates, - List selectedPairs) { - Set selectedPairKeys = selectedPairs.stream() - .map(this::pairKey) - .collect(Collectors.toSet()); - return PairingCandidates.builder() - .pairCandidates(candidates.getPairCandidates().stream() - .filter(candidate -> selectedPairKeys.contains(pairKey(candidate))) - .toList()) - .dispatchRegionCandidates(candidates.getDispatchRegionCandidates().stream() - .filter(candidate -> selectedPairKeys.contains(pairKey(candidate.getFieldMemberId(), - candidate.getExternalMemberId()))) - .toList()) - .assignmentCandidates(candidates.getAssignmentCandidates().stream() - .filter(candidate -> selectedPairKeys.contains(pairKey(candidate))) - .toList()) - .unassignedCenterReasons(candidates.getUnassignedCenterReasons()) - .build(); - } - - private Set pairedMemberIds(List selectedPairs) { - return selectedPairs.stream() - .flatMap(candidate -> java.util.stream.Stream.of(candidate.getFieldMemberId(), - candidate.getExternalMemberId())) - .collect(Collectors.toCollection(LinkedHashSet::new)); - } - - private String assignAllMembersAtLeastOnce(PairingData data, GreedyIndex index, - GreedyState state, List selectedAssignments) { - Set allMemberIds = data.getMembers().stream() - .map(Member::getId) - .collect(Collectors.toCollection(LinkedHashSet::new)); - - while (true) { - List uncoveredMemberIds = allMemberIds.stream() - .filter(memberId -> state.visitCount(memberId) == 0) - .toList(); - if (uncoveredMemberIds.isEmpty()) { - return ""; - } - - Optional targetMemberId = uncoveredMemberIds.stream() - .min(Comparator.comparingInt((String memberId) -> feasibleCandidatesForMember(memberId, - index, state).size()) - .thenComparing(Function.identity())); - if (targetMemberId.isEmpty()) { - return "입력 위원이 없습니다."; - } - - List feasibleCandidates = feasibleCandidatesForMember( - targetMemberId.get(), index, state); - if (feasibleCandidates.isEmpty()) { - return "최소 1회 배정 후보가 없는 위원: " + targetMemberId.get(); - } - - AssignmentCandidate selected = feasibleCandidates.stream() - .max(Comparator.comparingLong(candidate -> mandatoryAssignmentScore(candidate, state))) - .orElseThrow(); - addAssignment(selectedAssignments, state, selected); - } - } - - private String assignRemainingCenters(GreedyIndex index, GreedyState state, - List selectedAssignments) { - // 센터 후보가 가장 적은 센터부터 처리합니다. - // 선택지가 적은 센터를 먼저 잡아야 뒤에서 막히는 상황을 줄일 수 있습니다. - int assignedBefore; - do { - assignedBefore = state.assignedCenterIds().size(); - Optional centerChoice = state.remainingCenterIds().stream() - .map(remainingCenterId -> toCenterChoice(remainingCenterId, index, state)) - .filter(choice -> !choice.feasibleCandidates().isEmpty()) - .min(Comparator.comparingInt((CenterChoice choice) -> choice.feasibleCandidates().size()) - .thenComparing(Comparator.comparingLong(CenterChoice::bestScore).reversed())); - if (centerChoice.isEmpty()) { - break; - } - - AssignmentCandidate selected = centerChoice.get().feasibleCandidates().stream() - .max(Comparator.comparingLong(candidate -> centerAssignmentScore(candidate, state))) - .orElseThrow(); - addAssignment(selectedAssignments, state, selected); - } while (state.assignedCenterIds().size() > assignedBefore); - - return state.remainingCenterIds().isEmpty() - ? "remainingCenters=0" - : "remainingCenters=" + state.remainingCenterIds().size(); - } - - private RepairResult repairUnassignedCenters(PairingData data, List fixedPairs, - GreedyIndex index, GreedyState state, List selectedAssignments) { - // 1차 repair: 미배정 센터 하나를 넣기 위해 기존 충돌 배정을 최대 2개까지 빼고 재배정합니다. - // 배정 수가 실제로 늘어나는 경우만 반영합니다. - int repairCount = 0; - boolean changed; - do { - changed = false; - List remainingCenterIds = state.remainingCenterIds().stream() - .sorted(Comparator.comparingInt(centerId -> index.candidatesByCenter() - .getOrDefault(centerId, List.of()).size())) - .toList(); - - for (String centerId : remainingCenterIds) { - RepairAttempt repairAttempt = findRepairAttempt(data, fixedPairs, index, state, - selectedAssignments, centerId); - if (repairAttempt == null) { - continue; - } - - state = repairAttempt.state(); - selectedAssignments = repairAttempt.selectedAssignments(); - repairCount++; - changed = true; - break; - } - } while (changed); - - return new RepairResult(state, selectedAssignments, repairCount); - } - - private RepairAttempt findRepairAttempt(PairingData data, List fixedPairs, - GreedyIndex index, GreedyState state, List selectedAssignments, - String centerId) { - int currentAssignedCount = selectedAssignments.size(); - List candidates = index.candidatesByCenter().getOrDefault(centerId, - List.of()).stream() - .filter(candidate -> !state.assignedCenterIds().contains(candidate.getCenterId())) - .sorted(Comparator.comparingLong((AssignmentCandidate candidate) -> - centerAssignmentScore(candidate, state)) - .reversed()) - .limit(150) - .toList(); - - for (AssignmentCandidate candidate : candidates) { - Set conflictKeys = conflictAssignmentKeys(candidate, state, selectedAssignments); - if (conflictKeys.size() > 2) { - continue; - } - - List repairedAssignments = new ArrayList<>(selectedAssignments.stream() - .filter(assignment -> !conflictKeys.contains(assignmentKey(assignment))) - .toList()); - GreedyState repairedState = rebuildState(data, fixedPairs, repairedAssignments); - if (!isFeasible(candidate, repairedState)) { - continue; - } - - addAssignment(repairedAssignments, repairedState, candidate); - assignRemainingCenters(index, repairedState, repairedAssignments); - if (repairedAssignments.size() > currentAssignedCount) { - return new RepairAttempt(repairedState, repairedAssignments); - } - } - - return null; - } - - private RepairResult repairLowVisitMembers(PairingData data, List fixedPairs, - GreedyIndex index, GreedyState state, List selectedAssignments) { - // 2차 repair: 방문 수가 적은 위원이 남은 센터에 들어갈 수 있는지 우선 탐색합니다. - // 배정 수가 같더라도 최대 방문 수나 방문 편차가 개선되면 반영합니다. - int repairCount = 0; - boolean changed; - do { - changed = false; - List lowVisitMemberIds = data.getMembers().stream() - .map(Member::getId) - .sorted(Comparator.comparingInt(state::visitCount).thenComparing(Function.identity())) - .toList(); - - for (String memberId : lowVisitMemberIds) { - RepairAttempt repairAttempt = findLowVisitRepairAttempt(data, fixedPairs, index, state, - selectedAssignments, memberId); - if (repairAttempt == null) { - continue; - } - - state = repairAttempt.state(); - selectedAssignments = repairAttempt.selectedAssignments(); - repairCount++; - changed = true; - break; - } - } while (changed); - - return new RepairResult(state, selectedAssignments, repairCount); - } - - private RepairAttempt findLowVisitRepairAttempt(PairingData data, List fixedPairs, - GreedyIndex index, GreedyState state, List selectedAssignments, - String memberId) { - ScheduleQuality currentQuality = ScheduleQuality.of(state, selectedAssignments.size()); - Set remainingCenterIds = state.remainingCenterIds(); - List candidates = index.candidatesByMember() - .getOrDefault(memberId, List.of()).stream() - .filter(candidate -> remainingCenterIds.contains(candidate.getCenterId())) - .sorted(Comparator.comparingInt((AssignmentCandidate candidate) -> - memberVisitSumAsInt(candidate, state)) - .thenComparing(Comparator.comparingLong((AssignmentCandidate candidate) -> - centerAssignmentScore(candidate, state)).reversed())) - .limit(200) - .toList(); - - for (AssignmentCandidate candidate : candidates) { - Set conflictKeys = conflictAssignmentKeys(candidate, state, selectedAssignments); - if (conflictKeys.size() > 2) { - continue; - } - - List repairedAssignments = new ArrayList<>(selectedAssignments.stream() - .filter(assignment -> !conflictKeys.contains(assignmentKey(assignment))) - .toList()); - GreedyState repairedState = rebuildState(data, fixedPairs, repairedAssignments); - if (!isFeasible(candidate, repairedState)) { - continue; - } - - addAssignment(repairedAssignments, repairedState, candidate); - assignRemainingCenters(index, repairedState, repairedAssignments); - ScheduleQuality repairedQuality = ScheduleQuality.of(repairedState, - repairedAssignments.size()); - if (repairedQuality.isBetterThan(currentQuality)) { - return new RepairAttempt(repairedState, repairedAssignments); - } - } - - return null; - } - - private RepairResult repairByDonorSwap(PairingData data, List fixedPairs, - GreedyIndex index, GreedyState state, List selectedAssignments) { - // 3차 repair: 방문 수가 많은 위원의 배정을 donor로 보고, - // 같은 센터를 저방문 위원이 포함된 다른 후보에게 넘길 수 있는지 시도합니다. - int repairCount = 0; - boolean changed; - do { - changed = false; - RepairAttempt repairAttempt = findDonorSwapRepairAttempt(data, fixedPairs, index, state, - selectedAssignments); - if (repairAttempt != null) { - state = repairAttempt.state(); - selectedAssignments = repairAttempt.selectedAssignments(); - repairCount++; - changed = true; - } - } while (changed); - - return new RepairResult(state, selectedAssignments, repairCount); - } - - private RepairAttempt findDonorSwapRepairAttempt(PairingData data, List fixedPairs, - GreedyIndex index, GreedyState state, List selectedAssignments) { - ScheduleQuality currentQuality = ScheduleQuality.of(state, selectedAssignments.size()); - double averageVisitCount = averageVisitCount(state); - List donorAssignments = selectedAssignments.stream() - .sorted(Comparator.comparingInt((AssignmentCandidate assignment) -> - memberVisitSumAsInt(assignment, state)) - .reversed() - .thenComparing(AssignmentCandidate::getCenterId)) - .limit(300) - .toList(); - - for (AssignmentCandidate donorAssignment : donorAssignments) { - int donorVisitSum = memberVisitSumAsInt(donorAssignment, state); - if (!hasHighVisitMember(donorAssignment, state, averageVisitCount)) { - continue; - } - - List receiverCandidates = index.candidatesByCenter() - .getOrDefault(donorAssignment.getCenterId(), List.of()).stream() - .filter(candidate -> !assignmentKey(candidate).equals(assignmentKey(donorAssignment))) - .filter(candidate -> memberVisitSumAsInt(candidate, state) < donorVisitSum) - .filter(candidate -> hasLowVisitMember(candidate, state, averageVisitCount)) - .sorted(Comparator.comparingInt((AssignmentCandidate candidate) -> - memberVisitSumAsInt(candidate, state)) - .thenComparing(Comparator.comparingLong((AssignmentCandidate candidate) -> - centerAssignmentScore(candidate, state)).reversed())) - .limit(120) - .toList(); - - for (AssignmentCandidate receiverCandidate : receiverCandidates) { - Set conflictKeys = conflictAssignmentKeys(receiverCandidate, state, - selectedAssignments); - conflictKeys.add(assignmentKey(donorAssignment)); - if (conflictKeys.size() > 3) { - continue; - } - - List repairedAssignments = new ArrayList<>(selectedAssignments.stream() - .filter(assignment -> !conflictKeys.contains(assignmentKey(assignment))) - .toList()); - GreedyState repairedState = rebuildState(data, fixedPairs, repairedAssignments); - if (!isFeasible(receiverCandidate, repairedState)) { - continue; - } - - addAssignment(repairedAssignments, repairedState, receiverCandidate); - assignRemainingCenters(index, repairedState, repairedAssignments); - ScheduleQuality repairedQuality = ScheduleQuality.of(repairedState, - repairedAssignments.size()); - if (repairedQuality.isBetterThan(currentQuality)) { - return new RepairAttempt(repairedState, repairedAssignments); - } - } - } - - return null; - } - - private RepairResult repairWildcardFallbackCenters(PairingData data, List fixedPairs, - GreedyIndex index, GreedyState state, List selectedAssignments) { - // 4차 repair: 99 wildcard 규칙으로 만들어진 후보를 남은 센터에 적극 적용합니다. - // yml의 active-wildcard-fallback-enabled=false이면 이 단계는 비활성화됩니다. - if (!pairingProperties.getPreference().isActiveWildcardFallbackEnabled()) { - return new RepairResult(state, selectedAssignments, 0); - } - - int repairCount = 0; - boolean changed; - do { - changed = false; - List remainingCenterIds = state.remainingCenterIds().stream() - .sorted(Comparator.comparingInt(centerId -> wildcardCandidatesForCenter(centerId, index) - .size())) - .toList(); - - for (String centerId : remainingCenterIds) { - RepairAttempt repairAttempt = findWildcardRepairAttempt(data, fixedPairs, index, state, - selectedAssignments, centerId); - if (repairAttempt == null) { - continue; - } - - state = repairAttempt.state(); - selectedAssignments = repairAttempt.selectedAssignments(); - repairCount++; - changed = true; - break; - } - } while (changed); - - return new RepairResult(state, selectedAssignments, repairCount); - } - - private RepairAttempt findWildcardRepairAttempt(PairingData data, List fixedPairs, - GreedyIndex index, GreedyState state, List selectedAssignments, - String centerId) { - int currentAssignedCount = selectedAssignments.size(); - List candidates = wildcardCandidatesForCenter(centerId, index).stream() - .filter(candidate -> !state.assignedCenterIds().contains(candidate.getCenterId())) - .sorted(Comparator.comparingLong((AssignmentCandidate candidate) -> - centerAssignmentScore(candidate, state)) - .reversed()) - .limit(500) - .toList(); - - for (AssignmentCandidate candidate : candidates) { - Set conflictKeys = conflictAssignmentKeys(candidate, state, selectedAssignments); - if (conflictKeys.size() > 3) { - continue; - } - - List repairedAssignments = new ArrayList<>(selectedAssignments.stream() - .filter(assignment -> !conflictKeys.contains(assignmentKey(assignment))) - .toList()); - GreedyState repairedState = rebuildState(data, fixedPairs, repairedAssignments); - if (!isFeasible(candidate, repairedState)) { - continue; - } - - addAssignment(repairedAssignments, repairedState, candidate); - assignRemainingCenters(index, repairedState, repairedAssignments); - if (repairedAssignments.size() > currentAssignedCount) { - return new RepairAttempt(repairedState, repairedAssignments); - } - } - - return null; - } - - private Set conflictAssignmentKeys(AssignmentCandidate candidate, GreedyState state, - List selectedAssignments) { - // 새 후보를 넣을 때 같은 날짜에 같은 위원이 다른 조와 이미 일하는지, - // 같은 조/같은 날짜에 다른 인접지역 분류를 방문하게 되는지 확인합니다. - // repair 단계에서는 여기서 찾은 기존 배정을 제거한 뒤 상태를 다시 계산합니다. - Set conflicts = new LinkedHashSet<>(); - String candidatePairKey = pairKey(candidate); - String candidatePairDayKey = pairDayKey(candidate); - - selectedAssignments.forEach(assignment -> { - if (assignment.getDate().equals(candidate.getDate()) - && !pairKey(assignment).equals(candidatePairKey) - && sharesMember(candidate, assignment)) { - conflicts.add(assignmentKey(assignment)); - } - if (pairDayKey(assignment).equals(candidatePairDayKey) - && !assignment.getAdjacentRegionClassification() - .equals(candidate.getAdjacentRegionClassification())) { - conflicts.add(assignmentKey(assignment)); - } - }); - - if (state.pairDayCount(candidatePairDayKey) >= maxCentersPerPairPerDay()) { - selectedAssignments.stream() - .filter(assignment -> pairDayKey(assignment).equals(candidatePairDayKey)) - .min(Comparator.comparingLong(assignment -> centerAssignmentScore(assignment, state))) - .map(this::assignmentKey) - .ifPresent(conflicts::add); - } - - return conflicts; - } - - private boolean sharesMember(AssignmentCandidate left, AssignmentCandidate right) { - return left.getFieldMemberId().equals(right.getFieldMemberId()) - || left.getFieldMemberId().equals(right.getExternalMemberId()) - || left.getExternalMemberId().equals(right.getFieldMemberId()) - || left.getExternalMemberId().equals(right.getExternalMemberId()); - } - - private GreedyState rebuildState(PairingData data, List fixedPairs, - List assignments) { - GreedyState rebuiltState = GreedyState.of(data, fixedPairs, maxMemberVisitCount(data)); - assignments.forEach(rebuiltState::add); - return rebuiltState; - } - - private String remainingCenterStatus(GreedyState state) { - return state.remainingCenterIds().isEmpty() - ? "remainingCenters=0" - : "remainingCenters=" + state.remainingCenterIds().size(); - } - - private CenterChoice toCenterChoice(String centerId, GreedyIndex index, GreedyState state) { - List feasibleCandidates = feasibleCandidatesForCenter(centerId, index, - state); - long bestScore = feasibleCandidates.stream() - .mapToLong(candidate -> centerAssignmentScore(candidate, state)) - .max() - .orElse(Long.MIN_VALUE); - return new CenterChoice(centerId, feasibleCandidates, bestScore); - } - - private List feasibleCandidatesForMember(String memberId, GreedyIndex index, - GreedyState state) { - return index.candidatesByMember().getOrDefault(memberId, List.of()).stream() - .filter(candidate -> isFeasible(candidate, state)) - .toList(); - } - - private List feasibleCandidatesForCenter(String centerId, GreedyIndex index, - GreedyState state) { - return index.candidatesByCenter().getOrDefault(centerId, List.of()).stream() - .filter(candidate -> isFeasible(candidate, state)) - .toList(); - } - - private boolean isFeasible(AssignmentCandidate candidate, GreedyState state) { - // 최종 선택 직전의 HARD 룰 검사입니다. - // 후보 생성 단계에서 걸러진 규칙 외에, 이미 배정된 일정과의 충돌을 여기서 다시 확인합니다. - if (state.assignedCenterIds().contains(candidate.getCenterId())) { - return false; - } - if (!state.canVisit(candidate.getFieldMemberId()) - || !state.canVisit(candidate.getExternalMemberId())) { - return false; - } - String pairKey = pairKey(candidate); - if (state.isMemberBusyWithOtherPair(candidate.getFieldMemberId(), candidate.getDate(), pairKey) - || state.isMemberBusyWithOtherPair(candidate.getExternalMemberId(), candidate.getDate(), - pairKey)) { - return false; - } - if (!state.isAllowedCounterpart(candidate.getFieldMemberId(), - candidate.getExternalMemberId(), maxCounterpartsPerMember()) - || !state.isAllowedCounterpart(candidate.getExternalMemberId(), - candidate.getFieldMemberId(), maxCounterpartsPerMember())) { - return false; - } - if (state.pairDayCount(pairDayKey(candidate)) >= maxCentersPerPairPerDay()) { - return false; - } - return state.isAllowedAdjacentClassification(pairDayKey(candidate), - candidate.getAdjacentRegionClassification()); - } - - private long mandatoryAssignmentScore(AssignmentCandidate candidate, GreedyState state) { - long uncoveredCount = (state.visitCount(candidate.getFieldMemberId()) == 0 ? 1L : 0L) - + (state.visitCount(candidate.getExternalMemberId()) == 0 ? 1L : 0L); - return uncoveredCount * 10_000_000_000L - - memberVisitSum(candidate, state) * memberBalanceWeight() - + preferenceScore(candidate) * 100L - + residenceScore(candidate) - - datePenalty(candidate); - } - - private long centerAssignmentScore(AssignmentCandidate candidate, GreedyState state) { - // greedy가 후보 하나를 고를 때 쓰는 점수입니다. - // 이미 같은 조/같은 날짜/같은 인접지역으로 묶인 후보를 선호하고, - // 방문 수가 많은 위원은 점수를 깎아 균형을 맞춥니다. - return samePairDayReuseScore(candidate, state) - + counterpartReuseScore(candidate, state) - - memberVisitSum(candidate, state) * memberBalanceWeight() - + preferenceScore(candidate) * 100L - + residenceScore(candidate) - - datePenalty(candidate); - } - - private long samePairDayReuseScore(AssignmentCandidate candidate, GreedyState state) { - int usedCount = state.pairDayCount(pairDayKey(candidate)); - if (usedCount <= 0) { - return 0L; - } - //return 5_000_000L + usedCount * 1_000_000L; - - return 0L; - } - - private long counterpartReuseScore(AssignmentCandidate candidate, GreedyState state) { - boolean fieldHasCounterpart = state.hasCounterpart(candidate.getFieldMemberId(), - candidate.getExternalMemberId()); - boolean externalHasCounterpart = state.hasCounterpart(candidate.getExternalMemberId(), - candidate.getFieldMemberId()); - return (fieldHasCounterpart && externalHasCounterpart) ? 2_000_000L : 0L; - } - - private long memberVisitSum(AssignmentCandidate candidate, GreedyState state) { - return (long) state.visitCount(candidate.getFieldMemberId()) - + state.visitCount(candidate.getExternalMemberId()); - } - - private int memberVisitSumAsInt(AssignmentCandidate candidate, GreedyState state) { - return state.visitCount(candidate.getFieldMemberId()) - + state.visitCount(candidate.getExternalMemberId()); - } - - private double averageVisitCount(GreedyState state) { - return state.visitCountsByMember.values().stream() - .mapToInt(Integer::intValue) - .average() - .orElse(0D); - } - - private boolean hasHighVisitMember(AssignmentCandidate candidate, GreedyState state, - double averageVisitCount) { - return state.visitCount(candidate.getFieldMemberId()) > averageVisitCount - || state.visitCount(candidate.getExternalMemberId()) > averageVisitCount; - } - - private boolean hasLowVisitMember(AssignmentCandidate candidate, GreedyState state, - double averageVisitCount) { - return state.visitCount(candidate.getFieldMemberId()) < averageVisitCount - || state.visitCount(candidate.getExternalMemberId()) < averageVisitCount; - } - - private List wildcardCandidatesForCenter(String centerId, - GreedyIndex index) { - return index.candidatesByCenter().getOrDefault(centerId, List.of()).stream() - .filter(this::usesWildcardFallback) - .toList(); - } - - private boolean usesWildcardFallback(AssignmentCandidate candidate) { - return candidate.getFieldMemberPreferenceRank() < 0 - || candidate.getExternalMemberPreferenceRank() < 0; - } - - private long preferenceScore(AssignmentCandidate candidate) { - return Math.max(0L, pairingProperties.getObjective().getPreferenceBaseWeight() - - candidate.getPreferencePriority() - * pairingProperties.getObjective().getPreferenceRankPenalty()) - + wildcardFallbackBonus(candidate); - } - - private long wildcardFallbackBonus(AssignmentCandidate candidate) { - if (!pairingProperties.getPreference().isActiveWildcardFallbackEnabled()) { - return 0L; - } - if (!usesWildcardFallback(candidate)) { - return 0L; - } - return pairingProperties.getPreference().getWildcardFallbackScoreBonus(); - } - - private long residenceScore(AssignmentCandidate candidate) { - return candidate.getResidenceMatchScore() - * pairingProperties.getObjective().getResidenceMatchWeight(); - } - - private long datePenalty(AssignmentCandidate candidate) { - return candidate.getDate().toEpochDay(); - } - - private void addAssignment(List selectedAssignments, GreedyState state, - AssignmentCandidate assignment) { - selectedAssignments.add(assignment); - state.add(assignment); - } - - private void addSameRouteAssignments(GreedyIndex index, GreedyState state, - List selectedAssignments, AssignmentCandidate baseAssignment) { - String routeKey = pairDayAdjacentKey(baseAssignment); - List sameRouteCandidates = index.candidatesByPairDayAdjacent() - .getOrDefault(routeKey, List.of()).stream() - .filter(candidate -> !candidate.getCenterId().equals(baseAssignment.getCenterId())) - .filter(candidate -> isFeasible(candidate, state)) - .sorted(Comparator.comparingLong((AssignmentCandidate candidate) -> - centerAssignmentScore(candidate, state)) - .reversed()) - .toList(); - - for (AssignmentCandidate candidate : sameRouteCandidates) { - if (state.pairDayCount(pairDayKey(baseAssignment)) >= maxCentersPerPairPerDay()) { - break; - } - if (isFeasible(candidate, state)) { - addAssignment(selectedAssignments, state, candidate); - } - } - } - - private PairingResult appendGreedySummaries(PairingResult result, GreedyState state, - int originalCenterCount) { - List summaries = new ArrayList<>(result.getSummaries()); - summaries.add(new PairingSummaryExcelDto("그리디 배정 센터 수", - String.valueOf(state.assignedCenterIds().size()))); - summaries.add(new PairingSummaryExcelDto("그리디 잔여 센터 수", - String.valueOf(originalCenterCount - state.assignedCenterIds().size()))); - - List candidateSummaries = new ArrayList<>( - result.getCandidateSummaries()); - candidateSummaries.add(new CandidateSummaryExcelDto("그리디 배정 방식", "ON", - "모든 위원 최소 1회 배정을 먼저 수행한 뒤 남은 센터를 배정합니다.")); - - return PairingResult.builder() - .assignments(result.getAssignments()) - .unassignedCenters(result.getUnassignedCenters()) - .unusedMembers(result.getUnusedMembers()) - .summaries(summaries) - .abPairs(result.getAbPairs()) - .candidateSummaries(candidateSummaries) - .appliedSettings(result.getAppliedSettings()) - .validationErrors(result.getValidationErrors()) - .ruleViolations(result.getRuleViolations()) - .build(); - } - - private String pairKey(AssignmentCandidate candidate) { - return candidate.getFieldMemberId() + "|" + candidate.getExternalMemberId(); - } - - private String pairKey(PairCandidate candidate) { - return pairKey(candidate.getFieldMemberId(), candidate.getExternalMemberId()); - } - - private String pairKey(String fieldMemberId, String externalMemberId) { - return fieldMemberId + "|" + externalMemberId; - } - - private String pairDayKey(AssignmentCandidate candidate) { - return pairKey(candidate) + "|" + candidate.getDate(); - } - - private String pairDayAdjacentKey(AssignmentCandidate candidate) { - return pairDayKey(candidate) + "|" + candidate.getAdjacentRegionClassification(); - } - - private String assignmentKey(AssignmentCandidate candidate) { - return pairKey(candidate) + "|" + candidate.getCenterId() + "|" + candidate.getDate(); - } - - private int maxCounterpartsPerMember() { - return pairingProperties.getRule().getMaxCounterpartsPerMember(); - } - - private int maxCentersPerPairPerDay() { - return pairingProperties.getRule().getMaxCentersPerPairPerDay(); - } - - private long memberBalanceWeight() { - return pairingProperties.getObjective().getMemberBalanceWeight(); - } - - private record GreedyIndex(Map> candidatesByMember, - Map> candidatesByCenter, - Map> candidatesByPairDayAdjacent) { - - private static GreedyIndex of(List candidates) { - Map> byMember = new HashMap<>(); - Map> byCenter = new LinkedHashMap<>(); - Map> byPairDayAdjacent = new HashMap<>(); - for (AssignmentCandidate candidate : candidates) { - byMember.computeIfAbsent(candidate.getFieldMemberId(), key -> new ArrayList<>()) - .add(candidate); - byMember.computeIfAbsent(candidate.getExternalMemberId(), key -> new ArrayList<>()) - .add(candidate); - byCenter.computeIfAbsent(candidate.getCenterId(), key -> new ArrayList<>()) - .add(candidate); - String pairDayAdjacentKey = candidate.getFieldMemberId() + "|" - + candidate.getExternalMemberId() + "|" + candidate.getDate() + "|" - + candidate.getAdjacentRegionClassification(); - byPairDayAdjacent.computeIfAbsent(pairDayAdjacentKey, key -> new ArrayList<>()) - .add(candidate); - } - return new GreedyIndex(byMember, byCenter, byPairDayAdjacent); - } - } - - private record CenterChoice(String centerId, List feasibleCandidates, - long bestScore) { - } - - private record RepairAttempt(GreedyState state, - List selectedAssignments) { - } - - private record RepairResult(GreedyState state, List selectedAssignments, - int repairCount) { - } - - private record ScheduleQuality(int assignedCount, int maxVisitCount, long squaredVisitSum) { - - private static ScheduleQuality of(GreedyState state, int assignedCount) { - int maxVisitCount = state.visitCountsByMember.values().stream() - .mapToInt(Integer::intValue) - .max() - .orElse(0); - long squaredVisitSum = state.visitCountsByMember.values().stream() - .mapToLong(visitCount -> (long) visitCount * visitCount) - .sum(); - return new ScheduleQuality(assignedCount, maxVisitCount, squaredVisitSum); - } - - private boolean isBetterThan(ScheduleQuality other) { - // repair 결과 비교 기준: - // 1. 배정 센터 수가 더 많으면 우선 - // 2. 배정 수가 같으면 최대 방문 수가 낮은 결과 우선 - // 3. 그래도 같으면 방문 수 편차가 작은 결과 우선 - if (assignedCount != other.assignedCount) { - return assignedCount > other.assignedCount; - } - if (maxVisitCount != other.maxVisitCount) { - return maxVisitCount < other.maxVisitCount; - } - return squaredVisitSum < other.squaredVisitSum; - } - } - - private static final class GreedyState { - - // GreedyState는 "현재까지의 배정표"입니다. - // 센터 배정 여부, 위원별 방문 횟수, 날짜별 조 사용 여부 등을 들고 있다가 - // 새 후보가 들어갈 수 있는지 빠르게 판단하게 해줍니다. - private final Set allCenterIds; - private final Set assignedCenterIds = new LinkedHashSet<>(); - private final Map visitCountsByMember = new HashMap<>(); - private final Map> pairKeysByMemberDate = new HashMap<>(); - private final Map> counterpartsByMember = new HashMap<>(); - private final Map pairDayCounts = new HashMap<>(); - private final Map> adjacentClassificationsByPairDay = new HashMap<>(); - private final int maxVisitCount; - - private GreedyState(Set allCenterIds, int maxVisitCount) { - this.allCenterIds = allCenterIds; - this.maxVisitCount = maxVisitCount; - } - - private static GreedyState of(PairingData data, List fixedPairs, - int maxVisitCount) { - Set centerIds = data.getCenters().stream() - .map(com.kri.p6.ncrc.pairing.model.Center::getId) - .collect(Collectors.toCollection(LinkedHashSet::new)); - GreedyState state = new GreedyState(centerIds, maxVisitCount); - data.getMembers().forEach(member -> { - state.visitCountsByMember.put(member.getId(), 0); - state.counterpartsByMember.put(member.getId(), new HashSet<>()); - }); - fixedPairs.forEach(pair -> { - state.counterpartsByMember.computeIfAbsent(pair.getFieldMemberId(), key -> new HashSet<>()) - .add(pair.getExternalMemberId()); - state.counterpartsByMember.computeIfAbsent(pair.getExternalMemberId(), - key -> new HashSet<>()) - .add(pair.getFieldMemberId()); - }); - return state; - } - - private void add(AssignmentCandidate assignment) { - assignedCenterIds.add(assignment.getCenterId()); - visitCountsByMember.merge(assignment.getFieldMemberId(), 1, Integer::sum); - visitCountsByMember.merge(assignment.getExternalMemberId(), 1, Integer::sum); - String pairKey = assignment.getFieldMemberId() + "|" + assignment.getExternalMemberId(); - pairKeysByMemberDate.computeIfAbsent(memberDateKey(assignment.getFieldMemberId(), - assignment.getDate()), key -> new HashSet<>()) - .add(pairKey); - pairKeysByMemberDate.computeIfAbsent(memberDateKey(assignment.getExternalMemberId(), - assignment.getDate()), key -> new HashSet<>()) - .add(pairKey); - counterpartsByMember.computeIfAbsent(assignment.getFieldMemberId(), key -> new HashSet<>()) - .add(assignment.getExternalMemberId()); - counterpartsByMember.computeIfAbsent(assignment.getExternalMemberId(), key -> new HashSet<>()) - .add(assignment.getFieldMemberId()); - String pairDayKey = assignment.getFieldMemberId() + "|" + assignment.getExternalMemberId() - + "|" + assignment.getDate(); - pairDayCounts.merge(pairDayKey, 1, Integer::sum); - adjacentClassificationsByPairDay.computeIfAbsent(pairDayKey, key -> new HashSet<>()) - .add(assignment.getAdjacentRegionClassification()); - } - - private int visitCount(String memberId) { - return visitCountsByMember.getOrDefault(memberId, 0); - } - - private boolean canVisit(String memberId) { - return visitCount(memberId) < maxVisitCount; - } - - private boolean isMemberBusyWithOtherPair(String memberId, LocalDate date, String pairKey) { - Set pairKeys = pairKeysByMemberDate.getOrDefault(memberDateKey(memberId, date), - Set.of()); - return !pairKeys.isEmpty() && !pairKeys.contains(pairKey); - } - - private String memberDateKey(String memberId, LocalDate date) { - return memberId + "|" + date; - } - - private boolean isAllowedCounterpart(String memberId, String counterpartId, - int maxCounterpartsPerMember) { - Set counterparts = counterpartsByMember.getOrDefault(memberId, Set.of()); - return counterparts.contains(counterpartId) - || counterparts.size() < maxCounterpartsPerMember; - } - - private boolean hasCounterpart(String memberId, String counterpartId) { - return counterpartsByMember.getOrDefault(memberId, Set.of()).contains(counterpartId); - } - - private int pairDayCount(String pairDayKey) { - return pairDayCounts.getOrDefault(pairDayKey, 0); - } - - private boolean isAllowedAdjacentClassification(String pairDayKey, - String adjacentRegionClassification) { - Set adjacentClassifications = adjacentClassificationsByPairDay.getOrDefault( - pairDayKey, Set.of()); - return adjacentClassifications.isEmpty() - || adjacentClassifications.contains(adjacentRegionClassification); - } - - private Set assignedCenterIds() { - return assignedCenterIds; - } - - private Set remainingCenterIds() { - Set remaining = new LinkedHashSet<>(allCenterIds); - remaining.removeAll(assignedCenterIds); - return remaining; - } - } -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingService.java b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingService.java index ab0c072..2035021 100644 --- a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingService.java +++ b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingService.java @@ -3,7 +3,6 @@ package com.kri.p6.ncrc.pairing.service; import com.kri.p6.ncrc.pairing.dto.excel.input.PairingWorkbookData; import com.kri.p6.ncrc.pairing.model.NewPairingResult; import com.kri.p6.ncrc.pairing.model.PairingData; -import com.kri.p6.ncrc.pairing.model.PairingResult; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -16,18 +15,8 @@ public class PairingService { private final PairingNormalizeService pairingNormalizeService; private final PairingHolidayService pairingHolidayService; private final PairingValidationService pairingValidationService; - private final PairingScheduleService pairingScheduleService; private final PairingNewService pairingNewService; - public byte[] pairingMemberByCenter(MultipartFile file) { - PairingWorkbookData workbookData = pairingExcelService.read(file); - PairingData pairingData = pairingNormalizeService.normalize(workbookData); - pairingData = pairingHolidayService.applyHolidayUnavailableDates(pairingData); - pairingValidationService.validate(pairingData); - PairingResult result = pairingScheduleService.schedule(pairingData); - return pairingExcelService.write(result); - } - public byte[] pairingMemberByCenterNew(MultipartFile file) { PairingWorkbookData workbookData = pairingExcelService.read(file); PairingData pairingData = pairingNormalizeService.normalize(workbookData); diff --git a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingSolverService.java b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingSolverService.java deleted file mode 100644 index 195d9e3..0000000 --- a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingSolverService.java +++ /dev/null @@ -1,808 +0,0 @@ -package com.kri.p6.ncrc.pairing.service; - -import com.google.ortools.Loader; -import com.google.ortools.sat.BoolVar; -import com.google.ortools.sat.CpModel; -import com.google.ortools.sat.CpSolver; -import com.google.ortools.sat.CpSolverStatus; -import com.google.ortools.sat.LinearArgument; -import com.google.ortools.sat.LinearExpr; -import com.kri.p6.ncrc.pairing.common.enums.ExperienceType; -import com.kri.p6.ncrc.pairing.common.enums.Gender; -import com.kri.p6.ncrc.pairing.config.PairingProperties; -import com.kri.p6.ncrc.pairing.dto.excel.output.ABPairExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.AppliedSettingExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.AssignmentResultExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.CandidateSummaryExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.PairingSummaryExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.RuleViolationExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.UnassignedCenterExcelDto; -import com.kri.p6.ncrc.pairing.dto.excel.output.UnusedMemberExcelDto; -import com.kri.p6.ncrc.pairing.model.ABPairMatch; -import com.kri.p6.ncrc.pairing.model.AssignmentCandidate; -import com.kri.p6.ncrc.pairing.model.Center; -import com.kri.p6.ncrc.pairing.model.Member; -import com.kri.p6.ncrc.pairing.model.PairingCandidates; -import com.kri.p6.ncrc.pairing.model.PairingData; -import com.kri.p6.ncrc.pairing.model.PairingResult; -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class PairingSolverService { - - private final PairingProperties pairingProperties; - - public PairingResult solve(PairingData data, PairingCandidates candidates) { - SolveSelection selection = select(candidates); - if (!selection.hasSolution()) { - return emptyResult(data, candidates, selection.status()); - } - return toResult(data, candidates, selection.selectedAssignments(), selection.status(), Set.of()); - } - - public SolveSelection select(PairingCandidates candidates) { - return select(candidates, Map.of()); - } - - public SolveSelection select(PairingCandidates candidates, - Map> existingCounterpartsByMember) { - return select(candidates, existingCounterpartsByMember, Map.of()); - } - - public SolveSelection select(PairingCandidates candidates, - Map> existingCounterpartsByMember, - Map visitCountsByMember) { - if (candidates.getAssignmentCandidates().isEmpty()) { - return new SolveSelection(false, List.of(), "배정 가능한 후보가 없습니다."); - } - - CpModel model = new CpModel(); - List assignmentCandidates = candidates.getAssignmentCandidates(); - // CP-SAT에서는 각 배정 후보를 0/1 변수로 봅니다. - // 1이면 해당 후보 선택, 0이면 미선택입니다. - BoolVar[] assignmentVars = createAssignmentVars(model, assignmentCandidates); - Map pairUsedVars = createPairUsedVars(model, assignmentCandidates); - Map pairDayVars = createPairDayVars(model, assignmentCandidates); - Map pairDayAdjacentVars = createPairDayAdjacentVars(model, assignmentCandidates); - - // 현재 메인 배정은 Greedy가 담당하지만, CP-SAT 모델은 부분 최적화와 기존 방식 호환을 위해 유지합니다. - linkHelperVars(model, assignmentCandidates, assignmentVars, pairUsedVars, pairDayVars, pairDayAdjacentVars); - addCenterAssignedAtMostOnce(model, assignmentCandidates, assignmentVars); - addPairDailyCapacity(model, assignmentCandidates, assignmentVars); - addMemberDailyOnePair(model, assignmentCandidates, pairDayVars); - addPairDailyOneAdjacentClassification(model, assignmentCandidates, pairDayAdjacentVars); - addCumulativeBuddyLimit(model, assignmentCandidates, pairUsedVars, - existingCounterpartsByMember); - model.maximize(createObjective(assignmentCandidates, assignmentVars, visitCountsByMember)); - - CpSolver solver = new CpSolver(); - solver.getParameters().setMaxTimeInSeconds(pairingProperties.getSolver().getMaxTimeSeconds()); - solver.getParameters().setNumSearchWorkers(pairingProperties.getSolver().getNumSearchWorkers()); - CpSolverStatus status = solver.solve(model); - if (status != CpSolverStatus.OPTIMAL && status != CpSolverStatus.FEASIBLE) { - return new SolveSelection(false, List.of(), "solver가 feasible 해를 찾지 못했습니다: " + status); - } - return new SolveSelection(true, collectSelectedAssignments(assignmentCandidates, assignmentVars, solver), status.name()); - } - - public PairingResult buildResult(PairingData data, PairingCandidates candidates, - List selectedAssignments, String status) { - return toResult(data, candidates, selectedAssignments, status, Set.of()); - } - - public PairingResult buildResult(PairingData data, PairingCandidates candidates, - List selectedAssignments, String status, Set pairedMemberIds) { - return toResult(data, candidates, selectedAssignments, status, pairedMemberIds); - } - - private BoolVar[] createAssignmentVars(CpModel model, List candidates) { - BoolVar[] vars = new BoolVar[candidates.size()]; - for (int i = 0; i < candidates.size(); i++) { - vars[i] = model.newBoolVar("assign_" + i + "_" + candidates.get(i).getCenterId()); - } - return vars; - } - - private Map createPairUsedVars(CpModel model, List candidates) { - return candidates.stream().map(this::pairKey).distinct() - .collect(Collectors.toMap(Function.identity(), key -> model.newBoolVar("pair_used_" + key))); - } - - private Map createPairDayVars(CpModel model, List candidates) { - return candidates.stream().map(this::pairDayKey).distinct() - .collect(Collectors.toMap(Function.identity(), key -> model.newBoolVar("pair_day_" + key))); - } - - private Map createPairDayAdjacentVars(CpModel model, List candidates) { - return candidates.stream().map(this::pairDayAdjacentKey).distinct() - .collect(Collectors.toMap(Function.identity(), key -> model.newBoolVar("pair_day_adjacent_" + key))); - } - - private void linkHelperVars(CpModel model, List candidates, - BoolVar[] assignmentVars, Map pairUsedVars, Map pairDayVars, - Map pairDayAdjacentVars) { - for (int i = 0; i < candidates.size(); i++) { - AssignmentCandidate candidate = candidates.get(i); - model.addLessOrEqual(assignmentVars[i], pairUsedVars.get(pairKey(candidate))); - model.addLessOrEqual(assignmentVars[i], pairDayVars.get(pairDayKey(candidate))); - model.addLessOrEqual(assignmentVars[i], pairDayAdjacentVars.get(pairDayAdjacentKey(candidate))); - } - } - - private void addCenterAssignedAtMostOnce(CpModel model, List candidates, - BoolVar[] assignmentVars) { - // 하나의 센터는 최대 1번만 배정됩니다. - groupIndexes(candidates, AssignmentCandidate::getCenterId).values() - .forEach(indexes -> model.addAtMostOne(toLiteralArray(indexes, assignmentVars))); - } - - private void addPairDailyCapacity(CpModel model, List candidates, - BoolVar[] assignmentVars) { - // 같은 조가 하루에 방문할 수 있는 센터 수 상한입니다. - groupIndexes(candidates, this::pairDayKey).values().forEach(indexes -> model.addLessOrEqual( - LinearExpr.sum(toLinearArgumentArray(indexes, assignmentVars)), - pairingProperties.getRule().getMaxCentersPerPairPerDay())); - } - - private void addMemberDailyOnePair(CpModel model, List candidates, - Map pairDayVars) { - // 한 위원은 같은 날짜에 여러 조로 동시에 활동할 수 없습니다. - Map> pairDayKeysByMemberDay = candidates.stream() - .collect(Collectors.groupingBy(candidate -> candidate.getFieldMemberId() + "|" + candidate.getDate(), - Collectors.mapping(this::pairDayKey, Collectors.toSet()))); - Map> externalPairDayKeysByMemberDay = candidates.stream() - .collect(Collectors.groupingBy(candidate -> candidate.getExternalMemberId() + "|" + candidate.getDate(), - Collectors.mapping(this::pairDayKey, Collectors.toSet()))); - externalPairDayKeysByMemberDay.forEach((key, value) -> pairDayKeysByMemberDay.merge(key, value, (left, right) -> { - left.addAll(right); - return left; - })); - pairDayKeysByMemberDay.values().forEach(pairDayKeys -> - model.addAtMostOne(pairDayKeys.stream().map(pairDayVars::get).toArray(BoolVar[]::new))); - } - - private void addPairDailyOneAdjacentClassification(CpModel model, - List candidates, Map pairDayAdjacentVars) { - // 같은 조/같은 날짜에는 하나의 인접지역 분류만 방문합니다. - Map> adjacentKeysByPairDay = candidates.stream() - .collect(Collectors.groupingBy(this::pairDayKey, - Collectors.mapping(this::pairDayAdjacentKey, Collectors.toSet()))); - adjacentKeysByPairDay.values().forEach(adjacentKeys -> - model.addAtMostOne(adjacentKeys.stream().map(pairDayAdjacentVars::get).toArray(BoolVar[]::new))); - } - - private void addCumulativeBuddyLimit(CpModel model, List candidates, - Map pairUsedVars, Map> existingCounterpartsByMember) { - // 위원 1명당 누적 상대 위원 수 제한입니다. 현재 업무 기준은 application.yaml의 max-counterparts-per-member입니다. - Map> pairKeysByMember = candidates.stream() - .collect(Collectors.groupingBy(AssignmentCandidate::getFieldMemberId, - Collectors.mapping(this::pairKey, Collectors.toSet()))); - Map> externalPairKeysByMember = candidates.stream() - .collect(Collectors.groupingBy(AssignmentCandidate::getExternalMemberId, - Collectors.mapping(this::pairKey, Collectors.toSet()))); - externalPairKeysByMember.forEach((key, value) -> pairKeysByMember.merge(key, value, (left, right) -> { - left.addAll(right); - return left; - })); - pairKeysByMember.forEach((memberId, pairKeys) -> { - Set existingCounterparts = existingCounterpartsByMember.getOrDefault(memberId, - Set.of()); - List newCounterpartVars = pairKeys.stream() - .filter(pairKey -> !existingCounterparts.contains(counterpartId(pairKey, memberId))) - .map(pairUsedVars::get) - .toList(); - if (newCounterpartVars.isEmpty()) { - return; - } - - int remainingNewCounterpartSlots = Math.max(0, - pairingProperties.getRule().getMaxCounterpartsPerMember() - existingCounterparts.size()); - model.addLessOrEqual( - LinearExpr.sum(newCounterpartVars.toArray(LinearArgument[]::new)), - remainingNewCounterpartSlots); - }); - } - - private LinearExpr createObjective(List candidates, - BoolVar[] assignmentVars, Map visitCountsByMember) { - // soft rule 점수입니다. 센터를 많이 배정하는 점수가 가장 크고, - // 희망지역/거주지/방문 균형은 같은 배정 수 안에서 우열을 정하는 보조 점수입니다. - List vars = new ArrayList<>(); - List weights = new ArrayList<>(); - for (int i = 0; i < assignmentVars.length; i++) { - AssignmentCandidate candidate = candidates.get(i); - vars.add(assignmentVars[i]); - weights.add(pairingProperties.getObjective().getAssignmentWeight() - + Math.max(0L, pairingProperties.getObjective().getPreferenceBaseWeight() - - candidate.getPreferencePriority() * pairingProperties.getObjective().getPreferenceRankPenalty()) - + candidate.getResidenceMatchScore() * pairingProperties.getObjective().getResidenceMatchWeight() - - memberBalancePenalty(candidate, visitCountsByMember)); - } - - return LinearExpr.weightedSum(vars.toArray(LinearArgument[]::new), - weights.stream().mapToLong(Long::longValue).toArray()); - } - - private long memberBalancePenalty(AssignmentCandidate candidate, - Map visitCountsByMember) { - return (long) (visitCountsByMember.getOrDefault(candidate.getFieldMemberId(), 0) - + visitCountsByMember.getOrDefault(candidate.getExternalMemberId(), 0)) - * pairingProperties.getObjective().getMemberBalanceWeight(); - } - - private List collectSelectedAssignments(List candidates, - BoolVar[] assignmentVars, CpSolver solver) { - List selected = new ArrayList<>(); - for (int i = 0; i < candidates.size(); i++) { - if (solver.booleanValue(assignmentVars[i])) { - selected.add(candidates.get(i)); - } - } - selected.sort(Comparator.comparing(AssignmentCandidate::getDate) - .thenComparing(AssignmentCandidate::getFieldMemberId) - .thenComparing(AssignmentCandidate::getCenterId)); - return selected; - } - private PairingResult toResult(PairingData data, PairingCandidates candidates, - List selectedAssignments, String status, Set pairedMemberIds) { - Set assignedCenterIds = selectedAssignments.stream().map(AssignmentCandidate::getCenterId).collect(Collectors.toSet()); - Set usedMemberIds = selectedAssignments.stream() - .flatMap(candidate -> Stream.of(candidate.getFieldMemberId(), candidate.getExternalMemberId())) - .collect(Collectors.toSet()); - usedMemberIds.addAll(pairedMemberIds); - Map memberMap = data.getMembers().stream() - .collect(Collectors.toMap(Member::getId, Function.identity(), (left, right) -> left)); - Map centerMap = data.getCenters().stream() - .collect(Collectors.toMap(Center::getId, Function.identity(), (left, right) -> left)); - ABPairBuildResult abPairBuildResult = createABPairMatches(selectedAssignments); - Map abPairMatches = abPairBuildResult.matches(); - - List assignments = selectedAssignments.stream() - .map(candidate -> toAssignmentResult(candidate, memberMap, centerMap, abPairMatches)) - .toList(); - List unassignedCenters = data.getCenters().stream() - .filter(center -> !assignedCenterIds.contains(center.getId())) - .map(center -> toUnassignedCenter(center, candidates.getUnassignedCenterReasons())) - .toList(); - List unusedMembers = data.getMembers().stream() - .filter(member -> !usedMemberIds.contains(member.getId())) - .map(member -> new UnusedMemberExcelDto(member.getId(), member.getRole().name(), - "최종 배정에 포함되지 않았습니다. 후보 부족 또는 제약 충돌 가능")) - .toList(); - - return PairingResult.builder() - .assignments(assignments) - .unassignedCenters(unassignedCenters) - .unusedMembers(unusedMembers) - .summaries(createSummaries(data, candidates, assignments.size(), unassignedCenters.size(), - unusedMembers.size(), countABGroups(abPairMatches), status)) - .abPairs(abPairBuildResult.rows()) - .candidateSummaries(createCandidateSummaries(data, candidates, assignments.size(), - unassignedCenters.size(), unusedMembers.size(), countABGroups(abPairMatches))) - .appliedSettings(createAppliedSettings()) - .validationErrors(List.of()) - .ruleViolations(createRuleChecks(data, selectedAssignments, abPairMatches, pairedMemberIds)) - .build(); - } - - private PairingResult emptyResult(PairingData data, PairingCandidates candidates, String reason) { - return PairingResult.builder() - .assignments(List.of()) - .unassignedCenters(data.getCenters().stream() - .map(center -> new UnassignedCenterExcelDto(center.getId(), center.getMunicipalityId(), reason)) - .toList()) - .unusedMembers(data.getMembers().stream() - .map(member -> new UnusedMemberExcelDto(member.getId(), member.getRole().name(), reason)) - .toList()) - .summaries(createSummaries(data, candidates, 0, data.getCenters().size(), data.getMembers().size(), 0, reason)) - .abPairs(List.of()) - .candidateSummaries(createCandidateSummaries(data, candidates, 0, data.getCenters().size(), data.getMembers().size(), 0)) - .appliedSettings(createAppliedSettings()) - .validationErrors(List.of()) - .ruleViolations(List.of(new RuleViolationExcelDto("solver feasible 해", "FAIL", reason))) - .build(); - } - - private AssignmentResultExcelDto toAssignmentResult(AssignmentCandidate candidate, - Map memberMap, Map centerMap, - Map abPairMatches) { - Member fieldMember = memberMap.get(candidate.getFieldMemberId()); - Member externalMember = memberMap.get(candidate.getExternalMemberId()); - Center center = centerMap.get(candidate.getCenterId()); - ABPairMatch abPairMatch = abPairMatches.get(pairKey(candidate)); - return new AssignmentResultExcelDto(candidate.getDate().toString(), - candidate.getFieldMemberId(), formatGender(fieldMember.getGender()), - formatExperience(fieldMember.getExperienceType()), fieldMember.getResidenceCode(), - fieldMember.getActivityRegion(), formatPreferenceRank(candidate.getFieldMemberPreferenceRank()), - candidate.getExternalMemberId(), formatGender(externalMember.getGender()), - formatExperience(externalMember.getExperienceType()), externalMember.getResidenceCode(), - externalMember.getActivityRegion(), formatPreferenceRank(candidate.getExternalMemberPreferenceRank()), - candidate.getCenterId(), candidate.getMunicipalityId(), center.isWomenOnly() ? "1" : "0", - candidate.getDispatchRegion(), candidate.getAdjacentRegionClassification(), - String.valueOf(candidate.getPreferencePriority()), - abPairMatch == null ? "" : abPairMatch.getGroupId(), - abPairMatch == null ? "" : abPairMatch.getCounterpartFieldMemberId(), - abPairMatch == null ? "" : abPairMatch.getCounterpartExternalMemberId()); - } - - private UnassignedCenterExcelDto toUnassignedCenter(Center center, Map> reasonMap) { - Set reasons = new LinkedHashSet<>(reasonMap == null ? Set.of() - : reasonMap.getOrDefault(center.getId(), Set.of())); - reasons.add("solver 최적화에서 선택되지 않음"); - return new UnassignedCenterExcelDto(center.getId(), center.getMunicipalityId(), String.join(", ", reasons)); - } - - private String formatGender(Gender gender) { - return gender == Gender.FEMALE ? "여" : "남"; - } - - private String formatExperience(ExperienceType experienceType) { - return experienceType == ExperienceType.EXPERIENCED ? "경력" : "신규"; - } - - private String formatPreferenceRank(int rank) { - if (rank == 0) { - return "00"; - } - return rank == 99 ? "99" : String.valueOf(rank); - } - - private List createSummaries(PairingData data, - PairingCandidates candidates, int assignmentCount, int unassignedCenterCount, - int unusedMemberCount, int abGroupCount, String status) { - return List.of( - new PairingSummaryExcelDto("위원 수", String.valueOf(data.getMembers().size())), - new PairingSummaryExcelDto("지자체 수", String.valueOf(data.getMunicipalities().size())), - new PairingSummaryExcelDto("센터 수", String.valueOf(data.getCenters().size())), - new PairingSummaryExcelDto("페어 후보 수", String.valueOf(candidates.getPairCandidates().size())), - new PairingSummaryExcelDto("파견 권역 후보 수", String.valueOf(candidates.getDispatchRegionCandidates().size())), - new PairingSummaryExcelDto("배정 후보 수", String.valueOf(candidates.getAssignmentCandidates().size())), - new PairingSummaryExcelDto("배정 센터 수", String.valueOf(assignmentCount)), - new PairingSummaryExcelDto("미배정 센터 수", String.valueOf(unassignedCenterCount)), - new PairingSummaryExcelDto("미사용 위원 수", String.valueOf(unusedMemberCount)), - new PairingSummaryExcelDto("AB 그룹 수", String.valueOf(abGroupCount)), - new PairingSummaryExcelDto("처리 상태", status)); - } - - private ABPairBuildResult createABPairMatches(List selectedAssignments) { - Map> assignmentsByPair = selectedAssignments.stream() - .collect(Collectors.groupingBy(this::pairKey)); - List usedPairs = assignmentsByPair.entrySet().stream() - .map(entry -> UsedPair.of(entry.getKey(), entry.getValue())) - .sorted(Comparator.comparing(UsedPair::pairKey)) - .toList(); - Map matches = new HashMap<>(); - List rows = new ArrayList<>(); - Set alreadyMatched = new HashSet<>(); - int groupSequence = 1; - - for (UsedPair pair : usedPairs) { - if (alreadyMatched.contains(pair.pairKey())) { - continue; - } - UsedPair counterpart = usedPairs.stream() - .filter(candidate -> !alreadyMatched.contains(candidate.pairKey())) - .filter(candidate -> !candidate.pairKey().equals(pair.pairKey())) - .filter(pair::canBeABWith) - .findFirst() - .orElse(null); - if (counterpart == null) { - continue; - } - String groupId = "AB-" + String.format("%03d", groupSequence++); - matches.put(pair.pairKey(), toABPairMatch(groupId, pair, counterpart)); - matches.put(counterpart.pairKey(), toABPairMatch(groupId, counterpart, pair)); - rows.add(toABPairRow(groupId, pair, counterpart)); - alreadyMatched.add(pair.pairKey()); - alreadyMatched.add(counterpart.pairKey()); - } - return new ABPairBuildResult(matches, rows); - } - - private ABPairMatch toABPairMatch(String groupId, UsedPair pair, UsedPair counterpart) { - return ABPairMatch.builder() - .groupId(groupId) - .fieldMemberId(pair.fieldMemberId()) - .externalMemberId(pair.externalMemberId()) - .counterpartFieldMemberId(counterpart.fieldMemberId()) - .counterpartExternalMemberId(counterpart.externalMemberId()) - .build(); - } - - private int countABGroups(Map matches) { - return (int) matches.values().stream().map(ABPairMatch::getGroupId).distinct().count(); - } - - private ABPairExcelDto toABPairRow(String groupId, UsedPair pair, UsedPair counterpart) { - Set counterpartDispatchRegions = counterpart.dispatchRegions(); - String sharedDispatchRegion = pair.dispatchRegions().stream() - .filter(counterpartDispatchRegions::contains) - .sorted() - .findFirst() - .orElse(""); - boolean dateOverlapped = pair.dates().stream().anyMatch(counterpart.dates()::contains); - return new ABPairExcelDto(groupId, pair.fieldMemberId(), pair.externalMemberId(), - counterpart.fieldMemberId(), counterpart.externalMemberId(), sharedDispatchRegion, - formatDates(pair.dates()), formatDates(counterpart.dates()), dateOverlapped ? "Y" : "N"); - } - private List createCandidateSummaries(PairingData data, - PairingCandidates candidates, int assignmentCount, int unassignedCenterCount, - int unusedMemberCount, int abGroupCount) { - long fieldMemberCount = data.getMembers().stream().filter(member -> member.getRole().name().equals("FIELD")).count(); - long externalMemberCount = data.getMembers().stream().filter(member -> member.getRole().name().equals("EXTERNAL")).count(); - long womenOnlyCenterCount = data.getCenters().stream().filter(Center::isWomenOnly).count(); - long noCandidateCenterCount = data.getCenters().stream() - .filter(center -> candidates.getAssignmentCandidates().stream() - .noneMatch(candidate -> candidate.getCenterId().equals(center.getId()))) - .count(); - return List.of( - new CandidateSummaryExcelDto("전체 위원 수", String.valueOf(data.getMembers().size()), "입력 위원 수"), - new CandidateSummaryExcelDto("현장위원 수", String.valueOf(fieldMemberCount), "현장위원 입력 수"), - new CandidateSummaryExcelDto("외부위원 수", String.valueOf(externalMemberCount), "외부위원 입력 수"), - new CandidateSummaryExcelDto("센터 수", String.valueOf(data.getCenters().size()), "입력 센터 수"), - new CandidateSummaryExcelDto("여성 전용 센터 수", String.valueOf(womenOnlyCenterCount), "여성 위원만 가능한 센터 수"), - new CandidateSummaryExcelDto("공통 불가일 수", String.valueOf(commonUnavailableDates(data).size()), "배정 제외 공통 불가능 일자 수"), - new CandidateSummaryExcelDto("페어 후보 수", String.valueOf(candidates.getPairCandidates().size()), "현장+외부 조합 후보 수"), - new CandidateSummaryExcelDto("파견 권역 후보 수", String.valueOf(candidates.getDispatchRegionCandidates().size()), "페어별 파견 권역 후보 수"), - new CandidateSummaryExcelDto("배정 후보 수", String.valueOf(candidates.getAssignmentCandidates().size()), "solver 입력 배정 후보 수"), - new CandidateSummaryExcelDto("후보 없는 센터 수", String.valueOf(noCandidateCenterCount), "배정 후보가 하나도 없는 센터 수"), - new CandidateSummaryExcelDto("배정 센터 수", String.valueOf(assignmentCount), "최종 배정된 센터 수"), - new CandidateSummaryExcelDto("미배정 센터 수", String.valueOf(unassignedCenterCount), "최종 미배정 센터 수"), - new CandidateSummaryExcelDto("미사용 위원 수", String.valueOf(unusedMemberCount), "최종 배정에 포함되지 않은 위원 수"), - new CandidateSummaryExcelDto("AB 그룹 수", String.valueOf(abGroupCount), "후처리로 구성된 AB 그룹 수")); - } - - private List createAppliedSettings() { - PairingProperties.Excel excel = pairingProperties.getExcel(); - PairingProperties.Code code = pairingProperties.getCode(); - PairingProperties.Rule rule = pairingProperties.getRule(); - PairingProperties.Preference preference = pairingProperties.getPreference(); - PairingProperties.Objective objective = pairingProperties.getObjective(); - PairingProperties.Candidate candidate = pairingProperties.getCandidate(); - PairingProperties.Solver solver = pairingProperties.getSolver(); - return List.of( - setting("pairing.excel.header-row-index", - "엑셀 헤더로 사용할 행 인덱스", - excel.getHeaderRowIndex()), - setting("pairing.code.region-code-length", - "지역코드 정규화 길이", code.getRegionCodeLength()), - setting("pairing.code.residence-code-length", - "거주지코드 정규화 길이", - code.getResidenceCodeLength()), - setting("pairing.code.residence-match-prefix-length", - "거주지 일치 판단에 사용하는 앞자리 길이", - code.getResidenceMatchPrefixLength()), - setting("pairing.code.any-region-code", - "희망지역 anywhere로 처리하는 코드", - code.getAnyRegionCode()), - setting("pairing.rule.max-centers-per-pair-per-day", - "페어가 하루에 방문할 수 있는 최대 센터 수", - rule.getMaxCentersPerPairPerDay()), - setting("pairing.rule.max-counterparts-per-member", - "위원 1명당 허용되는 상대 위원 최대 수", - rule.getMaxCounterpartsPerMember()), - setting("pairing.rule.max-member-visit-average-ratio-percent", - "위원별 방문 수 상한을 평균 대비 몇 %까지 허용할지", - rule.getMaxMemberVisitAverageRatioPercent()), - setting("pairing.preference.anywhere-rank", - "선호지역 anywhere를 의미하는 순위", - preference.getAnywhereRank()), - setting("pairing.preference.ignored-rank", - "선호지역 고려하지 않음을 의미하는 순위", - preference.getIgnoredRank()), - setting("pairing.preference.active-wildcard-fallback-enabled", - "희망지역 고려하지 않음을 wildcard로 적극 사용할지", - preference.isActiveWildcardFallbackEnabled()), - setting("pairing.preference.wildcard-fallback-score-bonus", - "wildcard 후보에 추가할 점수", - preference.getWildcardFallbackScoreBonus()), - setting("pairing.objective.assignment-weight", - "센터 하나를 더 배정하는 것에 부여하는 기본 점수", - objective.getAssignmentWeight()), - setting("pairing.objective.preference-base-weight", - "희망지역 매칭 품질에 부여하는 기본 점수", - objective.getPreferenceBaseWeight()), - setting("pairing.objective.preference-rank-penalty", - "희망순위가 낮아질 때 감점하는 점수", - objective.getPreferenceRankPenalty()), - setting("pairing.objective.residence-match-weight", - "거주지 유사도 점수에 곱하는 가중치", - objective.getResidenceMatchWeight()), - setting("pairing.objective.member-balance-weight", - "방문 수가 많은 위원을 더 선택하지 않도록 감점하는 가중치", - objective.getMemberBalanceWeight()), - setting("pairing.candidate.max-pair-candidates-per-member", - "위원별 페어 후보 축소 상한, 0이면 무제한", - candidate.getMaxPairCandidatesPerMember()), - setting("pairing.candidate.max-dispatch-regions-per-pair", - "페어별 파견 권역 후보 축소 상한, 0이면 무제한", - candidate.getMaxDispatchRegionsPerPair()), - setting("pairing.candidate.max-assignments-per-center", - "센터별 배정 후보 축소 상한", - candidate.getMaxAssignmentsPerCenter()), - setting("pairing.candidate.max-assignments-per-member", - "위원별 배정 후보 축소 상한", - candidate.getMaxAssignmentsPerMember()), - setting("pairing.candidate.max-dates-per-assignment-candidate", - "하나의 페어-센터 조합에서 확장할 날짜 후보 상한", - candidate.getMaxDatesPerAssignmentCandidate()), - setting("pairing.solver.max-time-seconds", - "CP-SAT 사용 시 허용할 최대 탐색 시간", - solver.getMaxTimeSeconds()), - setting("pairing.solver.num-search-workers", - "CP-SAT 사용 시 사용할 worker 수", - solver.getNumSearchWorkers()) - ); - } - - private AppliedSettingExcelDto setting(String name, String description, Object value) { - return new AppliedSettingExcelDto(name, description, String.valueOf(value)); - } - - private List createRuleChecks(PairingData data, - List selectedAssignments, Map abPairMatches, - Set pairedMemberIds) { - Map memberMap = data.getMembers().stream() - .collect(Collectors.toMap(Member::getId, Function.identity(), (left, right) -> left)); - Map centerMap = data.getCenters().stream() - .collect(Collectors.toMap(Center::getId, Function.identity(), (left, right) -> left)); - List checks = new ArrayList<>(); - checks.add(checkDuplicate(selectedAssignments.stream().map(AssignmentCandidate::getCenterId).toList(), "센터 1회 초과 배정")); - checks.add(checkMaxGroupCount(selectedAssignments, this::pairDayKey, - pairingProperties.getRule().getMaxCentersPerPairPerDay(), "페어 하루 최대 센터 수")); - checks.add(checkMemberDateDuplicate(selectedAssignments)); - checks.add(checkPairDayAdjacentClassification(selectedAssignments)); - checks.add(checkWomenOnly(selectedAssignments, memberMap, centerMap)); - checks.add(checkActivityRegion(selectedAssignments, memberMap)); - checks.add(checkHistoryCenter(selectedAssignments, memberMap)); - checks.add(checkHoliday(selectedAssignments, commonUnavailableDates(data))); - checks.add(checkABDateOverlap(abPairMatches)); - checks.add(checkAllMembersUsed(data, selectedAssignments, pairedMemberIds)); - checks.add(checkMemberVisitBalance(data, selectedAssignments)); - checks.add(checkMemberVisitUpperBound(data, selectedAssignments)); - return checks; - } - - private RuleViolationExcelDto checkDuplicate(List values, String ruleName) { - Set seen = new HashSet<>(); - Set duplicates = values.stream().filter(value -> !seen.add(value)) - .collect(Collectors.toCollection(LinkedHashSet::new)); - return new RuleViolationExcelDto(ruleName, duplicates.isEmpty() ? "PASS" : "FAIL", - duplicates.isEmpty() ? "위반 없음" : String.join(", ", duplicates)); - } - - private RuleViolationExcelDto checkMaxGroupCount(List assignments, - Function classifier, int max, String ruleName) { - Map countsByKey = assignments.stream().collect(Collectors.groupingBy(classifier, Collectors.counting())); - List violations = countsByKey.entrySet().stream() - .filter(entry -> entry.getValue() > max) - .map(entry -> entry.getKey() + "=" + entry.getValue()) - .toList(); - return new RuleViolationExcelDto(ruleName, violations.isEmpty() ? "PASS" : "FAIL", - violations.isEmpty() ? "위반 없음" : String.join(", ", violations)); - } - - private RuleViolationExcelDto checkMemberDateDuplicate(List assignments) { - Map> pairKeysByMemberDate = new HashMap<>(); - assignments.forEach(candidate -> { - pairKeysByMemberDate.computeIfAbsent(candidate.getFieldMemberId() + "|" + candidate.getDate(), key -> new HashSet<>()).add(pairKey(candidate)); - pairKeysByMemberDate.computeIfAbsent(candidate.getExternalMemberId() + "|" + candidate.getDate(), key -> new HashSet<>()).add(pairKey(candidate)); - }); - List violations = pairKeysByMemberDate.entrySet().stream() - .filter(entry -> entry.getValue().size() > 1) - .map(entry -> entry.getKey() + "=" + String.join("/", entry.getValue())) - .toList(); - return new RuleViolationExcelDto("같은 위원 같은 날짜 중복", violations.isEmpty() ? "PASS" : "FAIL", - violations.isEmpty() ? "위반 없음" : String.join(", ", violations)); - } - - private RuleViolationExcelDto checkPairDayAdjacentClassification(List assignments) { - Map> adjacentClassificationsByPairDay = assignments.stream() - .collect(Collectors.groupingBy(this::pairDayKey, - Collectors.mapping(AssignmentCandidate::getAdjacentRegionClassification, Collectors.toSet()))); - List violations = adjacentClassificationsByPairDay.entrySet().stream() - .filter(entry -> entry.getValue().size() > 1) - .map(entry -> entry.getKey() + "=" + String.join("/", entry.getValue())) - .toList(); - return new RuleViolationExcelDto("페어 하루 1개 인접지역분류", violations.isEmpty() ? "PASS" : "FAIL", - violations.isEmpty() ? "위반 없음" : String.join(", ", violations)); - } - - private RuleViolationExcelDto checkWomenOnly(List assignments, - Map memberMap, Map centerMap) { - List violations = assignments.stream() - .filter(candidate -> centerMap.get(candidate.getCenterId()).isWomenOnly()) - .filter(candidate -> memberMap.get(candidate.getFieldMemberId()).getGender() != Gender.FEMALE - || memberMap.get(candidate.getExternalMemberId()).getGender() != Gender.FEMALE) - .map(AssignmentCandidate::getCenterId) - .toList(); - return new RuleViolationExcelDto("여성 전용 센터 조건", violations.isEmpty() ? "PASS" : "FAIL", - violations.isEmpty() ? "위반 없음" : String.join(", ", violations)); - } - - private RuleViolationExcelDto checkActivityRegion(List assignments, Map memberMap) { - List violations = assignments.stream() - .filter(candidate -> hasActivityRegion(memberMap.get(candidate.getFieldMemberId()), candidate.getDispatchRegion()) - || hasActivityRegion(memberMap.get(candidate.getExternalMemberId()), candidate.getDispatchRegion())) - .map(candidate -> candidate.getCenterId() + ":" + candidate.getDispatchRegion()) - .toList(); - return new RuleViolationExcelDto("활동지역 상피제", violations.isEmpty() ? "PASS" : "FAIL", - violations.isEmpty() ? "위반 없음" : String.join(", ", violations)); - } - - private boolean hasActivityRegion(Member member, String dispatchRegion) { - return java.util.Arrays.stream(member.getActivityRegion().split(",")).map(String::trim).anyMatch(dispatchRegion::equals); - } - - private RuleViolationExcelDto checkHistoryCenter(List assignments, Map memberMap) { - List violations = assignments.stream() - .filter(candidate -> memberMap.get(candidate.getFieldMemberId()).getHistoryCenterIds().contains(candidate.getCenterId()) - || memberMap.get(candidate.getExternalMemberId()).getHistoryCenterIds().contains(candidate.getCenterId())) - .map(AssignmentCandidate::getCenterId) - .toList(); - return new RuleViolationExcelDto("2023년 진행 센터 재배정", violations.isEmpty() ? "PASS" : "FAIL", - violations.isEmpty() ? "위반 없음" : String.join(", ", violations)); - } - - private RuleViolationExcelDto checkHoliday(List assignments, Set holidays) { - List violations = assignments.stream() - .filter(candidate -> holidays.contains(candidate.getDate())) - .map(candidate -> candidate.getCenterId() + ":" + candidate.getDate()) - .toList(); - return new RuleViolationExcelDto("공휴일 배정", violations.isEmpty() ? "PASS" : "FAIL", - violations.isEmpty() ? "위반 없음" : String.join(", ", violations)); - } - - private RuleViolationExcelDto checkABDateOverlap(Map abPairMatches) { - return new RuleViolationExcelDto("A/B 페어 날짜 겹침", "PASS", "A/B 그룹은 날짜가 겹치지 않는 페어만 후처리로 생성합니다."); - } - - private RuleViolationExcelDto checkAllMembersUsed(PairingData data, - List assignments, Set pairedMemberIds) { - Set usedMemberIds = assignments.stream() - .flatMap(candidate -> Stream.of(candidate.getFieldMemberId(), - candidate.getExternalMemberId())) - .collect(Collectors.toSet()); - usedMemberIds.addAll(pairedMemberIds); - List unusedMemberIds = data.getMembers().stream() - .map(Member::getId) - .filter(memberId -> !usedMemberIds.contains(memberId)) - .toList(); - return new RuleViolationExcelDto("위원 전원 조편성", unusedMemberIds.isEmpty() ? "PASS" : "FAIL", - unusedMemberIds.isEmpty() ? "위반 없음" : String.join(", ", unusedMemberIds)); - } - - private RuleViolationExcelDto checkMemberVisitBalance(PairingData data, - List assignments) { - Map visitCounts = data.getMembers().stream() - .collect(Collectors.toMap(Member::getId, member -> 0L, (left, right) -> left)); - assignments.forEach(candidate -> { - visitCounts.merge(candidate.getFieldMemberId(), 1L, Long::sum); - visitCounts.merge(candidate.getExternalMemberId(), 1L, Long::sum); - }); - long min = visitCounts.values().stream().mapToLong(Long::longValue).min().orElse(0L); - long max = visitCounts.values().stream().mapToLong(Long::longValue).max().orElse(0L); - double average = visitCounts.values().stream().mapToLong(Long::longValue).average().orElse(0.0D); - long maxAllowed = maxMemberVisitCount(data); - String detail = "min=" + min + ", max=" + max + ", avg=" + String.format("%.2f", average) - + ", maxAllowed=" + maxAllowed; - return new RuleViolationExcelDto("위원별 방문 센터 수 균등 배분", "PASS", detail); - } - - private long maxMemberVisitCount(PairingData data) { - if (data.getMembers().isEmpty()) { - return 0L; - } - double fullAssignmentAverage = (double) data.getCenters().size() * 2D - / data.getMembers().size(); - return Math.max(1L, (long) Math.ceil(fullAssignmentAverage - * pairingProperties.getRule().getMaxMemberVisitAverageRatioPercent() / 100D)); - } - - private RuleViolationExcelDto checkMemberVisitUpperBound(PairingData data, - List assignments) { - Map visitCounts = data.getMembers().stream() - .collect(Collectors.toMap(Member::getId, member -> 0L, (left, right) -> left)); - assignments.forEach(candidate -> { - visitCounts.merge(candidate.getFieldMemberId(), 1L, Long::sum); - visitCounts.merge(candidate.getExternalMemberId(), 1L, Long::sum); - }); - long max = visitCounts.values().stream().mapToLong(Long::longValue).max().orElse(0L); - long maxAllowed = maxMemberVisitCount(data); - String detail = "max=" + max + ", maxAllowed=" + maxAllowed - + ", ratioPercent=" + pairingProperties.getRule() - .getMaxMemberVisitAverageRatioPercent(); - return new RuleViolationExcelDto("위원 최대 방문 센터 수 상한", - max <= maxAllowed ? "PASS" : "FAIL", detail); - } - - private String formatDates(Set dates) { - return dates.stream().sorted().map(LocalDate::toString).collect(Collectors.joining(", ")); - } - - private Set commonUnavailableDates(PairingData data) { - return data.getCommonUnavailableDates() == null ? Set.of() : data.getCommonUnavailableDates(); - } - - private Map> groupIndexes(List candidates, - Function classifier) { - Map> grouped = new HashMap<>(); - for (int i = 0; i < candidates.size(); i++) { - grouped.computeIfAbsent(classifier.apply(candidates.get(i)), key -> new ArrayList<>()).add(i); - } - return grouped; - } - - private BoolVar[] toLiteralArray(List indexes, BoolVar[] assignmentVars) { - return indexes.stream().map(index -> assignmentVars[index]).toArray(BoolVar[]::new); - } - - private LinearArgument[] toLinearArgumentArray(List indexes, BoolVar[] assignmentVars) { - return indexes.stream().map(index -> assignmentVars[index]).toArray(LinearArgument[]::new); - } - - private String pairKey(AssignmentCandidate candidate) { - return candidate.getFieldMemberId() + "|" + candidate.getExternalMemberId(); - } - - private String counterpartId(String pairKey, String memberId) { - String[] memberIds = pairKey.split("\\|", 2); - if (memberIds.length != 2) { - return ""; - } - return memberId.equals(memberIds[0]) ? memberIds[1] : memberIds[0]; - } - - private String pairDayKey(AssignmentCandidate candidate) { - return pairKey(candidate) + "|" + candidate.getDate(); - } - - private String pairDayAdjacentKey(AssignmentCandidate candidate) { - return pairDayKey(candidate) + "|" + candidate.getAdjacentRegionClassification(); - } - - public record SolveSelection(boolean hasSolution, List selectedAssignments, String status) { - } - - private record ABPairBuildResult(Map matches, List rows) { - } - - private record UsedPair(String pairKey, String fieldMemberId, String externalMemberId, - Set dates, Set dispatchRegions) { - private static UsedPair of(String pairKey, List assignments) { - AssignmentCandidate first = assignments.get(0); - return new UsedPair(pairKey, first.getFieldMemberId(), first.getExternalMemberId(), - assignments.stream().map(AssignmentCandidate::getDate).collect(Collectors.toSet()), - assignments.stream().map(AssignmentCandidate::getDispatchRegion).collect(Collectors.toSet())); - } - - private boolean canBeABWith(UsedPair other) { - return dates.stream().noneMatch(other.dates::contains) - && dispatchRegions.stream().anyMatch(other.dispatchRegions::contains) - && !Objects.equals(fieldMemberId, other.fieldMemberId) - && !Objects.equals(fieldMemberId, other.externalMemberId) - && !Objects.equals(externalMemberId, other.fieldMemberId) - && !Objects.equals(externalMemberId, other.externalMemberId); - } - } - - static { - Loader.loadNativeLibraries(); - } -} diff --git a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingValidationService.java b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingValidationService.java index 547b7b7..56a3ce7 100644 --- a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingValidationService.java +++ b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingValidationService.java @@ -32,33 +32,37 @@ public class PairingValidationService { private void validateNotEmpty(PairingData data) { if (data.getMembers().isEmpty()) { throw BusinessException.badRequest("PAIRING_EMPTY_MEMBER", "위원정보 시트에 데이터가 없습니다."); - } else if (data.getMunicipalities().isEmpty()) { + } + if (data.getMunicipalities().isEmpty()) { throw BusinessException.badRequest("PAIRING_EMPTY_MUNICIPALITY", "지자체 정보 시트에 데이터가 없습니다."); - } else if (data.getCenters().isEmpty()) { + } + if (data.getCenters().isEmpty()) { throw BusinessException.badRequest("PAIRING_EMPTY_CENTER", "센터정보 시트에 데이터가 없습니다."); - } else if (data.getCenterAdjacentRegions().isEmpty()) { + } + if (data.getCenterAdjacentRegions().isEmpty()) { throw BusinessException.badRequest("PAIRING_EMPTY_CENTER_ADJACENT_REGION", "센터 인접지역표 시트에 데이터가 없습니다."); - } else if (data.getPreferenceMatchRules().isEmpty()) { + } + if (data.getPreferenceMatchRules().isEmpty()) { throw BusinessException.badRequest("PAIRING_EMPTY_PREFERENCE_MATCH", "희망지역 매칭표 시트에 데이터가 없습니다."); } } private void validateDateRanges(PairingData data) { - data.getMembers().forEach((member) -> { + data.getMembers().forEach(member -> { if (member.getAvailableEndDate().isBefore(member.getAvailableStartDate())) { throw BusinessException.badRequest("PAIRING_INVALID_DATE_RANGE", "위원 종료일이 시작일보다 빠릅니다: " + member.getId()); } }); - data.getMunicipalities().forEach((municipality) -> { + data.getMunicipalities().forEach(municipality -> { if (municipality.getAvailableEndDate().isBefore(municipality.getAvailableStartDate())) { throw BusinessException.badRequest("PAIRING_INVALID_DATE_RANGE", "지자체 종료일이 시작일보다 빠릅니다: " + municipality.getId()); } }); - data.getCenters().forEach((center) -> { + data.getCenters().forEach(center -> { if (center.getAvailableEndDate().isBefore(center.getAvailableStartDate())) { throw BusinessException.badRequest("PAIRING_INVALID_DATE_RANGE", "센터 종료일이 시작일보다 빠릅니다: " + center.getId()); @@ -67,53 +71,45 @@ public class PairingValidationService { } private void validateMunicipalityReferences(PairingData data) { - Map municipalities = (Map) data.getMunicipalities().stream() + Map municipalities = data.getMunicipalities().stream() .collect(Collectors.toMap(Municipality::getId, Function.identity(), (left, right) -> left)); for (Center center : data.getCenters()) { if (!municipalities.containsKey(center.getMunicipalityId())) { - String var10001 = center.getId(); throw BusinessException.badRequest("PAIRING_BROKEN_MUNICIPALITY_REFERENCE", - "센터가 존재하지 않는 지자체를 참조합니다. centerId=" + var10001 + ", municipalityId=" - + center.getMunicipalityId()); + "센터가 존재하지 않는 지자체를 참조합니다. centerId=" + center.getId() + + ", municipalityId=" + center.getMunicipalityId()); } } - } private void validatePreferenceRules(PairingData data) { - Set priorities = new HashSet(); - + Set priorities = new HashSet<>(); for (PreferenceMatchRule rule : data.getPreferenceMatchRules()) { if (!priorities.add(rule.getPriority())) { throw BusinessException.badRequest("PAIRING_DUPLICATE_PREFERENCE_PRIORITY", "희망지역 매칭표의 매칭 순위가 중복됩니다: " + rule.getPriority()); } - if (rule.getFieldMemberPreferenceRank() < 0 || rule.getExternalMemberPreferenceRank() < 0) { throw BusinessException.badRequest("PAIRING_INVALID_PREFERENCE_RANK", "희망지역 매칭표의 선호 순위는 0 이상이어야 합니다."); } } - } private void validatePreferenceAnyRegionOrder(PairingData data) { for (Member member : data.getMembers()) { boolean anyRegionAppeared = false; - for (String preferenceRegion : member.getPreferenceRegions()) { if (anyRegionAppeared && !anyRegionCode().equals(preferenceRegion)) { throw BusinessException.badRequest("PAIRING_INVALID_PREFERENCE_ORDER", - "선호지역 00 이후에는 다른 지역이 올 수 없습니다. memberId=" + member.getId()); + "희망지역 00 이후에는 다른 지역이 올 수 없습니다. memberId=" + member.getId()); } - if (anyRegionCode().equals(preferenceRegion)) { anyRegionAppeared = true; } } } - } private String anyRegionCode() { diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index fcfcc87..af8a6b6 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -4,8 +4,7 @@ server: spring: application: - name: narc-pairing - + name: ncrc-pairing servlet: multipart: max-file-size: 50MB @@ -21,7 +20,7 @@ kri: security: enabled: true - public-paths: # 인증 없이 열어둘 URL + public-paths: - /v3/api-docs/** - /swagger-ui.html - /swagger-ui/** @@ -31,74 +30,32 @@ kri: swagger: enabled: true title: "KRI P6 NCRC Pairing API" - description: "KRI P6 아동관리 보장원 조편성 API" + description: "아동권리보장원 조편성 API" version: "v1.0.0" base-package: "com.kri.p6.ncrc.pairing" web: - enabled: true # 공통 Web 구성 사용 여부 (기본 true) + enabled: true webmvc: - enabled: true # 공통 Webmvc 구성 사용 여부 (기본 true) + enabled: true redis: - enabled: false # RedisQueueHelper 사용 시 true + enabled: false scheduling: - enabled: false # @Scheduled 사용 시 true + enabled: false pairing: excel: - # ExcelMapper에서 헤더가 위치한 행 번호입니다. 공통 라이브러리 기준 1부터 시작합니다.(HARD) + # ExcelMapper가 데이터를 읽기 시작하는 헤더 행 번호입니다. header-row-index: 1 code: - # 활동지역, 선호지역, 파견 권역처럼 권역 비교에 사용하는 코드 길이입니다. + # 활동지역, 희망지역, 파견권역 코드의 표준 길이입니다. region-code-length: 2 - # 위원 거주지 입력 코드 길이입니다. + # 위원 거주지 코드의 표준 길이입니다. residence-code-length: 5 - # 거주지 유사도 비교 시 앞에서 몇 자리까지 비교할지 정합니다. - residence-match-prefix-length: 3 - # 선호지역에서 "어디든 가능"을 의미하는 코드입니다. + # 희망지역에서 '어디든 가능'을 의미하는 코드입니다. any-region-code: "00" - rule: - # 한 페어가 하루에 방문할 수 있는 최대 센터 수입니다. (HARD) - max-centers-per-pair-per-day: 3 - # 한 위원이 전체 기간 동안 가질 수 있는 최대 상대 파트너 수입니다.(HARD) - max-counterparts-per-member: 3 - # 위원 1명의 최대 방문 센터 수 상한입니다. 전체 센터가 모두 배정됐을 때 평균 방문 수의 N%를 넘지 못하게 합니다.(HARD) - max-member-visit-average-ratio-percent: 130 preference: - # 선호지역 00(anywhere)을 희망지역 매칭표에서 표현하는 rank 값입니다.(HARD) + # 희망지역 00(anywhere)이 희망지역 매칭표에서 표현되는 순위입니다. anywhere-rank: 0 - # 희망지역 매칭표에서 해당 위원의 선호지역을 고려하지 않는 wildcard rank 값입니다.(HARD) + # 희망지역을 고려하지 않는 wildcard 순위입니다. ignored-rank: 99 - # true면 선호지역 미일치 후보도 99 wildcard 매칭표 규칙을 적극 활용합니다. false로 바꾸면 기존 보수적 점수로 되돌아갑니다. - active-wildcard-fallback-enabled: true - # wildcard 후보가 후보 축소/배정 선택에서 너무 뒤로 밀리지 않도록 더하는 점수입니다. 값이 클수록 미배정 센터 감소를 우선합니다. - wildcard-fallback-score-bonus: 25_000 - objective: - # 센터 1개를 배정했을 때 부여하는 최우선 점수입니다. 다른 soft score 총합보다 충분히 커야 합니다. - assignment-weight: 1_000_000 - # 이미 많이 배정된 위원이 추가 배정될 때 차감하는 점수입니다. 값이 클수록 위원별 방문 센터 수를 평균에 가깝게 분산합니다. - member-balance-weight: 20_000 - # 희망지역 매칭 순위 점수의 기준값입니다. 값이 클수록 선호지역 품질 영향이 커집니다. - preference-base-weight: 30_000 - # 매칭 순위가 1 내려갈 때마다 차감하는 점수입니다. 값이 클수록 낮은 순위를 더 강하게 불리하게 봅니다. - preference-rank-penalty: 1_000 - # 거주지 prefix가 일치하는 페어에 부여하는 점수입니다. 값이 클수록 거주지 유사도를 더 중요하게 봅니다. - residence-match-weight: 10_000 - - candidate: - # 위원 1명당 유지할 상대 위원 후보 수입니다. 0이면 제한하지 않습니다. - # 모든 위원 조편성이 최우선 HARD 룰이므로 기본값은 제한 없음으로 둡니다. - max-pair-candidates-per-member: 0 - # 현장+외부 페어 1개가 solver에 넘기기 전에 유지할 최대 파견 권역 후보 수입니다. - max-dispatch-regions-per-pair: 0 - # 센터 1개마다 solver에 넘기기 전에 유지할 최대 배정 후보 수입니다. - max-assignments-per-center: 1_000 - # 위원 1명(현장/외부 모두 포함)이 solver 후보에 등장할 수 있는 최대 횟수입니다. - max-assignments-per-member: 3_000 - # 페어-센터 후보 1개에서 생성할 최대 가능 날짜 수입니다. 기간 전체에 고르게 분산해 날짜 쏠림을 줄입니다. - max-dates-per-assignment-candidate: 80 - solver: - # OR-Tools CP-SAT solver가 한 요청에서 탐색할 최대 시간(초)입니다. - max-time-seconds: 360.0 - # OR-Tools CP-SAT 병렬 탐색 worker 수입니다. 서버 CPU 상황에 맞춰 조정합니다. - num-search-workers: 15 diff --git a/src/test/java/com/kri/p6/ncrc/pairing/service/PairingCandidateServiceTest.java b/src/test/java/com/kri/p6/ncrc/pairing/service/PairingCandidateServiceTest.java deleted file mode 100644 index ffa5ebe..0000000 --- a/src/test/java/com/kri/p6/ncrc/pairing/service/PairingCandidateServiceTest.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.kri.p6.ncrc.pairing.service; - -import com.kri.p6.ncrc.pairing.model.Center; -import com.kri.p6.ncrc.pairing.model.CenterAdjacentRegion; -import com.kri.p6.ncrc.pairing.common.enums.ExperienceType; -import com.kri.p6.ncrc.pairing.common.enums.Gender; -import com.kri.p6.ncrc.pairing.config.PairingProperties; -import com.kri.p6.ncrc.pairing.model.Member; -import com.kri.p6.ncrc.pairing.common.enums.MemberRole; -import com.kri.p6.ncrc.pairing.model.Municipality; -import com.kri.p6.ncrc.pairing.model.PairingCandidates; -import com.kri.p6.ncrc.pairing.model.PairingData; -import com.kri.p6.ncrc.pairing.model.PreferenceMatchRule; -import java.time.LocalDate; -import java.util.Collection; -import java.util.List; -import java.util.Set; -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.Test; - -class PairingCandidateServiceTest { - private final PairingCandidateService service = new PairingCandidateService(PairingTestSupport.pairingProperties()); - - @Test - void generateAllowsNewNewPairBecauseAllMembersMustBePaired() { - PairingCandidates candidates = service.generate(baseData(member("field", MemberRole.FIELD, Gender.FEMALE, ExperienceType.NEW, "02", Set.of()), member("external", MemberRole.EXTERNAL, Gender.FEMALE, ExperienceType.NEW, "03", Set.of()), center("center", false))); - Assertions.assertThat(candidates.getPairCandidates()).hasSize(1); - Assertions.assertThat(candidates.getAssignmentCandidates()).hasSize(3); - } - - @Test - void generateExcludesConflictDispatchRegion() { - PairingCandidates candidates = service.generate(baseData(member("field", MemberRole.FIELD, Gender.FEMALE, ExperienceType.EXPERIENCED, "01", Set.of()), member("external", MemberRole.EXTERNAL, Gender.FEMALE, ExperienceType.EXPERIENCED, "03", Set.of()), center("center", false))); - Assertions.assertThat(candidates.getPairCandidates()).hasSize(1); - Assertions.assertThat(candidates.getDispatchRegionCandidates()).isEmpty(); - Assertions.assertThat(candidates.getAssignmentCandidates()).isEmpty(); - } - - @Test - void generateExcludesConflictWhenActivityRegionHasMultipleCodes() { - PairingCandidates candidates = service.generate(baseData(member("field", MemberRole.FIELD, Gender.FEMALE, ExperienceType.EXPERIENCED, "02,01", Set.of()), member("external", MemberRole.EXTERNAL, Gender.FEMALE, ExperienceType.EXPERIENCED, "03", Set.of()), center("center", false))); - Assertions.assertThat(candidates.getPairCandidates()).hasSize(1); - Assertions.assertThat(candidates.getDispatchRegionCandidates()).isEmpty(); - Assertions.assertThat(candidates.getAssignmentCandidates()).isEmpty(); - } - - @Test - void generateAllowsWomenOnlyCenterOnlyForFemalePair() { - PairingCandidates maleIncluded = service.generate(baseData(member("field", MemberRole.FIELD, Gender.FEMALE, ExperienceType.EXPERIENCED, "02", Set.of()), member("external", MemberRole.EXTERNAL, Gender.MALE, ExperienceType.EXPERIENCED, "03", Set.of()), center("center", true))); - PairingCandidates femaleOnly = service.generate(baseData(member("field", MemberRole.FIELD, Gender.FEMALE, ExperienceType.EXPERIENCED, "02", Set.of()), member("external", MemberRole.EXTERNAL, Gender.FEMALE, ExperienceType.EXPERIENCED, "03", Set.of()), center("center", true))); - Assertions.assertThat(maleIncluded.getAssignmentCandidates()).isEmpty(); - Assertions.assertThat(femaleOnly.getAssignmentCandidates()).hasSize(3); - } - - @Test - void generateExcludesHistoryCenter() { - PairingCandidates candidates = service.generate(baseData(member("field", MemberRole.FIELD, Gender.FEMALE, ExperienceType.EXPERIENCED, "02", Set.of("center")), member("external", MemberRole.EXTERNAL, Gender.FEMALE, ExperienceType.EXPERIENCED, "03", Set.of()), center("center", false))); - Assertions.assertThat(candidates.getAssignmentCandidates()).isEmpty(); - } - - @Test - void generateTreatsPreferenceRank99AsIgnored() { - PairingData data = PairingData.builder().members(List.of(member("field", MemberRole.FIELD, Gender.FEMALE, ExperienceType.EXPERIENCED, "02", Set.of()), member("external", MemberRole.EXTERNAL, Gender.FEMALE, ExperienceType.EXPERIENCED, "03", Set.of()))).municipalities(List.of(Municipality.builder().id("municipality").availableStartDate(LocalDate.of(2026, 5, 1)).availableEndDate(LocalDate.of(2026, 5, 3)).unavailableDates(Set.of()).build())).centers(List.of(center("center", false))).memberRegionCodes(List.of()).centerAdjacentRegions(List.of(CenterAdjacentRegion.builder().dispatchRegion("01").adjacentRegionClassification("A").build())).preferenceMatchRules(List.of(PreferenceMatchRule.builder().priority(1).fieldMemberPreferenceRank(1).externalMemberPreferenceRank(99).build())).commonUnavailableDates(Set.of()).build(); - PairingCandidates candidates = service.generate(data); - Assertions.assertThat(candidates.getDispatchRegionCandidates()).hasSize(1); - Assertions.assertThat(candidates.getAssignmentCandidates()).hasSize(3); - } - - @Test - void generateExcludesCommonHolidayDates() { - PairingData data = baseData(member("field", MemberRole.FIELD, Gender.FEMALE, ExperienceType.EXPERIENCED, "02", Set.of()), member("external", MemberRole.EXTERNAL, Gender.FEMALE, ExperienceType.EXPERIENCED, "03", Set.of()), Center.builder().id("center").municipalityId("municipality").womenOnly(false).adjacentRegionClassification("A").availableStartDate(LocalDate.of(2026, 5, 1)).availableEndDate(LocalDate.of(2026, 5, 1)).unavailableDates(Set.of()).build()); - data = PairingData.builder().members(data.getMembers()).municipalities(data.getMunicipalities()).centers(data.getCenters()).memberRegionCodes(data.getMemberRegionCodes()).centerAdjacentRegions(data.getCenterAdjacentRegions()).preferenceMatchRules(data.getPreferenceMatchRules()).commonUnavailableDates(Set.of(LocalDate.of(2026, 5, 1))).build(); - PairingCandidates candidates = service.generate(data); - Assertions.assertThat(candidates.getAssignmentCandidates()).isEmpty(); - Assertions.assertThat((Collection)candidates.getUnassignedCenterReasons().get("center")).contains(new String[]{"위원/지자체/센터 일정 또는 국공휴일 조건 불일치"}); - } - - @Test - void generateTrimsCandidatesByConfiguredLimits() { - PairingProperties properties = PairingTestSupport.pairingProperties(); - properties.getCandidate().setMaxDispatchRegionsPerPair(1); - properties.getCandidate().setMaxAssignmentsPerCenter(1); - properties.getCandidate().setMaxAssignmentsPerMember(1); - PairingCandidateService limitedService = new PairingCandidateService(properties); - PairingData data = PairingData.builder() - .members(List.of( - member("field1", MemberRole.FIELD, Gender.FEMALE, ExperienceType.EXPERIENCED, "09", Set.of()), - member("field2", MemberRole.FIELD, Gender.FEMALE, ExperienceType.EXPERIENCED, "09", Set.of()), - member("external1", MemberRole.EXTERNAL, Gender.FEMALE, ExperienceType.EXPERIENCED, "09", Set.of()), - member("external2", MemberRole.EXTERNAL, Gender.FEMALE, ExperienceType.EXPERIENCED, "09", Set.of()) - )) - .municipalities(List.of(Municipality.builder().id("municipality").availableStartDate(LocalDate.of(2026, 5, 1)).availableEndDate(LocalDate.of(2026, 5, 3)).unavailableDates(Set.of()).build())) - .centers(List.of(center("center1", false), center("center2", false))) - .memberRegionCodes(List.of()) - .centerAdjacentRegions(List.of( - CenterAdjacentRegion.builder().dispatchRegion("01").adjacentRegionClassification("A").build(), - CenterAdjacentRegion.builder().dispatchRegion("02").adjacentRegionClassification("A").build() - )) - .preferenceMatchRules(List.of( - PreferenceMatchRule.builder().priority(1).fieldMemberPreferenceRank(1).externalMemberPreferenceRank(1).build(), - PreferenceMatchRule.builder().priority(2).fieldMemberPreferenceRank(2).externalMemberPreferenceRank(2).build() - )) - .commonUnavailableDates(Set.of()) - .build(); - - PairingCandidates candidates = limitedService.generate(data); - - Assertions.assertThat(candidates.getDispatchRegionCandidates()).hasSize(4); - Assertions.assertThat(candidates.getAssignmentCandidates()).hasSizeLessThanOrEqualTo(2); - Assertions.assertThat(candidates.getAssignmentCandidates()) - .extracting(candidate -> candidate.getFieldMemberId()) - .doesNotHaveDuplicates(); - Assertions.assertThat(candidates.getAssignmentCandidates()) - .extracting(candidate -> candidate.getExternalMemberId()) - .doesNotHaveDuplicates(); - } - - private PairingData baseData(Member fieldMember, Member externalMember, Center center) { - return PairingData.builder().members(List.of(fieldMember, externalMember)).municipalities(List.of(Municipality.builder().id("municipality").availableStartDate(LocalDate.of(2026, 5, 1)).availableEndDate(LocalDate.of(2026, 5, 3)).unavailableDates(Set.of()).build())).centers(List.of(center)).memberRegionCodes(List.of()).centerAdjacentRegions(List.of(CenterAdjacentRegion.builder().dispatchRegion("01").adjacentRegionClassification("A").build())).preferenceMatchRules(List.of(PreferenceMatchRule.builder().priority(1).fieldMemberPreferenceRank(1).externalMemberPreferenceRank(1).build())).commonUnavailableDates(Set.of()).build(); - } - - private Member member(String id, MemberRole role, Gender gender, ExperienceType experienceType, String activityRegion, Set historyCenterIds) { - return Member.builder().id(id).gender(gender).experienceType(experienceType).role(role).availableStartDate(LocalDate.of(2026, 5, 1)).availableEndDate(LocalDate.of(2026, 5, 3)).unavailableDates(Set.of()).activityRegion(activityRegion).historyCenterIds(historyCenterIds).residenceCode("01101").preferenceRegions(List.of("01", "00", "00", "00")).build(); - } - - private Center center(String id, boolean womenOnly) { - return Center.builder().id(id).municipalityId("municipality").womenOnly(womenOnly).adjacentRegionClassification("A").availableStartDate(LocalDate.of(2026, 5, 1)).availableEndDate(LocalDate.of(2026, 5, 3)).unavailableDates(Set.of()).build(); - } -} diff --git a/src/test/java/com/kri/p6/ncrc/pairing/service/PairingExcelServiceTest.java b/src/test/java/com/kri/p6/ncrc/pairing/service/PairingExcelServiceTest.java deleted file mode 100644 index 414b7d6..0000000 --- a/src/test/java/com/kri/p6/ncrc/pairing/service/PairingExcelServiceTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.kri.p6.ncrc.pairing.service; - -import com.kri.p6.ncrc.pairing.dto.excel.input.PairingWorkbookData; -import java.io.IOException; -import java.io.InputStream; -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.Test; -import org.springframework.mock.web.MockMultipartFile; - -class PairingExcelServiceTest { - - private final PairingExcelService pairingExcelService = new PairingExcelService( - PairingTestSupport.pairingProperties()); - - @Test - void readSampleWorkbook() throws IOException { - try (InputStream inputStream = getClass().getResourceAsStream("/sample/기초 data TEST.xlsx")) { - MockMultipartFile file = new MockMultipartFile("file", "기초 data TEST.xlsx", - "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", inputStream); - - PairingWorkbookData data = pairingExcelService.read(file); - - Assertions.assertThat(data.getMembers()).isNotEmpty(); - Assertions.assertThat(data.getMunicipalities()).isNotEmpty(); - Assertions.assertThat(data.getCenters()).isNotEmpty(); - Assertions.assertThat(data.getMemberRegionCodes()).isNotEmpty(); - Assertions.assertThat(data.getCenterAdjacentRegions()).isNotEmpty(); - Assertions.assertThat(data.getPreferenceMatchRules()).isNotEmpty(); - } - } -} diff --git a/src/test/java/com/kri/p6/ncrc/pairing/service/PairingHolidayServiceTest.java b/src/test/java/com/kri/p6/ncrc/pairing/service/PairingHolidayServiceTest.java deleted file mode 100644 index 2bac8c0..0000000 --- a/src/test/java/com/kri/p6/ncrc/pairing/service/PairingHolidayServiceTest.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.kri.p6.ncrc.pairing.service; - -import com.kri.p6.ncrc.pairing.common.enums.ExperienceType; -import com.kri.p6.ncrc.pairing.common.enums.Gender; -import com.kri.p6.ncrc.pairing.common.enums.MemberRole; -import com.kri.p6.ncrc.pairing.common.external.datago.DatagoExtentionApiClient; -import com.kri.p6.ncrc.pairing.common.cache.DatagoHolidayCache; -import com.kri.p6.ncrc.pairing.common.external.datago.HolidayDto; -import com.kri.p6.ncrc.pairing.model.Member; -import com.kri.p6.ncrc.pairing.model.PairingData; -import java.time.LocalDate; -import java.util.List; -import java.util.Set; -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.Test; - -class PairingHolidayServiceTest { - @Test - void applyHolidayUnavailableDatesAddsDatagoHolidays() { - PairingHolidayService service = new PairingHolidayService(new DatagoHolidayCache(new StubDatagoExtentionApiClient())); - PairingData data = PairingData.builder().members(List.of( - Member.builder() - .id("member") - .gender(Gender.FEMALE) - .experienceType(ExperienceType.EXPERIENCED) - .role(MemberRole.FIELD) - .availableStartDate(LocalDate.of(2026, 5, 1)) - .availableEndDate(LocalDate.of(2026, 5, 10)) - .unavailableDates(Set.of()) - .activityRegion("02") - .historyCenterIds(Set.of()) - .residenceCode("01101") - .preferenceRegions(List.of("01", "00", "00", "00")) - .build())) - .municipalities(List.of()) - .centers(List.of()) - .memberRegionCodes(List.of()) - .centerAdjacentRegions(List.of()) - .preferenceMatchRules(List.of()) - .commonUnavailableDates(Set.of()) - .build(); - PairingData result = service.applyHolidayUnavailableDates(data); - Assertions.assertThat(result.getCommonUnavailableDates()).contains( - LocalDate.of(2026, 5, 2), - LocalDate.of(2026, 5, 3), - LocalDate.of(2026, 5, 5) - ); - } - - @Test - void getWeekendReturnsSaturdayAndSundayForYear() { - DatagoHolidayCache cache = new DatagoHolidayCache(new StubDatagoExtentionApiClient()); - - List weekendDates = cache.getWeekend("2026").stream() - .map(HolidayDto::getHolidayDate) - .toList(); - - Assertions.assertThat(weekendDates) - .contains("20260103", "20260104", "20261226", "20261227") - .doesNotContain("20260102"); - } - - @Test - void applyHolidayUnavailableDatesUsesCacheForSameYear() { - CountingDatagoExtentionApiClient client = new CountingDatagoExtentionApiClient(); - PairingHolidayService service = new PairingHolidayService(new DatagoHolidayCache(client)); - PairingData data = baseData(); - service.applyHolidayUnavailableDates(data); - service.applyHolidayUnavailableDates(data); - Assertions.assertThat(client.callCount).isEqualTo(1); - } - - private PairingData baseData() { - return PairingData.builder().members(List.of(Member.builder().id("member").gender(Gender.FEMALE).experienceType(ExperienceType.EXPERIENCED).role(MemberRole.FIELD).availableStartDate(LocalDate.of(2026, 5, 1)).availableEndDate(LocalDate.of(2026, 5, 10)).unavailableDates(Set.of()).activityRegion("02").historyCenterIds(Set.of()).residenceCode("01101").preferenceRegions(List.of("01", "00", "00", "00")).build())).municipalities(List.of()).centers(List.of()).memberRegionCodes(List.of()).centerAdjacentRegions(List.of()).preferenceMatchRules(List.of()).commonUnavailableDates(Set.of()).build(); - } - - private static class StubDatagoExtentionApiClient extends DatagoExtentionApiClient { - public List getHoliDayList(String year) { - return List.of(HolidayDto.of(year + "0505", "어린이날")); - } - } - - private static class CountingDatagoExtentionApiClient extends DatagoExtentionApiClient { - private int callCount; - - public List getHoliDayList(String year) { - ++callCount; - return List.of(HolidayDto.of(year + "0505", "어린이날")); - } - } -} diff --git a/src/test/java/com/kri/p6/ncrc/pairing/service/PairingServiceTest.java b/src/test/java/com/kri/p6/ncrc/pairing/service/PairingServiceTest.java deleted file mode 100644 index 8c2c92c..0000000 --- a/src/test/java/com/kri/p6/ncrc/pairing/service/PairingServiceTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.kri.p6.ncrc.pairing.service; - -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_AB_PAIR; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_ASSIGNMENT; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_CANDIDATE_SUMMARY; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_RULE_CHECK; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_SUMMARY; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_UNASSIGNED_CENTER; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_UNUSED_MEMBER; -import static com.kri.p6.ncrc.pairing.common.consts.PairingConstant.RESULT_SHEET_VALIDATION_ERROR; - -import com.kri.common.feature.excel.ExcelMapper; -import com.kri.p6.ncrc.pairing.dto.excel.output.RuleViolationExcelDto; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.List; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.ss.usermodel.WorkbookFactory; -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.mock.web.MockMultipartFile; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; - -@SpringBootTest -@AutoConfigureMockMvc -class PairingServiceTest { - - @Autowired - private MockMvc mockMvc; - - @Test - void pairingMemberByCenterCreatesResultWorkbook() throws Exception { - Path sample = Path.of("src/main/resources/sample/기초 data TEST.xlsx"); - - try (InputStream inputStream = Files.newInputStream(sample)) { - MockMultipartFile file = new MockMultipartFile("file", sample.getFileName().toString(), - "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", inputStream); - - MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.multipart("/api/v1/pairing/run") - .file(file)) - .andExpect(MockMvcResultMatchers.status().isOk()) - .andReturn(); - byte[] result = mvcResult.getResponse().getContentAsByteArray(); - - Assertions.assertThat(result).isNotEmpty(); - Files.createDirectories(Path.of("build")); - Files.write(Files.createTempFile(Path.of("build"), "pairing-result", ".xlsx"), result); - try (Workbook workbook = WorkbookFactory.create(new ByteArrayInputStream(result))) { - Assertions.assertThat(workbook.getSheet(RESULT_SHEET_ASSIGNMENT)).isNotNull(); - Assertions.assertThat(workbook.getSheet(RESULT_SHEET_UNASSIGNED_CENTER)).isNotNull(); - Assertions.assertThat(workbook.getSheet(RESULT_SHEET_UNUSED_MEMBER)).isNotNull(); - Assertions.assertThat(workbook.getSheet(RESULT_SHEET_SUMMARY)).isNotNull(); - Assertions.assertThat(workbook.getSheet(RESULT_SHEET_AB_PAIR)).isNotNull(); - Assertions.assertThat(workbook.getSheet(RESULT_SHEET_CANDIDATE_SUMMARY)).isNotNull(); - Assertions.assertThat(workbook.getSheet(RESULT_SHEET_VALIDATION_ERROR)).isNotNull(); - Assertions.assertThat(workbook.getSheet(RESULT_SHEET_RULE_CHECK)).isNotNull(); - - List ruleChecks = ExcelMapper.readFromWorkbook(workbook, - RuleViolationExcelDto.class, RESULT_SHEET_RULE_CHECK, 1); - Assertions.assertThat(ruleChecks) - .extracting(RuleViolationExcelDto::getResult) - .doesNotContain("FAIL"); - } - } - } -} diff --git a/src/test/java/com/kri/p6/ncrc/pairing/service/PairingSolverServiceTest.java b/src/test/java/com/kri/p6/ncrc/pairing/service/PairingSolverServiceTest.java deleted file mode 100644 index b81bb26..0000000 --- a/src/test/java/com/kri/p6/ncrc/pairing/service/PairingSolverServiceTest.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.kri.p6.ncrc.pairing.service; - -import com.kri.p6.ncrc.pairing.common.enums.ExperienceType; -import com.kri.p6.ncrc.pairing.common.enums.Gender; -import com.kri.p6.ncrc.pairing.common.enums.MemberRole; -import com.kri.p6.ncrc.pairing.model.AssignmentCandidate; -import com.kri.p6.ncrc.pairing.model.Center; -import com.kri.p6.ncrc.pairing.model.Member; -import com.kri.p6.ncrc.pairing.model.Municipality; -import com.kri.p6.ncrc.pairing.model.PairCandidate; -import com.kri.p6.ncrc.pairing.model.PairingCandidates; -import com.kri.p6.ncrc.pairing.model.PairingData; -import com.kri.p6.ncrc.pairing.model.PairingResult; -import java.time.LocalDate; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.Test; - -class PairingSolverServiceTest { - private final PairingSolverService service = new PairingSolverService(PairingTestSupport.pairingProperties()); - - @Test - void solveAssignsCenterAtMostOnceAndPairMaxThreeCentersPerDay() { - PairingData data = dataWithCenters("c1", "c2", "c3", "c4"); - PairingCandidates candidates = PairingCandidates.builder().pairCandidates(List.of(PairCandidate.builder().fieldMemberId("field").externalMemberId("external").residenceMatchScore(1).build())).dispatchRegionCandidates(List.of()).assignmentCandidates(List.of(assignment("field", "external", "c1", "A"), assignment("field", "external", "c2", "A"), assignment("field", "external", "c3", "A"), assignment("field", "external", "c4", "A"))).build(); - PairingResult result = service.solve(data, candidates); - Assertions.assertThat(result.getAssignments()).hasSize(3); - Assertions.assertThat(result.getAssignments()).extracting((assignment) -> assignment.getCenterId()).doesNotHaveDuplicates(); - } - - @Test - void solveAllowsOnlyOnePairForMemberOnSameDay() { - PairingData data = dataWithMembersAndCenters(List.of(member("field", MemberRole.FIELD), member("external1", MemberRole.EXTERNAL), member("external2", MemberRole.EXTERNAL)), List.of(center("c1"), center("c2"))); - PairingCandidates candidates = PairingCandidates.builder().pairCandidates(List.of(PairCandidate.builder().fieldMemberId("field").externalMemberId("external1").build(), PairCandidate.builder().fieldMemberId("field").externalMemberId("external2").build())).dispatchRegionCandidates(List.of()).assignmentCandidates(List.of(assignment("field", "external1", "c1", "A"), assignment("field", "external2", "c2", "A"))).build(); - PairingResult result = service.solve(data, candidates); - Assertions.assertThat(result.getAssignments()).hasSize(1); - } - - @Test - void solveAllowsOnlyOneAdjacentClassificationPerPairDay() { - PairingData data = dataWithCenters("c1", "c2"); - PairingCandidates candidates = PairingCandidates.builder().pairCandidates(List.of(PairCandidate.builder().fieldMemberId("field").externalMemberId("external").build())).dispatchRegionCandidates(List.of()).assignmentCandidates(List.of(assignment("field", "external", "c1", "A"), assignment("field", "external", "c2", "B"))).build(); - PairingResult result = service.solve(data, candidates); - Assertions.assertThat(result.getAssignments()).hasSize(1); - } - - @Test - void solveLimitsCounterpartsPerMemberToThree() { - PairingData data = dataWithMembersAndCenters(List.of(member("field", MemberRole.FIELD), member("external1", MemberRole.EXTERNAL), member("external2", MemberRole.EXTERNAL), member("external3", MemberRole.EXTERNAL)), List.of(center("c1"), center("c2"), center("c3"))); - PairingCandidates candidates = PairingCandidates.builder().pairCandidates(List.of(PairCandidate.builder().fieldMemberId("field").externalMemberId("external1").build(), PairCandidate.builder().fieldMemberId("field").externalMemberId("external2").build(), PairCandidate.builder().fieldMemberId("field").externalMemberId("external3").build())).dispatchRegionCandidates(List.of()).assignmentCandidates(List.of(assignment("field", "external1", "c1", "A", LocalDate.of(2026, 5, 1)), assignment("field", "external2", "c2", "A", LocalDate.of(2026, 5, 2)), assignment("field", "external3", "c3", "A", LocalDate.of(2026, 5, 3)))).build(); - PairingResult result = service.solve(data, candidates); - Map counterpartCounts = (Map)result.getAssignments().stream().collect(Collectors.groupingBy((assignment) -> assignment.getExternalMemberId(), Collectors.counting())); - Assertions.assertThat(result.getAssignments()).hasSize(3); - Assertions.assertThat(counterpartCounts).hasSize(3); - } - - @Test - void selectAppliesExistingCounterpartsToBuddyLimit() { - PairingCandidates candidates = PairingCandidates.builder().pairCandidates(List.of(PairCandidate.builder().fieldMemberId("field").externalMemberId("external1").build(), PairCandidate.builder().fieldMemberId("field").externalMemberId("external2").build(), PairCandidate.builder().fieldMemberId("field").externalMemberId("external3").build())).dispatchRegionCandidates(List.of()).assignmentCandidates(List.of(assignment("field", "external1", "c1", "A", LocalDate.of(2026, 5, 1)), assignment("field", "external2", "c2", "A", LocalDate.of(2026, 5, 2)), assignment("field", "external3", "c3", "A", LocalDate.of(2026, 5, 3)))).build(); - - PairingSolverService.SolveSelection selection = service.select(candidates, - Map.of("field", Set.of("external1"), "external1", Set.of("field"))); - - Assertions.assertThat(selection.selectedAssignments()).hasSize(3); - Assertions.assertThat(selection.selectedAssignments()) - .extracting(AssignmentCandidate::getExternalMemberId) - .contains("external1"); - Assertions.assertThat(selection.selectedAssignments()) - .extracting(AssignmentCandidate::getExternalMemberId) - .containsAnyOf("external2", "external3"); - } - - @Test - void solveAddsABGroupForSimilarPairsWithoutOverlappingDates() { - PairingData data = dataWithMembersAndCenters(List.of(member("field1", MemberRole.FIELD), member("external1", MemberRole.EXTERNAL), member("field2", MemberRole.FIELD), member("external2", MemberRole.EXTERNAL)), List.of(center("c1"), center("c2"))); - PairingCandidates candidates = PairingCandidates.builder().pairCandidates(List.of(PairCandidate.builder().fieldMemberId("field1").externalMemberId("external1").build(), PairCandidate.builder().fieldMemberId("field2").externalMemberId("external2").build())).dispatchRegionCandidates(List.of()).assignmentCandidates(List.of(assignment("field1", "external1", "c1", "A", LocalDate.of(2026, 5, 1)), assignment("field2", "external2", "c2", "A", LocalDate.of(2026, 5, 2)))).build(); - PairingResult result = service.solve(data, candidates); - Assertions.assertThat(result.getAssignments()).hasSize(2); - Assertions.assertThat(result.getAssignments()).extracting((assignment) -> assignment.getAbGroup()).containsOnly(new String[]{"AB-001"}); - Assertions.assertThat(result.getAssignments()).extracting((assignment) -> assignment.getBackupFieldMemberId()).containsExactlyInAnyOrder(new String[]{"field2", "field1"}); - } - - private PairingData dataWithCenters(String... centerIds) { - return dataWithMembersAndCenters(List.of(member("field", MemberRole.FIELD), member("external", MemberRole.EXTERNAL)), Arrays.stream(centerIds).map(this::center).toList()); - } - - private PairingData dataWithMembersAndCenters(List members, List
centers) { - return PairingData.builder().members(members).municipalities(List.of(Municipality.builder().id("municipality").availableStartDate(LocalDate.of(2026, 5, 1)).availableEndDate(LocalDate.of(2026, 5, 10)).unavailableDates(Set.of()).build())).centers(centers).memberRegionCodes(List.of()).centerAdjacentRegions(List.of()).preferenceMatchRules(List.of()).build(); - } - - private AssignmentCandidate assignment(String fieldMemberId, String externalMemberId, String centerId, String adjacentRegionClassification) { - return assignment(fieldMemberId, externalMemberId, centerId, adjacentRegionClassification, LocalDate.of(2026, 5, 1)); - } - - private AssignmentCandidate assignment(String fieldMemberId, String externalMemberId, String centerId, String adjacentRegionClassification, LocalDate date) { - return AssignmentCandidate.builder().fieldMemberId(fieldMemberId).externalMemberId(externalMemberId).centerId(centerId).municipalityId("municipality").date(date).dispatchRegion("01").adjacentRegionClassification(adjacentRegionClassification).preferencePriority(1).residenceMatchScore(0).build(); - } - - private Member member(String id, MemberRole role) { - return Member.builder().id(id).gender(Gender.FEMALE).experienceType(ExperienceType.EXPERIENCED).role(role).availableStartDate(LocalDate.of(2026, 5, 1)).availableEndDate(LocalDate.of(2026, 5, 10)).unavailableDates(Set.of()).activityRegion("02").historyCenterIds(Set.of()).residenceCode("01101").preferenceRegions(List.of("01", "00", "00", "00")).build(); - } - - private Center center(String id) { - return Center.builder().id(id).municipalityId("municipality").womenOnly(false).adjacentRegionClassification("A").availableStartDate(LocalDate.of(2026, 5, 1)).availableEndDate(LocalDate.of(2026, 5, 10)).unavailableDates(Set.of()).build(); - } -} diff --git a/src/test/java/com/kri/p6/ncrc/pairing/service/PairingTestSupport.java b/src/test/java/com/kri/p6/ncrc/pairing/service/PairingTestSupport.java deleted file mode 100644 index ea004f8..0000000 --- a/src/test/java/com/kri/p6/ncrc/pairing/service/PairingTestSupport.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.kri.p6.ncrc.pairing.service; - -import com.kri.p6.ncrc.pairing.config.PairingProperties; - -final class PairingTestSupport { - private PairingTestSupport() { - } - - static PairingProperties pairingProperties() { - PairingProperties properties = new PairingProperties(); - properties.getSolver().setMaxTimeSeconds(0.5); - return properties; - } -}