261104_01_ENH: 기존 통계 결과를 유지하며 데이터 접근 및 문항·쿼터 설정 해석 분리
This commit is contained in:
@@ -1,12 +1,10 @@
|
||||
package com.kri.kart.server.service;
|
||||
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.kri.common.feature.json.JsonUtil;
|
||||
import com.kri.common.feature.util.StringUtil;
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.kart.server.dto.project.ProjectRefDto;
|
||||
import com.kri.kart.server.dto.quota.PreparedQuotaDto;
|
||||
import com.kri.kart.server.dto.quota.QuotaResultDto;
|
||||
import com.kri.kart.server.dto.quota.QuotaResultRequestDto;
|
||||
import com.kri.kart.server.dto.quota.QuotaSetDto;
|
||||
@@ -15,14 +13,11 @@ import com.kri.kart.server.dto.statistics.StatisticsRequestDto;
|
||||
import com.kri.kart.server.dto.statistics.StatisticsResponseDto;
|
||||
import com.kri.kart.server.persistence.repository.QuotaRepository;
|
||||
import com.kri.kart.server.service.quota.QuotaComputationService;
|
||||
import com.kri.kart.server.service.statistics.LegacyFilterService;
|
||||
import com.kri.kart.server.service.quota.QuotaPreparationService;
|
||||
import com.kri.kart.server.service.statistics.StatisticsAggregationService;
|
||||
import com.kri.kart.server.service.statistics.StatisticsDimension;
|
||||
import com.kri.kart.server.service.statistics.StatisticsDimensionService;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -35,7 +30,7 @@ public class QuotaService {
|
||||
private final StatisticsService statisticsService;
|
||||
private final StatisticsAggregationService statisticsAggregationService;
|
||||
private final StatisticsDimensionService statisticsDimensionService;
|
||||
private final LegacyFilterService legacyFilterService;
|
||||
private final QuotaPreparationService quotaPreparationService;
|
||||
private final QuotaComputationService quotaComputationService;
|
||||
private final LogService logService;
|
||||
private final ObjectMapper objectMapper;
|
||||
@@ -57,44 +52,14 @@ public class QuotaService {
|
||||
content.put("QSTITLE", quotaSet.getQsTitle());
|
||||
content.put("QSJSON", quotaSet.getQsJson());
|
||||
logService.writeSiteLog(project, "QUOTA VIEW", content, ctx);
|
||||
JsonNode settings;
|
||||
try {
|
||||
settings = JsonUtil.fromJson(objectMapper, quotaSet.getQsJson(), JsonNode.class);
|
||||
} catch (IllegalArgumentException error) {
|
||||
throw invalidSettings();
|
||||
}
|
||||
if (settings == null
|
||||
|| !settings.isObject()
|
||||
|| !settings.path("ROW").isArray()
|
||||
|| !settings.path("COL").isArray()) {
|
||||
throw invalidSettings();
|
||||
}
|
||||
String index =
|
||||
settings.path("ROW").isEmpty() ? "" : dimension(settings.path("ROW").get(0), true);
|
||||
List<String> columns = new ArrayList<>();
|
||||
for (JsonNode column : settings.path("COL")) {
|
||||
columns.add(dimension(column, false));
|
||||
}
|
||||
List<List<String>> banners =
|
||||
columns.isEmpty()
|
||||
? List.of()
|
||||
: Arrays.stream(String.join("|", columns).split(",", -1))
|
||||
.map(group -> Arrays.stream(group.split("\\|", -1)).map(String::trim).toList())
|
||||
.toList();
|
||||
if (banners.stream()
|
||||
.anyMatch(
|
||||
group ->
|
||||
group.isEmpty() || group.size() > 5 || group.stream().anyMatch(String::isEmpty))) {
|
||||
throw invalidSettings();
|
||||
}
|
||||
PreparedQuotaDto settings =
|
||||
quotaPreparationService.settings(quotaSet.getQsJson());
|
||||
String index = settings.index();
|
||||
List<List<String>> banners = settings.banners();
|
||||
StatisticsRequestDto statisticsRequest = new StatisticsRequestDto();
|
||||
statisticsRequest.setIndex(index);
|
||||
statisticsRequest.setBanners(banners);
|
||||
try {
|
||||
statisticsRequest.setFilter(legacyFilterService.parse(settings.get("FILTER")));
|
||||
} catch (BusinessException exception) {
|
||||
throw BusinessException.validationError("QUOTA_FILTER_INVALID", "저장된 쿼터 필터 형식을 확인해 주세요.");
|
||||
}
|
||||
statisticsRequest.setFilter(settings.filter());
|
||||
statisticsRequest.setDataScope(request.getDataScope());
|
||||
statisticsRequest.setStartDate(request.getStartDate());
|
||||
statisticsRequest.setEndDate(request.getEndDate());
|
||||
@@ -105,7 +70,7 @@ public class QuotaService {
|
||||
StatisticsDimension indexDimension =
|
||||
statisticsDimensionService.resolve(
|
||||
index, statisticsBatch.questions(), statisticsBatch.responses());
|
||||
if ("text".equals(indexDimension.getQuestion().getQtype())
|
||||
if ("text".equals(indexDimension.getQuestionType())
|
||||
&& !indexDimension.isAttributeProjection()) {
|
||||
throw BusinessException.validationError(
|
||||
"QUOTA_TEXT_UNSUPPORTED", "주관식 문자 문항은 쿼터 완료수 표로 집계할 수 없습니다.");
|
||||
@@ -121,26 +86,8 @@ public class QuotaService {
|
||||
matchIndex,
|
||||
banners,
|
||||
table,
|
||||
quotaRepository.quotaEntries(project, quotaOrder));
|
||||
quotaPreparationService.entries(quotaRepository.quotaEntries(project, quotaOrder)));
|
||||
return result;
|
||||
}
|
||||
|
||||
private String dimension(JsonNode value, boolean allowEmpty) {
|
||||
if (!value.isTextual()) {
|
||||
throw invalidSettings();
|
||||
}
|
||||
String dimension = StringUtil.normalizeBlank(value.asText());
|
||||
if (dimension == null) {
|
||||
if (allowEmpty) {
|
||||
return "";
|
||||
}
|
||||
throw invalidSettings();
|
||||
}
|
||||
return dimension.toUpperCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
private BusinessException invalidSettings() {
|
||||
return BusinessException.validationError(
|
||||
"QUOTA_CONFIGURATION_INVALID", "저장된 쿼터 ROW/COL 설정을 확인해 주세요.");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user