260416_03_DOC: 코드 양식 정규화
This commit is contained in:
@@ -10,6 +10,7 @@ import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
|
|||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
@ConfigurationPropertiesScan
|
@ConfigurationPropertiesScan
|
||||||
public class NcrcPairingApplication {
|
public class NcrcPairingApplication {
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
private static final Logger log = LoggerFactory.getLogger(NcrcPairingApplication.class);
|
private static final Logger log = LoggerFactory.getLogger(NcrcPairingApplication.class);
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Component;
|
|||||||
|
|
||||||
@Component
|
@Component
|
||||||
public class DatagoHolidayCache extends AbstractListCache<HolidayDto> {
|
public class DatagoHolidayCache extends AbstractListCache<HolidayDto> {
|
||||||
|
|
||||||
private final DatagoExtentionApiClient datagoExtentionApiClient;
|
private final DatagoExtentionApiClient datagoExtentionApiClient;
|
||||||
|
|
||||||
public synchronized List<HolidayDto> getHolidays(Set<String> years) {
|
public synchronized List<HolidayDto> getHolidays(Set<String> years) {
|
||||||
@@ -38,7 +39,6 @@ public class DatagoHolidayCache extends AbstractListCache<HolidayDto> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public DatagoHolidayCache(final DatagoExtentionApiClient datagoExtentionApiClient) {
|
public DatagoHolidayCache(final DatagoExtentionApiClient datagoExtentionApiClient) {
|
||||||
this.datagoExtentionApiClient = datagoExtentionApiClient;
|
this.datagoExtentionApiClient = datagoExtentionApiClient;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.kri.p6.ncrc.pairing.common.consts;
|
package com.kri.p6.ncrc.pairing.common.consts;
|
||||||
|
|
||||||
public final class PairingConstant {
|
public final class PairingConstant {
|
||||||
|
|
||||||
public static final String SHEET_MEMBER = "위원정보";
|
public static final String SHEET_MEMBER = "위원정보";
|
||||||
public static final String SHEET_MUNICIPALITY = "지자체 정보";
|
public static final String SHEET_MUNICIPALITY = "지자체 정보";
|
||||||
public static final String SHEET_CENTER = "센터정보";
|
public static final String SHEET_CENTER = "센터정보";
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ import com.kri.common.feature.http.ExternalApiClient;
|
|||||||
import com.kri.common.feature.http.ExternalApiResponse;
|
import com.kri.common.feature.http.ExternalApiResponse;
|
||||||
import com.kri.common.feature.web.BusinessException;
|
import com.kri.common.feature.web.BusinessException;
|
||||||
import com.kri.p6.ncrc.pairing.common.external.datago.DatagoHolidayApiResponseDto.Body;
|
import com.kri.p6.ncrc.pairing.common.external.datago.DatagoHolidayApiResponseDto.Body;
|
||||||
|
import com.kri.p6.ncrc.pairing.common.external.datago.DatagoHolidayApiResponseDto.DatagoHolidayItemDto;
|
||||||
import com.kri.p6.ncrc.pairing.common.external.datago.DatagoHolidayApiResponseDto.Items;
|
import com.kri.p6.ncrc.pairing.common.external.datago.DatagoHolidayApiResponseDto.Items;
|
||||||
import com.kri.p6.ncrc.pairing.common.external.datago.DatagoHolidayApiResponseDto.Response;
|
import com.kri.p6.ncrc.pairing.common.external.datago.DatagoHolidayApiResponseDto.Response;
|
||||||
import com.kri.p6.ncrc.pairing.common.external.datago.DatagoHolidayApiResponseDto.DatagoHolidayItemDto;
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
|
|||||||
|
|
||||||
@Component
|
@Component
|
||||||
public class DatagoExtentionApiClient {
|
public class DatagoExtentionApiClient {
|
||||||
|
|
||||||
private final ExternalApiClient externalApiClient = new ExternalApiClient();
|
private final ExternalApiClient externalApiClient = new ExternalApiClient();
|
||||||
private final ObjectMapper objectMapper = new ObjectMapper();
|
private final ObjectMapper objectMapper = new ObjectMapper();
|
||||||
@Value("${kri.auth.servicekey}")
|
@Value("${kri.auth.servicekey}")
|
||||||
@@ -25,14 +26,16 @@ public class DatagoExtentionApiClient {
|
|||||||
|
|
||||||
public List<HolidayDto> getHoliDayList(String year) {
|
public List<HolidayDto> getHoliDayList(String year) {
|
||||||
String baseUrl = "http://apis.data.go.kr/B090041/openapi/service/SpcdeInfoService/getRestDeInfo";
|
String baseUrl = "http://apis.data.go.kr/B090041/openapi/service/SpcdeInfoService/getRestDeInfo";
|
||||||
String url = String.format("%s?ServiceKey=%s&pageNo=1&_type=json&numOfRows=1000&solYear=%s", baseUrl, serviceKey, year);
|
String url = String.format("%s?ServiceKey=%s&pageNo=1&_type=json&numOfRows=1000&solYear=%s",
|
||||||
|
baseUrl, serviceKey, year);
|
||||||
Map<String, String> headers = new HashMap();
|
Map<String, String> headers = new HashMap();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
ExternalApiResponse response = externalApiClient.get(url, headers);
|
ExternalApiResponse response = externalApiClient.get(url, headers);
|
||||||
|
|
||||||
if (response != null && response.getBody() != null && !response.getBody().isBlank()) {
|
if (response != null && response.getBody() != null && !response.getBody().isBlank()) {
|
||||||
DatagoHolidayApiResponseDto apiResponse = objectMapper.readValue(response.getBody(), DatagoHolidayApiResponseDto.class);
|
DatagoHolidayApiResponseDto apiResponse = objectMapper.readValue(response.getBody(),
|
||||||
|
DatagoHolidayApiResponseDto.class);
|
||||||
List<DatagoHolidayItemDto> items = Optional.ofNullable(apiResponse)
|
List<DatagoHolidayItemDto> items = Optional.ofNullable(apiResponse)
|
||||||
.map(DatagoHolidayApiResponseDto::getResponse)
|
.map(DatagoHolidayApiResponseDto::getResponse)
|
||||||
.map(Response::getBody)
|
.map(Response::getBody)
|
||||||
@@ -40,12 +43,14 @@ public class DatagoExtentionApiClient {
|
|||||||
.map(Items::getItem)
|
.map(Items::getItem)
|
||||||
.orElse(Collections.emptyList());
|
.orElse(Collections.emptyList());
|
||||||
|
|
||||||
return items.stream().map(item -> HolidayDto.of(item.getLocdate(), item.getDateName())).toList();
|
return items.stream().map(item -> HolidayDto.of(item.getLocdate(), item.getDateName()))
|
||||||
|
.toList();
|
||||||
} else {
|
} else {
|
||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw BusinessException.internalError("DATAGO_HOLIDAY_API_FAILED", "국공휴일 정보를 조회하는 중 오류가 발생했습니다: " + e.getMessage());
|
throw BusinessException.internalError("DATAGO_HOLIDAY_API_FAILED",
|
||||||
|
"국공휴일 정보를 조회하는 중 오류가 발생했습니다: " + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
package com.kri.p6.ncrc.pairing.common.external.datago;
|
package com.kri.p6.ncrc.pairing.common.external.datago;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat.Feature;
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat.Feature;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
@@ -11,6 +11,7 @@ import lombok.Generated;
|
|||||||
ignoreUnknown = true
|
ignoreUnknown = true
|
||||||
)
|
)
|
||||||
public class DatagoHolidayApiResponseDto {
|
public class DatagoHolidayApiResponseDto {
|
||||||
|
|
||||||
private Response response;
|
private Response response;
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
@@ -27,6 +28,7 @@ public class DatagoHolidayApiResponseDto {
|
|||||||
ignoreUnknown = true
|
ignoreUnknown = true
|
||||||
)
|
)
|
||||||
public static class Response {
|
public static class Response {
|
||||||
|
|
||||||
private Header header;
|
private Header header;
|
||||||
private Body body;
|
private Body body;
|
||||||
|
|
||||||
@@ -55,6 +57,7 @@ public class DatagoHolidayApiResponseDto {
|
|||||||
ignoreUnknown = true
|
ignoreUnknown = true
|
||||||
)
|
)
|
||||||
public static class Header {
|
public static class Header {
|
||||||
|
|
||||||
private String resultCode;
|
private String resultCode;
|
||||||
private String resultMsg;
|
private String resultMsg;
|
||||||
|
|
||||||
@@ -83,6 +86,7 @@ public class DatagoHolidayApiResponseDto {
|
|||||||
ignoreUnknown = true
|
ignoreUnknown = true
|
||||||
)
|
)
|
||||||
public static class Body {
|
public static class Body {
|
||||||
|
|
||||||
private Integer numOfRows;
|
private Integer numOfRows;
|
||||||
private Integer pageNo;
|
private Integer pageNo;
|
||||||
private Integer totalCount;
|
private Integer totalCount;
|
||||||
@@ -133,6 +137,7 @@ public class DatagoHolidayApiResponseDto {
|
|||||||
ignoreUnknown = true
|
ignoreUnknown = true
|
||||||
)
|
)
|
||||||
public static class Items {
|
public static class Items {
|
||||||
|
|
||||||
@JsonProperty("item")
|
@JsonProperty("item")
|
||||||
@JsonFormat(
|
@JsonFormat(
|
||||||
with = {Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY}
|
with = {Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY}
|
||||||
@@ -151,6 +156,7 @@ public class DatagoHolidayApiResponseDto {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static class DatagoHolidayItemDto {
|
public static class DatagoHolidayItemDto {
|
||||||
|
|
||||||
private String dateKind;
|
private String dateKind;
|
||||||
private String dateName;
|
private String dateName;
|
||||||
private String isHoliday;
|
private String isHoliday;
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
package com.kri.p6.ncrc.pairing.common.external.datago;
|
|
||||||
|
|
||||||
public class DatagoHolidayItemDto {
|
|
||||||
}
|
|
||||||
@@ -3,6 +3,7 @@ package com.kri.p6.ncrc.pairing.common.external.datago;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class HolidayDto {
|
public class HolidayDto {
|
||||||
|
|
||||||
private String holidayDate;
|
private String holidayDate;
|
||||||
private String holidayName;
|
private String holidayName;
|
||||||
|
|
||||||
@@ -37,6 +38,7 @@ public class HolidayDto {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public static class HolidayDtoBuilder {
|
public static class HolidayDtoBuilder {
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
private String holidayDate;
|
private String holidayDate;
|
||||||
@Generated
|
@Generated
|
||||||
@@ -65,7 +67,8 @@ public class HolidayDto {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "HolidayDto.HolidayDtoBuilder(holidayDate=" + this.holidayDate + ", holidayName=" + this.holidayName + ")";
|
return "HolidayDto.HolidayDtoBuilder(holidayDate=" + this.holidayDate + ", holidayName="
|
||||||
|
+ this.holidayName + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,14 +2,18 @@ package com.kri.p6.ncrc.pairing.common.util;
|
|||||||
|
|
||||||
import java.net.URLEncoder;
|
import java.net.URLEncoder;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import lombok.Generated;
|
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
|
|
||||||
public final class ExcelResponseBuilder {
|
public final class ExcelResponseBuilder {
|
||||||
|
|
||||||
public static ResponseEntity<byte[]> buildExcelResponse(String fileName, byte[] bytes) {
|
public static ResponseEntity<byte[]> buildExcelResponse(String fileName, byte[] bytes) {
|
||||||
String var10000 = URLEncoder.encode(fileName, StandardCharsets.UTF_8);
|
String var10000 = URLEncoder.encode(fileName, StandardCharsets.UTF_8);
|
||||||
String contentDisposition = "attachment; filename*=UTF-8''" + var10000.replace("+", "%20");
|
String contentDisposition = "attachment; filename*=UTF-8''" + var10000.replace("+", "%20");
|
||||||
return ((ResponseEntity.BodyBuilder)ResponseEntity.ok().header("Content-Disposition", new String[]{contentDisposition})).contentType(MediaType.parseMediaType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")).body(bytes);
|
|
||||||
|
return (ResponseEntity.ok()
|
||||||
|
.header("Content-Disposition", contentDisposition)).contentType(
|
||||||
|
MediaType.parseMediaType(
|
||||||
|
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")).body(bytes);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import org.springframework.context.annotation.Configuration;
|
|||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
public class OrToolsConfig {
|
public class OrToolsConfig {
|
||||||
|
|
||||||
@PostConstruct
|
@PostConstruct
|
||||||
public void init() {
|
public void init() {
|
||||||
Loader.loadNativeLibraries();
|
Loader.loadNativeLibraries();
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
|
|||||||
prefix = "pairing"
|
prefix = "pairing"
|
||||||
)
|
)
|
||||||
public class PairingProperties {
|
public class PairingProperties {
|
||||||
|
|
||||||
private Excel excel = new Excel();
|
private Excel excel = new Excel();
|
||||||
private Code code = new Code();
|
private Code code = new Code();
|
||||||
private Rule rule = new Rule();
|
private Rule rule = new Rule();
|
||||||
@@ -75,6 +76,7 @@ public class PairingProperties {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static class Excel {
|
public static class Excel {
|
||||||
|
|
||||||
private int headerRowIndex = 1;
|
private int headerRowIndex = 1;
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
@@ -89,6 +91,7 @@ public class PairingProperties {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static class Code {
|
public static class Code {
|
||||||
|
|
||||||
private int regionCodeLength = 2;
|
private int regionCodeLength = 2;
|
||||||
private int residenceCodeLength = 5;
|
private int residenceCodeLength = 5;
|
||||||
private int residenceMatchPrefixLength = 3;
|
private int residenceMatchPrefixLength = 3;
|
||||||
@@ -136,6 +139,7 @@ public class PairingProperties {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static class Rule {
|
public static class Rule {
|
||||||
|
|
||||||
private int maxCentersPerPairPerDay = 3;
|
private int maxCentersPerPairPerDay = 3;
|
||||||
private int maxCounterpartsPerMember = 2;
|
private int maxCounterpartsPerMember = 2;
|
||||||
|
|
||||||
@@ -161,6 +165,7 @@ public class PairingProperties {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static class Preference {
|
public static class Preference {
|
||||||
|
|
||||||
private int anywhereRank = 0;
|
private int anywhereRank = 0;
|
||||||
private int ignoredRank = 99;
|
private int ignoredRank = 99;
|
||||||
|
|
||||||
@@ -186,6 +191,7 @@ public class PairingProperties {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static class Objective {
|
public static class Objective {
|
||||||
|
|
||||||
private long assignmentWeight = 1000000L;
|
private long assignmentWeight = 1000000L;
|
||||||
private long preferenceBaseWeight = 10000L;
|
private long preferenceBaseWeight = 10000L;
|
||||||
private long preferenceRankPenalty = 100L;
|
private long preferenceRankPenalty = 100L;
|
||||||
@@ -233,6 +239,7 @@ public class PairingProperties {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static class Solver {
|
public static class Solver {
|
||||||
|
|
||||||
private double maxTimeSeconds = (double) 30.0F;
|
private double maxTimeSeconds = (double) 30.0F;
|
||||||
private int numSearchWorkers = Math.max(1, Runtime.getRuntime().availableProcessors() - 1);
|
private int numSearchWorkers = Math.max(1, Runtime.getRuntime().availableProcessors() - 1);
|
||||||
|
|
||||||
|
|||||||
@@ -6,12 +6,10 @@ import com.kri.p6.ncrc.pairing.common.external.datago.HolidayDto;
|
|||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
@@ -26,7 +24,7 @@ public class CacheAdminController {
|
|||||||
@Operation(summary = "국공휴일 캐시 조회")
|
@Operation(summary = "국공휴일 캐시 조회")
|
||||||
@GetMapping("/holiday/{year}")
|
@GetMapping("/holiday/{year}")
|
||||||
public List<HolidayDto> getHolidays(
|
public List<HolidayDto> getHolidays(
|
||||||
@PathVariable("year") String year
|
@PathVariable String year
|
||||||
) {
|
) {
|
||||||
if (year.length() != 4) {
|
if (year.length() != 4) {
|
||||||
throw BusinessException.badRequest("INVALID_YEAR_FORMAT", "년도 형식이 올바르지 않습니다.");
|
throw BusinessException.badRequest("INVALID_YEAR_FORMAT", "년도 형식이 올바르지 않습니다.");
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|||||||
description = "위원/센터 매칭 API"
|
description = "위원/센터 매칭 API"
|
||||||
)
|
)
|
||||||
public class PairingController {
|
public class PairingController {
|
||||||
|
|
||||||
private final PairingService pairingService;
|
private final PairingService pairingService;
|
||||||
private final PairingExcelService pairingExcelService;
|
private final PairingExcelService pairingExcelService;
|
||||||
|
|
||||||
@@ -30,7 +31,8 @@ public class PairingController {
|
|||||||
@Operation(
|
@Operation(
|
||||||
summary = "업로드된 파일로 위원과 센터를 매칭"
|
summary = "업로드된 파일로 위원과 센터를 매칭"
|
||||||
)
|
)
|
||||||
public ResponseEntity<byte[]> pairingMemberByCenter(@Parameter(description = "업로드 파일",required = true) @RequestPart("file") MultipartFile file) {
|
public ResponseEntity<byte[]> pairingMemberByCenter(
|
||||||
|
@Parameter(description = "업로드 파일", required = true) @RequestPart("file") MultipartFile file) {
|
||||||
String fileName = file.getOriginalFilename() == null ? "pairing" : file.getOriginalFilename();
|
String fileName = file.getOriginalFilename() == null ? "pairing" : file.getOriginalFilename();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -47,7 +49,8 @@ public class PairingController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingController(final PairingService pairingService, final PairingExcelService pairingExcelService) {
|
public PairingController(final PairingService pairingService,
|
||||||
|
final PairingExcelService pairingExcelService) {
|
||||||
this.pairingService = pairingService;
|
this.pairingService = pairingService;
|
||||||
this.pairingExcelService = pairingExcelService;
|
this.pairingExcelService = pairingExcelService;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.kri.common.feature.excel.ExcelColumn;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class CenterAdjacentRegionExcelDto {
|
public class CenterAdjacentRegionExcelDto {
|
||||||
|
|
||||||
@ExcelColumn(
|
@ExcelColumn(
|
||||||
header = "권역",
|
header = "권역",
|
||||||
order = 0,
|
order = 0,
|
||||||
@@ -85,13 +86,15 @@ public class CenterAdjacentRegionExcelDto {
|
|||||||
Object $dispatchRegion = this.getDispatchRegion();
|
Object $dispatchRegion = this.getDispatchRegion();
|
||||||
result = result * 59 + ($dispatchRegion == null ? 43 : $dispatchRegion.hashCode());
|
result = result * 59 + ($dispatchRegion == null ? 43 : $dispatchRegion.hashCode());
|
||||||
Object $adjacentRegionClassification = this.getAdjacentRegionClassification();
|
Object $adjacentRegionClassification = this.getAdjacentRegionClassification();
|
||||||
result = result * 59 + ($adjacentRegionClassification == null ? 43 : $adjacentRegionClassification.hashCode());
|
result = result * 59 + ($adjacentRegionClassification == null ? 43
|
||||||
|
: $adjacentRegionClassification.hashCode());
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.getDispatchRegion();
|
String var10000 = this.getDispatchRegion();
|
||||||
return "CenterAdjacentRegionExcelDto(dispatchRegion=" + var10000 + ", adjacentRegionClassification=" + this.getAdjacentRegionClassification() + ")";
|
return "CenterAdjacentRegionExcelDto(dispatchRegion=" + var10000
|
||||||
|
+ ", adjacentRegionClassification=" + this.getAdjacentRegionClassification() + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.kri.common.feature.excel.ExcelColumn;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class CenterExcelDto {
|
public class CenterExcelDto {
|
||||||
|
|
||||||
@ExcelColumn(
|
@ExcelColumn(
|
||||||
header = "id",
|
header = "id",
|
||||||
order = 0,
|
order = 0,
|
||||||
@@ -219,7 +220,8 @@ public class CenterExcelDto {
|
|||||||
Object $womenOnly = this.getWomenOnly();
|
Object $womenOnly = this.getWomenOnly();
|
||||||
result = result * 59 + ($womenOnly == null ? 43 : $womenOnly.hashCode());
|
result = result * 59 + ($womenOnly == null ? 43 : $womenOnly.hashCode());
|
||||||
Object $adjacentRegionClassification = this.getAdjacentRegionClassification();
|
Object $adjacentRegionClassification = this.getAdjacentRegionClassification();
|
||||||
result = result * 59 + ($adjacentRegionClassification == null ? 43 : $adjacentRegionClassification.hashCode());
|
result = result * 59 + ($adjacentRegionClassification == null ? 43
|
||||||
|
: $adjacentRegionClassification.hashCode());
|
||||||
Object $availableStartDate = this.getAvailableStartDate();
|
Object $availableStartDate = this.getAvailableStartDate();
|
||||||
result = result * 59 + ($availableStartDate == null ? 43 : $availableStartDate.hashCode());
|
result = result * 59 + ($availableStartDate == null ? 43 : $availableStartDate.hashCode());
|
||||||
Object $availableEndDate = this.getAvailableEndDate();
|
Object $availableEndDate = this.getAvailableEndDate();
|
||||||
@@ -232,6 +234,10 @@ public class CenterExcelDto {
|
|||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.getId();
|
String var10000 = this.getId();
|
||||||
return "CenterExcelDto(id=" + var10000 + ", municipalityId=" + this.getMunicipalityId() + ", womenOnly=" + this.getWomenOnly() + ", adjacentRegionClassification=" + this.getAdjacentRegionClassification() + ", availableStartDate=" + this.getAvailableStartDate() + ", availableEndDate=" + this.getAvailableEndDate() + ", unavailableDates=" + this.getUnavailableDates() + ")";
|
return "CenterExcelDto(id=" + var10000 + ", municipalityId=" + this.getMunicipalityId()
|
||||||
|
+ ", womenOnly=" + this.getWomenOnly() + ", adjacentRegionClassification="
|
||||||
|
+ this.getAdjacentRegionClassification() + ", availableStartDate="
|
||||||
|
+ this.getAvailableStartDate() + ", availableEndDate=" + this.getAvailableEndDate()
|
||||||
|
+ ", unavailableDates=" + this.getUnavailableDates() + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.kri.common.feature.excel.ExcelColumn;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class MemberExcelDto {
|
public class MemberExcelDto {
|
||||||
|
|
||||||
@ExcelColumn(
|
@ExcelColumn(
|
||||||
header = "id",
|
header = "id",
|
||||||
order = 0,
|
order = 0,
|
||||||
@@ -428,6 +429,14 @@ public class MemberExcelDto {
|
|||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.getId();
|
String var10000 = this.getId();
|
||||||
return "MemberExcelDto(id=" + var10000 + ", gender=" + this.getGender() + ", experience=" + this.getExperience() + ", role=" + this.getRole() + ", availableStartDate=" + this.getAvailableStartDate() + ", availableEndDate=" + this.getAvailableEndDate() + ", unavailableDates=" + this.getUnavailableDates() + ", activityRegion=" + this.getActivityRegion() + ", historyCenters=" + this.getHistoryCenters() + ", residenceCode=" + this.getResidenceCode() + ", preferenceRegion1=" + this.getPreferenceRegion1() + ", preferenceRegion2=" + this.getPreferenceRegion2() + ", preferenceRegion3=" + this.getPreferenceRegion3() + ", preferenceRegion4=" + this.getPreferenceRegion4() + ")";
|
return "MemberExcelDto(id=" + var10000 + ", gender=" + this.getGender() + ", experience="
|
||||||
|
+ this.getExperience() + ", role=" + this.getRole() + ", availableStartDate="
|
||||||
|
+ this.getAvailableStartDate() + ", availableEndDate=" + this.getAvailableEndDate()
|
||||||
|
+ ", unavailableDates=" + this.getUnavailableDates() + ", activityRegion="
|
||||||
|
+ this.getActivityRegion() + ", historyCenters=" + this.getHistoryCenters()
|
||||||
|
+ ", residenceCode=" + this.getResidenceCode() + ", preferenceRegion1="
|
||||||
|
+ this.getPreferenceRegion1() + ", preferenceRegion2=" + this.getPreferenceRegion2()
|
||||||
|
+ ", preferenceRegion3=" + this.getPreferenceRegion3() + ", preferenceRegion4="
|
||||||
|
+ this.getPreferenceRegion4() + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.kri.common.feature.excel.ExcelColumn;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class MemberRegionCodeExcelDto {
|
public class MemberRegionCodeExcelDto {
|
||||||
|
|
||||||
@ExcelColumn(
|
@ExcelColumn(
|
||||||
header = "시도",
|
header = "시도",
|
||||||
order = 0,
|
order = 0,
|
||||||
@@ -204,6 +205,9 @@ public class MemberRegionCodeExcelDto {
|
|||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.getSido();
|
String var10000 = this.getSido();
|
||||||
return "MemberRegionCodeExcelDto(sido=" + var10000 + ", sigungu=" + this.getSigungu() + ", regionCode=" + this.getRegionCode() + ", detailRegionCode=" + this.getDetailRegionCode() + ", detailAreaCode=" + this.getDetailAreaCode() + ", fullRegionCode=" + this.getFullRegionCode() + ")";
|
return "MemberRegionCodeExcelDto(sido=" + var10000 + ", sigungu=" + this.getSigungu()
|
||||||
|
+ ", regionCode=" + this.getRegionCode() + ", detailRegionCode="
|
||||||
|
+ this.getDetailRegionCode() + ", detailAreaCode=" + this.getDetailAreaCode()
|
||||||
|
+ ", fullRegionCode=" + this.getFullRegionCode() + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.kri.common.feature.excel.ExcelColumn;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class MunicipalityExcelDto {
|
public class MunicipalityExcelDto {
|
||||||
|
|
||||||
@ExcelColumn(
|
@ExcelColumn(
|
||||||
header = "지자체 id",
|
header = "지자체 id",
|
||||||
order = 0,
|
order = 0,
|
||||||
@@ -148,6 +149,8 @@ public class MunicipalityExcelDto {
|
|||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.getId();
|
String var10000 = this.getId();
|
||||||
return "MunicipalityExcelDto(id=" + var10000 + ", availableStartDate=" + this.getAvailableStartDate() + ", availableEndDate=" + this.getAvailableEndDate() + ", unavailableDates=" + this.getUnavailableDates() + ")";
|
return "MunicipalityExcelDto(id=" + var10000 + ", availableStartDate="
|
||||||
|
+ this.getAvailableStartDate() + ", availableEndDate=" + this.getAvailableEndDate()
|
||||||
|
+ ", unavailableDates=" + this.getUnavailableDates() + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import java.util.List;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class PairingWorkbookData {
|
public class PairingWorkbookData {
|
||||||
|
|
||||||
private final List<MemberExcelDto> members;
|
private final List<MemberExcelDto> members;
|
||||||
private final List<MunicipalityExcelDto> municipalities;
|
private final List<MunicipalityExcelDto> municipalities;
|
||||||
private final List<CenterExcelDto> centers;
|
private final List<CenterExcelDto> centers;
|
||||||
@@ -12,7 +13,11 @@ public class PairingWorkbookData {
|
|||||||
private final List<PreferenceMatchExcelDto> preferenceMatchRules;
|
private final List<PreferenceMatchExcelDto> preferenceMatchRules;
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
PairingWorkbookData(final List<MemberExcelDto> members, final List<MunicipalityExcelDto> municipalities, final List<CenterExcelDto> centers, final List<MemberRegionCodeExcelDto> memberRegionCodes, final List<CenterAdjacentRegionExcelDto> centerAdjacentRegions, final List<PreferenceMatchExcelDto> preferenceMatchRules) {
|
PairingWorkbookData(final List<MemberExcelDto> members,
|
||||||
|
final List<MunicipalityExcelDto> municipalities, final List<CenterExcelDto> centers,
|
||||||
|
final List<MemberRegionCodeExcelDto> memberRegionCodes,
|
||||||
|
final List<CenterAdjacentRegionExcelDto> centerAdjacentRegions,
|
||||||
|
final List<PreferenceMatchExcelDto> preferenceMatchRules) {
|
||||||
this.members = members;
|
this.members = members;
|
||||||
this.municipalities = municipalities;
|
this.municipalities = municipalities;
|
||||||
this.centers = centers;
|
this.centers = centers;
|
||||||
@@ -58,6 +63,7 @@ public class PairingWorkbookData {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public static class PairingWorkbookDataBuilder {
|
public static class PairingWorkbookDataBuilder {
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
private List<MemberExcelDto> members;
|
private List<MemberExcelDto> members;
|
||||||
@Generated
|
@Generated
|
||||||
@@ -82,7 +88,8 @@ public class PairingWorkbookData {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingWorkbookDataBuilder municipalities(final List<MunicipalityExcelDto> municipalities) {
|
public PairingWorkbookDataBuilder municipalities(
|
||||||
|
final List<MunicipalityExcelDto> municipalities) {
|
||||||
this.municipalities = municipalities;
|
this.municipalities = municipalities;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -94,32 +101,41 @@ public class PairingWorkbookData {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingWorkbookDataBuilder memberRegionCodes(final List<MemberRegionCodeExcelDto> memberRegionCodes) {
|
public PairingWorkbookDataBuilder memberRegionCodes(
|
||||||
|
final List<MemberRegionCodeExcelDto> memberRegionCodes) {
|
||||||
this.memberRegionCodes = memberRegionCodes;
|
this.memberRegionCodes = memberRegionCodes;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingWorkbookDataBuilder centerAdjacentRegions(final List<CenterAdjacentRegionExcelDto> centerAdjacentRegions) {
|
public PairingWorkbookDataBuilder centerAdjacentRegions(
|
||||||
|
final List<CenterAdjacentRegionExcelDto> centerAdjacentRegions) {
|
||||||
this.centerAdjacentRegions = centerAdjacentRegions;
|
this.centerAdjacentRegions = centerAdjacentRegions;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingWorkbookDataBuilder preferenceMatchRules(final List<PreferenceMatchExcelDto> preferenceMatchRules) {
|
public PairingWorkbookDataBuilder preferenceMatchRules(
|
||||||
|
final List<PreferenceMatchExcelDto> preferenceMatchRules) {
|
||||||
this.preferenceMatchRules = preferenceMatchRules;
|
this.preferenceMatchRules = preferenceMatchRules;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingWorkbookData build() {
|
public PairingWorkbookData build() {
|
||||||
return new PairingWorkbookData(this.members, this.municipalities, this.centers, this.memberRegionCodes, this.centerAdjacentRegions, this.preferenceMatchRules);
|
return new PairingWorkbookData(this.members, this.municipalities, this.centers,
|
||||||
|
this.memberRegionCodes, this.centerAdjacentRegions, this.preferenceMatchRules);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = String.valueOf(this.members);
|
String var10000 = String.valueOf(this.members);
|
||||||
return "PairingWorkbookData.PairingWorkbookDataBuilder(members=" + var10000 + ", municipalities=" + String.valueOf(this.municipalities) + ", centers=" + String.valueOf(this.centers) + ", memberRegionCodes=" + String.valueOf(this.memberRegionCodes) + ", centerAdjacentRegions=" + String.valueOf(this.centerAdjacentRegions) + ", preferenceMatchRules=" + String.valueOf(this.preferenceMatchRules) + ")";
|
return "PairingWorkbookData.PairingWorkbookDataBuilder(members=" + var10000
|
||||||
|
+ ", municipalities=" + String.valueOf(this.municipalities) + ", centers="
|
||||||
|
+ String.valueOf(this.centers) + ", memberRegionCodes=" + String.valueOf(
|
||||||
|
this.memberRegionCodes) + ", centerAdjacentRegions=" + String.valueOf(
|
||||||
|
this.centerAdjacentRegions) + ", preferenceMatchRules=" + String.valueOf(
|
||||||
|
this.preferenceMatchRules) + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.kri.common.feature.excel.ExcelColumn;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class PreferenceMatchExcelDto {
|
public class PreferenceMatchExcelDto {
|
||||||
|
|
||||||
@ExcelColumn(
|
@ExcelColumn(
|
||||||
header = "매칭 순위",
|
header = "매칭 순위",
|
||||||
order = 0,
|
order = 0,
|
||||||
@@ -111,15 +112,19 @@ public class PreferenceMatchExcelDto {
|
|||||||
Object $priority = this.getPriority();
|
Object $priority = this.getPriority();
|
||||||
result = result * 59 + ($priority == null ? 43 : $priority.hashCode());
|
result = result * 59 + ($priority == null ? 43 : $priority.hashCode());
|
||||||
Object $fieldMemberPreferenceRank = this.getFieldMemberPreferenceRank();
|
Object $fieldMemberPreferenceRank = this.getFieldMemberPreferenceRank();
|
||||||
result = result * 59 + ($fieldMemberPreferenceRank == null ? 43 : $fieldMemberPreferenceRank.hashCode());
|
result = result * 59 + ($fieldMemberPreferenceRank == null ? 43
|
||||||
|
: $fieldMemberPreferenceRank.hashCode());
|
||||||
Object $externalMemberPreferenceRank = this.getExternalMemberPreferenceRank();
|
Object $externalMemberPreferenceRank = this.getExternalMemberPreferenceRank();
|
||||||
result = result * 59 + ($externalMemberPreferenceRank == null ? 43 : $externalMemberPreferenceRank.hashCode());
|
result = result * 59 + ($externalMemberPreferenceRank == null ? 43
|
||||||
|
: $externalMemberPreferenceRank.hashCode());
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.getPriority();
|
String var10000 = this.getPriority();
|
||||||
return "PreferenceMatchExcelDto(priority=" + var10000 + ", fieldMemberPreferenceRank=" + this.getFieldMemberPreferenceRank() + ", externalMemberPreferenceRank=" + this.getExternalMemberPreferenceRank() + ")";
|
return "PreferenceMatchExcelDto(priority=" + var10000 + ", fieldMemberPreferenceRank="
|
||||||
|
+ this.getFieldMemberPreferenceRank() + ", externalMemberPreferenceRank="
|
||||||
|
+ this.getExternalMemberPreferenceRank() + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.kri.common.feature.excel.ExcelColumn;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class ABPairExcelDto {
|
public class ABPairExcelDto {
|
||||||
|
|
||||||
@ExcelColumn(
|
@ExcelColumn(
|
||||||
header = "AB 그룹",
|
header = "AB 그룹",
|
||||||
order = 0,
|
order = 0,
|
||||||
@@ -146,7 +147,8 @@ public class ABPairExcelDto {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public void setSharedAdjacentRegionClassification(final String sharedAdjacentRegionClassification) {
|
public void setSharedAdjacentRegionClassification(
|
||||||
|
final String sharedAdjacentRegionClassification) {
|
||||||
this.sharedAdjacentRegionClassification = sharedAdjacentRegionClassification;
|
this.sharedAdjacentRegionClassification = sharedAdjacentRegionClassification;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -242,7 +244,8 @@ public class ABPairExcelDto {
|
|||||||
if (other$sharedAdjacentRegionClassification != null) {
|
if (other$sharedAdjacentRegionClassification != null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else if (!this$sharedAdjacentRegionClassification.equals(other$sharedAdjacentRegionClassification)) {
|
} else if (!this$sharedAdjacentRegionClassification.equals(
|
||||||
|
other$sharedAdjacentRegionClassification)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -303,7 +306,8 @@ public class ABPairExcelDto {
|
|||||||
Object $sharedDispatchRegion = this.getSharedDispatchRegion();
|
Object $sharedDispatchRegion = this.getSharedDispatchRegion();
|
||||||
result = result * 59 + ($sharedDispatchRegion == null ? 43 : $sharedDispatchRegion.hashCode());
|
result = result * 59 + ($sharedDispatchRegion == null ? 43 : $sharedDispatchRegion.hashCode());
|
||||||
Object $sharedAdjacentRegionClassification = this.getSharedAdjacentRegionClassification();
|
Object $sharedAdjacentRegionClassification = this.getSharedAdjacentRegionClassification();
|
||||||
result = result * 59 + ($sharedAdjacentRegionClassification == null ? 43 : $sharedAdjacentRegionClassification.hashCode());
|
result = result * 59 + ($sharedAdjacentRegionClassification == null ? 43
|
||||||
|
: $sharedAdjacentRegionClassification.hashCode());
|
||||||
Object $aAssignmentDates = this.getAAssignmentDates();
|
Object $aAssignmentDates = this.getAAssignmentDates();
|
||||||
result = result * 59 + ($aAssignmentDates == null ? 43 : $aAssignmentDates.hashCode());
|
result = result * 59 + ($aAssignmentDates == null ? 43 : $aAssignmentDates.hashCode());
|
||||||
Object $bAssignmentDates = this.getBAssignmentDates();
|
Object $bAssignmentDates = this.getBAssignmentDates();
|
||||||
@@ -316,7 +320,13 @@ public class ABPairExcelDto {
|
|||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.getGroupId();
|
String var10000 = this.getGroupId();
|
||||||
return "ABPairExcelDto(groupId=" + var10000 + ", aFieldMemberId=" + this.getAFieldMemberId() + ", aExternalMemberId=" + this.getAExternalMemberId() + ", bFieldMemberId=" + this.getBFieldMemberId() + ", bExternalMemberId=" + this.getBExternalMemberId() + ", sharedDispatchRegion=" + this.getSharedDispatchRegion() + ", sharedAdjacentRegionClassification=" + this.getSharedAdjacentRegionClassification() + ", aAssignmentDates=" + this.getAAssignmentDates() + ", bAssignmentDates=" + this.getBAssignmentDates() + ", dateOverlapped=" + this.getDateOverlapped() + ")";
|
return "ABPairExcelDto(groupId=" + var10000 + ", aFieldMemberId=" + this.getAFieldMemberId()
|
||||||
|
+ ", aExternalMemberId=" + this.getAExternalMemberId() + ", bFieldMemberId="
|
||||||
|
+ this.getBFieldMemberId() + ", bExternalMemberId=" + this.getBExternalMemberId()
|
||||||
|
+ ", sharedDispatchRegion=" + this.getSharedDispatchRegion()
|
||||||
|
+ ", sharedAdjacentRegionClassification=" + this.getSharedAdjacentRegionClassification()
|
||||||
|
+ ", aAssignmentDates=" + this.getAAssignmentDates() + ", bAssignmentDates="
|
||||||
|
+ this.getBAssignmentDates() + ", dateOverlapped=" + this.getDateOverlapped() + ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
@@ -324,7 +334,10 @@ public class ABPairExcelDto {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public ABPairExcelDto(final String groupId, final String aFieldMemberId, final String aExternalMemberId, final String bFieldMemberId, final String bExternalMemberId, final String sharedDispatchRegion, final String sharedAdjacentRegionClassification, final String aAssignmentDates, final String bAssignmentDates, final String dateOverlapped) {
|
public ABPairExcelDto(final String groupId, final String aFieldMemberId,
|
||||||
|
final String aExternalMemberId, final String bFieldMemberId, final String bExternalMemberId,
|
||||||
|
final String sharedDispatchRegion, final String sharedAdjacentRegionClassification,
|
||||||
|
final String aAssignmentDates, final String bAssignmentDates, final String dateOverlapped) {
|
||||||
this.groupId = groupId;
|
this.groupId = groupId;
|
||||||
this.aFieldMemberId = aFieldMemberId;
|
this.aFieldMemberId = aFieldMemberId;
|
||||||
this.aExternalMemberId = aExternalMemberId;
|
this.aExternalMemberId = aExternalMemberId;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.kri.common.feature.excel.ExcelColumn;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class AssignmentResultExcelDto {
|
public class AssignmentResultExcelDto {
|
||||||
|
|
||||||
@ExcelColumn(
|
@ExcelColumn(
|
||||||
header = "일자",
|
header = "일자",
|
||||||
order = 0,
|
order = 0,
|
||||||
@@ -609,25 +610,33 @@ public class AssignmentResultExcelDto {
|
|||||||
Object $fieldMemberGender = this.getFieldMemberGender();
|
Object $fieldMemberGender = this.getFieldMemberGender();
|
||||||
result = result * 59 + ($fieldMemberGender == null ? 43 : $fieldMemberGender.hashCode());
|
result = result * 59 + ($fieldMemberGender == null ? 43 : $fieldMemberGender.hashCode());
|
||||||
Object $fieldMemberExperience = this.getFieldMemberExperience();
|
Object $fieldMemberExperience = this.getFieldMemberExperience();
|
||||||
result = result * 59 + ($fieldMemberExperience == null ? 43 : $fieldMemberExperience.hashCode());
|
result =
|
||||||
|
result * 59 + ($fieldMemberExperience == null ? 43 : $fieldMemberExperience.hashCode());
|
||||||
Object $fieldMemberResidenceCode = this.getFieldMemberResidenceCode();
|
Object $fieldMemberResidenceCode = this.getFieldMemberResidenceCode();
|
||||||
result = result * 59 + ($fieldMemberResidenceCode == null ? 43 : $fieldMemberResidenceCode.hashCode());
|
result = result * 59 + ($fieldMemberResidenceCode == null ? 43
|
||||||
|
: $fieldMemberResidenceCode.hashCode());
|
||||||
Object $fieldMemberActivityRegion = this.getFieldMemberActivityRegion();
|
Object $fieldMemberActivityRegion = this.getFieldMemberActivityRegion();
|
||||||
result = result * 59 + ($fieldMemberActivityRegion == null ? 43 : $fieldMemberActivityRegion.hashCode());
|
result = result * 59 + ($fieldMemberActivityRegion == null ? 43
|
||||||
|
: $fieldMemberActivityRegion.hashCode());
|
||||||
Object $fieldMemberPreferenceRank = this.getFieldMemberPreferenceRank();
|
Object $fieldMemberPreferenceRank = this.getFieldMemberPreferenceRank();
|
||||||
result = result * 59 + ($fieldMemberPreferenceRank == null ? 43 : $fieldMemberPreferenceRank.hashCode());
|
result = result * 59 + ($fieldMemberPreferenceRank == null ? 43
|
||||||
|
: $fieldMemberPreferenceRank.hashCode());
|
||||||
Object $externalMemberId = this.getExternalMemberId();
|
Object $externalMemberId = this.getExternalMemberId();
|
||||||
result = result * 59 + ($externalMemberId == null ? 43 : $externalMemberId.hashCode());
|
result = result * 59 + ($externalMemberId == null ? 43 : $externalMemberId.hashCode());
|
||||||
Object $externalMemberGender = this.getExternalMemberGender();
|
Object $externalMemberGender = this.getExternalMemberGender();
|
||||||
result = result * 59 + ($externalMemberGender == null ? 43 : $externalMemberGender.hashCode());
|
result = result * 59 + ($externalMemberGender == null ? 43 : $externalMemberGender.hashCode());
|
||||||
Object $externalMemberExperience = this.getExternalMemberExperience();
|
Object $externalMemberExperience = this.getExternalMemberExperience();
|
||||||
result = result * 59 + ($externalMemberExperience == null ? 43 : $externalMemberExperience.hashCode());
|
result = result * 59 + ($externalMemberExperience == null ? 43
|
||||||
|
: $externalMemberExperience.hashCode());
|
||||||
Object $externalMemberResidenceCode = this.getExternalMemberResidenceCode();
|
Object $externalMemberResidenceCode = this.getExternalMemberResidenceCode();
|
||||||
result = result * 59 + ($externalMemberResidenceCode == null ? 43 : $externalMemberResidenceCode.hashCode());
|
result = result * 59 + ($externalMemberResidenceCode == null ? 43
|
||||||
|
: $externalMemberResidenceCode.hashCode());
|
||||||
Object $externalMemberActivityRegion = this.getExternalMemberActivityRegion();
|
Object $externalMemberActivityRegion = this.getExternalMemberActivityRegion();
|
||||||
result = result * 59 + ($externalMemberActivityRegion == null ? 43 : $externalMemberActivityRegion.hashCode());
|
result = result * 59 + ($externalMemberActivityRegion == null ? 43
|
||||||
|
: $externalMemberActivityRegion.hashCode());
|
||||||
Object $externalMemberPreferenceRank = this.getExternalMemberPreferenceRank();
|
Object $externalMemberPreferenceRank = this.getExternalMemberPreferenceRank();
|
||||||
result = result * 59 + ($externalMemberPreferenceRank == null ? 43 : $externalMemberPreferenceRank.hashCode());
|
result = result * 59 + ($externalMemberPreferenceRank == null ? 43
|
||||||
|
: $externalMemberPreferenceRank.hashCode());
|
||||||
Object $centerId = this.getCenterId();
|
Object $centerId = this.getCenterId();
|
||||||
result = result * 59 + ($centerId == null ? 43 : $centerId.hashCode());
|
result = result * 59 + ($centerId == null ? 43 : $centerId.hashCode());
|
||||||
Object $municipalityId = this.getMunicipalityId();
|
Object $municipalityId = this.getMunicipalityId();
|
||||||
@@ -637,7 +646,8 @@ public class AssignmentResultExcelDto {
|
|||||||
Object $dispatchRegion = this.getDispatchRegion();
|
Object $dispatchRegion = this.getDispatchRegion();
|
||||||
result = result * 59 + ($dispatchRegion == null ? 43 : $dispatchRegion.hashCode());
|
result = result * 59 + ($dispatchRegion == null ? 43 : $dispatchRegion.hashCode());
|
||||||
Object $adjacentRegionClassification = this.getAdjacentRegionClassification();
|
Object $adjacentRegionClassification = this.getAdjacentRegionClassification();
|
||||||
result = result * 59 + ($adjacentRegionClassification == null ? 43 : $adjacentRegionClassification.hashCode());
|
result = result * 59 + ($adjacentRegionClassification == null ? 43
|
||||||
|
: $adjacentRegionClassification.hashCode());
|
||||||
Object $preferencePriority = this.getPreferencePriority();
|
Object $preferencePriority = this.getPreferencePriority();
|
||||||
result = result * 59 + ($preferencePriority == null ? 43 : $preferencePriority.hashCode());
|
result = result * 59 + ($preferencePriority == null ? 43 : $preferencePriority.hashCode());
|
||||||
Object $abGroup = this.getAbGroup();
|
Object $abGroup = this.getAbGroup();
|
||||||
@@ -645,14 +655,32 @@ public class AssignmentResultExcelDto {
|
|||||||
Object $backupFieldMemberId = this.getBackupFieldMemberId();
|
Object $backupFieldMemberId = this.getBackupFieldMemberId();
|
||||||
result = result * 59 + ($backupFieldMemberId == null ? 43 : $backupFieldMemberId.hashCode());
|
result = result * 59 + ($backupFieldMemberId == null ? 43 : $backupFieldMemberId.hashCode());
|
||||||
Object $backupExternalMemberId = this.getBackupExternalMemberId();
|
Object $backupExternalMemberId = this.getBackupExternalMemberId();
|
||||||
result = result * 59 + ($backupExternalMemberId == null ? 43 : $backupExternalMemberId.hashCode());
|
result =
|
||||||
|
result * 59 + ($backupExternalMemberId == null ? 43 : $backupExternalMemberId.hashCode());
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.getDate();
|
String var10000 = this.getDate();
|
||||||
return "AssignmentResultExcelDto(date=" + var10000 + ", fieldMemberId=" + this.getFieldMemberId() + ", fieldMemberGender=" + this.getFieldMemberGender() + ", fieldMemberExperience=" + this.getFieldMemberExperience() + ", fieldMemberResidenceCode=" + this.getFieldMemberResidenceCode() + ", fieldMemberActivityRegion=" + this.getFieldMemberActivityRegion() + ", fieldMemberPreferenceRank=" + this.getFieldMemberPreferenceRank() + ", externalMemberId=" + this.getExternalMemberId() + ", externalMemberGender=" + this.getExternalMemberGender() + ", externalMemberExperience=" + this.getExternalMemberExperience() + ", externalMemberResidenceCode=" + this.getExternalMemberResidenceCode() + ", externalMemberActivityRegion=" + this.getExternalMemberActivityRegion() + ", externalMemberPreferenceRank=" + this.getExternalMemberPreferenceRank() + ", centerId=" + this.getCenterId() + ", municipalityId=" + this.getMunicipalityId() + ", centerWomenOnly=" + this.getCenterWomenOnly() + ", dispatchRegion=" + this.getDispatchRegion() + ", adjacentRegionClassification=" + this.getAdjacentRegionClassification() + ", preferencePriority=" + this.getPreferencePriority() + ", abGroup=" + this.getAbGroup() + ", backupFieldMemberId=" + this.getBackupFieldMemberId() + ", backupExternalMemberId=" + this.getBackupExternalMemberId() + ")";
|
return "AssignmentResultExcelDto(date=" + var10000 + ", fieldMemberId="
|
||||||
|
+ this.getFieldMemberId() + ", fieldMemberGender=" + this.getFieldMemberGender()
|
||||||
|
+ ", fieldMemberExperience=" + this.getFieldMemberExperience()
|
||||||
|
+ ", fieldMemberResidenceCode=" + this.getFieldMemberResidenceCode()
|
||||||
|
+ ", fieldMemberActivityRegion=" + this.getFieldMemberActivityRegion()
|
||||||
|
+ ", fieldMemberPreferenceRank=" + this.getFieldMemberPreferenceRank()
|
||||||
|
+ ", externalMemberId=" + this.getExternalMemberId() + ", externalMemberGender="
|
||||||
|
+ this.getExternalMemberGender() + ", externalMemberExperience="
|
||||||
|
+ this.getExternalMemberExperience() + ", externalMemberResidenceCode="
|
||||||
|
+ this.getExternalMemberResidenceCode() + ", externalMemberActivityRegion="
|
||||||
|
+ this.getExternalMemberActivityRegion() + ", externalMemberPreferenceRank="
|
||||||
|
+ this.getExternalMemberPreferenceRank() + ", centerId=" + this.getCenterId()
|
||||||
|
+ ", municipalityId=" + this.getMunicipalityId() + ", centerWomenOnly="
|
||||||
|
+ this.getCenterWomenOnly() + ", dispatchRegion=" + this.getDispatchRegion()
|
||||||
|
+ ", adjacentRegionClassification=" + this.getAdjacentRegionClassification()
|
||||||
|
+ ", preferencePriority=" + this.getPreferencePriority() + ", abGroup=" + this.getAbGroup()
|
||||||
|
+ ", backupFieldMemberId=" + this.getBackupFieldMemberId() + ", backupExternalMemberId="
|
||||||
|
+ this.getBackupExternalMemberId() + ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
@@ -660,7 +688,16 @@ public class AssignmentResultExcelDto {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public AssignmentResultExcelDto(final String date, final String fieldMemberId, final String fieldMemberGender, final String fieldMemberExperience, final String fieldMemberResidenceCode, final String fieldMemberActivityRegion, final String fieldMemberPreferenceRank, final String externalMemberId, final String externalMemberGender, final String externalMemberExperience, final String externalMemberResidenceCode, final String externalMemberActivityRegion, final String externalMemberPreferenceRank, final String centerId, final String municipalityId, final String centerWomenOnly, final String dispatchRegion, final String adjacentRegionClassification, final String preferencePriority, final String abGroup, final String backupFieldMemberId, final String backupExternalMemberId) {
|
public AssignmentResultExcelDto(final String date, final String fieldMemberId,
|
||||||
|
final String fieldMemberGender, final String fieldMemberExperience,
|
||||||
|
final String fieldMemberResidenceCode, final String fieldMemberActivityRegion,
|
||||||
|
final String fieldMemberPreferenceRank, final String externalMemberId,
|
||||||
|
final String externalMemberGender, final String externalMemberExperience,
|
||||||
|
final String externalMemberResidenceCode, final String externalMemberActivityRegion,
|
||||||
|
final String externalMemberPreferenceRank, final String centerId, final String municipalityId,
|
||||||
|
final String centerWomenOnly, final String dispatchRegion,
|
||||||
|
final String adjacentRegionClassification, final String preferencePriority,
|
||||||
|
final String abGroup, final String backupFieldMemberId, final String backupExternalMemberId) {
|
||||||
this.date = date;
|
this.date = date;
|
||||||
this.fieldMemberId = fieldMemberId;
|
this.fieldMemberId = fieldMemberId;
|
||||||
this.fieldMemberGender = fieldMemberGender;
|
this.fieldMemberGender = fieldMemberGender;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.kri.common.feature.excel.ExcelColumn;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class CandidateSummaryExcelDto {
|
public class CandidateSummaryExcelDto {
|
||||||
|
|
||||||
@ExcelColumn(
|
@ExcelColumn(
|
||||||
header = "항목",
|
header = "항목",
|
||||||
order = 0,
|
order = 0,
|
||||||
@@ -120,7 +121,8 @@ public class CandidateSummaryExcelDto {
|
|||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.getName();
|
String var10000 = this.getName();
|
||||||
return "CandidateSummaryExcelDto(name=" + var10000 + ", value=" + this.getValue() + ", description=" + this.getDescription() + ")";
|
return "CandidateSummaryExcelDto(name=" + var10000 + ", value=" + this.getValue()
|
||||||
|
+ ", description=" + this.getDescription() + ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.kri.common.feature.excel.ExcelColumn;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class PairingSummaryExcelDto {
|
public class PairingSummaryExcelDto {
|
||||||
|
|
||||||
@ExcelColumn(
|
@ExcelColumn(
|
||||||
header = "항목",
|
header = "항목",
|
||||||
order = 0,
|
order = 0,
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.kri.common.feature.excel.ExcelColumn;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class RuleViolationExcelDto {
|
public class RuleViolationExcelDto {
|
||||||
|
|
||||||
@ExcelColumn(
|
@ExcelColumn(
|
||||||
header = "검사 항목",
|
header = "검사 항목",
|
||||||
order = 0,
|
order = 0,
|
||||||
@@ -120,7 +121,8 @@ public class RuleViolationExcelDto {
|
|||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.getRuleName();
|
String var10000 = this.getRuleName();
|
||||||
return "RuleViolationExcelDto(ruleName=" + var10000 + ", result=" + this.getResult() + ", detail=" + this.getDetail() + ")";
|
return "RuleViolationExcelDto(ruleName=" + var10000 + ", result=" + this.getResult()
|
||||||
|
+ ", detail=" + this.getDetail() + ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.kri.common.feature.excel.ExcelColumn;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class UnassignedCenterExcelDto {
|
public class UnassignedCenterExcelDto {
|
||||||
|
|
||||||
@ExcelColumn(
|
@ExcelColumn(
|
||||||
header = "센터 id",
|
header = "센터 id",
|
||||||
order = 0,
|
order = 0,
|
||||||
@@ -120,7 +121,8 @@ public class UnassignedCenterExcelDto {
|
|||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.getCenterId();
|
String var10000 = this.getCenterId();
|
||||||
return "UnassignedCenterExcelDto(centerId=" + var10000 + ", municipalityId=" + this.getMunicipalityId() + ", reason=" + this.getReason() + ")";
|
return "UnassignedCenterExcelDto(centerId=" + var10000 + ", municipalityId="
|
||||||
|
+ this.getMunicipalityId() + ", reason=" + this.getReason() + ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
@@ -128,7 +130,8 @@ public class UnassignedCenterExcelDto {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public UnassignedCenterExcelDto(final String centerId, final String municipalityId, final String reason) {
|
public UnassignedCenterExcelDto(final String centerId, final String municipalityId,
|
||||||
|
final String reason) {
|
||||||
this.centerId = centerId;
|
this.centerId = centerId;
|
||||||
this.municipalityId = municipalityId;
|
this.municipalityId = municipalityId;
|
||||||
this.reason = reason;
|
this.reason = reason;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.kri.common.feature.excel.ExcelColumn;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class UnusedMemberExcelDto {
|
public class UnusedMemberExcelDto {
|
||||||
|
|
||||||
@ExcelColumn(
|
@ExcelColumn(
|
||||||
header = "위원 id",
|
header = "위원 id",
|
||||||
order = 0,
|
order = 0,
|
||||||
@@ -120,7 +121,8 @@ public class UnusedMemberExcelDto {
|
|||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.getMemberId();
|
String var10000 = this.getMemberId();
|
||||||
return "UnusedMemberExcelDto(memberId=" + var10000 + ", role=" + this.getRole() + ", reason=" + this.getReason() + ")";
|
return "UnusedMemberExcelDto(memberId=" + var10000 + ", role=" + this.getRole() + ", reason="
|
||||||
|
+ this.getReason() + ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import com.kri.common.feature.excel.ExcelColumn;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class ValidationErrorExcelDto {
|
public class ValidationErrorExcelDto {
|
||||||
|
|
||||||
@ExcelColumn(
|
@ExcelColumn(
|
||||||
header = "오류 코드",
|
header = "오류 코드",
|
||||||
order = 0,
|
order = 0,
|
||||||
@@ -120,7 +121,8 @@ public class ValidationErrorExcelDto {
|
|||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.getCode();
|
String var10000 = this.getCode();
|
||||||
return "ValidationErrorExcelDto(code=" + var10000 + ", message=" + this.getMessage() + ", type=" + this.getType() + ")";
|
return "ValidationErrorExcelDto(code=" + var10000 + ", message=" + this.getMessage() + ", type="
|
||||||
|
+ this.getType() + ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.kri.p6.ncrc.pairing.model;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class ABPairMatch {
|
public class ABPairMatch {
|
||||||
|
|
||||||
private final String groupId;
|
private final String groupId;
|
||||||
private final String fieldMemberId;
|
private final String fieldMemberId;
|
||||||
private final String externalMemberId;
|
private final String externalMemberId;
|
||||||
@@ -10,7 +11,8 @@ public class ABPairMatch {
|
|||||||
private final String counterpartExternalMemberId;
|
private final String counterpartExternalMemberId;
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
ABPairMatch(final String groupId, final String fieldMemberId, final String externalMemberId, final String counterpartFieldMemberId, final String counterpartExternalMemberId) {
|
ABPairMatch(final String groupId, final String fieldMemberId, final String externalMemberId,
|
||||||
|
final String counterpartFieldMemberId, final String counterpartExternalMemberId) {
|
||||||
this.groupId = groupId;
|
this.groupId = groupId;
|
||||||
this.fieldMemberId = fieldMemberId;
|
this.fieldMemberId = fieldMemberId;
|
||||||
this.externalMemberId = externalMemberId;
|
this.externalMemberId = externalMemberId;
|
||||||
@@ -50,6 +52,7 @@ public class ABPairMatch {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public static class ABPairMatchBuilder {
|
public static class ABPairMatchBuilder {
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
private String groupId;
|
private String groupId;
|
||||||
@Generated
|
@Generated
|
||||||
@@ -90,19 +93,24 @@ public class ABPairMatch {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public ABPairMatchBuilder counterpartExternalMemberId(final String counterpartExternalMemberId) {
|
public ABPairMatchBuilder counterpartExternalMemberId(
|
||||||
|
final String counterpartExternalMemberId) {
|
||||||
this.counterpartExternalMemberId = counterpartExternalMemberId;
|
this.counterpartExternalMemberId = counterpartExternalMemberId;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public ABPairMatch build() {
|
public ABPairMatch build() {
|
||||||
return new ABPairMatch(this.groupId, this.fieldMemberId, this.externalMemberId, this.counterpartFieldMemberId, this.counterpartExternalMemberId);
|
return new ABPairMatch(this.groupId, this.fieldMemberId, this.externalMemberId,
|
||||||
|
this.counterpartFieldMemberId, this.counterpartExternalMemberId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "ABPairMatch.ABPairMatchBuilder(groupId=" + this.groupId + ", fieldMemberId=" + this.fieldMemberId + ", externalMemberId=" + this.externalMemberId + ", counterpartFieldMemberId=" + this.counterpartFieldMemberId + ", counterpartExternalMemberId=" + this.counterpartExternalMemberId + ")";
|
return "ABPairMatch.ABPairMatchBuilder(groupId=" + this.groupId + ", fieldMemberId="
|
||||||
|
+ this.fieldMemberId + ", externalMemberId=" + this.externalMemberId
|
||||||
|
+ ", counterpartFieldMemberId=" + this.counterpartFieldMemberId
|
||||||
|
+ ", counterpartExternalMemberId=" + this.counterpartExternalMemberId + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import java.time.LocalDate;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class AssignmentCandidate {
|
public class AssignmentCandidate {
|
||||||
|
|
||||||
private final String fieldMemberId;
|
private final String fieldMemberId;
|
||||||
private final String externalMemberId;
|
private final String externalMemberId;
|
||||||
private final String centerId;
|
private final String centerId;
|
||||||
@@ -17,7 +18,11 @@ public class AssignmentCandidate {
|
|||||||
private final int residenceMatchScore;
|
private final int residenceMatchScore;
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
AssignmentCandidate(final String fieldMemberId, final String externalMemberId, final String centerId, final String municipalityId, final LocalDate date, final String dispatchRegion, final String adjacentRegionClassification, final int preferencePriority, final int fieldMemberPreferenceRank, final int externalMemberPreferenceRank, final int residenceMatchScore) {
|
AssignmentCandidate(final String fieldMemberId, final String externalMemberId,
|
||||||
|
final String centerId, final String municipalityId, final LocalDate date,
|
||||||
|
final String dispatchRegion, final String adjacentRegionClassification,
|
||||||
|
final int preferencePriority, final int fieldMemberPreferenceRank,
|
||||||
|
final int externalMemberPreferenceRank, final int residenceMatchScore) {
|
||||||
this.fieldMemberId = fieldMemberId;
|
this.fieldMemberId = fieldMemberId;
|
||||||
this.externalMemberId = externalMemberId;
|
this.externalMemberId = externalMemberId;
|
||||||
this.centerId = centerId;
|
this.centerId = centerId;
|
||||||
@@ -93,6 +98,7 @@ public class AssignmentCandidate {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public static class AssignmentCandidateBuilder {
|
public static class AssignmentCandidateBuilder {
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
private String fieldMemberId;
|
private String fieldMemberId;
|
||||||
@Generated
|
@Generated
|
||||||
@@ -157,7 +163,8 @@ public class AssignmentCandidate {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public AssignmentCandidateBuilder adjacentRegionClassification(final String adjacentRegionClassification) {
|
public AssignmentCandidateBuilder adjacentRegionClassification(
|
||||||
|
final String adjacentRegionClassification) {
|
||||||
this.adjacentRegionClassification = adjacentRegionClassification;
|
this.adjacentRegionClassification = adjacentRegionClassification;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -169,13 +176,15 @@ public class AssignmentCandidate {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public AssignmentCandidateBuilder fieldMemberPreferenceRank(final int fieldMemberPreferenceRank) {
|
public AssignmentCandidateBuilder fieldMemberPreferenceRank(
|
||||||
|
final int fieldMemberPreferenceRank) {
|
||||||
this.fieldMemberPreferenceRank = fieldMemberPreferenceRank;
|
this.fieldMemberPreferenceRank = fieldMemberPreferenceRank;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public AssignmentCandidateBuilder externalMemberPreferenceRank(final int externalMemberPreferenceRank) {
|
public AssignmentCandidateBuilder externalMemberPreferenceRank(
|
||||||
|
final int externalMemberPreferenceRank) {
|
||||||
this.externalMemberPreferenceRank = externalMemberPreferenceRank;
|
this.externalMemberPreferenceRank = externalMemberPreferenceRank;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -188,13 +197,23 @@ public class AssignmentCandidate {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public AssignmentCandidate build() {
|
public AssignmentCandidate build() {
|
||||||
return new AssignmentCandidate(this.fieldMemberId, this.externalMemberId, this.centerId, this.municipalityId, this.date, this.dispatchRegion, this.adjacentRegionClassification, this.preferencePriority, this.fieldMemberPreferenceRank, this.externalMemberPreferenceRank, this.residenceMatchScore);
|
return new AssignmentCandidate(this.fieldMemberId, this.externalMemberId, this.centerId,
|
||||||
|
this.municipalityId, this.date, this.dispatchRegion, this.adjacentRegionClassification,
|
||||||
|
this.preferencePriority, this.fieldMemberPreferenceRank,
|
||||||
|
this.externalMemberPreferenceRank, this.residenceMatchScore);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.fieldMemberId;
|
String var10000 = this.fieldMemberId;
|
||||||
return "AssignmentCandidate.AssignmentCandidateBuilder(fieldMemberId=" + var10000 + ", externalMemberId=" + this.externalMemberId + ", centerId=" + this.centerId + ", municipalityId=" + this.municipalityId + ", date=" + String.valueOf(this.date) + ", dispatchRegion=" + this.dispatchRegion + ", adjacentRegionClassification=" + this.adjacentRegionClassification + ", preferencePriority=" + this.preferencePriority + ", fieldMemberPreferenceRank=" + this.fieldMemberPreferenceRank + ", externalMemberPreferenceRank=" + this.externalMemberPreferenceRank + ", residenceMatchScore=" + this.residenceMatchScore + ")";
|
return "AssignmentCandidate.AssignmentCandidateBuilder(fieldMemberId=" + var10000
|
||||||
|
+ ", externalMemberId=" + this.externalMemberId + ", centerId=" + this.centerId
|
||||||
|
+ ", municipalityId=" + this.municipalityId + ", date=" + String.valueOf(this.date)
|
||||||
|
+ ", dispatchRegion=" + this.dispatchRegion + ", adjacentRegionClassification="
|
||||||
|
+ this.adjacentRegionClassification + ", preferencePriority=" + this.preferencePriority
|
||||||
|
+ ", fieldMemberPreferenceRank=" + this.fieldMemberPreferenceRank
|
||||||
|
+ ", externalMemberPreferenceRank=" + this.externalMemberPreferenceRank
|
||||||
|
+ ", residenceMatchScore=" + this.residenceMatchScore + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import java.util.Set;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class Center {
|
public class Center {
|
||||||
|
|
||||||
private final String id;
|
private final String id;
|
||||||
private final String municipalityId;
|
private final String municipalityId;
|
||||||
private final boolean womenOnly;
|
private final boolean womenOnly;
|
||||||
@@ -14,7 +15,9 @@ public class Center {
|
|||||||
private final Set<LocalDate> unavailableDates;
|
private final Set<LocalDate> unavailableDates;
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
Center(final String id, final String municipalityId, final boolean womenOnly, final String adjacentRegionClassification, final LocalDate availableStartDate, final LocalDate availableEndDate, final Set<LocalDate> unavailableDates) {
|
Center(final String id, final String municipalityId, final boolean womenOnly,
|
||||||
|
final String adjacentRegionClassification, final LocalDate availableStartDate,
|
||||||
|
final LocalDate availableEndDate, final Set<LocalDate> unavailableDates) {
|
||||||
this.id = id;
|
this.id = id;
|
||||||
this.municipalityId = municipalityId;
|
this.municipalityId = municipalityId;
|
||||||
this.womenOnly = womenOnly;
|
this.womenOnly = womenOnly;
|
||||||
@@ -66,6 +69,7 @@ public class Center {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public static class CenterBuilder {
|
public static class CenterBuilder {
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
private String id;
|
private String id;
|
||||||
@Generated
|
@Generated
|
||||||
@@ -129,13 +133,19 @@ public class Center {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public Center build() {
|
public Center build() {
|
||||||
return new Center(this.id, this.municipalityId, this.womenOnly, this.adjacentRegionClassification, this.availableStartDate, this.availableEndDate, this.unavailableDates);
|
return new Center(this.id, this.municipalityId, this.womenOnly,
|
||||||
|
this.adjacentRegionClassification, this.availableStartDate, this.availableEndDate,
|
||||||
|
this.unavailableDates);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.id;
|
String var10000 = this.id;
|
||||||
return "Center.CenterBuilder(id=" + var10000 + ", municipalityId=" + this.municipalityId + ", womenOnly=" + this.womenOnly + ", adjacentRegionClassification=" + this.adjacentRegionClassification + ", availableStartDate=" + String.valueOf(this.availableStartDate) + ", availableEndDate=" + String.valueOf(this.availableEndDate) + ", unavailableDates=" + String.valueOf(this.unavailableDates) + ")";
|
return "Center.CenterBuilder(id=" + var10000 + ", municipalityId=" + this.municipalityId
|
||||||
|
+ ", womenOnly=" + this.womenOnly + ", adjacentRegionClassification="
|
||||||
|
+ this.adjacentRegionClassification + ", availableStartDate=" + String.valueOf(
|
||||||
|
this.availableStartDate) + ", availableEndDate=" + String.valueOf(this.availableEndDate)
|
||||||
|
+ ", unavailableDates=" + String.valueOf(this.unavailableDates) + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.kri.p6.ncrc.pairing.model;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class CenterAdjacentRegion {
|
public class CenterAdjacentRegion {
|
||||||
|
|
||||||
private final String dispatchRegion;
|
private final String dispatchRegion;
|
||||||
private final String adjacentRegionClassification;
|
private final String adjacentRegionClassification;
|
||||||
|
|
||||||
@@ -29,6 +30,7 @@ public class CenterAdjacentRegion {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public static class CenterAdjacentRegionBuilder {
|
public static class CenterAdjacentRegionBuilder {
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
private String dispatchRegion;
|
private String dispatchRegion;
|
||||||
@Generated
|
@Generated
|
||||||
@@ -45,7 +47,8 @@ public class CenterAdjacentRegion {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public CenterAdjacentRegionBuilder adjacentRegionClassification(final String adjacentRegionClassification) {
|
public CenterAdjacentRegionBuilder adjacentRegionClassification(
|
||||||
|
final String adjacentRegionClassification) {
|
||||||
this.adjacentRegionClassification = adjacentRegionClassification;
|
this.adjacentRegionClassification = adjacentRegionClassification;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -57,7 +60,9 @@ public class CenterAdjacentRegion {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "CenterAdjacentRegion.CenterAdjacentRegionBuilder(dispatchRegion=" + this.dispatchRegion + ", adjacentRegionClassification=" + this.adjacentRegionClassification + ")";
|
return "CenterAdjacentRegion.CenterAdjacentRegionBuilder(dispatchRegion="
|
||||||
|
+ this.dispatchRegion + ", adjacentRegionClassification="
|
||||||
|
+ this.adjacentRegionClassification + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.kri.p6.ncrc.pairing.model;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class DispatchRegionCandidate {
|
public class DispatchRegionCandidate {
|
||||||
|
|
||||||
private final String fieldMemberId;
|
private final String fieldMemberId;
|
||||||
private final String externalMemberId;
|
private final String externalMemberId;
|
||||||
private final String dispatchRegion;
|
private final String dispatchRegion;
|
||||||
@@ -11,7 +12,9 @@ public class DispatchRegionCandidate {
|
|||||||
private final int externalMemberPreferenceRank;
|
private final int externalMemberPreferenceRank;
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
DispatchRegionCandidate(final String fieldMemberId, final String externalMemberId, final String dispatchRegion, final int preferencePriority, final int fieldMemberPreferenceRank, final int externalMemberPreferenceRank) {
|
DispatchRegionCandidate(final String fieldMemberId, final String externalMemberId,
|
||||||
|
final String dispatchRegion, final int preferencePriority,
|
||||||
|
final int fieldMemberPreferenceRank, final int externalMemberPreferenceRank) {
|
||||||
this.fieldMemberId = fieldMemberId;
|
this.fieldMemberId = fieldMemberId;
|
||||||
this.externalMemberId = externalMemberId;
|
this.externalMemberId = externalMemberId;
|
||||||
this.dispatchRegion = dispatchRegion;
|
this.dispatchRegion = dispatchRegion;
|
||||||
@@ -57,6 +60,7 @@ public class DispatchRegionCandidate {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public static class DispatchRegionCandidateBuilder {
|
public static class DispatchRegionCandidateBuilder {
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
private String fieldMemberId;
|
private String fieldMemberId;
|
||||||
@Generated
|
@Generated
|
||||||
@@ -99,25 +103,33 @@ public class DispatchRegionCandidate {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public DispatchRegionCandidateBuilder fieldMemberPreferenceRank(final int fieldMemberPreferenceRank) {
|
public DispatchRegionCandidateBuilder fieldMemberPreferenceRank(
|
||||||
|
final int fieldMemberPreferenceRank) {
|
||||||
this.fieldMemberPreferenceRank = fieldMemberPreferenceRank;
|
this.fieldMemberPreferenceRank = fieldMemberPreferenceRank;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public DispatchRegionCandidateBuilder externalMemberPreferenceRank(final int externalMemberPreferenceRank) {
|
public DispatchRegionCandidateBuilder externalMemberPreferenceRank(
|
||||||
|
final int externalMemberPreferenceRank) {
|
||||||
this.externalMemberPreferenceRank = externalMemberPreferenceRank;
|
this.externalMemberPreferenceRank = externalMemberPreferenceRank;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public DispatchRegionCandidate build() {
|
public DispatchRegionCandidate build() {
|
||||||
return new DispatchRegionCandidate(this.fieldMemberId, this.externalMemberId, this.dispatchRegion, this.preferencePriority, this.fieldMemberPreferenceRank, this.externalMemberPreferenceRank);
|
return new DispatchRegionCandidate(this.fieldMemberId, this.externalMemberId,
|
||||||
|
this.dispatchRegion, this.preferencePriority, this.fieldMemberPreferenceRank,
|
||||||
|
this.externalMemberPreferenceRank);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "DispatchRegionCandidate.DispatchRegionCandidateBuilder(fieldMemberId=" + this.fieldMemberId + ", externalMemberId=" + this.externalMemberId + ", dispatchRegion=" + this.dispatchRegion + ", preferencePriority=" + this.preferencePriority + ", fieldMemberPreferenceRank=" + this.fieldMemberPreferenceRank + ", externalMemberPreferenceRank=" + this.externalMemberPreferenceRank + ")";
|
return "DispatchRegionCandidate.DispatchRegionCandidateBuilder(fieldMemberId="
|
||||||
|
+ this.fieldMemberId + ", externalMemberId=" + this.externalMemberId + ", dispatchRegion="
|
||||||
|
+ this.dispatchRegion + ", preferencePriority=" + this.preferencePriority
|
||||||
|
+ ", fieldMemberPreferenceRank=" + this.fieldMemberPreferenceRank
|
||||||
|
+ ", externalMemberPreferenceRank=" + this.externalMemberPreferenceRank + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import java.util.Set;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class Member {
|
public class Member {
|
||||||
|
|
||||||
private final String id;
|
private final String id;
|
||||||
private final Gender gender;
|
private final Gender gender;
|
||||||
private final ExperienceType experienceType;
|
private final ExperienceType experienceType;
|
||||||
@@ -22,7 +23,11 @@ public class Member {
|
|||||||
private final List<String> preferenceRegions;
|
private final List<String> preferenceRegions;
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
Member(final String id, final Gender gender, final ExperienceType experienceType, final MemberRole role, final LocalDate availableStartDate, final LocalDate availableEndDate, final Set<LocalDate> unavailableDates, final String activityRegion, final Set<String> historyCenterIds, final String residenceCode, final List<String> preferenceRegions) {
|
Member(final String id, final Gender gender, final ExperienceType experienceType,
|
||||||
|
final MemberRole role, final LocalDate availableStartDate, final LocalDate availableEndDate,
|
||||||
|
final Set<LocalDate> unavailableDates, final String activityRegion,
|
||||||
|
final Set<String> historyCenterIds, final String residenceCode,
|
||||||
|
final List<String> preferenceRegions) {
|
||||||
this.id = id;
|
this.id = id;
|
||||||
this.gender = gender;
|
this.gender = gender;
|
||||||
this.experienceType = experienceType;
|
this.experienceType = experienceType;
|
||||||
@@ -98,6 +103,7 @@ public class Member {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public static class MemberBuilder {
|
public static class MemberBuilder {
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
private String id;
|
private String id;
|
||||||
@Generated
|
@Generated
|
||||||
@@ -193,13 +199,22 @@ public class Member {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public Member build() {
|
public Member build() {
|
||||||
return new Member(this.id, this.gender, this.experienceType, this.role, this.availableStartDate, this.availableEndDate, this.unavailableDates, this.activityRegion, this.historyCenterIds, this.residenceCode, this.preferenceRegions);
|
return new Member(this.id, this.gender, this.experienceType, this.role,
|
||||||
|
this.availableStartDate, this.availableEndDate, this.unavailableDates,
|
||||||
|
this.activityRegion, this.historyCenterIds, this.residenceCode, this.preferenceRegions);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.id;
|
String var10000 = this.id;
|
||||||
return "Member.MemberBuilder(id=" + var10000 + ", gender=" + String.valueOf(this.gender) + ", experienceType=" + String.valueOf(this.experienceType) + ", role=" + String.valueOf(this.role) + ", availableStartDate=" + String.valueOf(this.availableStartDate) + ", availableEndDate=" + String.valueOf(this.availableEndDate) + ", unavailableDates=" + String.valueOf(this.unavailableDates) + ", activityRegion=" + this.activityRegion + ", historyCenterIds=" + String.valueOf(this.historyCenterIds) + ", residenceCode=" + this.residenceCode + ", preferenceRegions=" + String.valueOf(this.preferenceRegions) + ")";
|
return "Member.MemberBuilder(id=" + var10000 + ", gender=" + String.valueOf(this.gender)
|
||||||
|
+ ", experienceType=" + String.valueOf(this.experienceType) + ", role=" + String.valueOf(
|
||||||
|
this.role) + ", availableStartDate=" + String.valueOf(this.availableStartDate)
|
||||||
|
+ ", availableEndDate=" + String.valueOf(this.availableEndDate) + ", unavailableDates="
|
||||||
|
+ String.valueOf(this.unavailableDates) + ", activityRegion=" + this.activityRegion
|
||||||
|
+ ", historyCenterIds=" + String.valueOf(this.historyCenterIds) + ", residenceCode="
|
||||||
|
+ this.residenceCode + ", preferenceRegions=" + String.valueOf(this.preferenceRegions)
|
||||||
|
+ ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.kri.p6.ncrc.pairing.model;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class MemberRegionCode {
|
public class MemberRegionCode {
|
||||||
|
|
||||||
private final String sido;
|
private final String sido;
|
||||||
private final String sigungu;
|
private final String sigungu;
|
||||||
private final String regionCode;
|
private final String regionCode;
|
||||||
@@ -11,7 +12,8 @@ public class MemberRegionCode {
|
|||||||
private final String fullRegionCode;
|
private final String fullRegionCode;
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
MemberRegionCode(final String sido, final String sigungu, final String regionCode, final String detailRegionCode, final String detailAreaCode, final String fullRegionCode) {
|
MemberRegionCode(final String sido, final String sigungu, final String regionCode,
|
||||||
|
final String detailRegionCode, final String detailAreaCode, final String fullRegionCode) {
|
||||||
this.sido = sido;
|
this.sido = sido;
|
||||||
this.sigungu = sigungu;
|
this.sigungu = sigungu;
|
||||||
this.regionCode = regionCode;
|
this.regionCode = regionCode;
|
||||||
@@ -57,6 +59,7 @@ public class MemberRegionCode {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public static class MemberRegionCodeBuilder {
|
public static class MemberRegionCodeBuilder {
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
private String sido;
|
private String sido;
|
||||||
@Generated
|
@Generated
|
||||||
@@ -112,12 +115,16 @@ public class MemberRegionCode {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public MemberRegionCode build() {
|
public MemberRegionCode build() {
|
||||||
return new MemberRegionCode(this.sido, this.sigungu, this.regionCode, this.detailRegionCode, this.detailAreaCode, this.fullRegionCode);
|
return new MemberRegionCode(this.sido, this.sigungu, this.regionCode, this.detailRegionCode,
|
||||||
|
this.detailAreaCode, this.fullRegionCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "MemberRegionCode.MemberRegionCodeBuilder(sido=" + this.sido + ", sigungu=" + this.sigungu + ", regionCode=" + this.regionCode + ", detailRegionCode=" + this.detailRegionCode + ", detailAreaCode=" + this.detailAreaCode + ", fullRegionCode=" + this.fullRegionCode + ")";
|
return "MemberRegionCode.MemberRegionCodeBuilder(sido=" + this.sido + ", sigungu="
|
||||||
|
+ this.sigungu + ", regionCode=" + this.regionCode + ", detailRegionCode="
|
||||||
|
+ this.detailRegionCode + ", detailAreaCode=" + this.detailAreaCode + ", fullRegionCode="
|
||||||
|
+ this.fullRegionCode + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,13 +5,15 @@ import java.util.Set;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class Municipality {
|
public class Municipality {
|
||||||
|
|
||||||
private final String id;
|
private final String id;
|
||||||
private final LocalDate availableStartDate;
|
private final LocalDate availableStartDate;
|
||||||
private final LocalDate availableEndDate;
|
private final LocalDate availableEndDate;
|
||||||
private final Set<LocalDate> unavailableDates;
|
private final Set<LocalDate> unavailableDates;
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
Municipality(final String id, final LocalDate availableStartDate, final LocalDate availableEndDate, final Set<LocalDate> unavailableDates) {
|
Municipality(final String id, final LocalDate availableStartDate,
|
||||||
|
final LocalDate availableEndDate, final Set<LocalDate> unavailableDates) {
|
||||||
this.id = id;
|
this.id = id;
|
||||||
this.availableStartDate = availableStartDate;
|
this.availableStartDate = availableStartDate;
|
||||||
this.availableEndDate = availableEndDate;
|
this.availableEndDate = availableEndDate;
|
||||||
@@ -45,6 +47,7 @@ public class Municipality {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public static class MunicipalityBuilder {
|
public static class MunicipalityBuilder {
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
private String id;
|
private String id;
|
||||||
@Generated
|
@Generated
|
||||||
@@ -84,13 +87,17 @@ public class Municipality {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public Municipality build() {
|
public Municipality build() {
|
||||||
return new Municipality(this.id, this.availableStartDate, this.availableEndDate, this.unavailableDates);
|
return new Municipality(this.id, this.availableStartDate, this.availableEndDate,
|
||||||
|
this.unavailableDates);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = this.id;
|
String var10000 = this.id;
|
||||||
return "Municipality.MunicipalityBuilder(id=" + var10000 + ", availableStartDate=" + String.valueOf(this.availableStartDate) + ", availableEndDate=" + String.valueOf(this.availableEndDate) + ", unavailableDates=" + String.valueOf(this.unavailableDates) + ")";
|
return "Municipality.MunicipalityBuilder(id=" + var10000 + ", availableStartDate="
|
||||||
|
+ String.valueOf(this.availableStartDate) + ", availableEndDate=" + String.valueOf(
|
||||||
|
this.availableEndDate) + ", unavailableDates=" + String.valueOf(this.unavailableDates)
|
||||||
|
+ ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,12 +3,14 @@ package com.kri.p6.ncrc.pairing.model;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class PairCandidate {
|
public class PairCandidate {
|
||||||
|
|
||||||
private final String fieldMemberId;
|
private final String fieldMemberId;
|
||||||
private final String externalMemberId;
|
private final String externalMemberId;
|
||||||
private final int residenceMatchScore;
|
private final int residenceMatchScore;
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
PairCandidate(final String fieldMemberId, final String externalMemberId, final int residenceMatchScore) {
|
PairCandidate(final String fieldMemberId, final String externalMemberId,
|
||||||
|
final int residenceMatchScore) {
|
||||||
this.fieldMemberId = fieldMemberId;
|
this.fieldMemberId = fieldMemberId;
|
||||||
this.externalMemberId = externalMemberId;
|
this.externalMemberId = externalMemberId;
|
||||||
this.residenceMatchScore = residenceMatchScore;
|
this.residenceMatchScore = residenceMatchScore;
|
||||||
@@ -36,6 +38,7 @@ public class PairCandidate {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public static class PairCandidateBuilder {
|
public static class PairCandidateBuilder {
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
private String fieldMemberId;
|
private String fieldMemberId;
|
||||||
@Generated
|
@Generated
|
||||||
@@ -72,7 +75,9 @@ public class PairCandidate {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "PairCandidate.PairCandidateBuilder(fieldMemberId=" + this.fieldMemberId + ", externalMemberId=" + this.externalMemberId + ", residenceMatchScore=" + this.residenceMatchScore + ")";
|
return "PairCandidate.PairCandidateBuilder(fieldMemberId=" + this.fieldMemberId
|
||||||
|
+ ", externalMemberId=" + this.externalMemberId + ", residenceMatchScore="
|
||||||
|
+ this.residenceMatchScore + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,13 +6,17 @@ import java.util.Set;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class PairingCandidates {
|
public class PairingCandidates {
|
||||||
|
|
||||||
private final List<PairCandidate> pairCandidates;
|
private final List<PairCandidate> pairCandidates;
|
||||||
private final List<DispatchRegionCandidate> dispatchRegionCandidates;
|
private final List<DispatchRegionCandidate> dispatchRegionCandidates;
|
||||||
private final List<AssignmentCandidate> assignmentCandidates;
|
private final List<AssignmentCandidate> assignmentCandidates;
|
||||||
private final Map<String, Set<String>> unassignedCenterReasons;
|
private final Map<String, Set<String>> unassignedCenterReasons;
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
PairingCandidates(final List<PairCandidate> pairCandidates, final List<DispatchRegionCandidate> dispatchRegionCandidates, final List<AssignmentCandidate> assignmentCandidates, final Map<String, Set<String>> unassignedCenterReasons) {
|
PairingCandidates(final List<PairCandidate> pairCandidates,
|
||||||
|
final List<DispatchRegionCandidate> dispatchRegionCandidates,
|
||||||
|
final List<AssignmentCandidate> assignmentCandidates,
|
||||||
|
final Map<String, Set<String>> unassignedCenterReasons) {
|
||||||
this.pairCandidates = pairCandidates;
|
this.pairCandidates = pairCandidates;
|
||||||
this.dispatchRegionCandidates = dispatchRegionCandidates;
|
this.dispatchRegionCandidates = dispatchRegionCandidates;
|
||||||
this.assignmentCandidates = assignmentCandidates;
|
this.assignmentCandidates = assignmentCandidates;
|
||||||
@@ -46,6 +50,7 @@ public class PairingCandidates {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public static class PairingCandidatesBuilder {
|
public static class PairingCandidatesBuilder {
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
private List<PairCandidate> pairCandidates;
|
private List<PairCandidate> pairCandidates;
|
||||||
@Generated
|
@Generated
|
||||||
@@ -66,32 +71,39 @@ public class PairingCandidates {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingCandidatesBuilder dispatchRegionCandidates(final List<DispatchRegionCandidate> dispatchRegionCandidates) {
|
public PairingCandidatesBuilder dispatchRegionCandidates(
|
||||||
|
final List<DispatchRegionCandidate> dispatchRegionCandidates) {
|
||||||
this.dispatchRegionCandidates = dispatchRegionCandidates;
|
this.dispatchRegionCandidates = dispatchRegionCandidates;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingCandidatesBuilder assignmentCandidates(final List<AssignmentCandidate> assignmentCandidates) {
|
public PairingCandidatesBuilder assignmentCandidates(
|
||||||
|
final List<AssignmentCandidate> assignmentCandidates) {
|
||||||
this.assignmentCandidates = assignmentCandidates;
|
this.assignmentCandidates = assignmentCandidates;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingCandidatesBuilder unassignedCenterReasons(final Map<String, Set<String>> unassignedCenterReasons) {
|
public PairingCandidatesBuilder unassignedCenterReasons(
|
||||||
|
final Map<String, Set<String>> unassignedCenterReasons) {
|
||||||
this.unassignedCenterReasons = unassignedCenterReasons;
|
this.unassignedCenterReasons = unassignedCenterReasons;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingCandidates build() {
|
public PairingCandidates build() {
|
||||||
return new PairingCandidates(this.pairCandidates, this.dispatchRegionCandidates, this.assignmentCandidates, this.unassignedCenterReasons);
|
return new PairingCandidates(this.pairCandidates, this.dispatchRegionCandidates,
|
||||||
|
this.assignmentCandidates, this.unassignedCenterReasons);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = String.valueOf(this.pairCandidates);
|
String var10000 = String.valueOf(this.pairCandidates);
|
||||||
return "PairingCandidates.PairingCandidatesBuilder(pairCandidates=" + var10000 + ", dispatchRegionCandidates=" + String.valueOf(this.dispatchRegionCandidates) + ", assignmentCandidates=" + String.valueOf(this.assignmentCandidates) + ", unassignedCenterReasons=" + String.valueOf(this.unassignedCenterReasons) + ")";
|
return "PairingCandidates.PairingCandidatesBuilder(pairCandidates=" + var10000
|
||||||
|
+ ", dispatchRegionCandidates=" + String.valueOf(this.dispatchRegionCandidates)
|
||||||
|
+ ", assignmentCandidates=" + String.valueOf(this.assignmentCandidates)
|
||||||
|
+ ", unassignedCenterReasons=" + String.valueOf(this.unassignedCenterReasons) + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import java.util.Set;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class PairingData {
|
public class PairingData {
|
||||||
|
|
||||||
private final List<Member> members;
|
private final List<Member> members;
|
||||||
private final List<Municipality> municipalities;
|
private final List<Municipality> municipalities;
|
||||||
private final List<Center> centers;
|
private final List<Center> centers;
|
||||||
@@ -15,7 +16,11 @@ public class PairingData {
|
|||||||
private final Set<LocalDate> commonUnavailableDates;
|
private final Set<LocalDate> commonUnavailableDates;
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
PairingData(final List<Member> members, final List<Municipality> municipalities, final List<Center> centers, final List<MemberRegionCode> memberRegionCodes, final List<CenterAdjacentRegion> centerAdjacentRegions, final List<PreferenceMatchRule> preferenceMatchRules, final Set<LocalDate> commonUnavailableDates) {
|
PairingData(final List<Member> members, final List<Municipality> municipalities,
|
||||||
|
final List<Center> centers, final List<MemberRegionCode> memberRegionCodes,
|
||||||
|
final List<CenterAdjacentRegion> centerAdjacentRegions,
|
||||||
|
final List<PreferenceMatchRule> preferenceMatchRules,
|
||||||
|
final Set<LocalDate> commonUnavailableDates) {
|
||||||
this.members = members;
|
this.members = members;
|
||||||
this.municipalities = municipalities;
|
this.municipalities = municipalities;
|
||||||
this.centers = centers;
|
this.centers = centers;
|
||||||
@@ -67,6 +72,7 @@ public class PairingData {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public static class PairingDataBuilder {
|
public static class PairingDataBuilder {
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
private List<Member> members;
|
private List<Member> members;
|
||||||
@Generated
|
@Generated
|
||||||
@@ -111,13 +117,15 @@ public class PairingData {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingDataBuilder centerAdjacentRegions(final List<CenterAdjacentRegion> centerAdjacentRegions) {
|
public PairingDataBuilder centerAdjacentRegions(
|
||||||
|
final List<CenterAdjacentRegion> centerAdjacentRegions) {
|
||||||
this.centerAdjacentRegions = centerAdjacentRegions;
|
this.centerAdjacentRegions = centerAdjacentRegions;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingDataBuilder preferenceMatchRules(final List<PreferenceMatchRule> preferenceMatchRules) {
|
public PairingDataBuilder preferenceMatchRules(
|
||||||
|
final List<PreferenceMatchRule> preferenceMatchRules) {
|
||||||
this.preferenceMatchRules = preferenceMatchRules;
|
this.preferenceMatchRules = preferenceMatchRules;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -130,13 +138,20 @@ public class PairingData {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingData build() {
|
public PairingData build() {
|
||||||
return new PairingData(this.members, this.municipalities, this.centers, this.memberRegionCodes, this.centerAdjacentRegions, this.preferenceMatchRules, this.commonUnavailableDates);
|
return new PairingData(this.members, this.municipalities, this.centers,
|
||||||
|
this.memberRegionCodes, this.centerAdjacentRegions, this.preferenceMatchRules,
|
||||||
|
this.commonUnavailableDates);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = String.valueOf(this.members);
|
String var10000 = String.valueOf(this.members);
|
||||||
return "PairingData.PairingDataBuilder(members=" + var10000 + ", municipalities=" + String.valueOf(this.municipalities) + ", centers=" + String.valueOf(this.centers) + ", memberRegionCodes=" + String.valueOf(this.memberRegionCodes) + ", centerAdjacentRegions=" + String.valueOf(this.centerAdjacentRegions) + ", preferenceMatchRules=" + String.valueOf(this.preferenceMatchRules) + ", commonUnavailableDates=" + String.valueOf(this.commonUnavailableDates) + ")";
|
return "PairingData.PairingDataBuilder(members=" + var10000 + ", municipalities="
|
||||||
|
+ String.valueOf(this.municipalities) + ", centers=" + String.valueOf(this.centers)
|
||||||
|
+ ", memberRegionCodes=" + String.valueOf(this.memberRegionCodes)
|
||||||
|
+ ", centerAdjacentRegions=" + String.valueOf(this.centerAdjacentRegions)
|
||||||
|
+ ", preferenceMatchRules=" + String.valueOf(this.preferenceMatchRules)
|
||||||
|
+ ", commonUnavailableDates=" + String.valueOf(this.commonUnavailableDates) + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import java.util.List;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class PairingResult {
|
public class PairingResult {
|
||||||
|
|
||||||
private final List<AssignmentResultExcelDto> assignments;
|
private final List<AssignmentResultExcelDto> assignments;
|
||||||
private final List<UnassignedCenterExcelDto> unassignedCenters;
|
private final List<UnassignedCenterExcelDto> unassignedCenters;
|
||||||
private final List<UnusedMemberExcelDto> unusedMembers;
|
private final List<UnusedMemberExcelDto> unusedMembers;
|
||||||
@@ -22,7 +23,12 @@ public class PairingResult {
|
|||||||
private final List<RuleViolationExcelDto> ruleViolations;
|
private final List<RuleViolationExcelDto> ruleViolations;
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
PairingResult(final List<AssignmentResultExcelDto> assignments, final List<UnassignedCenterExcelDto> unassignedCenters, final List<UnusedMemberExcelDto> unusedMembers, final List<PairingSummaryExcelDto> summaries, final List<ABPairExcelDto> abPairs, final List<CandidateSummaryExcelDto> candidateSummaries, final List<ValidationErrorExcelDto> validationErrors, final List<RuleViolationExcelDto> ruleViolations) {
|
PairingResult(final List<AssignmentResultExcelDto> assignments,
|
||||||
|
final List<UnassignedCenterExcelDto> unassignedCenters,
|
||||||
|
final List<UnusedMemberExcelDto> unusedMembers, final List<PairingSummaryExcelDto> summaries,
|
||||||
|
final List<ABPairExcelDto> abPairs, final List<CandidateSummaryExcelDto> candidateSummaries,
|
||||||
|
final List<ValidationErrorExcelDto> validationErrors,
|
||||||
|
final List<RuleViolationExcelDto> ruleViolations) {
|
||||||
this.assignments = assignments;
|
this.assignments = assignments;
|
||||||
this.unassignedCenters = unassignedCenters;
|
this.unassignedCenters = unassignedCenters;
|
||||||
this.unusedMembers = unusedMembers;
|
this.unusedMembers = unusedMembers;
|
||||||
@@ -80,6 +86,7 @@ public class PairingResult {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public static class PairingResultBuilder {
|
public static class PairingResultBuilder {
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
private List<AssignmentResultExcelDto> assignments;
|
private List<AssignmentResultExcelDto> assignments;
|
||||||
@Generated
|
@Generated
|
||||||
@@ -108,7 +115,8 @@ public class PairingResult {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingResultBuilder unassignedCenters(final List<UnassignedCenterExcelDto> unassignedCenters) {
|
public PairingResultBuilder unassignedCenters(
|
||||||
|
final List<UnassignedCenterExcelDto> unassignedCenters) {
|
||||||
this.unassignedCenters = unassignedCenters;
|
this.unassignedCenters = unassignedCenters;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -132,13 +140,15 @@ public class PairingResult {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingResultBuilder candidateSummaries(final List<CandidateSummaryExcelDto> candidateSummaries) {
|
public PairingResultBuilder candidateSummaries(
|
||||||
|
final List<CandidateSummaryExcelDto> candidateSummaries) {
|
||||||
this.candidateSummaries = candidateSummaries;
|
this.candidateSummaries = candidateSummaries;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingResultBuilder validationErrors(final List<ValidationErrorExcelDto> validationErrors) {
|
public PairingResultBuilder validationErrors(
|
||||||
|
final List<ValidationErrorExcelDto> validationErrors) {
|
||||||
this.validationErrors = validationErrors;
|
this.validationErrors = validationErrors;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -151,13 +161,20 @@ public class PairingResult {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingResult build() {
|
public PairingResult build() {
|
||||||
return new PairingResult(this.assignments, this.unassignedCenters, this.unusedMembers, this.summaries, this.abPairs, this.candidateSummaries, this.validationErrors, this.ruleViolations);
|
return new PairingResult(this.assignments, this.unassignedCenters, this.unusedMembers,
|
||||||
|
this.summaries, this.abPairs, this.candidateSummaries, this.validationErrors,
|
||||||
|
this.ruleViolations);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String var10000 = String.valueOf(this.assignments);
|
String var10000 = String.valueOf(this.assignments);
|
||||||
return "PairingResult.PairingResultBuilder(assignments=" + var10000 + ", unassignedCenters=" + String.valueOf(this.unassignedCenters) + ", unusedMembers=" + String.valueOf(this.unusedMembers) + ", summaries=" + String.valueOf(this.summaries) + ", abPairs=" + String.valueOf(this.abPairs) + ", candidateSummaries=" + String.valueOf(this.candidateSummaries) + ", validationErrors=" + String.valueOf(this.validationErrors) + ", ruleViolations=" + String.valueOf(this.ruleViolations) + ")";
|
return "PairingResult.PairingResultBuilder(assignments=" + var10000 + ", unassignedCenters="
|
||||||
|
+ String.valueOf(this.unassignedCenters) + ", unusedMembers=" + String.valueOf(
|
||||||
|
this.unusedMembers) + ", summaries=" + String.valueOf(this.summaries) + ", abPairs="
|
||||||
|
+ String.valueOf(this.abPairs) + ", candidateSummaries=" + String.valueOf(
|
||||||
|
this.candidateSummaries) + ", validationErrors=" + String.valueOf(this.validationErrors)
|
||||||
|
+ ", ruleViolations=" + String.valueOf(this.ruleViolations) + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,12 +3,14 @@ package com.kri.p6.ncrc.pairing.model;
|
|||||||
import lombok.Generated;
|
import lombok.Generated;
|
||||||
|
|
||||||
public class PreferenceMatchRule {
|
public class PreferenceMatchRule {
|
||||||
|
|
||||||
private final int priority;
|
private final int priority;
|
||||||
private final int fieldMemberPreferenceRank;
|
private final int fieldMemberPreferenceRank;
|
||||||
private final int externalMemberPreferenceRank;
|
private final int externalMemberPreferenceRank;
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
PreferenceMatchRule(final int priority, final int fieldMemberPreferenceRank, final int externalMemberPreferenceRank) {
|
PreferenceMatchRule(final int priority, final int fieldMemberPreferenceRank,
|
||||||
|
final int externalMemberPreferenceRank) {
|
||||||
this.priority = priority;
|
this.priority = priority;
|
||||||
this.fieldMemberPreferenceRank = fieldMemberPreferenceRank;
|
this.fieldMemberPreferenceRank = fieldMemberPreferenceRank;
|
||||||
this.externalMemberPreferenceRank = externalMemberPreferenceRank;
|
this.externalMemberPreferenceRank = externalMemberPreferenceRank;
|
||||||
@@ -36,6 +38,7 @@ public class PreferenceMatchRule {
|
|||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public static class PreferenceMatchRuleBuilder {
|
public static class PreferenceMatchRuleBuilder {
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
private int priority;
|
private int priority;
|
||||||
@Generated
|
@Generated
|
||||||
@@ -54,25 +57,30 @@ public class PreferenceMatchRule {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PreferenceMatchRuleBuilder fieldMemberPreferenceRank(final int fieldMemberPreferenceRank) {
|
public PreferenceMatchRuleBuilder fieldMemberPreferenceRank(
|
||||||
|
final int fieldMemberPreferenceRank) {
|
||||||
this.fieldMemberPreferenceRank = fieldMemberPreferenceRank;
|
this.fieldMemberPreferenceRank = fieldMemberPreferenceRank;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PreferenceMatchRuleBuilder externalMemberPreferenceRank(final int externalMemberPreferenceRank) {
|
public PreferenceMatchRuleBuilder externalMemberPreferenceRank(
|
||||||
|
final int externalMemberPreferenceRank) {
|
||||||
this.externalMemberPreferenceRank = externalMemberPreferenceRank;
|
this.externalMemberPreferenceRank = externalMemberPreferenceRank;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PreferenceMatchRule build() {
|
public PreferenceMatchRule build() {
|
||||||
return new PreferenceMatchRule(this.priority, this.fieldMemberPreferenceRank, this.externalMemberPreferenceRank);
|
return new PreferenceMatchRule(this.priority, this.fieldMemberPreferenceRank,
|
||||||
|
this.externalMemberPreferenceRank);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "PreferenceMatchRule.PreferenceMatchRuleBuilder(priority=" + this.priority + ", fieldMemberPreferenceRank=" + this.fieldMemberPreferenceRank + ", externalMemberPreferenceRank=" + this.externalMemberPreferenceRank + ")";
|
return "PreferenceMatchRule.PreferenceMatchRuleBuilder(priority=" + this.priority
|
||||||
|
+ ", fieldMemberPreferenceRank=" + this.fieldMemberPreferenceRank
|
||||||
|
+ ", externalMemberPreferenceRank=" + this.externalMemberPreferenceRank + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
package com.kri.p6.ncrc.pairing.service;
|
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.config.PairingProperties;
|
import com.kri.p6.ncrc.pairing.config.PairingProperties;
|
||||||
import com.kri.p6.ncrc.pairing.model.AssignmentCandidate;
|
import com.kri.p6.ncrc.pairing.model.AssignmentCandidate;
|
||||||
import com.kri.p6.ncrc.pairing.model.Center;
|
import com.kri.p6.ncrc.pairing.model.Center;
|
||||||
import com.kri.p6.ncrc.pairing.model.CenterAdjacentRegion;
|
import com.kri.p6.ncrc.pairing.model.CenterAdjacentRegion;
|
||||||
import com.kri.p6.ncrc.pairing.model.DispatchRegionCandidate;
|
import com.kri.p6.ncrc.pairing.model.DispatchRegionCandidate;
|
||||||
import com.kri.p6.ncrc.pairing.common.enums.ExperienceType;
|
|
||||||
import com.kri.p6.ncrc.pairing.common.enums.Gender;
|
|
||||||
import com.kri.p6.ncrc.pairing.model.Member;
|
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.Municipality;
|
||||||
import com.kri.p6.ncrc.pairing.model.PairCandidate;
|
import com.kri.p6.ncrc.pairing.model.PairCandidate;
|
||||||
import com.kri.p6.ncrc.pairing.model.PairingCandidates;
|
import com.kri.p6.ncrc.pairing.model.PairingCandidates;
|
||||||
@@ -30,25 +30,37 @@ import org.springframework.stereotype.Service;
|
|||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class PairingCandidateService {
|
public class PairingCandidateService {
|
||||||
|
|
||||||
private final PairingProperties pairingProperties;
|
private final PairingProperties pairingProperties;
|
||||||
|
|
||||||
public PairingCandidates generate(PairingData data) {
|
public PairingCandidates generate(PairingData data) {
|
||||||
List<PairCandidate> pairCandidates = this.createPairCandidates(data.getMembers());
|
List<PairCandidate> pairCandidates = this.createPairCandidates(data.getMembers());
|
||||||
List<DispatchRegionCandidate> dispatchRegionCandidates = this.createDispatchRegionCandidates(data, pairCandidates);
|
List<DispatchRegionCandidate> dispatchRegionCandidates = this.createDispatchRegionCandidates(
|
||||||
|
data, pairCandidates);
|
||||||
Map<String, Set<String>> unassignedCenterReasons = this.createInitialCenterReasonMap(data);
|
Map<String, Set<String>> unassignedCenterReasons = this.createInitialCenterReasonMap(data);
|
||||||
List<AssignmentCandidate> assignmentCandidates = this.createAssignmentCandidates(data, pairCandidates, dispatchRegionCandidates, unassignedCenterReasons);
|
List<AssignmentCandidate> assignmentCandidates = this.createAssignmentCandidates(data,
|
||||||
return PairingCandidates.builder().pairCandidates(pairCandidates).dispatchRegionCandidates(dispatchRegionCandidates).assignmentCandidates(assignmentCandidates).unassignedCenterReasons(unassignedCenterReasons).build();
|
pairCandidates, dispatchRegionCandidates, unassignedCenterReasons);
|
||||||
|
return PairingCandidates.builder().pairCandidates(pairCandidates)
|
||||||
|
.dispatchRegionCandidates(dispatchRegionCandidates)
|
||||||
|
.assignmentCandidates(assignmentCandidates).unassignedCenterReasons(unassignedCenterReasons)
|
||||||
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<PairCandidate> createPairCandidates(List<Member> members) {
|
private List<PairCandidate> createPairCandidates(List<Member> members) {
|
||||||
List<Member> fieldMembers = members.stream().filter((member) -> member.getRole() == MemberRole.FIELD).toList();
|
List<Member> fieldMembers = members.stream()
|
||||||
List<Member> externalMembers = members.stream().filter((member) -> member.getRole() == MemberRole.EXTERNAL).toList();
|
.filter((member) -> member.getRole() == MemberRole.FIELD).toList();
|
||||||
|
List<Member> externalMembers = members.stream()
|
||||||
|
.filter((member) -> member.getRole() == MemberRole.EXTERNAL).toList();
|
||||||
List<PairCandidate> candidates = new ArrayList();
|
List<PairCandidate> candidates = new ArrayList();
|
||||||
|
|
||||||
for (Member fieldMember : fieldMembers) {
|
for (Member fieldMember : fieldMembers) {
|
||||||
for (Member externalMember : externalMembers) {
|
for (Member externalMember : externalMembers) {
|
||||||
if (!this.isNewNewPair(fieldMember, externalMember) && this.hasDateOverlap(fieldMember, externalMember)) {
|
if (!this.isNewNewPair(fieldMember, externalMember) && this.hasDateOverlap(fieldMember,
|
||||||
candidates.add(PairCandidate.builder().fieldMemberId(fieldMember.getId()).externalMemberId(externalMember.getId()).residenceMatchScore(this.calculateResidenceMatchScore(fieldMember, externalMember)).build());
|
externalMember)) {
|
||||||
|
candidates.add(PairCandidate.builder().fieldMemberId(fieldMember.getId())
|
||||||
|
.externalMemberId(externalMember.getId())
|
||||||
|
.residenceMatchScore(this.calculateResidenceMatchScore(fieldMember, externalMember))
|
||||||
|
.build());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -56,9 +68,11 @@ public class PairingCandidateService {
|
|||||||
return candidates;
|
return candidates;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<DispatchRegionCandidate> createDispatchRegionCandidates(PairingData data, List<PairCandidate> pairCandidates) {
|
private List<DispatchRegionCandidate> createDispatchRegionCandidates(PairingData data,
|
||||||
|
List<PairCandidate> pairCandidates) {
|
||||||
Map<String, Member> memberMap = this.toMemberMap(data.getMembers());
|
Map<String, Member> memberMap = this.toMemberMap(data.getMembers());
|
||||||
Set<String> dispatchRegions = (Set)data.getCenterAdjacentRegions().stream().map(CenterAdjacentRegion::getDispatchRegion).collect(Collectors.toSet());
|
Set<String> dispatchRegions = (Set) data.getCenterAdjacentRegions().stream()
|
||||||
|
.map(CenterAdjacentRegion::getDispatchRegion).collect(Collectors.toSet());
|
||||||
List<DispatchRegionCandidate> candidates = new ArrayList();
|
List<DispatchRegionCandidate> candidates = new ArrayList();
|
||||||
|
|
||||||
for (PairCandidate pairCandidate : pairCandidates) {
|
for (PairCandidate pairCandidate : pairCandidates) {
|
||||||
@@ -69,9 +83,14 @@ public class PairingCandidateService {
|
|||||||
if (!this.isConflictRegion(fieldMember, externalMember, dispatchRegion)) {
|
if (!this.isConflictRegion(fieldMember, externalMember, dispatchRegion)) {
|
||||||
int fieldRank = this.findPreferenceRank(fieldMember, dispatchRegion);
|
int fieldRank = this.findPreferenceRank(fieldMember, dispatchRegion);
|
||||||
int externalRank = this.findPreferenceRank(externalMember, dispatchRegion);
|
int externalRank = this.findPreferenceRank(externalMember, dispatchRegion);
|
||||||
Optional<PreferenceMatchRule> matchRule = this.findPreferenceMatchRule(data.getPreferenceMatchRules(), fieldRank, externalRank);
|
Optional<PreferenceMatchRule> matchRule = this.findPreferenceMatchRule(
|
||||||
|
data.getPreferenceMatchRules(), fieldRank, externalRank);
|
||||||
if (!matchRule.isEmpty()) {
|
if (!matchRule.isEmpty()) {
|
||||||
candidates.add(DispatchRegionCandidate.builder().fieldMemberId(fieldMember.getId()).externalMemberId(externalMember.getId()).dispatchRegion(dispatchRegion).preferencePriority(((PreferenceMatchRule)matchRule.get()).getPriority()).fieldMemberPreferenceRank(fieldRank).externalMemberPreferenceRank(externalRank).build());
|
candidates.add(DispatchRegionCandidate.builder().fieldMemberId(fieldMember.getId())
|
||||||
|
.externalMemberId(externalMember.getId()).dispatchRegion(dispatchRegion)
|
||||||
|
.preferencePriority(((PreferenceMatchRule) matchRule.get()).getPriority())
|
||||||
|
.fieldMemberPreferenceRank(fieldRank).externalMemberPreferenceRank(externalRank)
|
||||||
|
.build());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -80,33 +99,57 @@ public class PairingCandidateService {
|
|||||||
return candidates;
|
return candidates;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<AssignmentCandidate> createAssignmentCandidates(PairingData data, List<PairCandidate> pairCandidates, List<DispatchRegionCandidate> dispatchRegionCandidates, Map<String, Set<String>> unassignedCenterReasons) {
|
private List<AssignmentCandidate> createAssignmentCandidates(PairingData data,
|
||||||
|
List<PairCandidate> pairCandidates, List<DispatchRegionCandidate> dispatchRegionCandidates,
|
||||||
|
Map<String, Set<String>> unassignedCenterReasons) {
|
||||||
Map<String, Member> memberMap = this.toMemberMap(data.getMembers());
|
Map<String, Member> memberMap = this.toMemberMap(data.getMembers());
|
||||||
Map<String, Municipality> municipalityMap = (Map)data.getMunicipalities().stream().collect(Collectors.toMap(Municipality::getId, Function.identity(), (left, right) -> left));
|
Map<String, Municipality> municipalityMap = (Map) data.getMunicipalities().stream()
|
||||||
Map<String, PairCandidate> pairMap = (Map)pairCandidates.stream().collect(Collectors.toMap(this::pairKey, Function.identity(), (left, right) -> left));
|
.collect(Collectors.toMap(Municipality::getId, Function.identity(), (left, right) -> left));
|
||||||
Map<String, Set<String>> adjacentClassificationsByDispatchRegion = (Map)data.getCenterAdjacentRegions().stream().collect(Collectors.groupingBy(CenterAdjacentRegion::getDispatchRegion, Collectors.mapping(CenterAdjacentRegion::getAdjacentRegionClassification, Collectors.toSet())));
|
Map<String, PairCandidate> pairMap = (Map) pairCandidates.stream()
|
||||||
|
.collect(Collectors.toMap(this::pairKey, Function.identity(), (left, right) -> left));
|
||||||
|
Map<String, Set<String>> adjacentClassificationsByDispatchRegion = (Map) data.getCenterAdjacentRegions()
|
||||||
|
.stream().collect(Collectors.groupingBy(CenterAdjacentRegion::getDispatchRegion,
|
||||||
|
Collectors.mapping(CenterAdjacentRegion::getAdjacentRegionClassification,
|
||||||
|
Collectors.toSet())));
|
||||||
List<AssignmentCandidate> candidates = new ArrayList();
|
List<AssignmentCandidate> candidates = new ArrayList();
|
||||||
|
|
||||||
for (DispatchRegionCandidate dispatchCandidate : dispatchRegionCandidates) {
|
for (DispatchRegionCandidate dispatchCandidate : dispatchRegionCandidates) {
|
||||||
Member fieldMember = (Member) memberMap.get(dispatchCandidate.getFieldMemberId());
|
Member fieldMember = (Member) memberMap.get(dispatchCandidate.getFieldMemberId());
|
||||||
Member externalMember = (Member) memberMap.get(dispatchCandidate.getExternalMemberId());
|
Member externalMember = (Member) memberMap.get(dispatchCandidate.getExternalMemberId());
|
||||||
PairCandidate pairCandidate = (PairCandidate)pairMap.get(this.pairKey(dispatchCandidate.getFieldMemberId(), dispatchCandidate.getExternalMemberId()));
|
PairCandidate pairCandidate = (PairCandidate) pairMap.get(
|
||||||
Set<String> adjacentClassifications = (Set)adjacentClassificationsByDispatchRegion.getOrDefault(dispatchCandidate.getDispatchRegion(), Set.of());
|
this.pairKey(dispatchCandidate.getFieldMemberId(),
|
||||||
|
dispatchCandidate.getExternalMemberId()));
|
||||||
|
Set<String> adjacentClassifications = (Set) adjacentClassificationsByDispatchRegion.getOrDefault(
|
||||||
|
dispatchCandidate.getDispatchRegion(), Set.of());
|
||||||
|
|
||||||
for (Center center : data.getCenters()) {
|
for (Center center : data.getCenters()) {
|
||||||
if (!adjacentClassifications.contains(center.getAdjacentRegionClassification())) {
|
if (!adjacentClassifications.contains(center.getAdjacentRegionClassification())) {
|
||||||
this.addReason(unassignedCenterReasons, center.getId(), "파견 권역과 센터 인접지역 분류 불일치");
|
this.addReason(unassignedCenterReasons, center.getId(), "파견 권역과 센터 인접지역 분류 불일치");
|
||||||
} else {
|
} else {
|
||||||
Municipality municipality = (Municipality)municipalityMap.get(center.getMunicipalityId());
|
Municipality municipality = (Municipality) municipalityMap.get(
|
||||||
List<String> centerReasons = this.findCenterHardRuleReasons(fieldMember, externalMember, center);
|
center.getMunicipalityId());
|
||||||
|
List<String> centerReasons = this.findCenterHardRuleReasons(fieldMember, externalMember,
|
||||||
|
center);
|
||||||
if (!centerReasons.isEmpty()) {
|
if (!centerReasons.isEmpty()) {
|
||||||
centerReasons.forEach((reason) -> this.addReason(unassignedCenterReasons, center.getId(), reason));
|
centerReasons.forEach(
|
||||||
|
(reason) -> this.addReason(unassignedCenterReasons, center.getId(), reason));
|
||||||
} else {
|
} else {
|
||||||
LocalDate firstAssignableDate = this.findFirstAssignableDate(fieldMember, externalMember, municipality, center, this.commonUnavailableDates(data));
|
LocalDate firstAssignableDate = this.findFirstAssignableDate(fieldMember,
|
||||||
|
externalMember, municipality, center, this.commonUnavailableDates(data));
|
||||||
if (firstAssignableDate == null) {
|
if (firstAssignableDate == null) {
|
||||||
this.addReason(unassignedCenterReasons, center.getId(), "위원/지자체/센터 일정 또는 국공휴일 조건 불일치");
|
this.addReason(unassignedCenterReasons, center.getId(),
|
||||||
|
"위원/지자체/센터 일정 또는 국공휴일 조건 불일치");
|
||||||
} else {
|
} else {
|
||||||
candidates.add(AssignmentCandidate.builder().fieldMemberId(fieldMember.getId()).externalMemberId(externalMember.getId()).centerId(center.getId()).municipalityId(center.getMunicipalityId()).date(firstAssignableDate).dispatchRegion(dispatchCandidate.getDispatchRegion()).adjacentRegionClassification(center.getAdjacentRegionClassification()).preferencePriority(dispatchCandidate.getPreferencePriority()).fieldMemberPreferenceRank(dispatchCandidate.getFieldMemberPreferenceRank()).externalMemberPreferenceRank(dispatchCandidate.getExternalMemberPreferenceRank()).residenceMatchScore(pairCandidate == null ? 0 : pairCandidate.getResidenceMatchScore()).build());
|
candidates.add(AssignmentCandidate.builder().fieldMemberId(fieldMember.getId())
|
||||||
|
.externalMemberId(externalMember.getId()).centerId(center.getId())
|
||||||
|
.municipalityId(center.getMunicipalityId()).date(firstAssignableDate)
|
||||||
|
.dispatchRegion(dispatchCandidate.getDispatchRegion())
|
||||||
|
.adjacentRegionClassification(center.getAdjacentRegionClassification())
|
||||||
|
.preferencePriority(dispatchCandidate.getPreferencePriority())
|
||||||
|
.fieldMemberPreferenceRank(dispatchCandidate.getFieldMemberPreferenceRank())
|
||||||
|
.externalMemberPreferenceRank(dispatchCandidate.getExternalMemberPreferenceRank())
|
||||||
|
.residenceMatchScore(
|
||||||
|
pairCandidate == null ? 0 : pairCandidate.getResidenceMatchScore()).build());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -117,12 +160,15 @@ public class PairingCandidateService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean isNewNewPair(Member fieldMember, Member externalMember) {
|
private boolean isNewNewPair(Member fieldMember, Member externalMember) {
|
||||||
return fieldMember.getExperienceType() == ExperienceType.NEW && externalMember.getExperienceType() == ExperienceType.NEW;
|
return fieldMember.getExperienceType() == ExperienceType.NEW
|
||||||
|
&& externalMember.getExperienceType() == ExperienceType.NEW;
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean hasDateOverlap(Member fieldMember, Member externalMember) {
|
private boolean hasDateOverlap(Member fieldMember, Member externalMember) {
|
||||||
LocalDate latestStart = this.max(fieldMember.getAvailableStartDate(), externalMember.getAvailableStartDate());
|
LocalDate latestStart = this.max(fieldMember.getAvailableStartDate(),
|
||||||
LocalDate earliestEnd = this.min(fieldMember.getAvailableEndDate(), externalMember.getAvailableEndDate());
|
externalMember.getAvailableStartDate());
|
||||||
|
LocalDate earliestEnd = this.min(fieldMember.getAvailableEndDate(),
|
||||||
|
externalMember.getAvailableEndDate());
|
||||||
return !latestStart.isAfter(earliestEnd);
|
return !latestStart.isAfter(earliestEnd);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -132,8 +178,10 @@ public class PairingCandidateService {
|
|||||||
return fieldPrefix.equals(externalPrefix) ? 1 : 0;
|
return fieldPrefix.equals(externalPrefix) ? 1 : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isConflictRegion(Member fieldMember, Member externalMember, String dispatchRegion) {
|
private boolean isConflictRegion(Member fieldMember, Member externalMember,
|
||||||
return dispatchRegion.equals(fieldMember.getActivityRegion()) || dispatchRegion.equals(externalMember.getActivityRegion());
|
String dispatchRegion) {
|
||||||
|
return dispatchRegion.equals(fieldMember.getActivityRegion()) || dispatchRegion.equals(
|
||||||
|
externalMember.getActivityRegion());
|
||||||
}
|
}
|
||||||
|
|
||||||
private int findPreferenceRank(Member member, String dispatchRegion) {
|
private int findPreferenceRank(Member member, String dispatchRegion) {
|
||||||
@@ -153,35 +201,50 @@ public class PairingCandidateService {
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Optional<PreferenceMatchRule> findPreferenceMatchRule(List<PreferenceMatchRule> rules, int fieldRank, int externalRank) {
|
private Optional<PreferenceMatchRule> findPreferenceMatchRule(List<PreferenceMatchRule> rules,
|
||||||
return fieldRank >= 0 && externalRank >= 0 ? rules.stream().filter((rule) -> this.matchesPreferenceRank(rule.getFieldMemberPreferenceRank(), fieldRank)).filter((rule) -> this.matchesPreferenceRank(rule.getExternalMemberPreferenceRank(), externalRank)).min(Comparator.comparingInt(PreferenceMatchRule::getPriority)) : Optional.empty();
|
int fieldRank, int externalRank) {
|
||||||
|
return fieldRank >= 0 && externalRank >= 0 ? rules.stream().filter(
|
||||||
|
(rule) -> this.matchesPreferenceRank(rule.getFieldMemberPreferenceRank(), fieldRank))
|
||||||
|
.filter((rule) -> this.matchesPreferenceRank(
|
||||||
|
rule.getExternalMemberPreferenceRank(),
|
||||||
|
externalRank)).min(
|
||||||
|
Comparator.comparingInt(PreferenceMatchRule::getPriority)) : Optional.empty();
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean matchesPreferenceRank(int ruleRank, int memberRank) {
|
private boolean matchesPreferenceRank(int ruleRank, int memberRank) {
|
||||||
return ruleRank == this.ignoredPreferenceRank() || ruleRank == memberRank;
|
return ruleRank == this.ignoredPreferenceRank() || ruleRank == memberRank;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<String> findCenterHardRuleReasons(Member fieldMember, Member externalMember, Center center) {
|
private List<String> findCenterHardRuleReasons(Member fieldMember, Member externalMember,
|
||||||
|
Center center) {
|
||||||
List<String> reasons = new ArrayList();
|
List<String> reasons = new ArrayList();
|
||||||
if (center.isWomenOnly() && (fieldMember.getGender() != Gender.FEMALE || externalMember.getGender() != Gender.FEMALE)) {
|
if (center.isWomenOnly() && (fieldMember.getGender() != Gender.FEMALE
|
||||||
|
|| externalMember.getGender() != Gender.FEMALE)) {
|
||||||
reasons.add("여성 전용 센터 조건 불충족");
|
reasons.add("여성 전용 센터 조건 불충족");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fieldMember.getHistoryCenterIds().contains(center.getId()) || externalMember.getHistoryCenterIds().contains(center.getId())) {
|
if (fieldMember.getHistoryCenterIds().contains(center.getId())
|
||||||
|
|| externalMember.getHistoryCenterIds().contains(center.getId())) {
|
||||||
reasons.add("2023년 진행 센터 재배정 제외");
|
reasons.add("2023년 진행 센터 재배정 제외");
|
||||||
}
|
}
|
||||||
|
|
||||||
return reasons;
|
return reasons;
|
||||||
}
|
}
|
||||||
|
|
||||||
private LocalDate findFirstAssignableDate(Member fieldMember, Member externalMember, Municipality municipality, Center center, Set<LocalDate> commonUnavailableDates) {
|
private LocalDate findFirstAssignableDate(Member fieldMember, Member externalMember,
|
||||||
LocalDate start = this.max(this.max(fieldMember.getAvailableStartDate(), externalMember.getAvailableStartDate()), this.max(municipality.getAvailableStartDate(), center.getAvailableStartDate()));
|
Municipality municipality, Center center, Set<LocalDate> commonUnavailableDates) {
|
||||||
LocalDate end = this.min(this.min(fieldMember.getAvailableEndDate(), externalMember.getAvailableEndDate()), this.min(municipality.getAvailableEndDate(), center.getAvailableEndDate()));
|
LocalDate start = this.max(
|
||||||
|
this.max(fieldMember.getAvailableStartDate(), externalMember.getAvailableStartDate()),
|
||||||
|
this.max(municipality.getAvailableStartDate(), center.getAvailableStartDate()));
|
||||||
|
LocalDate end = this.min(
|
||||||
|
this.min(fieldMember.getAvailableEndDate(), externalMember.getAvailableEndDate()),
|
||||||
|
this.min(municipality.getAvailableEndDate(), center.getAvailableEndDate()));
|
||||||
if (start.isAfter(end)) {
|
if (start.isAfter(end)) {
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
for (LocalDate date = start; !date.isAfter(end); date = date.plusDays(1L)) {
|
for (LocalDate date = start; !date.isAfter(end); date = date.plusDays(1L)) {
|
||||||
if (this.isAvailableOn(date, fieldMember, externalMember, municipality, center, commonUnavailableDates)) {
|
if (this.isAvailableOn(date, fieldMember, externalMember, municipality, center,
|
||||||
|
commonUnavailableDates)) {
|
||||||
return date;
|
return date;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -190,8 +253,12 @@ public class PairingCandidateService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isAvailableOn(LocalDate date, Member fieldMember, Member externalMember, Municipality municipality, Center center, Set<LocalDate> commonUnavailableDates) {
|
private boolean isAvailableOn(LocalDate date, Member fieldMember, Member externalMember,
|
||||||
return !fieldMember.getUnavailableDates().contains(date) && !externalMember.getUnavailableDates().contains(date) && !municipality.getUnavailableDates().contains(date) && !center.getUnavailableDates().contains(date) && !commonUnavailableDates.contains(date);
|
Municipality municipality, Center center, Set<LocalDate> commonUnavailableDates) {
|
||||||
|
return !fieldMember.getUnavailableDates().contains(date)
|
||||||
|
&& !externalMember.getUnavailableDates().contains(date)
|
||||||
|
&& !municipality.getUnavailableDates().contains(date) && !center.getUnavailableDates()
|
||||||
|
.contains(date) && !commonUnavailableDates.contains(date);
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, Set<String>> createInitialCenterReasonMap(PairingData data) {
|
private Map<String, Set<String>> createInitialCenterReasonMap(PairingData data) {
|
||||||
@@ -209,7 +276,8 @@ public class PairingCandidateService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, Member> toMemberMap(List<Member> members) {
|
private Map<String, Member> toMemberMap(List<Member> members) {
|
||||||
return (Map)members.stream().collect(Collectors.toMap(Member::getId, Function.identity(), (left, right) -> left));
|
return (Map) members.stream()
|
||||||
|
.collect(Collectors.toMap(Member::getId, Function.identity(), (left, right) -> left));
|
||||||
}
|
}
|
||||||
|
|
||||||
private String pairKey(PairCandidate pairCandidate) {
|
private String pairKey(PairCandidate pairCandidate) {
|
||||||
|
|||||||
@@ -3,21 +3,21 @@ package com.kri.p6.ncrc.pairing.service;
|
|||||||
import com.kri.common.feature.excel.ExcelMapper;
|
import com.kri.common.feature.excel.ExcelMapper;
|
||||||
import com.kri.common.feature.web.BusinessException;
|
import com.kri.common.feature.web.BusinessException;
|
||||||
import com.kri.p6.ncrc.pairing.config.PairingProperties;
|
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.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.input.PairingWorkbookData;
|
|
||||||
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.dto.excel.input.CenterAdjacentRegionExcelDto;
|
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.CenterExcelDto;
|
||||||
import com.kri.p6.ncrc.pairing.dto.excel.input.MemberExcelDto;
|
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.MemberRegionCodeExcelDto;
|
||||||
import com.kri.p6.ncrc.pairing.dto.excel.input.MunicipalityExcelDto;
|
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.input.PreferenceMatchExcelDto;
|
||||||
|
import com.kri.p6.ncrc.pairing.dto.excel.output.ABPairExcelDto;
|
||||||
|
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 com.kri.p6.ncrc.pairing.model.PairingResult;
|
import com.kri.p6.ncrc.pairing.model.PairingResult;
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -33,6 +33,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class PairingExcelService {
|
public class PairingExcelService {
|
||||||
|
|
||||||
private final PairingProperties pairingProperties;
|
private final PairingProperties pairingProperties;
|
||||||
|
|
||||||
public PairingWorkbookData read(MultipartFile file) {
|
public PairingWorkbookData read(MultipartFile file) {
|
||||||
@@ -45,7 +46,15 @@ public class PairingExcelService {
|
|||||||
Workbook workbook = WorkbookFactory.create(inputStream);
|
Workbook workbook = WorkbookFactory.create(inputStream);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
var4 = PairingWorkbookData.builder().members(this.readSheet(workbook, MemberExcelDto.class, "위원정보")).municipalities(this.readSheet(workbook, MunicipalityExcelDto.class, "지자체 정보")).centers(this.readSheet(workbook, CenterExcelDto.class, "센터정보")).memberRegionCodes(this.readSheet(workbook, MemberRegionCodeExcelDto.class, "위원 지역 코드표")).centerAdjacentRegions(this.readSheet(workbook, CenterAdjacentRegionExcelDto.class, "센터 인접지역표")).preferenceMatchRules(this.readSheet(workbook, PreferenceMatchExcelDto.class, "희망지역 매칭표")).build();
|
var4 = PairingWorkbookData.builder()
|
||||||
|
.members(this.readSheet(workbook, MemberExcelDto.class, "위원정보"))
|
||||||
|
.municipalities(this.readSheet(workbook, MunicipalityExcelDto.class, "지자체 정보"))
|
||||||
|
.centers(this.readSheet(workbook, CenterExcelDto.class, "센터정보")).memberRegionCodes(
|
||||||
|
this.readSheet(workbook, MemberRegionCodeExcelDto.class, "위원 지역 코드표"))
|
||||||
|
.centerAdjacentRegions(
|
||||||
|
this.readSheet(workbook, CenterAdjacentRegionExcelDto.class, "센터 인접지역표"))
|
||||||
|
.preferenceMatchRules(
|
||||||
|
this.readSheet(workbook, PreferenceMatchExcelDto.class, "희망지역 매칭표")).build();
|
||||||
} catch (Throwable var8) {
|
} catch (Throwable var8) {
|
||||||
if (workbook != null) {
|
if (workbook != null) {
|
||||||
try {
|
try {
|
||||||
@@ -81,7 +90,8 @@ public class PairingExcelService {
|
|||||||
} catch (BusinessException e) {
|
} catch (BusinessException e) {
|
||||||
throw e;
|
throw e;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw BusinessException.badRequest("PAIRING_EXCEL_READ_FAILED", "엑셀 파일을 읽는 중 오류가 발생했습니다: " + e.getMessage());
|
throw BusinessException.badRequest("PAIRING_EXCEL_READ_FAILED",
|
||||||
|
"엑셀 파일을 읽는 중 오류가 발생했습니다: " + e.getMessage());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw BusinessException.badRequest("PAIRING_EMPTY_FILE", "업로드된 엑셀 파일이 없습니다.");
|
throw BusinessException.badRequest("PAIRING_EMPTY_FILE", "업로드된 엑셀 파일이 없습니다.");
|
||||||
@@ -90,20 +100,28 @@ public class PairingExcelService {
|
|||||||
|
|
||||||
public byte[] write(PairingResult result) {
|
public byte[] write(PairingResult result) {
|
||||||
try {
|
try {
|
||||||
Workbook workbook = ExcelMapper.writeToWorkbook(result.getAssignments(), AssignmentResultExcelDto.class, "배정결과");
|
Workbook workbook = ExcelMapper.writeToWorkbook(result.getAssignments(),
|
||||||
|
AssignmentResultExcelDto.class, "배정결과");
|
||||||
|
|
||||||
byte[] var4;
|
byte[] var4;
|
||||||
try {
|
try {
|
||||||
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
|
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
ExcelMapper.appendSheetToWorkbook(workbook, result.getUnassignedCenters(), UnassignedCenterExcelDto.class, "미배정센터", this.headerRowIndex());
|
ExcelMapper.appendSheetToWorkbook(workbook, result.getUnassignedCenters(),
|
||||||
ExcelMapper.appendSheetToWorkbook(workbook, result.getUnusedMembers(), UnusedMemberExcelDto.class, "미사용위원", this.headerRowIndex());
|
UnassignedCenterExcelDto.class, "미배정센터", this.headerRowIndex());
|
||||||
ExcelMapper.appendSheetToWorkbook(workbook, result.getSummaries(), PairingSummaryExcelDto.class, "처리요약", this.headerRowIndex());
|
ExcelMapper.appendSheetToWorkbook(workbook, result.getUnusedMembers(),
|
||||||
ExcelMapper.appendSheetToWorkbook(workbook, result.getAbPairs(), ABPairExcelDto.class, "AB페어목록", this.headerRowIndex());
|
UnusedMemberExcelDto.class, "미사용위원", this.headerRowIndex());
|
||||||
ExcelMapper.appendSheetToWorkbook(workbook, result.getCandidateSummaries(), CandidateSummaryExcelDto.class, "후보요약", this.headerRowIndex());
|
ExcelMapper.appendSheetToWorkbook(workbook, result.getSummaries(),
|
||||||
ExcelMapper.appendSheetToWorkbook(workbook, result.getValidationErrors(), ValidationErrorExcelDto.class, "검증오류", this.headerRowIndex());
|
PairingSummaryExcelDto.class, "처리요약", this.headerRowIndex());
|
||||||
ExcelMapper.appendSheetToWorkbook(workbook, result.getRuleViolations(), RuleViolationExcelDto.class, "규칙위반검사", this.headerRowIndex());
|
ExcelMapper.appendSheetToWorkbook(workbook, result.getAbPairs(), ABPairExcelDto.class,
|
||||||
|
"AB페어목록", this.headerRowIndex());
|
||||||
|
ExcelMapper.appendSheetToWorkbook(workbook, result.getCandidateSummaries(),
|
||||||
|
CandidateSummaryExcelDto.class, "후보요약", this.headerRowIndex());
|
||||||
|
ExcelMapper.appendSheetToWorkbook(workbook, result.getValidationErrors(),
|
||||||
|
ValidationErrorExcelDto.class, "검증오류", this.headerRowIndex());
|
||||||
|
ExcelMapper.appendSheetToWorkbook(workbook, result.getRuleViolations(),
|
||||||
|
RuleViolationExcelDto.class, "규칙위반검사", this.headerRowIndex());
|
||||||
workbook.write(outputStream);
|
workbook.write(outputStream);
|
||||||
var4 = outputStream.toByteArray();
|
var4 = outputStream.toByteArray();
|
||||||
} catch (Throwable var8) {
|
} catch (Throwable var8) {
|
||||||
@@ -135,20 +153,28 @@ public class PairingExcelService {
|
|||||||
|
|
||||||
return var4;
|
return var4;
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw BusinessException.badRequest("PAIRING_EXCEL_WRITE_FAILED", "결과 엑셀 파일을 생성하는 중 오류가 발생했습니다: " + e.getMessage());
|
throw BusinessException.badRequest("PAIRING_EXCEL_WRITE_FAILED",
|
||||||
|
"결과 엑셀 파일을 생성하는 중 오류가 발생했습니다: " + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public byte[] writeValidationError(String code, String message) {
|
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()).validationErrors(List.of(new ValidationErrorExcelDto(code, message, "ERROR"))).ruleViolations(List.of()).build();
|
PairingResult result = PairingResult.builder().assignments(List.of())
|
||||||
|
.unassignedCenters(List.of()).unusedMembers(List.of())
|
||||||
|
.summaries(List.of(new PairingSummaryExcelDto("처리 상태", "검증 실패"))).abPairs(List.of())
|
||||||
|
.candidateSummaries(List.of())
|
||||||
|
.validationErrors(List.of(new ValidationErrorExcelDto(code, message, "ERROR")))
|
||||||
|
.ruleViolations(List.of()).build();
|
||||||
return this.write(result);
|
return this.write(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
private <T> List<T> readSheet(Workbook workbook, Class<T> type, String sheetName) {
|
private <T> List<T> readSheet(Workbook workbook, Class<T> type, String sheetName) {
|
||||||
if (workbook.getSheet(sheetName) == null) {
|
if (workbook.getSheet(sheetName) == null) {
|
||||||
throw BusinessException.badRequest("PAIRING_REQUIRED_SHEET_MISSING", "필수 시트가 없습니다: " + sheetName);
|
throw BusinessException.badRequest("PAIRING_REQUIRED_SHEET_MISSING",
|
||||||
|
"필수 시트가 없습니다: " + sheetName);
|
||||||
} else {
|
} else {
|
||||||
return ExcelMapper.readFromWorkbook(workbook, type, sheetName, this.headerRowIndex()).stream().filter((row) -> !this.isBlankRow(row)).toList();
|
return ExcelMapper.readFromWorkbook(workbook, type, sheetName, this.headerRowIndex()).stream()
|
||||||
|
.filter((row) -> !this.isBlankRow(row)).toList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -157,7 +183,8 @@ public class PairingExcelService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean isBlankRow(Object row) {
|
private boolean isBlankRow(Object row) {
|
||||||
return Arrays.stream(row.getClass().getDeclaredFields()).allMatch((field) -> this.isBlankField(row, field));
|
return Arrays.stream(row.getClass().getDeclaredFields())
|
||||||
|
.allMatch((field) -> this.isBlankField(row, field));
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isBlankField(Object row, Field field) {
|
private boolean isBlankField(Object row, Field field) {
|
||||||
@@ -166,7 +193,8 @@ public class PairingExcelService {
|
|||||||
Object value = field.get(row);
|
Object value = field.get(row);
|
||||||
return value == null || value.toString().trim().isBlank();
|
return value == null || value.toString().trim().isBlank();
|
||||||
} catch (IllegalAccessException e) {
|
} catch (IllegalAccessException e) {
|
||||||
throw BusinessException.badRequest("PAIRING_EXCEL_READ_FAILED", "엑셀 행을 확인하는 중 오류가 발생했습니다: " + e.getMessage());
|
throw BusinessException.badRequest("PAIRING_EXCEL_READ_FAILED",
|
||||||
|
"엑셀 행을 확인하는 중 오류가 발생했습니다: " + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,20 +13,31 @@ import org.springframework.stereotype.Service;
|
|||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class PairingHolidayService {
|
public class PairingHolidayService {
|
||||||
private static final DateTimeFormatter DATAGO_DATE_FORMAT = DateTimeFormatter.ofPattern("yyyyMMdd");
|
|
||||||
|
private static final DateTimeFormatter DATAGO_DATE_FORMAT = DateTimeFormatter.ofPattern(
|
||||||
|
"yyyyMMdd");
|
||||||
private final DatagoHolidayCache datagoHolidayCache;
|
private final DatagoHolidayCache datagoHolidayCache;
|
||||||
|
|
||||||
public PairingData applyHolidayUnavailableDates(PairingData data) {
|
public PairingData applyHolidayUnavailableDates(PairingData data) {
|
||||||
Set<String> years = this.collectYears(data);
|
Set<String> years = this.collectYears(data);
|
||||||
Set<LocalDate> holidays = this.datagoHolidayCache.getHolidays(years).stream().map(this::toHolidayDate).collect(Collectors.toSet());
|
Set<LocalDate> holidays = this.datagoHolidayCache.getHolidays(years).stream()
|
||||||
return PairingData.builder().members(data.getMembers()).municipalities(data.getMunicipalities()).centers(data.getCenters()).memberRegionCodes(data.getMemberRegionCodes()).centerAdjacentRegions(data.getCenterAdjacentRegions()).preferenceMatchRules(data.getPreferenceMatchRules()).commonUnavailableDates(holidays).build();
|
.map(this::toHolidayDate).collect(Collectors.toSet());
|
||||||
|
return PairingData.builder().members(data.getMembers()).municipalities(data.getMunicipalities())
|
||||||
|
.centers(data.getCenters()).memberRegionCodes(data.getMemberRegionCodes())
|
||||||
|
.centerAdjacentRegions(data.getCenterAdjacentRegions())
|
||||||
|
.preferenceMatchRules(data.getPreferenceMatchRules()).commonUnavailableDates(holidays)
|
||||||
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
private Set<String> collectYears(PairingData data) {
|
private Set<String> collectYears(PairingData data) {
|
||||||
Set<String> years = new HashSet();
|
Set<String> years = new HashSet();
|
||||||
data.getMembers().forEach((member) -> this.addYears(years, member.getAvailableStartDate(), member.getAvailableEndDate()));
|
data.getMembers().forEach((member) -> this.addYears(years, member.getAvailableStartDate(),
|
||||||
data.getMunicipalities().forEach((municipality) -> this.addYears(years, municipality.getAvailableStartDate(), municipality.getAvailableEndDate()));
|
member.getAvailableEndDate()));
|
||||||
data.getCenters().forEach((center) -> this.addYears(years, center.getAvailableStartDate(), center.getAvailableEndDate()));
|
data.getMunicipalities().forEach(
|
||||||
|
(municipality) -> this.addYears(years, municipality.getAvailableStartDate(),
|
||||||
|
municipality.getAvailableEndDate()));
|
||||||
|
data.getCenters().forEach((center) -> this.addYears(years, center.getAvailableStartDate(),
|
||||||
|
center.getAvailableEndDate()));
|
||||||
return years;
|
return years;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,21 +1,21 @@
|
|||||||
package com.kri.p6.ncrc.pairing.service;
|
package com.kri.p6.ncrc.pairing.service;
|
||||||
|
|
||||||
import com.kri.common.feature.web.BusinessException;
|
import com.kri.common.feature.web.BusinessException;
|
||||||
|
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.config.PairingProperties;
|
import com.kri.p6.ncrc.pairing.config.PairingProperties;
|
||||||
import com.kri.p6.ncrc.pairing.dto.excel.input.PairingWorkbookData;
|
|
||||||
import com.kri.p6.ncrc.pairing.dto.excel.input.CenterAdjacentRegionExcelDto;
|
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.CenterExcelDto;
|
||||||
import com.kri.p6.ncrc.pairing.dto.excel.input.MemberExcelDto;
|
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.MemberRegionCodeExcelDto;
|
||||||
import com.kri.p6.ncrc.pairing.dto.excel.input.MunicipalityExcelDto;
|
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.input.PreferenceMatchExcelDto;
|
||||||
import com.kri.p6.ncrc.pairing.model.Center;
|
import com.kri.p6.ncrc.pairing.model.Center;
|
||||||
import com.kri.p6.ncrc.pairing.model.CenterAdjacentRegion;
|
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.model.Member;
|
import com.kri.p6.ncrc.pairing.model.Member;
|
||||||
import com.kri.p6.ncrc.pairing.model.MemberRegionCode;
|
import com.kri.p6.ncrc.pairing.model.MemberRegionCode;
|
||||||
import com.kri.p6.ncrc.pairing.common.enums.MemberRole;
|
|
||||||
import com.kri.p6.ncrc.pairing.model.Municipality;
|
import com.kri.p6.ncrc.pairing.model.Municipality;
|
||||||
import com.kri.p6.ncrc.pairing.model.PairingData;
|
import com.kri.p6.ncrc.pairing.model.PairingData;
|
||||||
import com.kri.p6.ncrc.pairing.model.PreferenceMatchRule;
|
import com.kri.p6.ncrc.pairing.model.PreferenceMatchRule;
|
||||||
@@ -32,41 +32,86 @@ import org.springframework.stereotype.Service;
|
|||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class PairingNormalizeService {
|
public class PairingNormalizeService {
|
||||||
|
|
||||||
private final PairingProperties pairingProperties;
|
private final PairingProperties pairingProperties;
|
||||||
|
|
||||||
public PairingData normalize(PairingWorkbookData workbookData) {
|
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();
|
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();
|
||||||
}
|
}
|
||||||
|
|
||||||
private Member toMember(MemberExcelDto row) {
|
private Member toMember(MemberExcelDto row) {
|
||||||
return Member.builder().id(this.required(row.getId(), "위원 id")).gender(this.parseGender(row.getGender())).experienceType(this.parseExperienceType(row.getExperience())).role(this.parseMemberRole(row.getRole())).availableStartDate(this.parseDate(row.getAvailableStartDate(), "위원 진행 시작일")).availableEndDate(this.parseDate(row.getAvailableEndDate(), "위원 진행 종료일")).unavailableDates(this.parseDateSet(row.getUnavailableDates(), "위원 진행 불가 일자")).activityRegion(this.normalizeCode(row.getActivityRegion(), this.regionCodeLength(), "위원 활동지역")).historyCenterIds(this.parseCsv(row.getHistoryCenters())).residenceCode(this.normalizeCode(row.getResidenceCode(), this.residenceCodeLength(), "위원 거주지")).preferenceRegions(this.normalizePreferenceRegions(row)).build();
|
return Member.builder().id(this.required(row.getId(), "위원 id"))
|
||||||
|
.gender(this.parseGender(row.getGender()))
|
||||||
|
.experienceType(this.parseExperienceType(row.getExperience()))
|
||||||
|
.role(this.parseMemberRole(row.getRole()))
|
||||||
|
.availableStartDate(this.parseDate(row.getAvailableStartDate(), "위원 진행 시작일"))
|
||||||
|
.availableEndDate(this.parseDate(row.getAvailableEndDate(), "위원 진행 종료일"))
|
||||||
|
.unavailableDates(this.parseDateSet(row.getUnavailableDates(), "위원 진행 불가 일자"))
|
||||||
|
.activityRegion(
|
||||||
|
this.normalizeCode(row.getActivityRegion(), this.regionCodeLength(), "위원 활동지역"))
|
||||||
|
.historyCenterIds(this.parseCsv(row.getHistoryCenters())).residenceCode(
|
||||||
|
this.normalizeCode(row.getResidenceCode(), this.residenceCodeLength(), "위원 거주지"))
|
||||||
|
.preferenceRegions(this.normalizePreferenceRegions(row)).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
private Municipality toMunicipality(MunicipalityExcelDto row) {
|
private Municipality toMunicipality(MunicipalityExcelDto row) {
|
||||||
return Municipality.builder().id(this.required(row.getId(), "지자체 id")).availableStartDate(this.parseDate(row.getAvailableStartDate(), "지자체 진행 시작일")).availableEndDate(this.parseDate(row.getAvailableEndDate(), "지자체 진행 종료일")).unavailableDates(this.parseDateSet(row.getUnavailableDates(), "지자체 진행 불가 일자")).build();
|
return Municipality.builder().id(this.required(row.getId(), "지자체 id"))
|
||||||
|
.availableStartDate(this.parseDate(row.getAvailableStartDate(), "지자체 진행 시작일"))
|
||||||
|
.availableEndDate(this.parseDate(row.getAvailableEndDate(), "지자체 진행 종료일"))
|
||||||
|
.unavailableDates(this.parseDateSet(row.getUnavailableDates(), "지자체 진행 불가 일자")).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
private Center toCenter(CenterExcelDto row) {
|
private Center toCenter(CenterExcelDto row) {
|
||||||
return Center.builder().id(this.required(row.getId(), "센터 id")).municipalityId(this.required(row.getMunicipalityId(), "센터 지자체 id")).womenOnly(this.parseBooleanFlag(row.getWomenOnly(), "센터 여성 위원만")).adjacentRegionClassification(this.required(row.getAdjacentRegionClassification(), "센터 인접지역 분류")).availableStartDate(this.parseDate(row.getAvailableStartDate(), "센터 진행 시작일")).availableEndDate(this.parseDate(row.getAvailableEndDate(), "센터 진행 종료일")).unavailableDates(this.parseDateSet(row.getUnavailableDates(), "센터 진행 불가 일자")).build();
|
return Center.builder().id(this.required(row.getId(), "센터 id"))
|
||||||
|
.municipalityId(this.required(row.getMunicipalityId(), "센터 지자체 id"))
|
||||||
|
.womenOnly(this.parseBooleanFlag(row.getWomenOnly(), "센터 여성 위원만"))
|
||||||
|
.adjacentRegionClassification(
|
||||||
|
this.required(row.getAdjacentRegionClassification(), "센터 인접지역 분류"))
|
||||||
|
.availableStartDate(this.parseDate(row.getAvailableStartDate(), "센터 진행 시작일"))
|
||||||
|
.availableEndDate(this.parseDate(row.getAvailableEndDate(), "센터 진행 종료일"))
|
||||||
|
.unavailableDates(this.parseDateSet(row.getUnavailableDates(), "센터 진행 불가 일자")).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
private MemberRegionCode toMemberRegionCode(MemberRegionCodeExcelDto row) {
|
private MemberRegionCode toMemberRegionCode(MemberRegionCodeExcelDto row) {
|
||||||
String regionCode = this.normalizeCode(row.getRegionCode(), this.regionCodeLength(), "권역코드");
|
String regionCode = this.normalizeCode(row.getRegionCode(), this.regionCodeLength(), "권역코드");
|
||||||
String detailRegionCode = this.normalizeCode(row.getDetailRegionCode(), 1, "세부권역코드");
|
String detailRegionCode = this.normalizeCode(row.getDetailRegionCode(), 1, "세부권역코드");
|
||||||
String detailAreaCode = this.normalizeCode(row.getDetailAreaCode(), 2, "세부지역코드");
|
String detailAreaCode = this.normalizeCode(row.getDetailAreaCode(), 2, "세부지역코드");
|
||||||
return MemberRegionCode.builder().sido(this.clean(row.getSido())).sigungu(this.clean(row.getSigungu())).regionCode(regionCode).detailRegionCode(detailRegionCode).detailAreaCode(detailAreaCode).fullRegionCode(this.normalizeFullRegionCode(row.getFullRegionCode(), regionCode, detailRegionCode, detailAreaCode)).build();
|
return MemberRegionCode.builder().sido(this.clean(row.getSido()))
|
||||||
|
.sigungu(this.clean(row.getSigungu())).regionCode(regionCode)
|
||||||
|
.detailRegionCode(detailRegionCode).detailAreaCode(detailAreaCode).fullRegionCode(
|
||||||
|
this.normalizeFullRegionCode(row.getFullRegionCode(), regionCode, detailRegionCode,
|
||||||
|
detailAreaCode)).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
private CenterAdjacentRegion toCenterAdjacentRegion(CenterAdjacentRegionExcelDto row) {
|
private CenterAdjacentRegion toCenterAdjacentRegion(CenterAdjacentRegionExcelDto row) {
|
||||||
return CenterAdjacentRegion.builder().dispatchRegion(this.normalizeCode(row.getDispatchRegion(), this.regionCodeLength(), "센터 인접지역표 권역")).adjacentRegionClassification(this.required(row.getAdjacentRegionClassification(), "인접지역 분류")).build();
|
return CenterAdjacentRegion.builder().dispatchRegion(
|
||||||
|
this.normalizeCode(row.getDispatchRegion(), this.regionCodeLength(), "센터 인접지역표 권역"))
|
||||||
|
.adjacentRegionClassification(
|
||||||
|
this.required(row.getAdjacentRegionClassification(), "인접지역 분류")).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
private PreferenceMatchRule toPreferenceMatchRule(PreferenceMatchExcelDto row) {
|
private PreferenceMatchRule toPreferenceMatchRule(PreferenceMatchExcelDto row) {
|
||||||
return PreferenceMatchRule.builder().priority(this.parseInt(row.getPriority(), "매칭 순위")).fieldMemberPreferenceRank(this.parseInt(row.getFieldMemberPreferenceRank(), "현장위원 선호 순위")).externalMemberPreferenceRank(this.parseInt(row.getExternalMemberPreferenceRank(), "외부위원 선호 순위")).build();
|
return PreferenceMatchRule.builder().priority(this.parseInt(row.getPriority(), "매칭 순위"))
|
||||||
|
.fieldMemberPreferenceRank(this.parseInt(row.getFieldMemberPreferenceRank(), "현장위원 선호 순위"))
|
||||||
|
.externalMemberPreferenceRank(
|
||||||
|
this.parseInt(row.getExternalMemberPreferenceRank(), "외부위원 선호 순위")).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<String> normalizePreferenceRegions(MemberExcelDto row) {
|
private List<String> normalizePreferenceRegions(MemberExcelDto row) {
|
||||||
List<String> preferences = new ArrayList(Arrays.asList(this.normalizeCode(row.getPreferenceRegion1(), this.regionCodeLength(), "선호 지역1"), this.normalizeCode(row.getPreferenceRegion2(), this.regionCodeLength(), "선호 지역2"), this.normalizeCode(row.getPreferenceRegion3(), this.regionCodeLength(), "선호 지역3"), this.normalizeCode(row.getPreferenceRegion4(), this.regionCodeLength(), "선호 지역4")));
|
List<String> preferences = new ArrayList(Arrays.asList(
|
||||||
|
this.normalizeCode(row.getPreferenceRegion1(), this.regionCodeLength(), "선호 지역1"),
|
||||||
|
this.normalizeCode(row.getPreferenceRegion2(), this.regionCodeLength(), "선호 지역2"),
|
||||||
|
this.normalizeCode(row.getPreferenceRegion3(), this.regionCodeLength(), "선호 지역3"),
|
||||||
|
this.normalizeCode(row.getPreferenceRegion4(), this.regionCodeLength(), "선호 지역4")));
|
||||||
boolean anyRegionAppeared = false;
|
boolean anyRegionAppeared = false;
|
||||||
|
|
||||||
for (int i = 0; i < preferences.size(); ++i) {
|
for (int i = 0; i < preferences.size(); ++i) {
|
||||||
@@ -98,7 +143,8 @@ public class PairingNormalizeService {
|
|||||||
} else if ("신규".equals(cleaned)) {
|
} else if ("신규".equals(cleaned)) {
|
||||||
return ExperienceType.NEW;
|
return ExperienceType.NEW;
|
||||||
} else {
|
} else {
|
||||||
throw BusinessException.badRequest("PAIRING_INVALID_EXPERIENCE", "경력여부 값이 올바르지 않습니다: " + value);
|
throw BusinessException.badRequest("PAIRING_INVALID_EXPERIENCE",
|
||||||
|
"경력여부 값이 올바르지 않습니다: " + value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,7 +155,8 @@ public class PairingNormalizeService {
|
|||||||
} else if ("외부".equals(cleaned)) {
|
} else if ("외부".equals(cleaned)) {
|
||||||
return MemberRole.EXTERNAL;
|
return MemberRole.EXTERNAL;
|
||||||
} else {
|
} else {
|
||||||
throw BusinessException.badRequest("PAIRING_INVALID_MEMBER_ROLE", "현장/외부 구분 값이 올바르지 않습니다: " + value);
|
throw BusinessException.badRequest("PAIRING_INVALID_MEMBER_ROLE",
|
||||||
|
"현장/외부 구분 값이 올바르지 않습니다: " + value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -120,7 +167,8 @@ public class PairingNormalizeService {
|
|||||||
} else if ("0".equals(cleaned)) {
|
} else if ("0".equals(cleaned)) {
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
throw BusinessException.badRequest("PAIRING_INVALID_BOOLEAN_FLAG", fieldName + " 값은 0 또는 1이어야 합니다: " + value);
|
throw BusinessException.badRequest("PAIRING_INVALID_BOOLEAN_FLAG",
|
||||||
|
fieldName + " 값은 0 또는 1이어야 합니다: " + value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -130,17 +178,22 @@ public class PairingNormalizeService {
|
|||||||
try {
|
try {
|
||||||
return LocalDate.parse(cleaned);
|
return LocalDate.parse(cleaned);
|
||||||
} catch (DateTimeParseException var5) {
|
} catch (DateTimeParseException var5) {
|
||||||
throw BusinessException.badRequest("PAIRING_INVALID_DATE", fieldName + " 날짜 형식이 올바르지 않습니다: " + value);
|
throw BusinessException.badRequest("PAIRING_INVALID_DATE",
|
||||||
|
fieldName + " 날짜 형식이 올바르지 않습니다: " + value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private Set<LocalDate> parseDateSet(String value, String fieldName) {
|
private Set<LocalDate> parseDateSet(String value, String fieldName) {
|
||||||
return (Set)this.parseCsv(value).stream().map((date) -> this.parseDate(date, fieldName)).collect(Collectors.toCollection(LinkedHashSet::new));
|
return (Set) this.parseCsv(value).stream().map((date) -> this.parseDate(date, fieldName))
|
||||||
|
.collect(Collectors.toCollection(LinkedHashSet::new));
|
||||||
}
|
}
|
||||||
|
|
||||||
private Set<String> parseCsv(String value) {
|
private Set<String> parseCsv(String value) {
|
||||||
String cleaned = this.clean(value);
|
String cleaned = this.clean(value);
|
||||||
return (Set<String>)(cleaned.isBlank() ? new LinkedHashSet() : (Set)Arrays.stream(cleaned.split(",")).map(String::trim).filter((token) -> !token.isBlank()).collect(Collectors.toCollection(LinkedHashSet::new)));
|
return (Set<String>) (cleaned.isBlank() ? new LinkedHashSet()
|
||||||
|
: (Set) Arrays.stream(cleaned.split(",")).map(String::trim)
|
||||||
|
.filter((token) -> !token.isBlank())
|
||||||
|
.collect(Collectors.toCollection(LinkedHashSet::new)));
|
||||||
}
|
}
|
||||||
|
|
||||||
private int parseInt(String value, String fieldName) {
|
private int parseInt(String value, String fieldName) {
|
||||||
@@ -149,7 +202,8 @@ public class PairingNormalizeService {
|
|||||||
try {
|
try {
|
||||||
return Integer.parseInt(cleaned);
|
return Integer.parseInt(cleaned);
|
||||||
} catch (NumberFormatException var5) {
|
} catch (NumberFormatException var5) {
|
||||||
throw BusinessException.badRequest("PAIRING_INVALID_NUMBER", fieldName + " 숫자 형식이 올바르지 않습니다: " + value);
|
throw BusinessException.badRequest("PAIRING_INVALID_NUMBER",
|
||||||
|
fieldName + " 숫자 형식이 올바르지 않습니다: " + value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -160,23 +214,28 @@ public class PairingNormalizeService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!cleaned.matches("\\d+")) {
|
if (!cleaned.matches("\\d+")) {
|
||||||
throw BusinessException.badRequest("PAIRING_INVALID_CODE", fieldName + " 코드는 숫자만 허용됩니다: " + value);
|
throw BusinessException.badRequest("PAIRING_INVALID_CODE",
|
||||||
|
fieldName + " 코드는 숫자만 허용됩니다: " + value);
|
||||||
} else if (cleaned.length() > length) {
|
} else if (cleaned.length() > length) {
|
||||||
throw BusinessException.badRequest("PAIRING_INVALID_CODE", fieldName + " 코드 길이가 올바르지 않습니다: " + value);
|
throw BusinessException.badRequest("PAIRING_INVALID_CODE",
|
||||||
|
fieldName + " 코드 길이가 올바르지 않습니다: " + value);
|
||||||
} else {
|
} 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 normalizeFullRegionCode(String value, String regionCode, String detailRegionCode, String detailAreaCode) {
|
private String normalizeFullRegionCode(String value, String regionCode, String detailRegionCode,
|
||||||
|
String detailAreaCode) {
|
||||||
String cleaned = this.clean(value);
|
String cleaned = this.clean(value);
|
||||||
return cleaned.matches("\\d+") ? this.normalizeCode(cleaned, 5, "지역 코드") : regionCode + detailRegionCode + detailAreaCode;
|
return cleaned.matches("\\d+") ? this.normalizeCode(cleaned, 5, "지역 코드")
|
||||||
|
: regionCode + detailRegionCode + detailAreaCode;
|
||||||
}
|
}
|
||||||
|
|
||||||
private String required(String value, String fieldName) {
|
private String required(String value, String fieldName) {
|
||||||
String cleaned = this.clean(value);
|
String cleaned = this.clean(value);
|
||||||
if (cleaned.isBlank()) {
|
if (cleaned.isBlank()) {
|
||||||
throw BusinessException.badRequest("PAIRING_REQUIRED_VALUE_MISSING", "필수 값이 없습니다: " + fieldName);
|
throw BusinessException.badRequest("PAIRING_REQUIRED_VALUE_MISSING",
|
||||||
|
"필수 값이 없습니다: " + fieldName);
|
||||||
} else {
|
} else {
|
||||||
return cleaned;
|
return cleaned;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class PairingService {
|
public class PairingService {
|
||||||
|
|
||||||
private final PairingExcelService pairingExcelService;
|
private final PairingExcelService pairingExcelService;
|
||||||
private final PairingNormalizeService pairingNormalizeService;
|
private final PairingNormalizeService pairingNormalizeService;
|
||||||
private final PairingHolidayService pairingHolidayService;
|
private final PairingHolidayService pairingHolidayService;
|
||||||
@@ -28,7 +29,12 @@ public class PairingService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Generated
|
@Generated
|
||||||
public PairingService(final PairingExcelService pairingExcelService, final PairingNormalizeService pairingNormalizeService, final PairingHolidayService pairingHolidayService, final PairingValidationService pairingValidationService, final PairingCandidateService pairingCandidateService, final PairingSolverService pairingSolverService) {
|
public PairingService(final PairingExcelService pairingExcelService,
|
||||||
|
final PairingNormalizeService pairingNormalizeService,
|
||||||
|
final PairingHolidayService pairingHolidayService,
|
||||||
|
final PairingValidationService pairingValidationService,
|
||||||
|
final PairingCandidateService pairingCandidateService,
|
||||||
|
final PairingSolverService pairingSolverService) {
|
||||||
this.pairingExcelService = pairingExcelService;
|
this.pairingExcelService = pairingExcelService;
|
||||||
this.pairingNormalizeService = pairingNormalizeService;
|
this.pairingNormalizeService = pairingNormalizeService;
|
||||||
this.pairingHolidayService = pairingHolidayService;
|
this.pairingHolidayService = pairingHolidayService;
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ import com.google.ortools.sat.CpSolverStatus;
|
|||||||
import com.google.ortools.sat.LinearArgument;
|
import com.google.ortools.sat.LinearArgument;
|
||||||
import com.google.ortools.sat.LinearExpr;
|
import com.google.ortools.sat.LinearExpr;
|
||||||
import com.google.ortools.sat.Literal;
|
import com.google.ortools.sat.Literal;
|
||||||
|
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.config.PairingProperties;
|
||||||
import com.kri.p6.ncrc.pairing.dto.excel.output.ABPairExcelDto;
|
import com.kri.p6.ncrc.pairing.dto.excel.output.ABPairExcelDto;
|
||||||
import com.kri.p6.ncrc.pairing.dto.excel.output.AssignmentResultExcelDto;
|
import com.kri.p6.ncrc.pairing.dto.excel.output.AssignmentResultExcelDto;
|
||||||
@@ -19,8 +21,6 @@ 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.ABPairMatch;
|
||||||
import com.kri.p6.ncrc.pairing.model.AssignmentCandidate;
|
import com.kri.p6.ncrc.pairing.model.AssignmentCandidate;
|
||||||
import com.kri.p6.ncrc.pairing.model.Center;
|
import com.kri.p6.ncrc.pairing.model.Center;
|
||||||
import com.kri.p6.ncrc.pairing.common.enums.ExperienceType;
|
|
||||||
import com.kri.p6.ncrc.pairing.common.enums.Gender;
|
|
||||||
import com.kri.p6.ncrc.pairing.model.Member;
|
import com.kri.p6.ncrc.pairing.model.Member;
|
||||||
import com.kri.p6.ncrc.pairing.model.PairingCandidates;
|
import com.kri.p6.ncrc.pairing.model.PairingCandidates;
|
||||||
import com.kri.p6.ncrc.pairing.model.PairingData;
|
import com.kri.p6.ncrc.pairing.model.PairingData;
|
||||||
@@ -44,6 +44,7 @@ import org.springframework.stereotype.Service;
|
|||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class PairingSolverService {
|
public class PairingSolverService {
|
||||||
|
|
||||||
private final PairingProperties pairingProperties;
|
private final PairingProperties pairingProperties;
|
||||||
|
|
||||||
public PairingResult solve(PairingData data, PairingCandidates candidates) {
|
public PairingResult solve(PairingData data, PairingCandidates candidates) {
|
||||||
@@ -55,8 +56,10 @@ public class PairingSolverService {
|
|||||||
BoolVar[] assignmentVars = this.createAssignmentVars(model, assignmentCandidates);
|
BoolVar[] assignmentVars = this.createAssignmentVars(model, assignmentCandidates);
|
||||||
Map<String, BoolVar> pairUsedVars = this.createPairUsedVars(model, assignmentCandidates);
|
Map<String, BoolVar> pairUsedVars = this.createPairUsedVars(model, assignmentCandidates);
|
||||||
Map<String, BoolVar> pairDayVars = this.createPairDayVars(model, assignmentCandidates);
|
Map<String, BoolVar> pairDayVars = this.createPairDayVars(model, assignmentCandidates);
|
||||||
Map<String, BoolVar> pairDayAdjacentVars = this.createPairDayAdjacentVars(model, assignmentCandidates);
|
Map<String, BoolVar> pairDayAdjacentVars = this.createPairDayAdjacentVars(model,
|
||||||
this.linkHelperVars(model, assignmentCandidates, assignmentVars, pairUsedVars, pairDayVars, pairDayAdjacentVars);
|
assignmentCandidates);
|
||||||
|
this.linkHelperVars(model, assignmentCandidates, assignmentVars, pairUsedVars, pairDayVars,
|
||||||
|
pairDayAdjacentVars);
|
||||||
this.addCenterAssignedAtMostOnce(model, assignmentCandidates, assignmentVars);
|
this.addCenterAssignedAtMostOnce(model, assignmentCandidates, assignmentVars);
|
||||||
this.addPairDailyCapacity(model, assignmentCandidates, assignmentVars);
|
this.addPairDailyCapacity(model, assignmentCandidates, assignmentVars);
|
||||||
this.addMemberDailyOnePair(model, assignmentCandidates, pairDayVars);
|
this.addMemberDailyOnePair(model, assignmentCandidates, pairDayVars);
|
||||||
@@ -64,13 +67,17 @@ public class PairingSolverService {
|
|||||||
this.addBuddyLimit(model, assignmentCandidates, pairUsedVars);
|
this.addBuddyLimit(model, assignmentCandidates, pairUsedVars);
|
||||||
model.maximize(this.createObjective(assignmentCandidates, assignmentVars));
|
model.maximize(this.createObjective(assignmentCandidates, assignmentVars));
|
||||||
CpSolver solver = new CpSolver();
|
CpSolver solver = new CpSolver();
|
||||||
solver.getParameters().setMaxTimeInSeconds(this.pairingProperties.getSolver().getMaxTimeSeconds());
|
solver.getParameters()
|
||||||
solver.getParameters().setNumSearchWorkers(this.pairingProperties.getSolver().getNumSearchWorkers());
|
.setMaxTimeInSeconds(this.pairingProperties.getSolver().getMaxTimeSeconds());
|
||||||
|
solver.getParameters()
|
||||||
|
.setNumSearchWorkers(this.pairingProperties.getSolver().getNumSearchWorkers());
|
||||||
CpSolverStatus status = solver.solve(model);
|
CpSolverStatus status = solver.solve(model);
|
||||||
if (status != CpSolverStatus.OPTIMAL && status != CpSolverStatus.FEASIBLE) {
|
if (status != CpSolverStatus.OPTIMAL && status != CpSolverStatus.FEASIBLE) {
|
||||||
return this.emptyResult(data, candidates, "solver가 feasible 해를 찾지 못했습니다: " + String.valueOf(status));
|
return this.emptyResult(data, candidates,
|
||||||
|
"solver가 feasible 해를 찾지 못했습니다: " + String.valueOf(status));
|
||||||
} else {
|
} else {
|
||||||
List<AssignmentCandidate> selectedAssignments = this.collectSelectedAssignments(assignmentCandidates, assignmentVars, solver);
|
List<AssignmentCandidate> selectedAssignments = this.collectSelectedAssignments(
|
||||||
|
assignmentCandidates, assignmentVars, solver);
|
||||||
return this.toResult(data, candidates, selectedAssignments, status);
|
return this.toResult(data, candidates, selectedAssignments, status);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -87,95 +94,137 @@ public class PairingSolverService {
|
|||||||
return vars;
|
return vars;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, BoolVar> createPairUsedVars(CpModel model, List<AssignmentCandidate> candidates) {
|
private Map<String, BoolVar> createPairUsedVars(CpModel model,
|
||||||
return (Map)candidates.stream().map(this::pairKey).distinct().collect(Collectors.toMap(Function.identity(), (key) -> model.newBoolVar("pair_used_" + key)));
|
List<AssignmentCandidate> candidates) {
|
||||||
|
return (Map) candidates.stream().map(this::pairKey).distinct().collect(
|
||||||
|
Collectors.toMap(Function.identity(), (key) -> model.newBoolVar("pair_used_" + key)));
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, BoolVar> createPairDayVars(CpModel model, List<AssignmentCandidate> candidates) {
|
private Map<String, BoolVar> createPairDayVars(CpModel model,
|
||||||
return (Map)candidates.stream().map(this::pairDayKey).distinct().collect(Collectors.toMap(Function.identity(), (key) -> model.newBoolVar("pair_day_" + key)));
|
List<AssignmentCandidate> candidates) {
|
||||||
|
return (Map) candidates.stream().map(this::pairDayKey).distinct().collect(
|
||||||
|
Collectors.toMap(Function.identity(), (key) -> model.newBoolVar("pair_day_" + key)));
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, BoolVar> createPairDayAdjacentVars(CpModel model, List<AssignmentCandidate> candidates) {
|
private Map<String, BoolVar> createPairDayAdjacentVars(CpModel model,
|
||||||
return (Map)candidates.stream().map(this::pairDayAdjacentKey).distinct().collect(Collectors.toMap(Function.identity(), (key) -> model.newBoolVar("pair_day_adjacent_" + key)));
|
List<AssignmentCandidate> candidates) {
|
||||||
|
return (Map) candidates.stream().map(this::pairDayAdjacentKey).distinct().collect(
|
||||||
|
Collectors.toMap(Function.identity(),
|
||||||
|
(key) -> model.newBoolVar("pair_day_adjacent_" + key)));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void linkHelperVars(CpModel model, List<AssignmentCandidate> candidates, BoolVar[] assignmentVars, Map<String, BoolVar> pairUsedVars, Map<String, BoolVar> pairDayVars, Map<String, BoolVar> pairDayAdjacentVars) {
|
private void linkHelperVars(CpModel model, List<AssignmentCandidate> candidates,
|
||||||
|
BoolVar[] assignmentVars, Map<String, BoolVar> pairUsedVars, Map<String, BoolVar> pairDayVars,
|
||||||
|
Map<String, BoolVar> pairDayAdjacentVars) {
|
||||||
for (int i = 0; i < candidates.size(); ++i) {
|
for (int i = 0; i < candidates.size(); ++i) {
|
||||||
AssignmentCandidate candidate = (AssignmentCandidate) candidates.get(i);
|
AssignmentCandidate candidate = (AssignmentCandidate) candidates.get(i);
|
||||||
model.addLessOrEqual(assignmentVars[i], (LinearArgument)pairUsedVars.get(this.pairKey(candidate)));
|
model.addLessOrEqual(assignmentVars[i],
|
||||||
model.addLessOrEqual(assignmentVars[i], (LinearArgument)pairDayVars.get(this.pairDayKey(candidate)));
|
(LinearArgument) pairUsedVars.get(this.pairKey(candidate)));
|
||||||
model.addLessOrEqual(assignmentVars[i], (LinearArgument)pairDayAdjacentVars.get(this.pairDayAdjacentKey(candidate)));
|
model.addLessOrEqual(assignmentVars[i],
|
||||||
|
(LinearArgument) pairDayVars.get(this.pairDayKey(candidate)));
|
||||||
|
model.addLessOrEqual(assignmentVars[i],
|
||||||
|
(LinearArgument) pairDayAdjacentVars.get(this.pairDayAdjacentKey(candidate)));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addCenterAssignedAtMostOnce(CpModel model, List<AssignmentCandidate> candidates, BoolVar[] assignmentVars) {
|
private void addCenterAssignedAtMostOnce(CpModel model, List<AssignmentCandidate> candidates,
|
||||||
Map<String, List<Integer>> indexesByCenter = this.groupIndexes(candidates, AssignmentCandidate::getCenterId);
|
BoolVar[] assignmentVars) {
|
||||||
indexesByCenter.values().forEach((indexes) -> model.addAtMostOne(this.toLiteralArray(indexes, assignmentVars)));
|
Map<String, List<Integer>> indexesByCenter = this.groupIndexes(candidates,
|
||||||
|
AssignmentCandidate::getCenterId);
|
||||||
|
indexesByCenter.values()
|
||||||
|
.forEach((indexes) -> model.addAtMostOne(this.toLiteralArray(indexes, assignmentVars)));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addPairDailyCapacity(CpModel model, List<AssignmentCandidate> candidates, BoolVar[] assignmentVars) {
|
private void addPairDailyCapacity(CpModel model, List<AssignmentCandidate> candidates,
|
||||||
|
BoolVar[] assignmentVars) {
|
||||||
Map<String, List<Integer>> indexesByPairDay = this.groupIndexes(candidates, this::pairDayKey);
|
Map<String, List<Integer>> indexesByPairDay = this.groupIndexes(candidates, this::pairDayKey);
|
||||||
indexesByPairDay.values().forEach((indexes) -> model.addLessOrEqual(LinearExpr.sum(this.toLinearArgumentArray(indexes, assignmentVars)), (long)this.pairingProperties.getRule().getMaxCentersPerPairPerDay()));
|
indexesByPairDay.values().forEach((indexes) -> model.addLessOrEqual(
|
||||||
|
LinearExpr.sum(this.toLinearArgumentArray(indexes, assignmentVars)),
|
||||||
|
(long) this.pairingProperties.getRule().getMaxCentersPerPairPerDay()));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addMemberDailyOnePair(CpModel model, List<AssignmentCandidate> candidates, Map<String, BoolVar> pairDayVars) {
|
private void addMemberDailyOnePair(CpModel model, List<AssignmentCandidate> candidates,
|
||||||
Map<String, Set<String>> pairDayKeysByMemberDay = (Map)candidates.stream().collect(Collectors.groupingBy((candidate) -> {
|
Map<String, BoolVar> pairDayVars) {
|
||||||
|
Map<String, Set<String>> pairDayKeysByMemberDay = (Map) candidates.stream()
|
||||||
|
.collect(Collectors.groupingBy((candidate) -> {
|
||||||
String var10000 = candidate.getFieldMemberId();
|
String var10000 = candidate.getFieldMemberId();
|
||||||
return var10000 + "|" + String.valueOf(candidate.getDate());
|
return var10000 + "|" + String.valueOf(candidate.getDate());
|
||||||
}, Collectors.mapping(this::pairDayKey, Collectors.toSet())));
|
}, Collectors.mapping(this::pairDayKey, Collectors.toSet())));
|
||||||
Map<String, Set<String>> externalPairDayKeysByMemberDay = candidates.stream().collect(Collectors.groupingBy((candidate) -> {
|
Map<String, Set<String>> externalPairDayKeysByMemberDay = candidates.stream()
|
||||||
|
.collect(Collectors.groupingBy((candidate) -> {
|
||||||
String var10000 = candidate.getExternalMemberId();
|
String var10000 = candidate.getExternalMemberId();
|
||||||
return var10000 + "|" + String.valueOf(candidate.getDate());
|
return var10000 + "|" + String.valueOf(candidate.getDate());
|
||||||
}, Collectors.mapping(this::pairDayKey, Collectors.toSet())));
|
}, Collectors.mapping(this::pairDayKey, Collectors.toSet())));
|
||||||
externalPairDayKeysByMemberDay.forEach((key, value) -> pairDayKeysByMemberDay.merge(key, value, (left, right) -> {
|
externalPairDayKeysByMemberDay.forEach(
|
||||||
|
(key, value) -> pairDayKeysByMemberDay.merge(key, value, (left, right) -> {
|
||||||
left.addAll(right);
|
left.addAll(right);
|
||||||
return left;
|
return left;
|
||||||
}));
|
}));
|
||||||
pairDayKeysByMemberDay.values().forEach((pairDayKeys) -> {
|
pairDayKeysByMemberDay.values().forEach((pairDayKeys) -> {
|
||||||
Stream var10001 = pairDayKeys.stream();
|
Stream var10001 = pairDayKeys.stream();
|
||||||
Objects.requireNonNull(pairDayVars);
|
Objects.requireNonNull(pairDayVars);
|
||||||
model.addAtMostOne((Literal[])var10001.map(pairDayVars::get).toArray((x$0) -> new BoolVar[x$0]));
|
model.addAtMostOne(
|
||||||
|
(Literal[]) var10001.map(pairDayVars::get).toArray((x$0) -> new BoolVar[x$0]));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addPairDailyOneAdjacentClassification(CpModel model, List<AssignmentCandidate> candidates, Map<String, BoolVar> pairDayAdjacentVars) {
|
private void addPairDailyOneAdjacentClassification(CpModel model,
|
||||||
Map<String, Set<String>> adjacentKeysByPairDay = (Map)candidates.stream().collect(Collectors.groupingBy(this::pairDayKey, Collectors.mapping(this::pairDayAdjacentKey, Collectors.toSet())));
|
List<AssignmentCandidate> candidates, Map<String, BoolVar> pairDayAdjacentVars) {
|
||||||
|
Map<String, Set<String>> adjacentKeysByPairDay = (Map) candidates.stream().collect(
|
||||||
|
Collectors.groupingBy(this::pairDayKey,
|
||||||
|
Collectors.mapping(this::pairDayAdjacentKey, Collectors.toSet())));
|
||||||
adjacentKeysByPairDay.values().forEach((adjacentKeys) -> {
|
adjacentKeysByPairDay.values().forEach((adjacentKeys) -> {
|
||||||
Stream var10001 = adjacentKeys.stream();
|
Stream var10001 = adjacentKeys.stream();
|
||||||
Objects.requireNonNull(pairDayAdjacentVars);
|
Objects.requireNonNull(pairDayAdjacentVars);
|
||||||
model.addAtMostOne((Literal[])var10001.map(pairDayAdjacentVars::get).toArray((x$0) -> new BoolVar[x$0]));
|
model.addAtMostOne(
|
||||||
|
(Literal[]) var10001.map(pairDayAdjacentVars::get).toArray((x$0) -> new BoolVar[x$0]));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addBuddyLimit(CpModel model, List<AssignmentCandidate> candidates, Map<String, BoolVar> pairUsedVars) {
|
private void addBuddyLimit(CpModel model, List<AssignmentCandidate> candidates,
|
||||||
Map<String, Set<String>> pairKeysByMember = (Map)candidates.stream().collect(Collectors.groupingBy(AssignmentCandidate::getFieldMemberId, Collectors.mapping(this::pairKey, Collectors.toSet())));
|
Map<String, BoolVar> pairUsedVars) {
|
||||||
Map<String, Set<String>> externalPairKeysByMember = candidates.stream().collect(Collectors.groupingBy(AssignmentCandidate::getExternalMemberId, Collectors.mapping(this::pairKey, Collectors.toSet())));
|
Map<String, Set<String>> pairKeysByMember = (Map) candidates.stream().collect(
|
||||||
externalPairKeysByMember.forEach((key, value) -> pairKeysByMember.merge(key, value, (left, right) -> {
|
Collectors.groupingBy(AssignmentCandidate::getFieldMemberId,
|
||||||
|
Collectors.mapping(this::pairKey, Collectors.toSet())));
|
||||||
|
Map<String, Set<String>> 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);
|
left.addAll(right);
|
||||||
return left;
|
return left;
|
||||||
}));
|
}));
|
||||||
pairKeysByMember.values().forEach((pairKeys) -> {
|
pairKeysByMember.values().forEach((pairKeys) -> {
|
||||||
Stream var10001 = pairKeys.stream();
|
Stream var10001 = pairKeys.stream();
|
||||||
Objects.requireNonNull(pairUsedVars);
|
Objects.requireNonNull(pairUsedVars);
|
||||||
model.addLessOrEqual(LinearExpr.sum((LinearArgument[])var10001.map(pairUsedVars::get).toArray((x$0) -> new LinearArgument[x$0])), (long)this.pairingProperties.getRule().getMaxCounterpartsPerMember());
|
model.addLessOrEqual(LinearExpr.sum((LinearArgument[]) var10001.map(pairUsedVars::get)
|
||||||
|
.toArray((x$0) -> new LinearArgument[x$0])),
|
||||||
|
(long) this.pairingProperties.getRule().getMaxCounterpartsPerMember());
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private LinearExpr createObjective(List<AssignmentCandidate> candidates, BoolVar[] assignmentVars) {
|
private LinearExpr createObjective(List<AssignmentCandidate> candidates,
|
||||||
|
BoolVar[] assignmentVars) {
|
||||||
LinearArgument[] vars = new LinearArgument[assignmentVars.length];
|
LinearArgument[] vars = new LinearArgument[assignmentVars.length];
|
||||||
long[] weights = new long[assignmentVars.length];
|
long[] weights = new long[assignmentVars.length];
|
||||||
|
|
||||||
for (int i = 0; i < assignmentVars.length; ++i) {
|
for (int i = 0; i < assignmentVars.length; ++i) {
|
||||||
AssignmentCandidate candidate = (AssignmentCandidate) candidates.get(i);
|
AssignmentCandidate candidate = (AssignmentCandidate) candidates.get(i);
|
||||||
vars[i] = assignmentVars[i];
|
vars[i] = assignmentVars[i];
|
||||||
weights[i] = this.pairingProperties.getObjective().getAssignmentWeight() + Math.max(0L, this.pairingProperties.getObjective().getPreferenceBaseWeight() - (long)candidate.getPreferencePriority() * this.pairingProperties.getObjective().getPreferenceRankPenalty()) + (long)candidate.getResidenceMatchScore() * this.pairingProperties.getObjective().getResidenceMatchWeight();
|
weights[i] = this.pairingProperties.getObjective().getAssignmentWeight() + Math.max(0L,
|
||||||
|
this.pairingProperties.getObjective().getPreferenceBaseWeight()
|
||||||
|
- (long) candidate.getPreferencePriority() * this.pairingProperties.getObjective()
|
||||||
|
.getPreferenceRankPenalty())
|
||||||
|
+ (long) candidate.getResidenceMatchScore() * this.pairingProperties.getObjective()
|
||||||
|
.getResidenceMatchWeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
return LinearExpr.weightedSum(vars, weights);
|
return LinearExpr.weightedSum(vars, weights);
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<AssignmentCandidate> collectSelectedAssignments(List<AssignmentCandidate> candidates, BoolVar[] assignmentVars, CpSolver solver) {
|
private List<AssignmentCandidate> collectSelectedAssignments(List<AssignmentCandidate> candidates,
|
||||||
|
BoolVar[] assignmentVars, CpSolver solver) {
|
||||||
List<AssignmentCandidate> selected = new ArrayList();
|
List<AssignmentCandidate> selected = new ArrayList();
|
||||||
|
|
||||||
for (int i = 0; i < candidates.size(); ++i) {
|
for (int i = 0; i < candidates.size(); ++i) {
|
||||||
@@ -184,39 +233,92 @@ public class PairingSolverService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
selected.sort(Comparator.comparing(AssignmentCandidate::getDate).thenComparing(AssignmentCandidate::getFieldMemberId).thenComparing(AssignmentCandidate::getCenterId));
|
selected.sort(Comparator.comparing(AssignmentCandidate::getDate)
|
||||||
|
.thenComparing(AssignmentCandidate::getFieldMemberId)
|
||||||
|
.thenComparing(AssignmentCandidate::getCenterId));
|
||||||
return selected;
|
return selected;
|
||||||
}
|
}
|
||||||
|
|
||||||
private PairingResult toResult(PairingData data, PairingCandidates candidates, List<AssignmentCandidate> selectedAssignments, CpSolverStatus status) {
|
private PairingResult toResult(PairingData data, PairingCandidates candidates,
|
||||||
Set<String> assignedCenterIds = (Set)selectedAssignments.stream().map(AssignmentCandidate::getCenterId).collect(Collectors.toSet());
|
List<AssignmentCandidate> selectedAssignments, CpSolverStatus status) {
|
||||||
Set<String> usedMemberIds = (Set)selectedAssignments.stream().flatMap((candidate) -> List.of(candidate.getFieldMemberId(), candidate.getExternalMemberId()).stream()).collect(Collectors.toSet());
|
Set<String> assignedCenterIds = (Set) selectedAssignments.stream()
|
||||||
Map<String, Member> memberMap = (Map)data.getMembers().stream().collect(Collectors.toMap(Member::getId, Function.identity(), (left, right) -> left));
|
.map(AssignmentCandidate::getCenterId).collect(Collectors.toSet());
|
||||||
Map<String, Center> centerMap = (Map)data.getCenters().stream().collect(Collectors.toMap(Center::getId, Function.identity(), (left, right) -> left));
|
Set<String> usedMemberIds = (Set) selectedAssignments.stream().flatMap(
|
||||||
|
(candidate) -> List.of(candidate.getFieldMemberId(), candidate.getExternalMemberId())
|
||||||
|
.stream()).collect(Collectors.toSet());
|
||||||
|
Map<String, Member> memberMap = (Map) data.getMembers().stream()
|
||||||
|
.collect(Collectors.toMap(Member::getId, Function.identity(), (left, right) -> left));
|
||||||
|
Map<String, Center> centerMap = (Map) data.getCenters().stream()
|
||||||
|
.collect(Collectors.toMap(Center::getId, Function.identity(), (left, right) -> left));
|
||||||
ABPairBuildResult abPairBuildResult = this.createABPairMatches(selectedAssignments);
|
ABPairBuildResult abPairBuildResult = this.createABPairMatches(selectedAssignments);
|
||||||
Map<String, ABPairMatch> abPairMatches = abPairBuildResult.matches();
|
Map<String, ABPairMatch> abPairMatches = abPairBuildResult.matches();
|
||||||
List<AssignmentResultExcelDto> assignments = selectedAssignments.stream().map((candidate) -> this.toAssignmentResult(candidate, memberMap, centerMap, abPairMatches)).toList();
|
List<AssignmentResultExcelDto> assignments = selectedAssignments.stream()
|
||||||
List<UnassignedCenterExcelDto> unassignedCenters = data.getCenters().stream().filter((center) -> !assignedCenterIds.contains(center.getId())).map((center) -> this.toUnassignedCenter(center, candidates.getUnassignedCenterReasons())).toList();
|
.map((candidate) -> this.toAssignmentResult(candidate, memberMap, centerMap, abPairMatches))
|
||||||
List<UnusedMemberExcelDto> unusedMembers = data.getMembers().stream().filter((member) -> !usedMemberIds.contains(member.getId())).map((member) -> new UnusedMemberExcelDto(member.getId(), member.getRole().name(), "선택된 최적해에 포함되지 않았습니다. 후보 부족 또는 제약 충돌 가능")).toList();
|
.toList();
|
||||||
return PairingResult.builder().assignments(assignments).unassignedCenters(unassignedCenters).unusedMembers(unusedMembers).summaries(this.createSummaries(data, candidates, assignments.size(), unassignedCenters.size(), unusedMembers.size(), this.countABGroups(abPairMatches), status.name())).abPairs(abPairBuildResult.rows()).candidateSummaries(this.createCandidateSummaries(data, candidates, assignments.size(), unassignedCenters.size(), unusedMembers.size(), this.countABGroups(abPairMatches))).validationErrors(List.of()).ruleViolations(this.createRuleChecks(data, selectedAssignments, abPairMatches)).build();
|
List<UnassignedCenterExcelDto> unassignedCenters = data.getCenters().stream()
|
||||||
|
.filter((center) -> !assignedCenterIds.contains(center.getId()))
|
||||||
|
.map((center) -> this.toUnassignedCenter(center, candidates.getUnassignedCenterReasons()))
|
||||||
|
.toList();
|
||||||
|
List<UnusedMemberExcelDto> 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(
|
||||||
|
this.createSummaries(data, candidates, assignments.size(), unassignedCenters.size(),
|
||||||
|
unusedMembers.size(), this.countABGroups(abPairMatches), status.name()))
|
||||||
|
.abPairs(abPairBuildResult.rows()).candidateSummaries(
|
||||||
|
this.createCandidateSummaries(data, candidates, assignments.size(),
|
||||||
|
unassignedCenters.size(), unusedMembers.size(), this.countABGroups(abPairMatches)))
|
||||||
|
.validationErrors(List.of())
|
||||||
|
.ruleViolations(this.createRuleChecks(data, selectedAssignments, abPairMatches)).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
private PairingResult emptyResult(PairingData data, PairingCandidates candidates, String reason) {
|
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(this.createSummaries(data, candidates, 0, data.getCenters().size(), data.getMembers().size(), 0, reason)).abPairs(List.of()).candidateSummaries(this.createCandidateSummaries(data, candidates, 0, data.getCenters().size(), data.getMembers().size(), 0)).validationErrors(List.of()).ruleViolations(List.of(new RuleViolationExcelDto("solver feasible 해", "FAIL", reason))).build();
|
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(this.createSummaries(data, candidates, 0, data.getCenters().size(),
|
||||||
|
data.getMembers().size(), 0, reason)).abPairs(List.of()).candidateSummaries(
|
||||||
|
this.createCandidateSummaries(data, candidates, 0, data.getCenters().size(),
|
||||||
|
data.getMembers().size(), 0)).validationErrors(List.of())
|
||||||
|
.ruleViolations(List.of(new RuleViolationExcelDto("solver feasible 해", "FAIL", reason)))
|
||||||
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
private AssignmentResultExcelDto toAssignmentResult(AssignmentCandidate candidate, Map<String, Member> memberMap, Map<String, Center> centerMap, Map<String, ABPairMatch> abPairMatches) {
|
private AssignmentResultExcelDto toAssignmentResult(AssignmentCandidate candidate,
|
||||||
|
Map<String, Member> memberMap, Map<String, Center> centerMap,
|
||||||
|
Map<String, ABPairMatch> abPairMatches) {
|
||||||
Member fieldMember = (Member) memberMap.get(candidate.getFieldMemberId());
|
Member fieldMember = (Member) memberMap.get(candidate.getFieldMemberId());
|
||||||
Member externalMember = (Member) memberMap.get(candidate.getExternalMemberId());
|
Member externalMember = (Member) memberMap.get(candidate.getExternalMemberId());
|
||||||
Center center = (Center) centerMap.get(candidate.getCenterId());
|
Center center = (Center) centerMap.get(candidate.getCenterId());
|
||||||
ABPairMatch abPairMatch = (ABPairMatch) abPairMatches.get(this.pairKey(candidate));
|
ABPairMatch abPairMatch = (ABPairMatch) abPairMatches.get(this.pairKey(candidate));
|
||||||
return new AssignmentResultExcelDto(candidate.getDate().toString(), candidate.getFieldMemberId(), this.formatGender(fieldMember.getGender()), this.formatExperience(fieldMember.getExperienceType()), fieldMember.getResidenceCode(), fieldMember.getActivityRegion(), this.formatPreferenceRank(candidate.getFieldMemberPreferenceRank()), candidate.getExternalMemberId(), this.formatGender(externalMember.getGender()), this.formatExperience(externalMember.getExperienceType()), externalMember.getResidenceCode(), externalMember.getActivityRegion(), this.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());
|
return new AssignmentResultExcelDto(candidate.getDate().toString(),
|
||||||
|
candidate.getFieldMemberId(), this.formatGender(fieldMember.getGender()),
|
||||||
|
this.formatExperience(fieldMember.getExperienceType()), fieldMember.getResidenceCode(),
|
||||||
|
fieldMember.getActivityRegion(),
|
||||||
|
this.formatPreferenceRank(candidate.getFieldMemberPreferenceRank()),
|
||||||
|
candidate.getExternalMemberId(), this.formatGender(externalMember.getGender()),
|
||||||
|
this.formatExperience(externalMember.getExperienceType()),
|
||||||
|
externalMember.getResidenceCode(), externalMember.getActivityRegion(),
|
||||||
|
this.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<String, Set<String>> reasonMap) {
|
private UnassignedCenterExcelDto toUnassignedCenter(Center center,
|
||||||
Set<String> reasons = new LinkedHashSet((Collection)(reasonMap == null ? Set.of() : (Collection)reasonMap.getOrDefault(center.getId(), Set.of())));
|
Map<String, Set<String>> reasonMap) {
|
||||||
|
Set<String> reasons = new LinkedHashSet((Collection) (reasonMap == null ? Set.of()
|
||||||
|
: (Collection) reasonMap.getOrDefault(center.getId(), Set.of())));
|
||||||
reasons.add("solver 최적해에서 선택되지 않음");
|
reasons.add("solver 최적해에서 선택되지 않음");
|
||||||
return new UnassignedCenterExcelDto(center.getId(), center.getMunicipalityId(), String.join(", ", reasons));
|
return new UnassignedCenterExcelDto(center.getId(), center.getMunicipalityId(),
|
||||||
|
String.join(", ", reasons));
|
||||||
}
|
}
|
||||||
|
|
||||||
private String formatGender(Gender gender) {
|
private String formatGender(Gender gender) {
|
||||||
@@ -235,13 +337,31 @@ public class PairingSolverService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<PairingSummaryExcelDto> createSummaries(PairingData data, PairingCandidates candidates, int assignmentCount, int unassignedCenterCount, int unusedMemberCount, int abGroupCount, String status) {
|
private List<PairingSummaryExcelDto> createSummaries(PairingData data,
|
||||||
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));
|
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<AssignmentCandidate> selectedAssignments) {
|
private ABPairBuildResult createABPairMatches(List<AssignmentCandidate> selectedAssignments) {
|
||||||
Map<String, List<AssignmentCandidate>> assignmentsByPair = selectedAssignments.stream().collect(Collectors.groupingBy(this::pairKey));
|
Map<String, List<AssignmentCandidate>> assignmentsByPair = selectedAssignments.stream()
|
||||||
List<UsedPair> usedPairs = assignmentsByPair.entrySet().stream().map((entry) -> PairingSolverService.UsedPair.of(entry.getKey(), entry.getValue())).sorted(Comparator.comparing(UsedPair::pairKey)).toList();
|
.collect(Collectors.groupingBy(this::pairKey));
|
||||||
|
List<UsedPair> usedPairs = assignmentsByPair.entrySet().stream()
|
||||||
|
.map((entry) -> PairingSolverService.UsedPair.of(entry.getKey(), entry.getValue()))
|
||||||
|
.sorted(Comparator.comparing(UsedPair::pairKey)).toList();
|
||||||
Map<String, ABPairMatch> matches = new HashMap();
|
Map<String, ABPairMatch> matches = new HashMap();
|
||||||
List<ABPairExcelDto> rows = new ArrayList();
|
List<ABPairExcelDto> rows = new ArrayList();
|
||||||
Set<String> alreadyMatched = new HashSet();
|
Set<String> alreadyMatched = new HashSet();
|
||||||
@@ -271,7 +391,10 @@ public class PairingSolverService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private ABPairMatch toABPairMatch(String groupId, UsedPair pair, UsedPair counterpart) {
|
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();
|
return ABPairMatch.builder().groupId(groupId).fieldMemberId(pair.fieldMemberId())
|
||||||
|
.externalMemberId(pair.externalMemberId())
|
||||||
|
.counterpartFieldMemberId(counterpart.fieldMemberId())
|
||||||
|
.counterpartExternalMemberId(counterpart.externalMemberId()).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
private int countABGroups(Map<String, ABPairMatch> matches) {
|
private int countABGroups(Map<String, ABPairMatch> matches) {
|
||||||
@@ -282,29 +405,67 @@ public class PairingSolverService {
|
|||||||
Stream var10000 = pair.dispatchAdjacentKeys().stream();
|
Stream var10000 = pair.dispatchAdjacentKeys().stream();
|
||||||
Set var10001 = counterpart.dispatchAdjacentKeys();
|
Set var10001 = counterpart.dispatchAdjacentKeys();
|
||||||
Objects.requireNonNull(var10001);
|
Objects.requireNonNull(var10001);
|
||||||
String sharedKey = (String)var10000.filter(var10001::contains).sorted().findFirst().orElse("|");
|
String sharedKey = (String) var10000.filter(var10001::contains).sorted().findFirst()
|
||||||
|
.orElse("|");
|
||||||
String[] parts = sharedKey.split("\\|", -1);
|
String[] parts = sharedKey.split("\\|", -1);
|
||||||
var10000 = pair.dates().stream();
|
var10000 = pair.dates().stream();
|
||||||
var10001 = counterpart.dates();
|
var10001 = counterpart.dates();
|
||||||
Objects.requireNonNull(var10001);
|
Objects.requireNonNull(var10001);
|
||||||
boolean dateOverlapped = var10000.anyMatch(var10001::contains);
|
boolean dateOverlapped = var10000.anyMatch(var10001::contains);
|
||||||
return new ABPairExcelDto(groupId, pair.fieldMemberId(), pair.externalMemberId(), counterpart.fieldMemberId(), counterpart.externalMemberId(), parts.length > 0 ? parts[0] : "", parts.length > 1 ? parts[1] : "", this.formatDates(pair.dates()), this.formatDates(counterpart.dates()), dateOverlapped ? "Y" : "N");
|
return new ABPairExcelDto(groupId, pair.fieldMemberId(), pair.externalMemberId(),
|
||||||
|
counterpart.fieldMemberId(), counterpart.externalMemberId(),
|
||||||
|
parts.length > 0 ? parts[0] : "", parts.length > 1 ? parts[1] : "",
|
||||||
|
this.formatDates(pair.dates()), this.formatDates(counterpart.dates()),
|
||||||
|
dateOverlapped ? "Y" : "N");
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<CandidateSummaryExcelDto> createCandidateSummaries(PairingData data, PairingCandidates candidates, int assignmentCount, int unassignedCenterCount, int unusedMemberCount, int abGroupCount) {
|
private List<CandidateSummaryExcelDto> createCandidateSummaries(PairingData data,
|
||||||
long fieldMemberCount = data.getMembers().stream().filter((member) -> member.getRole().name().equals("FIELD")).count();
|
PairingCandidates candidates, int assignmentCount, int unassignedCenterCount,
|
||||||
long externalMemberCount = data.getMembers().stream().filter((member) -> member.getRole().name().equals("EXTERNAL")).count();
|
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 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();
|
long noCandidateCenterCount = data.getCenters().stream().filter(
|
||||||
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(this.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 그룹 수"));
|
(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(this.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<RuleViolationExcelDto> createRuleChecks(PairingData data, List<AssignmentCandidate> selectedAssignments, Map<String, ABPairMatch> abPairMatches) {
|
private List<RuleViolationExcelDto> createRuleChecks(PairingData data,
|
||||||
Map<String, Member> memberMap = (Map)data.getMembers().stream().collect(Collectors.toMap(Member::getId, Function.identity(), (left, right) -> left));
|
List<AssignmentCandidate> selectedAssignments, Map<String, ABPairMatch> abPairMatches) {
|
||||||
Map<String, Center> centerMap = (Map)data.getCenters().stream().collect(Collectors.toMap(Center::getId, Function.identity(), (left, right) -> left));
|
Map<String, Member> memberMap = (Map) data.getMembers().stream()
|
||||||
|
.collect(Collectors.toMap(Member::getId, Function.identity(), (left, right) -> left));
|
||||||
|
Map<String, Center> centerMap = (Map) data.getCenters().stream()
|
||||||
|
.collect(Collectors.toMap(Center::getId, Function.identity(), (left, right) -> left));
|
||||||
List<RuleViolationExcelDto> checks = new ArrayList();
|
List<RuleViolationExcelDto> checks = new ArrayList();
|
||||||
checks.add(this.checkDuplicate(selectedAssignments.stream().map(AssignmentCandidate::getCenterId).toList(), "한 센터 1회 초과 배정"));
|
checks.add(this.checkDuplicate(
|
||||||
checks.add(this.checkMaxGroupCount(selectedAssignments, this::pairDayKey, this.pairingProperties.getRule().getMaxCentersPerPairPerDay(), "한 페어 하루 최대 센터 수"));
|
selectedAssignments.stream().map(AssignmentCandidate::getCenterId).toList(),
|
||||||
|
"한 센터 1회 초과 배정"));
|
||||||
|
checks.add(this.checkMaxGroupCount(selectedAssignments, this::pairDayKey,
|
||||||
|
this.pairingProperties.getRule().getMaxCentersPerPairPerDay(), "한 페어 하루 최대 센터 수"));
|
||||||
checks.add(this.checkMemberDateDuplicate(selectedAssignments));
|
checks.add(this.checkMemberDateDuplicate(selectedAssignments));
|
||||||
checks.add(this.checkPairDayAdjacentClassification(selectedAssignments));
|
checks.add(this.checkPairDayAdjacentClassification(selectedAssignments));
|
||||||
checks.add(this.checkWomenOnly(selectedAssignments, memberMap, centerMap));
|
checks.add(this.checkWomenOnly(selectedAssignments, memberMap, centerMap));
|
||||||
@@ -317,95 +478,143 @@ public class PairingSolverService {
|
|||||||
|
|
||||||
private RuleViolationExcelDto checkDuplicate(List<String> values, String ruleName) {
|
private RuleViolationExcelDto checkDuplicate(List<String> values, String ruleName) {
|
||||||
Set<String> seen = new HashSet();
|
Set<String> seen = new HashSet();
|
||||||
Set<String> duplicates = (Set)values.stream().filter((value) -> !seen.add(value)).collect(Collectors.toCollection(LinkedHashSet::new));
|
Set<String> duplicates = (Set) values.stream().filter((value) -> !seen.add(value))
|
||||||
return new RuleViolationExcelDto(ruleName, duplicates.isEmpty() ? "PASS" : "FAIL", duplicates.isEmpty() ? "위반 없음" : String.join(", ", duplicates));
|
.collect(Collectors.toCollection(LinkedHashSet::new));
|
||||||
|
return new RuleViolationExcelDto(ruleName, duplicates.isEmpty() ? "PASS" : "FAIL",
|
||||||
|
duplicates.isEmpty() ? "위반 없음" : String.join(", ", duplicates));
|
||||||
}
|
}
|
||||||
|
|
||||||
private RuleViolationExcelDto checkMaxGroupCount(List<AssignmentCandidate> assignments, Function<AssignmentCandidate, String> classifier, int max, String ruleName) {
|
private RuleViolationExcelDto checkMaxGroupCount(List<AssignmentCandidate> assignments,
|
||||||
Map<String, Long> countsByKey = assignments.stream().collect(Collectors.groupingBy(classifier, Collectors.counting()));
|
Function<AssignmentCandidate, String> classifier, int max, String ruleName) {
|
||||||
List<String> violations = countsByKey.entrySet().stream().filter((entry) -> entry.getValue() > (long)max).map((entry) -> {
|
Map<String, Long> countsByKey = assignments.stream()
|
||||||
|
.collect(Collectors.groupingBy(classifier, Collectors.counting()));
|
||||||
|
List<String> violations = countsByKey.entrySet().stream()
|
||||||
|
.filter((entry) -> entry.getValue() > (long) max).map((entry) -> {
|
||||||
String var10000 = entry.getKey();
|
String var10000 = entry.getKey();
|
||||||
return var10000 + "=" + String.valueOf(entry.getValue());
|
return var10000 + "=" + String.valueOf(entry.getValue());
|
||||||
}).toList();
|
}).toList();
|
||||||
return new RuleViolationExcelDto(ruleName, violations.isEmpty() ? "PASS" : "FAIL", violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
|
return new RuleViolationExcelDto(ruleName, violations.isEmpty() ? "PASS" : "FAIL",
|
||||||
|
violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
|
||||||
}
|
}
|
||||||
|
|
||||||
private RuleViolationExcelDto checkMemberDateDuplicate(List<AssignmentCandidate> assignments) {
|
private RuleViolationExcelDto checkMemberDateDuplicate(List<AssignmentCandidate> assignments) {
|
||||||
Map<String, Set<String>> pairKeysByMemberDate = new HashMap();
|
Map<String, Set<String>> pairKeysByMemberDate = new HashMap();
|
||||||
assignments.forEach((candidate) -> {
|
assignments.forEach((candidate) -> {
|
||||||
((Set)pairKeysByMemberDate.computeIfAbsent(candidate.getFieldMemberId() + "|" + String.valueOf(candidate.getDate()), (key) -> new HashSet())).add(this.pairKey(candidate));
|
((Set) pairKeysByMemberDate.computeIfAbsent(
|
||||||
((Set)pairKeysByMemberDate.computeIfAbsent(candidate.getExternalMemberId() + "|" + String.valueOf(candidate.getDate()), (key) -> new HashSet())).add(this.pairKey(candidate));
|
candidate.getFieldMemberId() + "|" + String.valueOf(candidate.getDate()),
|
||||||
|
(key) -> new HashSet())).add(this.pairKey(candidate));
|
||||||
|
((Set) pairKeysByMemberDate.computeIfAbsent(
|
||||||
|
candidate.getExternalMemberId() + "|" + String.valueOf(candidate.getDate()),
|
||||||
|
(key) -> new HashSet())).add(this.pairKey(candidate));
|
||||||
});
|
});
|
||||||
List<String> violations = pairKeysByMemberDate.entrySet().stream().filter((entry) -> ((Set)entry.getValue()).size() > 1).map((entry) -> {
|
List<String> violations = pairKeysByMemberDate.entrySet().stream()
|
||||||
|
.filter((entry) -> ((Set) entry.getValue()).size() > 1).map((entry) -> {
|
||||||
String var10000 = (String) entry.getKey();
|
String var10000 = (String) entry.getKey();
|
||||||
return var10000 + "=" + String.join("/", (Iterable) entry.getValue());
|
return var10000 + "=" + String.join("/", (Iterable) entry.getValue());
|
||||||
}).toList();
|
}).toList();
|
||||||
return new RuleViolationExcelDto("같은 위원 같은 날짜 중복", violations.isEmpty() ? "PASS" : "FAIL", violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
|
return new RuleViolationExcelDto("같은 위원 같은 날짜 중복", violations.isEmpty() ? "PASS" : "FAIL",
|
||||||
|
violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
|
||||||
}
|
}
|
||||||
|
|
||||||
private RuleViolationExcelDto checkPairDayAdjacentClassification(List<AssignmentCandidate> assignments) {
|
private RuleViolationExcelDto checkPairDayAdjacentClassification(
|
||||||
Map<String, Set<String>> adjacentClassificationsByPairDay = assignments.stream().collect(Collectors.groupingBy(this::pairDayKey, Collectors.mapping(AssignmentCandidate::getAdjacentRegionClassification, Collectors.toSet())));
|
List<AssignmentCandidate> assignments) {
|
||||||
List<String> violations = adjacentClassificationsByPairDay.entrySet().stream().filter((entry) -> entry.getValue().size() > 1).map((entry) -> {
|
Map<String, Set<String>> adjacentClassificationsByPairDay = assignments.stream().collect(
|
||||||
|
Collectors.groupingBy(this::pairDayKey,
|
||||||
|
Collectors.mapping(AssignmentCandidate::getAdjacentRegionClassification,
|
||||||
|
Collectors.toSet())));
|
||||||
|
List<String> violations = adjacentClassificationsByPairDay.entrySet().stream()
|
||||||
|
.filter((entry) -> entry.getValue().size() > 1).map((entry) -> {
|
||||||
String var10000 = entry.getKey();
|
String var10000 = entry.getKey();
|
||||||
return var10000 + "=" + String.join("/", entry.getValue());
|
return var10000 + "=" + String.join("/", entry.getValue());
|
||||||
}).toList();
|
}).toList();
|
||||||
return new RuleViolationExcelDto("한 페어 하루 1개 인접지역 분류", violations.isEmpty() ? "PASS" : "FAIL", violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
|
return new RuleViolationExcelDto("한 페어 하루 1개 인접지역 분류", violations.isEmpty() ? "PASS" : "FAIL",
|
||||||
|
violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
|
||||||
}
|
}
|
||||||
|
|
||||||
private RuleViolationExcelDto checkWomenOnly(List<AssignmentCandidate> assignments, Map<String, Member> memberMap, Map<String, Center> centerMap) {
|
private RuleViolationExcelDto checkWomenOnly(List<AssignmentCandidate> assignments,
|
||||||
List<String> violations = assignments.stream().filter((candidate) -> ((Center)centerMap.get(candidate.getCenterId())).isWomenOnly()).filter((candidate) -> ((Member)memberMap.get(candidate.getFieldMemberId())).getGender() != Gender.FEMALE || ((Member)memberMap.get(candidate.getExternalMemberId())).getGender() != Gender.FEMALE).map(AssignmentCandidate::getCenterId).toList();
|
Map<String, Member> memberMap, Map<String, Center> centerMap) {
|
||||||
return new RuleViolationExcelDto("여성 전용 센터 조건", violations.isEmpty() ? "PASS" : "FAIL", violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
|
List<String> violations = assignments.stream()
|
||||||
|
.filter((candidate) -> ((Center) centerMap.get(candidate.getCenterId())).isWomenOnly())
|
||||||
|
.filter((candidate) ->
|
||||||
|
((Member) memberMap.get(candidate.getFieldMemberId())).getGender() != Gender.FEMALE
|
||||||
|
|| ((Member) 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<AssignmentCandidate> assignments, Map<String, Member> memberMap) {
|
private RuleViolationExcelDto checkActivityRegion(List<AssignmentCandidate> assignments,
|
||||||
List<String> violations = assignments.stream().filter((candidate) -> candidate.getDispatchRegion().equals(((Member)memberMap.get(candidate.getFieldMemberId())).getActivityRegion()) || candidate.getDispatchRegion().equals(((Member)memberMap.get(candidate.getExternalMemberId())).getActivityRegion())).map((candidate) -> {
|
Map<String, Member> memberMap) {
|
||||||
|
List<String> violations = assignments.stream().filter((candidate) ->
|
||||||
|
candidate.getDispatchRegion()
|
||||||
|
.equals(((Member) memberMap.get(candidate.getFieldMemberId())).getActivityRegion())
|
||||||
|
|| candidate.getDispatchRegion()
|
||||||
|
.equals(((Member) memberMap.get(candidate.getExternalMemberId())).getActivityRegion()))
|
||||||
|
.map((candidate) -> {
|
||||||
String var10000 = candidate.getCenterId();
|
String var10000 = candidate.getCenterId();
|
||||||
return var10000 + ":" + candidate.getDispatchRegion();
|
return var10000 + ":" + candidate.getDispatchRegion();
|
||||||
}).toList();
|
}).toList();
|
||||||
return new RuleViolationExcelDto("활동지역 상피제", violations.isEmpty() ? "PASS" : "FAIL", violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
|
return new RuleViolationExcelDto("활동지역 상피제", violations.isEmpty() ? "PASS" : "FAIL",
|
||||||
|
violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
|
||||||
}
|
}
|
||||||
|
|
||||||
private RuleViolationExcelDto checkHistoryCenter(List<AssignmentCandidate> assignments, Map<String, Member> memberMap) {
|
private RuleViolationExcelDto checkHistoryCenter(List<AssignmentCandidate> assignments,
|
||||||
List<String> violations = assignments.stream().filter((candidate) -> ((Member)memberMap.get(candidate.getFieldMemberId())).getHistoryCenterIds().contains(candidate.getCenterId()) || ((Member)memberMap.get(candidate.getExternalMemberId())).getHistoryCenterIds().contains(candidate.getCenterId())).map(AssignmentCandidate::getCenterId).toList();
|
Map<String, Member> memberMap) {
|
||||||
return new RuleViolationExcelDto("2023년 진행 센터 재배정", violations.isEmpty() ? "PASS" : "FAIL", violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
|
List<String> violations = assignments.stream().filter((candidate) ->
|
||||||
|
((Member) memberMap.get(candidate.getFieldMemberId())).getHistoryCenterIds()
|
||||||
|
.contains(candidate.getCenterId()) || ((Member) 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<AssignmentCandidate> assignments, Set<LocalDate> holidays) {
|
private RuleViolationExcelDto checkHoliday(List<AssignmentCandidate> assignments,
|
||||||
List<String> violations = assignments.stream().filter((candidate) -> holidays.contains(candidate.getDate())).map((candidate) -> {
|
Set<LocalDate> holidays) {
|
||||||
|
List<String> violations = assignments.stream()
|
||||||
|
.filter((candidate) -> holidays.contains(candidate.getDate())).map((candidate) -> {
|
||||||
String var10000 = candidate.getCenterId();
|
String var10000 = candidate.getCenterId();
|
||||||
return var10000 + ":" + String.valueOf(candidate.getDate());
|
return var10000 + ":" + String.valueOf(candidate.getDate());
|
||||||
}).toList();
|
}).toList();
|
||||||
return new RuleViolationExcelDto("공휴일 배정", violations.isEmpty() ? "PASS" : "FAIL", violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
|
return new RuleViolationExcelDto("공휴일 배정", violations.isEmpty() ? "PASS" : "FAIL",
|
||||||
|
violations.isEmpty() ? "위반 없음" : String.join(", ", violations));
|
||||||
}
|
}
|
||||||
|
|
||||||
private RuleViolationExcelDto checkABDateOverlap(Map<String, ABPairMatch> abPairMatches) {
|
private RuleViolationExcelDto checkABDateOverlap(Map<String, ABPairMatch> abPairMatches) {
|
||||||
return new RuleViolationExcelDto("A/B 페어 날짜 겹침", "PASS", "A/B 그룹은 날짜가 겹치지 않는 페어끼리만 후처리로 생성됩니다.");
|
return new RuleViolationExcelDto("A/B 페어 날짜 겹침", "PASS",
|
||||||
|
"A/B 그룹은 날짜가 겹치지 않는 페어끼리만 후처리로 생성됩니다.");
|
||||||
}
|
}
|
||||||
|
|
||||||
private String formatDates(Set<LocalDate> dates) {
|
private String formatDates(Set<LocalDate> dates) {
|
||||||
return (String)dates.stream().sorted().map(LocalDate::toString).collect(Collectors.joining(", "));
|
return (String) dates.stream().sorted().map(LocalDate::toString)
|
||||||
|
.collect(Collectors.joining(", "));
|
||||||
}
|
}
|
||||||
|
|
||||||
private Set<LocalDate> commonUnavailableDates(PairingData data) {
|
private Set<LocalDate> commonUnavailableDates(PairingData data) {
|
||||||
return data.getCommonUnavailableDates() == null ? Set.of() : data.getCommonUnavailableDates();
|
return data.getCommonUnavailableDates() == null ? Set.of() : data.getCommonUnavailableDates();
|
||||||
}
|
}
|
||||||
|
|
||||||
private Map<String, List<Integer>> groupIndexes(List<AssignmentCandidate> candidates, Function<AssignmentCandidate, String> classifier) {
|
private Map<String, List<Integer>> groupIndexes(List<AssignmentCandidate> candidates,
|
||||||
|
Function<AssignmentCandidate, String> classifier) {
|
||||||
Map<String, List<Integer>> grouped = new HashMap();
|
Map<String, List<Integer>> grouped = new HashMap();
|
||||||
|
|
||||||
for (int i = 0; i < candidates.size(); ++i) {
|
for (int i = 0; i < candidates.size(); ++i) {
|
||||||
((List)grouped.computeIfAbsent((String)classifier.apply((AssignmentCandidate)candidates.get(i)), (key) -> new ArrayList())).add(i);
|
((List) grouped.computeIfAbsent(
|
||||||
|
(String) classifier.apply((AssignmentCandidate) candidates.get(i)),
|
||||||
|
(key) -> new ArrayList())).add(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
return grouped;
|
return grouped;
|
||||||
}
|
}
|
||||||
|
|
||||||
private BoolVar[] toLiteralArray(List<Integer> indexes, BoolVar[] assignmentVars) {
|
private BoolVar[] toLiteralArray(List<Integer> indexes, BoolVar[] assignmentVars) {
|
||||||
return (BoolVar[])indexes.stream().map((index) -> assignmentVars[index]).toArray((x$0) -> new BoolVar[x$0]);
|
return (BoolVar[]) indexes.stream().map((index) -> assignmentVars[index])
|
||||||
|
.toArray((x$0) -> new BoolVar[x$0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
private LinearArgument[] toLinearArgumentArray(List<Integer> indexes, BoolVar[] assignmentVars) {
|
private LinearArgument[] toLinearArgumentArray(List<Integer> indexes, BoolVar[] assignmentVars) {
|
||||||
return (LinearArgument[])indexes.stream().map((index) -> assignmentVars[index]).toArray((x$0) -> new LinearArgument[x$0]);
|
return (LinearArgument[]) indexes.stream().map((index) -> assignmentVars[index])
|
||||||
|
.toArray((x$0) -> new LinearArgument[x$0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
private String pairKey(AssignmentCandidate candidate) {
|
private String pairKey(AssignmentCandidate candidate) {
|
||||||
@@ -432,13 +641,19 @@ public class PairingSolverService {
|
|||||||
Loader.loadNativeLibraries();
|
Loader.loadNativeLibraries();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static record ABPairBuildResult(Map<String, ABPairMatch> matches, List<ABPairExcelDto> rows) {
|
private static record ABPairBuildResult(Map<String, ABPairMatch> matches,
|
||||||
|
List<ABPairExcelDto> rows) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static record UsedPair(String pairKey, String fieldMemberId, String externalMemberId, Set<LocalDate> dates, Set<String> dispatchAdjacentKeys) {
|
private static record UsedPair(String pairKey, String fieldMemberId, String externalMemberId,
|
||||||
|
Set<LocalDate> dates, Set<String> dispatchAdjacentKeys) {
|
||||||
|
|
||||||
private static UsedPair of(String pairKey, List<AssignmentCandidate> assignments) {
|
private static UsedPair of(String pairKey, List<AssignmentCandidate> assignments) {
|
||||||
AssignmentCandidate first = (AssignmentCandidate) assignments.get(0);
|
AssignmentCandidate first = (AssignmentCandidate) assignments.get(0);
|
||||||
return new UsedPair(pairKey, first.getFieldMemberId(), first.getExternalMemberId(), (Set)assignments.stream().map(AssignmentCandidate::getDate).collect(Collectors.toSet()), (Set)assignments.stream().map((candidate) -> {
|
return new UsedPair(pairKey, first.getFieldMemberId(), first.getExternalMemberId(),
|
||||||
|
(Set) assignments.stream().map(AssignmentCandidate::getDate).collect(Collectors.toSet()),
|
||||||
|
(Set) assignments.stream().map((candidate) -> {
|
||||||
String var10000 = candidate.getDispatchRegion();
|
String var10000 = candidate.getDispatchRegion();
|
||||||
return var10000 + "|" + candidate.getAdjacentRegionClassification();
|
return var10000 + "|" + candidate.getAdjacentRegionClassification();
|
||||||
}).collect(Collectors.toSet()));
|
}).collect(Collectors.toSet()));
|
||||||
@@ -453,7 +668,10 @@ public class PairingSolverService {
|
|||||||
Stream var2 = this.dispatchAdjacentKeys.stream();
|
Stream var2 = this.dispatchAdjacentKeys.stream();
|
||||||
var10001 = other.dispatchAdjacentKeys;
|
var10001 = other.dispatchAdjacentKeys;
|
||||||
Objects.requireNonNull(var10001);
|
Objects.requireNonNull(var10001);
|
||||||
if (var2.anyMatch(var10001::contains) && !Objects.equals(this.fieldMemberId, other.fieldMemberId) && !Objects.equals(this.fieldMemberId, other.externalMemberId) && !Objects.equals(this.externalMemberId, other.fieldMemberId) && !Objects.equals(this.externalMemberId, other.externalMemberId)) {
|
if (var2.anyMatch(var10001::contains) && !Objects.equals(this.fieldMemberId,
|
||||||
|
other.fieldMemberId) && !Objects.equals(this.fieldMemberId, other.externalMemberId)
|
||||||
|
&& !Objects.equals(this.externalMemberId, other.fieldMemberId) && !Objects.equals(
|
||||||
|
this.externalMemberId, other.externalMemberId)) {
|
||||||
var3 = true;
|
var3 = true;
|
||||||
return var3;
|
return var3;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
|
|||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class PairingValidationService {
|
public class PairingValidationService {
|
||||||
|
|
||||||
private final PairingProperties pairingProperties;
|
private final PairingProperties pairingProperties;
|
||||||
|
|
||||||
public void validate(PairingData data) {
|
public void validate(PairingData data) {
|
||||||
@@ -35,37 +36,45 @@ public class PairingValidationService {
|
|||||||
} else if (data.getCenters().isEmpty()) {
|
} else if (data.getCenters().isEmpty()) {
|
||||||
throw BusinessException.badRequest("PAIRING_EMPTY_CENTER", "센터정보 시트에 데이터가 없습니다.");
|
throw BusinessException.badRequest("PAIRING_EMPTY_CENTER", "센터정보 시트에 데이터가 없습니다.");
|
||||||
} else if (data.getCenterAdjacentRegions().isEmpty()) {
|
} else if (data.getCenterAdjacentRegions().isEmpty()) {
|
||||||
throw BusinessException.badRequest("PAIRING_EMPTY_CENTER_ADJACENT_REGION", "센터 인접지역표 시트에 데이터가 없습니다.");
|
throw BusinessException.badRequest("PAIRING_EMPTY_CENTER_ADJACENT_REGION",
|
||||||
|
"센터 인접지역표 시트에 데이터가 없습니다.");
|
||||||
} else if (data.getPreferenceMatchRules().isEmpty()) {
|
} else if (data.getPreferenceMatchRules().isEmpty()) {
|
||||||
throw BusinessException.badRequest("PAIRING_EMPTY_PREFERENCE_MATCH", "희망지역 매칭표 시트에 데이터가 없습니다.");
|
throw BusinessException.badRequest("PAIRING_EMPTY_PREFERENCE_MATCH",
|
||||||
|
"희망지역 매칭표 시트에 데이터가 없습니다.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void validateDateRanges(PairingData data) {
|
private void validateDateRanges(PairingData data) {
|
||||||
data.getMembers().forEach((member) -> {
|
data.getMembers().forEach((member) -> {
|
||||||
if (member.getAvailableEndDate().isBefore(member.getAvailableStartDate())) {
|
if (member.getAvailableEndDate().isBefore(member.getAvailableStartDate())) {
|
||||||
throw BusinessException.badRequest("PAIRING_INVALID_DATE_RANGE", "위원 종료일이 시작일보다 빠릅니다: " + member.getId());
|
throw BusinessException.badRequest("PAIRING_INVALID_DATE_RANGE",
|
||||||
|
"위원 종료일이 시작일보다 빠릅니다: " + member.getId());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
data.getMunicipalities().forEach((municipality) -> {
|
data.getMunicipalities().forEach((municipality) -> {
|
||||||
if (municipality.getAvailableEndDate().isBefore(municipality.getAvailableStartDate())) {
|
if (municipality.getAvailableEndDate().isBefore(municipality.getAvailableStartDate())) {
|
||||||
throw BusinessException.badRequest("PAIRING_INVALID_DATE_RANGE", "지자체 종료일이 시작일보다 빠릅니다: " + municipality.getId());
|
throw BusinessException.badRequest("PAIRING_INVALID_DATE_RANGE",
|
||||||
|
"지자체 종료일이 시작일보다 빠릅니다: " + municipality.getId());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
data.getCenters().forEach((center) -> {
|
data.getCenters().forEach((center) -> {
|
||||||
if (center.getAvailableEndDate().isBefore(center.getAvailableStartDate())) {
|
if (center.getAvailableEndDate().isBefore(center.getAvailableStartDate())) {
|
||||||
throw BusinessException.badRequest("PAIRING_INVALID_DATE_RANGE", "센터 종료일이 시작일보다 빠릅니다: " + center.getId());
|
throw BusinessException.badRequest("PAIRING_INVALID_DATE_RANGE",
|
||||||
|
"센터 종료일이 시작일보다 빠릅니다: " + center.getId());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void validateMunicipalityReferences(PairingData data) {
|
private void validateMunicipalityReferences(PairingData data) {
|
||||||
Map<String, Municipality> municipalities = (Map)data.getMunicipalities().stream().collect(Collectors.toMap(Municipality::getId, Function.identity(), (left, right) -> left));
|
Map<String, Municipality> municipalities = (Map) data.getMunicipalities().stream()
|
||||||
|
.collect(Collectors.toMap(Municipality::getId, Function.identity(), (left, right) -> left));
|
||||||
|
|
||||||
for (Center center : data.getCenters()) {
|
for (Center center : data.getCenters()) {
|
||||||
if (!municipalities.containsKey(center.getMunicipalityId())) {
|
if (!municipalities.containsKey(center.getMunicipalityId())) {
|
||||||
String var10001 = center.getId();
|
String var10001 = center.getId();
|
||||||
throw BusinessException.badRequest("PAIRING_BROKEN_MUNICIPALITY_REFERENCE", "센터가 존재하지 않는 지자체를 참조합니다. centerId=" + var10001 + ", municipalityId=" + center.getMunicipalityId());
|
throw BusinessException.badRequest("PAIRING_BROKEN_MUNICIPALITY_REFERENCE",
|
||||||
|
"센터가 존재하지 않는 지자체를 참조합니다. centerId=" + var10001 + ", municipalityId="
|
||||||
|
+ center.getMunicipalityId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,11 +85,13 @@ public class PairingValidationService {
|
|||||||
|
|
||||||
for (PreferenceMatchRule rule : data.getPreferenceMatchRules()) {
|
for (PreferenceMatchRule rule : data.getPreferenceMatchRules()) {
|
||||||
if (!priorities.add(rule.getPriority())) {
|
if (!priorities.add(rule.getPriority())) {
|
||||||
throw BusinessException.badRequest("PAIRING_DUPLICATE_PREFERENCE_PRIORITY", "희망지역 매칭표의 매칭 순위가 중복됩니다: " + rule.getPriority());
|
throw BusinessException.badRequest("PAIRING_DUPLICATE_PREFERENCE_PRIORITY",
|
||||||
|
"희망지역 매칭표의 매칭 순위가 중복됩니다: " + rule.getPriority());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rule.getFieldMemberPreferenceRank() < 0 || rule.getExternalMemberPreferenceRank() < 0) {
|
if (rule.getFieldMemberPreferenceRank() < 0 || rule.getExternalMemberPreferenceRank() < 0) {
|
||||||
throw BusinessException.badRequest("PAIRING_INVALID_PREFERENCE_RANK", "희망지역 매칭표의 선호 순위는 0 이상이어야 합니다.");
|
throw BusinessException.badRequest("PAIRING_INVALID_PREFERENCE_RANK",
|
||||||
|
"희망지역 매칭표의 선호 순위는 0 이상이어야 합니다.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -92,7 +103,8 @@ public class PairingValidationService {
|
|||||||
|
|
||||||
for (String preferenceRegion : member.getPreferenceRegions()) {
|
for (String preferenceRegion : member.getPreferenceRegions()) {
|
||||||
if (anyRegionAppeared && !this.anyRegionCode().equals(preferenceRegion)) {
|
if (anyRegionAppeared && !this.anyRegionCode().equals(preferenceRegion)) {
|
||||||
throw BusinessException.badRequest("PAIRING_INVALID_PREFERENCE_ORDER", "선호지역 00 이후에는 다른 지역이 올 수 없습니다. memberId=" + member.getId());
|
throw BusinessException.badRequest("PAIRING_INVALID_PREFERENCE_ORDER",
|
||||||
|
"선호지역 00 이후에는 다른 지역이 올 수 없습니다. memberId=" + member.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.anyRegionCode().equals(preferenceRegion)) {
|
if (this.anyRegionCode().equals(preferenceRegion)) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.kri.p6.ncrc.pairing.service;
|
package com.kri.p6.ncrc.pairing.service;
|
||||||
|
|
||||||
import com.kri.p6.ncrc.pairing.dto.PairingWorkbookData;
|
import com.kri.p6.ncrc.pairing.dto.excel.input.PairingWorkbookData;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import org.assertj.core.api.Assertions;
|
import org.assertj.core.api.Assertions;
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
package com.kri.p6.ncrc.pairing.service;
|
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.external.datago.DatagoExtentionApiClient;
|
||||||
import com.kri.p6.ncrc.pairing.common.cache.DatagoHolidayCache;
|
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.common.external.datago.HolidayDto;
|
||||||
import com.kri.p6.ncrc.pairing.model.ExperienceType;
|
|
||||||
import com.kri.p6.ncrc.pairing.model.Gender;
|
|
||||||
import com.kri.p6.ncrc.pairing.model.Member;
|
import com.kri.p6.ncrc.pairing.model.Member;
|
||||||
import com.kri.p6.ncrc.pairing.model.MemberRole;
|
|
||||||
import com.kri.p6.ncrc.pairing.model.PairingData;
|
import com.kri.p6.ncrc.pairing.model.PairingData;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -18,7 +18,27 @@ class PairingHolidayServiceTest {
|
|||||||
@Test
|
@Test
|
||||||
void applyHolidayUnavailableDatesAddsDatagoHolidays() {
|
void applyHolidayUnavailableDatesAddsDatagoHolidays() {
|
||||||
PairingHolidayService service = new PairingHolidayService(new DatagoHolidayCache(new StubDatagoExtentionApiClient()));
|
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 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);
|
PairingData result = service.applyHolidayUnavailableDates(data);
|
||||||
Assertions.assertThat(result.getCommonUnavailableDates()).contains(new LocalDate[]{LocalDate.of(2026, 5, 5)});
|
Assertions.assertThat(result.getCommonUnavailableDates()).contains(new LocalDate[]{LocalDate.of(2026, 5, 5)});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
package com.kri.p6.ncrc.pairing.service;
|
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.AssignmentCandidate;
|
||||||
import com.kri.p6.ncrc.pairing.model.Center;
|
import com.kri.p6.ncrc.pairing.model.Center;
|
||||||
import com.kri.p6.ncrc.pairing.model.ExperienceType;
|
|
||||||
import com.kri.p6.ncrc.pairing.model.Gender;
|
|
||||||
import com.kri.p6.ncrc.pairing.model.Member;
|
import com.kri.p6.ncrc.pairing.model.Member;
|
||||||
import com.kri.p6.ncrc.pairing.model.MemberRole;
|
|
||||||
import com.kri.p6.ncrc.pairing.model.Municipality;
|
import com.kri.p6.ncrc.pairing.model.Municipality;
|
||||||
import com.kri.p6.ncrc.pairing.model.PairCandidate;
|
import com.kri.p6.ncrc.pairing.model.PairCandidate;
|
||||||
import com.kri.p6.ncrc.pairing.model.PairingCandidates;
|
import com.kri.p6.ncrc.pairing.model.PairingCandidates;
|
||||||
|
|||||||
Reference in New Issue
Block a user