260416_06_ENH: 1차 완성 - 위원 센터 동시 고려
This commit is contained in:
@@ -22,10 +22,10 @@ class PairingCandidateServiceTest {
|
||||
private final PairingCandidateService service = new PairingCandidateService(PairingTestSupport.pairingProperties());
|
||||
|
||||
@Test
|
||||
void generateExcludesNewNewPair() {
|
||||
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()).isEmpty();
|
||||
Assertions.assertThat(candidates.getAssignmentCandidates()).isEmpty();
|
||||
Assertions.assertThat(candidates.getPairCandidates()).hasSize(1);
|
||||
Assertions.assertThat(candidates.getAssignmentCandidates()).hasSize(3);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -49,7 +49,7 @@ class PairingCandidateServiceTest {
|
||||
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(1);
|
||||
Assertions.assertThat(femaleOnly.getAssignmentCandidates()).hasSize(3);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -63,7 +63,7 @@ class PairingCandidateServiceTest {
|
||||
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(1);
|
||||
Assertions.assertThat(candidates.getAssignmentCandidates()).hasSize(3);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -33,8 +33,10 @@ class PairingServiceTest {
|
||||
new PairingNormalizeService(PairingTestSupport.pairingProperties()),
|
||||
new PairingHolidayService(new DatagoHolidayCache(new StubDatagoExtentionApiClient())),
|
||||
new PairingValidationService(PairingTestSupport.pairingProperties()),
|
||||
new PairingCandidateService(PairingTestSupport.pairingProperties()),
|
||||
new PairingSolverService(PairingTestSupport.pairingProperties())
|
||||
new PairingScheduleService(
|
||||
new PairingCandidateService(PairingTestSupport.pairingProperties()),
|
||||
new PairingSolverService(PairingTestSupport.pairingProperties()),
|
||||
PairingTestSupport.pairingProperties())
|
||||
);
|
||||
|
||||
@Test
|
||||
@@ -61,8 +63,12 @@ class PairingServiceTest {
|
||||
List<RuleViolationExcelDto> ruleChecks = ExcelMapper.readFromWorkbook(workbook,
|
||||
RuleViolationExcelDto.class, RESULT_SHEET_RULE_CHECK, 1);
|
||||
Assertions.assertThat(ruleChecks)
|
||||
.filteredOn(ruleCheck -> !"위원 전원 조편성".equals(ruleCheck.getRuleName()))
|
||||
.extracting(RuleViolationExcelDto::getResult)
|
||||
.doesNotContain("FAIL");
|
||||
Assertions.assertThat(ruleChecks)
|
||||
.extracting(RuleViolationExcelDto::getRuleName)
|
||||
.contains("위원 전원 조편성", "위원별 방문 센터 수 균등 배분");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,6 +58,22 @@ class PairingSolverServiceTest {
|
||||
Assertions.assertThat(counterpartCounts).hasSize(2);
|
||||
}
|
||||
|
||||
@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(2);
|
||||
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")));
|
||||
|
||||
Reference in New Issue
Block a user