From 6497a12a460b6140b36f7a6f18a0b17e414371bb Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 22 Apr 2026 17:47:34 +0900 Subject: [PATCH] =?UTF-8?q?260422=5F01=5FENH:=20=EB=B3=B5=EC=88=98=20?= =?UTF-8?q?=EA=B6=8C=EC=97=AD=EC=9D=84=20=EA=B0=80=EC=A7=80=EB=8A=94=20?= =?UTF-8?q?=EC=9D=B8=EC=A0=91=EC=A7=80=EC=97=AD=20=EC=83=81=ED=94=BC?= =?UTF-8?q?=EC=A0=9C=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../pairing/service/PairingNewService.java | 96 +++++++++++++------ 2 files changed, 68 insertions(+), 30 deletions(-) diff --git a/build.gradle b/build.gradle index 92b1a27..214e551 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ repositories { } } dependencies { - implementation "com.kri.common:starter:beta.1.1.16" + implementation "com.kri.common:starter:beta.1.1.17" implementation "org.apache.poi:poi-ooxml:5.5.1" implementation 'org.springframework.boot:spring-boot-starter-web' diff --git a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingNewService.java b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingNewService.java index e4494c1..a970508 100644 --- a/src/main/java/com/kri/p6/ncrc/pairing/service/PairingNewService.java +++ b/src/main/java/com/kri/p6/ncrc/pairing/service/PairingNewService.java @@ -26,7 +26,6 @@ import java.time.LocalDate; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Comparator; -import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -55,12 +54,15 @@ public class PairingNewService { private final PairingProperties pairingProperties; public NewPairingResult pair(PairingData data) { + Map> dispatchRegionsByAdjacentClassification = + dispatchRegionsByAdjacentClassification(data); List newCenters = createNewCenters(data); List newAdjacentRegions = createNewAdjacentRegions(data, newCenters); List selectedPairs = sortSelectedPairsByAvailability( - matchMembers(data, newAdjacentRegions), newAdjacentRegions, data); + matchMembers(data, newAdjacentRegions, dispatchRegionsByAdjacentClassification), + newAdjacentRegions, dispatchRegionsByAdjacentClassification, data); NewAssignmentResult assignmentResult = assignAdjacentRegions(selectedPairs, newAdjacentRegions, - data); + dispatchRegionsByAdjacentClassification, data); return NewPairingResult.builder() .pairs(toPairRows(selectedPairs)) @@ -70,10 +72,19 @@ public class PairingNewService { .centers(toCenterRows(newCenters)) .summaries(createSummaries(data, selectedPairs, newCenters, newAdjacentRegions)) .scoreGuides(createScoreGuides()) - .ruleChecks(createRuleChecks(data, selectedPairs, assignmentResult)) + .ruleChecks(createRuleChecks(data, selectedPairs, assignmentResult, + dispatchRegionsByAdjacentClassification)) .build(); } + private Map> dispatchRegionsByAdjacentClassification(PairingData data) { + return data.getCenterAdjacentRegions().stream() + .collect(Collectors.groupingBy(CenterAdjacentRegion::getAdjacentRegionClassification, + LinkedHashMap::new, + Collectors.mapping(CenterAdjacentRegion::getDispatchRegion, + Collectors.toCollection(LinkedHashSet::new)))); + } + private List createNewCenters(PairingData data) { Map municipalityMap = data.getMunicipalities().stream() .collect(Collectors.toMap(Municipality::getId, Function.identity(), (left, right) -> left)); @@ -147,8 +158,7 @@ public class PairingNewService { .flatMap(center -> center.getUnavailableDates().stream()) .collect(Collectors.toCollection(LinkedHashSet::new)); unavailableDates.addAll(commonUnavailableDates); - Set centerSet = centers.stream() - .collect(Collectors.toCollection(LinkedHashSet::new)); + Set centerSet = new LinkedHashSet<>(centers); Set centerIds = centerSet.stream().map(NewCenter::getId) .collect(Collectors.toCollection(LinkedHashSet::new)); @@ -165,7 +175,8 @@ public class PairingNewService { } private List matchMembers(PairingData data, - List newAdjacentRegions) { + List newAdjacentRegions, + Map> dispatchRegionsByAdjacentClassification) { List fieldMembers = data.getMembers().stream() .filter(member -> member.getRole() == MemberRole.FIELD) .sorted(Comparator.comparing(Member::getId)) @@ -182,7 +193,7 @@ public class PairingNewService { } List candidates = createPairCandidates(fieldMembers, externalMembers, - data, newAdjacentRegions); + data, newAdjacentRegions, dispatchRegionsByAdjacentClassification); MinCostMatcher matcher = new MinCostMatcher(fieldMembers.size(), externalMembers.size()); long maxScore = candidates.stream().mapToLong(ScoredPair::score).max().orElse(0L); for (ScoredPair candidate : candidates) { @@ -206,7 +217,8 @@ public class PairingNewService { } private List createPairCandidates(List fieldMembers, - List externalMembers, PairingData data, List newAdjacentRegions) { + List externalMembers, PairingData data, List newAdjacentRegions, + Map> dispatchRegionsByAdjacentClassification) { List candidates = new ArrayList<>(); for (int fieldIndex = 0; fieldIndex < fieldMembers.size(); fieldIndex++) { Member fieldMember = fieldMembers.get(fieldIndex); @@ -217,14 +229,15 @@ public class PairingNewService { continue; } candidates.add(scorePair(fieldIndex, externalIndex, fieldMember, externalMember, - data, newAdjacentRegions)); + data, newAdjacentRegions, dispatchRegionsByAdjacentClassification)); } } return candidates; } private ScoredPair scorePair(int fieldIndex, int externalIndex, Member fieldMember, - Member externalMember, PairingData data, List newAdjacentRegions) { + Member externalMember, PairingData data, List newAdjacentRegions, + Map> dispatchRegionsByAdjacentClassification) { int activityOverlap = overlapCount(csvSet(fieldMember.getActivityRegion()), csvSet(externalMember.getActivityRegion())); int dateOverlap = availableDateOverlapCount(fieldMember, externalMember, @@ -233,7 +246,8 @@ public class PairingNewService { int historyScore = historyScore(fieldMember, externalMember); int residenceScore = residenceScore(fieldMember, externalMember); AvailableRegionStats availability = USE_AVAILABLE_ADJACENT_REGION_IN_PAIR_SCORE - ? availableRegionStats(fieldMember, externalMember, newAdjacentRegions, data) + ? availableRegionStats(fieldMember, externalMember, newAdjacentRegions, + dispatchRegionsByAdjacentClassification, data) : AvailableRegionStats.empty(); long score = activityOverlap * ACTIVITY_WEIGHT + dateOverlap * DATE_WEIGHT @@ -247,10 +261,12 @@ public class PairingNewService { } private List sortSelectedPairsByAvailability(List pairs, - List newAdjacentRegions, PairingData data) { + List newAdjacentRegions, + Map> dispatchRegionsByAdjacentClassification, PairingData data) { return pairs.stream() .map(pair -> pair.withAvailability(availableRegionStats(pair.fieldMember(), - pair.externalMember(), newAdjacentRegions, data))) + pair.externalMember(), newAdjacentRegions, dispatchRegionsByAdjacentClassification, + data))) .sorted(Comparator.comparingInt(ScoredPair::availableAdjacentRegionCount) .thenComparingInt(ScoredPair::availableAdjacentRegionDateCount) .thenComparing(Comparator.comparingLong(ScoredPair::score).reversed()) @@ -260,7 +276,8 @@ public class PairingNewService { } private AvailableRegionStats availableRegionStats(Member fieldMember, Member externalMember, - List newAdjacentRegions, PairingData data) { + List newAdjacentRegions, + Map> dispatchRegionsByAdjacentClassification, PairingData data) { int regionCount = 0; Set availableDates = new LinkedHashSet<>(); for (NewAdjacentRegion region : newAdjacentRegions) { @@ -268,8 +285,8 @@ public class PairingNewService { || externalMember.getGender() != Gender.FEMALE)) { continue; } - if (hasActivityRegion(fieldMember, region.getDispatchRegion()) - || hasActivityRegion(externalMember, region.getDispatchRegion())) { + if (hasActivityRegion(fieldMember, region, dispatchRegionsByAdjacentClassification) + || hasActivityRegion(externalMember, region, dispatchRegionsByAdjacentClassification)) { continue; } if (hasHistoryConflict(fieldMember, externalMember, region.getCenterIds())) { @@ -424,7 +441,8 @@ public class PairingNewService { } private NewAssignmentResult assignAdjacentRegions(List pairs, - List newAdjacentRegions, PairingData data) { + List newAdjacentRegions, + Map> dispatchRegionsByAdjacentClassification, PairingData data) { Map pairNoMap = new LinkedHashMap<>(); for (int i = 0; i < pairs.size(); i++) { pairNoMap.put(pairs.get(i), String.valueOf(i + 1)); @@ -442,7 +460,8 @@ public class PairingNewService { assignedInPass = false; for (ScoredPair pair : pairs) { AssignmentChoice choice = findBestAssignmentChoice(pair, newAdjacentRegions, data, - assignedAdjacentClassifications, usedDatesByPair.get(pair)); + assignedAdjacentClassifications, usedDatesByPair.get(pair), + dispatchRegionsByAdjacentClassification); if (choice == null) { continue; } @@ -479,7 +498,8 @@ public class PairingNewService { private AssignmentChoice findBestAssignmentChoice(ScoredPair pair, List newAdjacentRegions, PairingData data, - Set assignedAdjacentClassifications, Set usedDates) { + Set assignedAdjacentClassifications, Set usedDates, + Map> dispatchRegionsByAdjacentClassification) { AssignmentChoice bestChoice = null; for (NewAdjacentRegion region : newAdjacentRegions) { if (assignedAdjacentClassifications.contains(region.getAdjacentRegionClassification())) { @@ -489,8 +509,9 @@ public class PairingNewService { || pair.externalMember().getGender() != Gender.FEMALE)) { continue; } - if (hasActivityRegion(pair.fieldMember(), region.getDispatchRegion()) - || hasActivityRegion(pair.externalMember(), region.getDispatchRegion())) { + if (hasActivityRegion(pair.fieldMember(), region, dispatchRegionsByAdjacentClassification) + || hasActivityRegion(pair.externalMember(), region, + dispatchRegionsByAdjacentClassification)) { continue; } if (hasHistoryConflict(pair.fieldMember(), pair.externalMember(), region.getCenterIds())) { @@ -590,7 +611,8 @@ public class PairingNewService { } private List createRuleChecks(PairingData data, - List selectedPairs, NewAssignmentResult assignmentResult) { + List selectedPairs, NewAssignmentResult assignmentResult, + Map> dispatchRegionsByAdjacentClassification) { Set fieldIds = selectedPairs.stream().map(pair -> pair.fieldMember().getId()) .collect(Collectors.toCollection(LinkedHashSet::new)); Set externalIds = selectedPairs.stream().map(pair -> pair.externalMember().getId()) @@ -618,12 +640,14 @@ public class PairingNewService { checks.add(new RuleViolationExcelDto("신규+신규 페어 금지", passFail(!hasNewNewPair), hasNewNewPair ? "신규+신규 페어가 존재합니다." : "위반 없음")); - checks.addAll(createAssignmentRuleChecks(assignmentResult)); + checks.addAll(createAssignmentRuleChecks(assignmentResult, + dispatchRegionsByAdjacentClassification)); return checks; } private List createAssignmentRuleChecks( - NewAssignmentResult assignmentResult) { + NewAssignmentResult assignmentResult, + Map> dispatchRegionsByAdjacentClassification) { List audits = assignmentResult.audits(); List checks = new ArrayList<>(); @@ -653,9 +677,9 @@ public class PairingNewService { List conflictRegionViolations = audits.stream() .filter(audit -> hasActivityRegion(audit.pair().fieldMember(), - audit.choice().region().getDispatchRegion()) + audit.choice().region(), dispatchRegionsByAdjacentClassification) || hasActivityRegion(audit.pair().externalMember(), - audit.choice().region().getDispatchRegion())) + audit.choice().region(), dispatchRegionsByAdjacentClassification)) .map(this::assignmentDetail) .toList(); checks.add(new RuleViolationExcelDto("상피제 준수", @@ -789,8 +813,22 @@ public class PairingNewService { .collect(Collectors.toCollection(LinkedHashSet::new)); } - private boolean hasActivityRegion(Member member, String dispatchRegion) { - return csvSet(member.getActivityRegion()).contains(dispatchRegion); + private boolean hasActivityRegion(Member member, NewAdjacentRegion region, + Map> dispatchRegionsByAdjacentClassification) { + Set memberActivityRegions = csvSet(member.getActivityRegion()); + if (memberActivityRegions.isEmpty()) { + return false; + } + + Set adjacentDispatchRegions = new LinkedHashSet<>( + dispatchRegionsByAdjacentClassification.getOrDefault( + region.getAdjacentRegionClassification(), Set.of())); + if (adjacentDispatchRegions.isEmpty()) { + adjacentDispatchRegions = new LinkedHashSet<>(Set.of(region.getDispatchRegion())); + } + + adjacentDispatchRegions.retainAll(memberActivityRegions); + return !adjacentDispatchRegions.isEmpty(); } private Set preferenceSet(Member member) {