diff --git a/src/main/java/com/kri/kart/server/dto/quota/PreparedQuotaDto.java b/src/main/java/com/kri/kart/server/dto/quota/PreparedQuotaDto.java new file mode 100644 index 0000000..d639835 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/quota/PreparedQuotaDto.java @@ -0,0 +1,14 @@ +package com.kri.kart.server.dto.quota; + +import com.kri.kart.server.dto.statistics.StatisticsFilterDto; +import java.util.List; +import java.util.function.Function; + +/** Internal quota interpretation; condition validation remains lazy to preserve failure order. */ +public record PreparedQuotaDto( + String index, List> banners, StatisticsFilterDto filter) { + + public record Entry(Long target, String isUsed, Long quotaId, Function value) {} + + public record Condition(String dimension, String choice) {} +} diff --git a/src/main/java/com/kri/kart/server/service/QuotaService.java b/src/main/java/com/kri/kart/server/service/QuotaService.java index e7f88e4..3626200 100644 --- a/src/main/java/com/kri/kart/server/service/QuotaService.java +++ b/src/main/java/com/kri/kart/server/service/QuotaService.java @@ -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 columns = new ArrayList<>(); - for (JsonNode column : settings.path("COL")) { - columns.add(dimension(column, false)); - } - List> 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> 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 설정을 확인해 주세요."); - } } diff --git a/src/main/java/com/kri/kart/server/service/StatisticsService.java b/src/main/java/com/kri/kart/server/service/StatisticsService.java index 5eea4f7..52b6988 100644 --- a/src/main/java/com/kri/kart/server/service/StatisticsService.java +++ b/src/main/java/com/kri/kart/server/service/StatisticsService.java @@ -22,12 +22,10 @@ import com.kri.kart.server.service.statistics.StatisticsDataService; import com.kri.kart.server.service.statistics.StatisticsDimension; import com.kri.kart.server.service.statistics.StatisticsDimensionService; import com.kri.kart.server.service.statistics.StatisticsFilterService; +import com.kri.kart.server.service.statistics.StatisticsSourceService; import com.kri.kart.server.service.statistics.StatisticsTextService; import java.io.IOException; -import java.util.ArrayList; import java.util.List; -import java.util.Locale; -import java.util.Objects; import java.util.function.BooleanSupplier; import java.util.function.Predicate; import lombok.RequiredArgsConstructor; @@ -43,6 +41,7 @@ public class StatisticsService { private final QuestionRepository questionRepository; private final QuestionService questionService; private final StatisticsDataService statisticsDataService; + private final StatisticsSourceService statisticsSourceService; private final StatisticsDimensionService statisticsDimensionService; private final StatisticsFilterService statisticsFilterService; private final StatisticsAggregationService statisticsAggregationService; @@ -188,7 +187,7 @@ public class StatisticsService { needsProfileResponses(project, requests, sharedRequest, questions); // Query the union of all storage roots once; calculate() narrows it again for each index. List storageRoots = - requests.stream().flatMap(request -> storageRoots(request).stream()).distinct().toList(); + requests.stream().flatMap(request -> statisticsSourceService.storageRoots(request).stream()).distinct().toList(); List data = statisticsRepository.data(project, sharedRequest, includeProfileResponses, storageRoots); return statisticsDataService.normalize(data).stream().filter(filter).toList(); @@ -203,8 +202,8 @@ public class StatisticsService { if (project.projectType() != ProjectType.KIWI) { return false; } - return requests.stream().anyMatch(request -> isProfileId(request.getIndex())) - || sharedRequest.getBanners().stream().flatMap(List::stream).anyMatch(this::isProfileId) + return requests.stream().anyMatch(request -> statisticsSourceService.isProfileId(request.getIndex())) + || sharedRequest.getBanners().stream().flatMap(List::stream).anyMatch(statisticsSourceService::isProfileId) || filterUsesProfile(sharedRequest.getFilter(), questions); } @@ -213,25 +212,17 @@ public class StatisticsService { return false; } if (filter.getDimensionId() != null - && isProfileId(statisticsFilterService.resolveQid(filter, questions))) { + && statisticsSourceService.isProfileId(statisticsFilterService.resolveQid(filter, questions))) { return true; } return filter.getChildren().stream().anyMatch(child -> filterUsesProfile(child, questions)); } - private boolean isProfileId(String id) { - String normalized = StringUtil.normalizeBlank(id); - if (normalized == null) { - return false; - } - String upperCaseId = normalized.toUpperCase(Locale.ROOT); - return KartConstant.PROFILE_ID_PREFIXES.stream().anyMatch(upperCaseId::startsWith); - } - private StatisticsResponseDto calculate( StatisticsBatchDto statisticsBatch, StatisticsRequestDto request) { List responses = - withinStorageRoots(statisticsBatch.responses(), storageRoots(request)); + statisticsSourceService.withinStorageRoots( + statisticsBatch.responses(), statisticsSourceService.storageRoots(request)); StatisticsDimension index = statisticsDimensionService.resolve( request.getIndex(), statisticsBatch.questions(), responses); @@ -242,34 +233,8 @@ public class StatisticsService { request, statisticsBatch.questions(), responses); } - /** The shared union query must not add respondents that a single-index query would omit. */ - private List withinStorageRoots( - List responses, List storageRoots) { - Predicate storedUnderRoots = - key -> storageRoots.contains(key) || storageRoots.contains(key.split("_")[0]); - return responses.stream() - .filter(response -> response.values().keySet().stream().anyMatch(storedUnderRoots)) - .toList(); - } - - /** Storage root keys selected by the original single-index query: index plus banners. */ - private List storageRoots(StatisticsRequestDto request) { - List ids = new ArrayList<>(); - ids.add(isStandard(request) ? request.getIndex() : KartConstant.TABULATION_STORAGE_ROOT); - request.getBanners().forEach(ids::addAll); - return ids.stream().map(this::toStorageRoot).distinct().toList(); - } - - /** e.g. "q1_2#a" -> "Q1": upper-case, drop the attribute projection and keep the root. */ - private String toStorageRoot(String id) { - return Objects.toString(StringUtil.normalizeBlank(id), "") - .toUpperCase(Locale.ROOT) - .replace(KartConstant.ATTRIBUTE_PROJECTION_SUFFIX, "") - .split("_")[0]; - } - private boolean isOpenText(StatisticsDimension index) { - return "text".equals(index.getQuestion().getQtype()) && !index.isAttributeProjection(); + return "text".equals(index.getQuestionType()) && !index.isAttributeProjection(); } private StatisticsResponseDto textAnalysis( @@ -280,7 +245,7 @@ public class StatisticsService { return StatisticsResponseDto.builder() .type("TEXT_ANALYSIS") .questionId(index.getDimensionId()) - .title(index.getQuestion().getTitle()) + .title(index.getTitle()) .columns(List.of()) .headerRows(List.of()) .rows(List.of()) diff --git a/src/main/java/com/kri/kart/server/service/quota/QuotaComputationService.java b/src/main/java/com/kri/kart/server/service/quota/QuotaComputationService.java index 566637e..e28fd18 100644 --- a/src/main/java/com/kri/kart/server/service/quota/QuotaComputationService.java +++ b/src/main/java/com/kri/kart/server/service/quota/QuotaComputationService.java @@ -1,11 +1,9 @@ package com.kri.kart.server.service.quota; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.kri.common.feature.json.JsonUtil; import com.kri.common.feature.web.BusinessException; +import com.kri.kart.server.dto.quota.PreparedQuotaDto.Condition; +import com.kri.kart.server.dto.quota.PreparedQuotaDto.Entry; import com.kri.kart.server.dto.quota.QuotaCellDto; -import com.kri.kart.server.dto.quota.QuotaEntryDto; import com.kri.kart.server.dto.quota.QuotaResultDto; import com.kri.kart.server.dto.quota.QuotaRowDto; import com.kri.kart.server.dto.quota.QuotaSetDto; @@ -15,18 +13,19 @@ import com.kri.kart.server.dto.statistics.StatisticsRowDto; import com.kri.kart.server.service.statistics.StatisticsArithmetic; import com.kri.kart.server.service.statistics.StatisticsTableService; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.function.Function; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor public class QuotaComputationService { - private final ObjectMapper objectMapper; + private final QuotaPreparationService quotaPreparationService; private final StatisticsTableService statisticsTableService; - private record Entry(QuotaEntryDto quotaEntry, JsonNode values) {} - private record Target(long count, String isUsed, Long quotaId) {} public QuotaResultDto compute( @@ -35,26 +34,11 @@ public class QuotaComputationService { String matchIndex, List> banners, StatisticsResponseDto table, - List quotaEntries) { - List entries = - quotaEntries.stream() - .map( - quotaEntry -> { - JsonNode values; - try { - values = - JsonUtil.fromJson(objectMapper, quotaEntry.getQuotaJson(), JsonNode.class); - } catch (IllegalArgumentException error) { - throw BusinessException.validationError( - "QUOTA_DATA_INVALID", "저장된 쿼터 조건을 확인해 주세요."); - } - if (values == null || !values.isObject()) { - throw BusinessException.validationError( - "QUOTA_DATA_INVALID", "저장된 쿼터 조건을 확인해 주세요."); - } - return new Entry(quotaEntry, values); - }) - .toList(); + List entries) { + Map> conditions = new HashMap<>(); + Function> columnConditions = + id -> conditions.computeIfAbsent(id, key -> quotaPreparationService.columnConditions( + key, banners.isEmpty() ? List.of() : banners.get(0))); List columns = new ArrayList<>(); columns.add(table.columns().get(0)); table.columns().stream() @@ -99,7 +83,7 @@ public class QuotaComputationService { } Target target = target( - entries, row, matchIndex, columnId, banners.isEmpty() ? List.of() : banners.get(0)); + entries, row, matchIndex, columnConditions, columnId); rowTargetSum += target.count(); cells.add(cell(columnIndex, complete, target)); } @@ -151,46 +135,30 @@ public class QuotaComputationService { } private Target target( - List entries, StatisticsRowDto row, String index, String columnId, List banners) { + List entries, + StatisticsRowDto row, String index, + Function> columnConditions, + String columnId) { List matching = entries; if (!index.isEmpty() && StatisticsArithmetic.number(row.rowId()) != null && !"TOTAL".equals(row.kind())) { matching = matching.stream() - .filter(entry -> value(entry.values(), index).equals(row.rowId())) + .filter(entry -> entry.value().apply(index).equals(row.rowId())) .toList(); } - if (!"i".equals(columnId)) { - String[] values = columnId.split("_"); - if (values.length - 1 > banners.size()) { - throw BusinessException.validationError("QUOTA_COLUMNS_INVALID", "쿼터 배너와 집계 열이 일치하지 않습니다."); - } - for (int depth = 1; depth < values.length; depth++) { - String banner = banners.get(depth - 1); - String choice = values[depth]; - matching = - matching.stream() - .filter(entry -> value(entry.values(), banner).equals(choice)) - .toList(); - } + for (Condition condition : columnConditions.apply(columnId)) { + matching = matching.stream() + .filter(entry -> entry.value().apply(condition.dimension()).equals(condition.choice())).toList(); } long count = matching.stream() - .map(Entry::quotaEntry) - .mapToLong(entry -> entry.getOriCnt() == null ? 0 : entry.getOriCnt()) + .mapToLong(entry -> entry.target() == null ? 0 : entry.target()) .sum(); - QuotaEntryDto only = matching.size() == 1 ? matching.get(0).quotaEntry() : null; + Entry only = matching.size() == 1 ? matching.get(0) : null; return new Target( - count, only == null ? null : only.getIsUse(), only == null ? null : only.getId()); - } - - private String value(JsonNode values, String key) { - JsonNode value = values.get(key); - if (value == null || value.isNull() || !value.isValueNode()) { - throw BusinessException.validationError("QUOTA_DATA_INVALID", "쿼터 조건에 필요한 문항 값이 없습니다."); - } - return value.asText(); + count, only == null ? null : only.isUsed(), only == null ? null : only.quotaId()); } private QuotaCellDto cell(int columnIndex, long complete, Target target) { diff --git a/src/main/java/com/kri/kart/server/service/quota/QuotaPreparationService.java b/src/main/java/com/kri/kart/server/service/quota/QuotaPreparationService.java new file mode 100644 index 0000000..b383897 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/quota/QuotaPreparationService.java @@ -0,0 +1,130 @@ +package com.kri.kart.server.service.quota; + +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.kart.server.dto.quota.PreparedQuotaDto; +import com.kri.kart.server.dto.quota.QuotaEntryDto; +import com.kri.kart.server.dto.statistics.StatisticsFilterDto; +import com.kri.kart.server.service.statistics.LegacyFilterService; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +/** Interprets saved quota formats without changing target/error semantics. */ +@Service +@RequiredArgsConstructor +public class QuotaPreparationService { + private final ObjectMapper objectMapper; + private final LegacyFilterService legacyFilterService; + + public PreparedQuotaDto settings(String json) { + JsonNode settings; + try { + settings = JsonUtil.fromJson(objectMapper, json, 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 columns = new ArrayList<>(); + for (JsonNode column : settings.path("COL")) { + columns.add(dimension(column, false)); + } + List> 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(); + } + StatisticsFilterDto filter; + try { + filter = legacyFilterService.parse(settings.get("FILTER")); + } catch (BusinessException exception) { + throw BusinessException.validationError("QUOTA_FILTER_INVALID", "저장된 쿼터 필터 형식을 확인해 주세요."); + } + return new PreparedQuotaDto(index, banners, filter); + } + + public List entries(List quotaEntries) { + return quotaEntries.stream() + .map( + quotaEntry -> { + JsonNode values; + try { + values = + JsonUtil.fromJson(objectMapper, quotaEntry.getQuotaJson(), JsonNode.class); + } catch (IllegalArgumentException error) { + throw BusinessException.validationError( + "QUOTA_DATA_INVALID", "저장된 쿼터 조건을 확인해 주세요."); + } + if (values == null || !values.isObject()) { + throw BusinessException.validationError( + "QUOTA_DATA_INVALID", "저장된 쿼터 조건을 확인해 주세요."); + } + return new PreparedQuotaDto.Entry( + quotaEntry.getOriCnt(), quotaEntry.getIsUse(), quotaEntry.getId(), + key -> value(values, key)); + }) + .toList(); + } + + public List columnConditions(String columnId, List banners) { + if ("i".equals(columnId)) { + return List.of(); + } + String[] values = columnId.split("_"); + if (values.length - 1 > banners.size()) { + throw BusinessException.validationError("QUOTA_COLUMNS_INVALID", "쿼터 배너와 집계 열이 일치하지 않습니다."); + } + List conditions = new ArrayList<>(); + for (int depth = 1; depth < values.length; depth++) { + conditions.add(new PreparedQuotaDto.Condition(banners.get(depth - 1), values[depth])); + } + return conditions; + } + + private String value(JsonNode values, String key) { + JsonNode value = values.get(key); + if (value == null || value.isNull() || !value.isValueNode()) { + throw BusinessException.validationError("QUOTA_DATA_INVALID", "쿼터 조건에 필요한 문항 값이 없습니다."); + } + return value.asText(); + } + + 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 설정을 확인해 주세요."); + } +} diff --git a/src/main/java/com/kri/kart/server/service/statistics/StatisticsAggregationService.java b/src/main/java/com/kri/kart/server/service/statistics/StatisticsAggregationService.java index e07898a..6896e9d 100644 --- a/src/main/java/com/kri/kart/server/service/statistics/StatisticsAggregationService.java +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsAggregationService.java @@ -11,7 +11,6 @@ import com.kri.kart.server.dto.statistics.StatisticsRowDto; import com.kri.kart.server.dto.statistics.StatisticsValueGroupDto; import com.kri.kart.server.dto.statistics.SurveyResponseDto; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -19,6 +18,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Objects; +import java.util.function.Function; import java.util.regex.Pattern; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -53,9 +53,10 @@ public class StatisticsAggregationService { StatisticsRequestDto request, List questions, List responses) { - StatisticsDimension index = - statisticsDimensionService.resolve(request.getIndex(), questions, responses); - List columns = columns(index, request, questions, responses); + Function dimensions = + statisticsDimensionService.prepare(questions, responses); + StatisticsDimension index = dimensions.apply(request.getIndex()); + List columns = columns(index, request, responses, dimensions); if (KartConstant.BANNER_CROSS_MODE.equals(request.getMode())) { return bannerCrossTable(index, columns, request); } @@ -65,7 +66,7 @@ public class StatisticsAggregationService { addSummaryRows(rows, index, columns, request); return statisticsTableService.table( index.getDimensionId(), - index.getQuestion().getTitle(), + index.getTitle(), columnHeaders(index, columns), rows, request); @@ -75,8 +76,8 @@ public class StatisticsAggregationService { private List columns( StatisticsDimension index, StatisticsRequestDto request, - List questions, - List responses) { + List responses, + Function preparedDimensions) { List total = statisticsSelectionService.total(responses, index); List> cases = index.getChoices().stream() @@ -87,12 +88,12 @@ public class StatisticsAggregationService { List> banners = request.getBanners(); if (!index.getAttributes().isEmpty()) { // The old matrix summary replaces supplied banners with its own attribute projection. - banners = List.of(List.of(index.getQuestion().getQid() + "#A")); + banners = List.of(List.of(index.getAttributeBannerId())); } for (int group = 0; group < banners.size(); group++) { List dimensions = banners.get(group).stream() - .map(id -> statisticsDimensionService.resolve(id, questions, responses)) + .map(preparedDimensions) .toList(); if (dimensions.stream().anyMatch(this::isOpenAnswer)) { throw BusinessException.badRequest("주관식 문자·숫자 문항은 배너로 사용할 수 없습니다."); @@ -123,7 +124,7 @@ public class StatisticsAggregationService { for (StatisticsDimension.Choice choice : banner.getChoices()) { String columnId = parentId + "_" + choice.value(); List labels = new ArrayList<>(parentLabels); - labels.add(banner.getQuestion().getTitle()); + labels.add(banner.getTitle()); labels.add(choice.label()); List bannerTotal = statisticsSelectionService.bannerTotal(total, banner, choice.value()); @@ -161,7 +162,7 @@ public class StatisticsAggregationService { } private boolean isOpenAnswer(StatisticsDimension dimension) { - return KartConstant.OPEN_QUESTION_TYPES.contains(dimension.getQuestion().getQtype()) + return KartConstant.OPEN_QUESTION_TYPES.contains(dimension.getQuestionType()) && !dimension.isAttributeProjection(); } @@ -221,7 +222,7 @@ public class StatisticsAggregationService { StatisticsDimension index, List columns, StatisticsRequestDto request) { - String type = index.getQuestion().getQtype(); + String type = index.getQuestionType(); if ("num".equals(type)) { addStatistic(rows, columns, index, KartConstant.MEAN, request); for (String statistic : KartConstant.NUMERIC_STATISTICS) { @@ -396,12 +397,11 @@ public class StatisticsAggregationService { Column column, StatisticsDimension index, boolean totalColumn) { List source = totalColumn ? column.total() : column.cases().stream().flatMap(List::stream).toList(); - String baseKey = index.getBaseKey(); LinkedHashSet keys = new LinkedHashSet<>(); source.forEach( response -> response.values().keySet().stream() - .filter(key -> key.equals(baseKey) || key.startsWith(baseKey + "_")) + .filter(index.getAnswerAccess().valueKeys()) .forEach(keys::add)); List numbers = new ArrayList<>(); for (String key : keys) { @@ -555,21 +555,15 @@ public class StatisticsAggregationService { } private List missingValues(StatisticsDimension index) { - String values = index.getQuestion().getMissingValue(); - return values == null - ? List.of() - : Arrays.stream(values.split(",")) - .map(StatisticsArithmetic::number) - .filter(Objects::nonNull) - .toList(); + return index.getMissingValues(); } private boolean isReverse(StatisticsDimension index) { - return "1".equals(index.getQuestion().getIsReverse()); + return index.isReverse(); } private boolean isNps(StatisticsDimension index) { - return "1".equals(index.getQuestion().getIsNps()); + return index.isNps(); } /** One row summing the cases of the given choice codes. */ @@ -615,7 +609,7 @@ public class StatisticsAggregationService { private List columnHeaders(StatisticsDimension index, List columns) { List result = new ArrayList<>(); - result.add(new StatisticsColumnDto("LABEL", "LABEL", List.of(index.getQuestion().getTitle()))); + result.add(new StatisticsColumnDto("LABEL", "LABEL", List.of(index.getTitle()))); for (Column column : columns) { result.add(new StatisticsColumnDto(column.id(), columnKind(column), column.labels())); } diff --git a/src/main/java/com/kri/kart/server/service/statistics/StatisticsAnswerAccess.java b/src/main/java/com/kri/kart/server/service/statistics/StatisticsAnswerAccess.java new file mode 100644 index 0000000..982e59d --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsAnswerAccess.java @@ -0,0 +1,17 @@ +package com.kri.kart.server.service.statistics; + +import java.util.List; +import java.util.function.Predicate; + +/** Prepared access to existing response maps; never owns or copies respondent values. */ +public record StatisticsAnswerAccess( + boolean wholeSample, Predicate valueKeys, Selection selection) { + + @FunctionalInterface + public interface Selection { + List prepare( + String attribute, String multiValue, List attributes, int numberedSlots); + } + + public record Read(String key, Predicate answeredKeys) {} +} diff --git a/src/main/java/com/kri/kart/server/service/statistics/StatisticsDimension.java b/src/main/java/com/kri/kart/server/service/statistics/StatisticsDimension.java index dd74c4a..727c364 100644 --- a/src/main/java/com/kri/kart/server/service/statistics/StatisticsDimension.java +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsDimension.java @@ -1,21 +1,48 @@ package com.kri.kart.server.service.statistics; -import com.kri.kart.server.dto.question.QuestionDto; import java.util.List; import lombok.Getter; -import lombok.RequiredArgsConstructor; @Getter -@RequiredArgsConstructor public class StatisticsDimension { private final String dimensionId; - private final QuestionDto question; private final String baseKey; private final String attributeValue; private final List attributes; private final int rankCount; private final boolean attributeProjection; private final List choices; + private final String title; + private final String questionType; + private final String attributeBannerId; + private final List missingValues; + private final boolean reverse; + private final boolean nps; + private final StatisticsAnswerAccess answerAccess; + + public StatisticsDimension( + String dimensionId, Definition definition, String baseKey, String attributeValue, + List attributes, int rankCount, boolean attributeProjection, List choices, + StatisticsAnswerAccess answerAccess) { + this.dimensionId = dimensionId; + this.baseKey = baseKey; + this.attributeValue = attributeValue; + this.attributes = attributes; + this.rankCount = rankCount; + this.attributeProjection = attributeProjection; + this.choices = choices; + this.title = definition.title(); + this.questionType = definition.questionType(); + this.attributeBannerId = definition.attributeBannerId(); + this.missingValues = definition.missingValues(); + this.reverse = definition.reverse(); + this.nps = definition.nps(); + this.answerAccess = answerAccess; + } + + public record Definition( + String title, String questionType, String attributeBannerId, + List missingValues, boolean reverse, boolean nps) {} public record Choice(String value, String label) {} diff --git a/src/main/java/com/kri/kart/server/service/statistics/StatisticsDimensionService.java b/src/main/java/com/kri/kart/server/service/statistics/StatisticsDimensionService.java index 85ce4b8..2b4a05c 100644 --- a/src/main/java/com/kri/kart/server/service/statistics/StatisticsDimensionService.java +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsDimensionService.java @@ -9,10 +9,15 @@ import com.kri.kart.server.common.consts.KartConstant; import com.kri.kart.server.dto.question.QuestionDto; import com.kri.kart.server.dto.statistics.SurveyResponseDto; import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.Objects; +import java.util.function.Function; +import java.util.function.Predicate; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -21,6 +26,7 @@ import org.springframework.stereotype.Service; public class StatisticsDimensionService { private final ObjectMapper objectMapper; + private final StatisticsSourceService statisticsSourceService; /** * Resolves an index or banner id. A blank id is the whole sample; "Q1#A" projects the attributes @@ -73,7 +79,24 @@ public class StatisticsDimensionService { List choices = choices(question, qid, projection, responses); excludeScreenedOutChoices(question, qid, choices); return new StatisticsDimension( - id, question, baseKey, attributeValue, attributes, rankCount, projection, choices); + id, definition(question), baseKey, attributeValue, attributes, rankCount, projection, + choices, statisticsSourceService.access(baseKey)); + } + + /** Cache only within one calculation and its exact respondent population. */ + public Function prepare( + List questions, List responses) { + Map dimensions = new HashMap<>(); + return id -> dimensions.computeIfAbsent(id, key -> resolve(key, questions, responses)); + } + + private StatisticsDimension.Definition definition(QuestionDto question) { + String missing = question.getMissingValue(); + List missingValues = missing == null ? List.of() : Arrays.stream(missing.split(",")) + .map(StatisticsArithmetic::number).filter(Objects::nonNull).toList(); + return new StatisticsDimension.Definition( + question.getTitle(), question.getQtype(), question.getQid() + KartConstant.ATTRIBUTE_PROJECTION_SUFFIX, + missingValues, "1".equals(question.getIsReverse()), "1".equals(question.getIsNps())); } public JsonNode metadata(String json) { @@ -96,13 +119,13 @@ public class StatisticsDimensionService { .build(); return new StatisticsDimension( "", - question, + definition(question), "", "", List.of(), 0, false, - List.of(new StatisticsDimension.Choice("0", "전체"))); + List.of(new StatisticsDimension.Choice("0", "전체")), statisticsSourceService.access("")); } private List choices( @@ -126,11 +149,12 @@ public class StatisticsDimensionService { /** Open questions have no label metadata; every distinct answer becomes a choice. */ private List answeredChoices( QuestionDto question, String qid, List responses) { + Predicate valueKeys = statisticsSourceService.valueKeys(qid); LinkedHashSet keys = new LinkedHashSet<>(); responses.forEach( response -> response.values().keySet().stream() - .filter(key -> key.equals(qid) || key.startsWith(qid + "_")) + .filter(valueKeys) .forEach(keys::add)); LinkedHashSet values = new LinkedHashSet<>(); for (String key : keys) { diff --git a/src/main/java/com/kri/kart/server/service/statistics/StatisticsFilterService.java b/src/main/java/com/kri/kart/server/service/statistics/StatisticsFilterService.java index 3b0dab4..bcf40cc 100644 --- a/src/main/java/com/kri/kart/server/service/statistics/StatisticsFilterService.java +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsFilterService.java @@ -8,16 +8,17 @@ import com.kri.kart.server.dto.question.QuestionDto; import com.kri.kart.server.dto.statistics.StatisticsFilterDto; import com.kri.kart.server.dto.statistics.SurveyResponseDto; import java.util.List; -import java.util.Locale; import java.util.Objects; import java.util.Set; import java.util.function.Predicate; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.springframework.web.util.HtmlUtils; /** Compiles a filter AST into a respondent predicate. User input is never turned into SQL. */ @Service +@RequiredArgsConstructor public class StatisticsFilterService { + private final StatisticsSourceService statisticsSourceService; public Predicate compile( StatisticsFilterDto filter, List questions) { @@ -25,29 +26,7 @@ public class StatisticsFilterService { } public String resolveQid(StatisticsFilterDto filter, List questions) { - String dimension = StringUtil.normalizeBlank(filter.getDimensionId()); - if (dimension == null - || dimension.contains("#") - || !Set.of("QID", "VARIABLE").contains(Objects.toString(filter.getReference(), ""))) { - throw BusinessException.badRequest("필터 문항과 참조 방식을 확인해 주세요."); - } - String id = dimension.toUpperCase(Locale.ROOT); - for (QuestionDto question : questions) { - String reference = reference(filter, question); - if (reference != null && reference.equalsIgnoreCase(id)) { - return question.getQid().toUpperCase(Locale.ROOT); - } - } - // Base rank/open IDs exist in saved data even though the UI lists expanded dimensions only. - String root = id.split("_")[0]; - for (QuestionDto question : questions) { - String reference = reference(filter, question); - if (reference != null && reference.split("_")[0].equalsIgnoreCase(root)) { - return question.getQid().split("_")[0].toUpperCase(Locale.ROOT) - + id.substring(root.length()); - } - } - throw BusinessException.badRequest("필터 문항을 찾을 수 없습니다."); + return statisticsSourceService.resolveFilterQid(filter, questions); } private Predicate compile( @@ -94,11 +73,11 @@ public class StatisticsFilterService { if (!hasValidValues(operator, filter.getValues())) { throw BusinessException.badRequest("필터 비교 값의 개수나 유형이 올바르지 않습니다."); } - String qid = resolveQid(filter, questions); + Predicate keys = statisticsSourceService.filterKeys(resolveQid(filter, questions)); Predicate predicate = response -> response.filterValues().entrySet().stream() - .filter(entry -> matchingKey(qid, entry.getKey())) + .filter(entry -> keys.test(entry.getKey())) .anyMatch(entry -> compare(entry.getValue(), operator, filter.getValues())); // Legacy negative multi conditions are NOT EXISTS of a matching value, including missing keys. return KartConstant.FILTER_NEGATED_OPERATORS.contains(operator) ? predicate.negate() : predicate; @@ -123,22 +102,6 @@ public class StatisticsFilterService { && !(value.isNumber() && !Double.isFinite(value.asDouble())); } - private String reference(StatisticsFilterDto filter, QuestionDto question) { - return "VARIABLE".equals(filter.getReference()) ? question.getVariable() : question.getQid(); - } - - /** Q1 matches Q1 and Q1_*; Q1_2 matches Q1_2 and Q1_*_2. */ - private boolean matchingKey(String qid, String key) { - if (key.equals(qid)) { - return true; - } - String[] parts = qid.split("_"); - if (parts.length == 1) { - return key.startsWith(qid + "_"); - } - return parts.length == 2 && key.startsWith(parts[0] + "_") && key.endsWith("_" + parts[1]); - } - private boolean compare(String actual, String operator, List operands) { if (Set.of("IS_ANSWERED", "IS_UNANSWERED").contains(operator)) { return actual != null; @@ -172,8 +135,7 @@ public class StatisticsFilterService { return number == null ? KartConstant.FILTER_NOT_COMPARABLE : Double.compare(number, expected.asDouble()); } // SQL Server's existing collation is case-insensitive; DAT also contains FOR XML escaping. - return HtmlUtils.htmlUnescape(actual) - .replaceFirst(" +$", "") + return statisticsSourceService.filterText(actual) .compareToIgnoreCase(expected.asText().replaceFirst(" +$", "")); } } diff --git a/src/main/java/com/kri/kart/server/service/statistics/StatisticsSelectionService.java b/src/main/java/com/kri/kart/server/service/statistics/StatisticsSelectionService.java index 1e544a5..8373ff1 100644 --- a/src/main/java/com/kri/kart/server/service/statistics/StatisticsSelectionService.java +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsSelectionService.java @@ -17,7 +17,7 @@ public class StatisticsSelectionService { List source, StatisticsDimension dimension) { return select( source, - dimension.getBaseKey(), + dimension.getAnswerAccess(), true, dimension.getAttributeValue(), "", @@ -32,7 +32,7 @@ public class StatisticsSelectionService { String multiValue = isMulti(dimension) ? value : ""; return select( source, - dimension.getBaseKey(), + dimension.getAnswerAccess(), false, dimension.getAttributeValue(), multiValue, @@ -48,7 +48,7 @@ public class StatisticsSelectionService { boolean projection = banner.isAttributeProjection(); return select( source, - banner.getBaseKey(), + banner.getAnswerAccess(), multi || projection, projection ? value : banner.getAttributeValue(), multi && !projection ? value : "", @@ -71,7 +71,7 @@ public class StatisticsSelectionService { boolean projection = banner.isAttributeProjection(); return select( source, - banner.getBaseKey(), + banner.getAnswerAccess(), false, projection ? value : banner.getAttributeValue(), multi && !projection ? value : "", @@ -81,7 +81,7 @@ public class StatisticsSelectionService { } private boolean isMulti(StatisticsDimension dimension) { - return "multi".equals(dimension.getQuestion().getQtype()); + return "multi".equals(dimension.getQuestionType()); } /** @@ -90,7 +90,7 @@ public class StatisticsSelectionService { */ private List select( List source, - String baseKey, + StatisticsAnswerAccess access, boolean anyAnswer, String attributeValue, String multiValue, @@ -98,21 +98,13 @@ public class StatisticsSelectionService { List attributes, int numberedSlots) { List result = new ArrayList<>(); - int attributeCount = Math.max(1, attributes.size()); - int slotCount = Math.max(1, numberedSlots); - for (int attributeIndex = 0; attributeIndex < attributeCount; attributeIndex++) { - String attribute = attributes.isEmpty() ? attributeValue : attributes.get(attributeIndex); - String attributeSuffix = attribute.isEmpty() ? "" : "_" + attribute; - for (int slot = 0; slot < slotCount; slot++) { - String slotSuffix = - numberedSlots != 0 ? "_" + (slot + 1) : multiValue.isEmpty() ? "" : "_" + multiValue; - String suffix = slotSuffix + attributeSuffix; - for (SurveyResponseDto response : source) { - if (baseKey.isEmpty() - || matches(response.values(), baseKey, suffix, anyAnswer, choiceValue)) { - // Legacy JArray.Merge concatenates; the same person can be counted in several slots. - result.add(response); - } + List reads = + access.selection().prepare(attributeValue, multiValue, attributes, numberedSlots); + for (StatisticsAnswerAccess.Read read : reads) { + for (SurveyResponseDto response : source) { + if (access.wholeSample() || matches(response.values(), read, anyAnswer, choiceValue)) { + // Preserve repeated attribute/slot occurrences and their original order. + result.add(response); } } } @@ -120,24 +112,13 @@ public class StatisticsSelectionService { } private boolean matches( - Map values, - String baseKey, - String suffix, - boolean anyAnswer, - String choiceValue) { + Map values, StatisticsAnswerAccess.Read read, + boolean anyAnswer, String choiceValue) { if (anyAnswer) { - return values.entrySet().stream() - .anyMatch( - entry -> { - String key = entry.getKey(); - boolean sameBase = - baseKey.contains("_") - ? key.equals(baseKey) || key.startsWith(baseKey + "_") - : key.split("_")[0].equals(baseKey); - return sameBase && key.endsWith(suffix) && !"".equals(entry.getValue()); - }); + return values.entrySet().stream().anyMatch(entry -> + read.answeredKeys().test(entry.getKey()) && !"".equals(entry.getValue())); } - Double actual = StatisticsArithmetic.number(values.get(baseKey + suffix)); + Double actual = StatisticsArithmetic.number(values.get(read.key())); Double expected = StatisticsArithmetic.number(choiceValue); return actual != null && expected != null && actual.doubleValue() == expected.doubleValue(); } diff --git a/src/main/java/com/kri/kart/server/service/statistics/StatisticsSourceService.java b/src/main/java/com/kri/kart/server/service/statistics/StatisticsSourceService.java new file mode 100644 index 0000000..549079a --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsSourceService.java @@ -0,0 +1,126 @@ +package com.kri.kart.server.service.statistics; + +import com.kri.common.feature.util.StringUtil; +import com.kri.common.feature.web.BusinessException; +import com.kri.kart.server.common.consts.KartConstant; +import com.kri.kart.server.dto.question.QuestionDto; +import com.kri.kart.server.dto.statistics.StatisticsFilterDto; +import com.kri.kart.server.dto.statistics.StatisticsRequestDto; +import com.kri.kart.server.dto.statistics.SurveyResponseDto; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Objects; +import java.util.Set; +import java.util.function.Predicate; +import org.springframework.stereotype.Service; +import org.springframework.web.util.HtmlUtils; + +/** KON/KIWI storage conventions, kept outside statistical calculations. */ +@Service +public class StatisticsSourceService { + + public StatisticsAnswerAccess access(String baseKey) { + Predicate sameBase = + baseKey.contains("_") + ? key -> key.equals(baseKey) || key.startsWith(baseKey + "_") + : key -> key.split("_")[0].equals(baseKey); + return new StatisticsAnswerAccess( + baseKey.isEmpty(), + valueKeys(baseKey), + (attributeValue, multiValue, attributes, numberedSlots) -> { + List reads = new ArrayList<>(); + int attributeCount = Math.max(1, attributes.size()); + int slotCount = Math.max(1, numberedSlots); + for (int attributeIndex = 0; attributeIndex < attributeCount; attributeIndex++) { + String attribute = attributes.isEmpty() ? attributeValue : attributes.get(attributeIndex); + String attributeSuffix = attribute.isEmpty() ? "" : "_" + attribute; + for (int slot = 0; slot < slotCount; slot++) { + String slotSuffix = numberedSlots != 0 + ? "_" + (slot + 1) : multiValue.isEmpty() ? "" : "_" + multiValue; + String suffix = slotSuffix + attributeSuffix; + reads.add(new StatisticsAnswerAccess.Read( + baseKey + suffix, key -> sameBase.test(key) && key.endsWith(suffix))); + } + } + return reads; + }); + } + + public Predicate valueKeys(String baseKey) { + String prefix = baseKey + "_"; + return key -> key.equals(baseKey) || key.startsWith(prefix); + } + + public Predicate filterKeys(String qid) { + String[] parts = qid.split("_"); + return key -> key.equals(qid) + || (parts.length == 1 && key.startsWith(qid + "_")) + || (parts.length == 2 && key.startsWith(parts[0] + "_") && key.endsWith("_" + parts[1])); + } + + public String resolveFilterQid(StatisticsFilterDto filter, List questions) { + String dimension = StringUtil.normalizeBlank(filter.getDimensionId()); + if (dimension == null || dimension.contains("#") + || !Set.of("QID", "VARIABLE").contains(Objects.toString(filter.getReference(), ""))) { + throw BusinessException.badRequest("필터 문항과 참조 방식을 확인해 주세요."); + } + String id = dimension.toUpperCase(Locale.ROOT); + for (QuestionDto question : questions) { + String reference = reference(filter, question); + if (reference != null && reference.equalsIgnoreCase(id)) { + return question.getQid().toUpperCase(Locale.ROOT); + } + } + String root = id.split("_")[0]; + for (QuestionDto question : questions) { + String reference = reference(filter, question); + if (reference != null && reference.split("_")[0].equalsIgnoreCase(root)) { + return question.getQid().split("_")[0].toUpperCase(Locale.ROOT) + + id.substring(root.length()); + } + } + throw BusinessException.badRequest("필터 문항을 찾을 수 없습니다."); + } + + private String reference(StatisticsFilterDto filter, QuestionDto question) { + return "VARIABLE".equals(filter.getReference()) ? question.getVariable() : question.getQid(); + } + + public List storageRoots(StatisticsRequestDto request) { + List ids = new ArrayList<>(); + ids.add(KartConstant.STANDARD_MODE.equals(request.getMode()) + ? request.getIndex() : KartConstant.TABULATION_STORAGE_ROOT); + request.getBanners().forEach(ids::addAll); + return ids.stream().map(this::storageRoot).distinct().toList(); + } + + private String storageRoot(String id) { + return Objects.toString(StringUtil.normalizeBlank(id), "") + .toUpperCase(Locale.ROOT).replace(KartConstant.ATTRIBUTE_PROJECTION_SUFFIX, "").split("_")[0]; + } + + public List withinStorageRoots( + List responses, List roots) { + Predicate stored = key -> roots.contains(key) || roots.contains(key.split("_")[0]); + return responses.stream() + .filter(response -> response.values().keySet().stream().anyMatch(stored)).toList(); + } + + public boolean isProfileId(String id) { + String normalized = StringUtil.normalizeBlank(id); + if (normalized == null) { + return false; + } + String upper = normalized.toUpperCase(Locale.ROOT); + return KartConstant.PROFILE_ID_PREFIXES.stream().anyMatch(upper::startsWith); + } + + public String textAnswer(String value) { + return HtmlUtils.htmlUnescape(value.replace('¸', ',')); + } + + public String filterText(String value) { + return HtmlUtils.htmlUnescape(value).replaceFirst(" +$", ""); + } +} diff --git a/src/main/java/com/kri/kart/server/service/statistics/StatisticsTextService.java b/src/main/java/com/kri/kart/server/service/statistics/StatisticsTextService.java index a9581bf..27f1ea9 100644 --- a/src/main/java/com/kri/kart/server/service/statistics/StatisticsTextService.java +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsTextService.java @@ -13,10 +13,10 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; +import java.util.function.Predicate; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Service; -import org.springframework.web.util.HtmlUtils; /** Word frequencies of open text answers, using the Report DB NLP dictionary and tag scopes. */ @Service @@ -26,6 +26,7 @@ public class StatisticsTextService { private final NlpRepository nlpRepository; private final KiwiNlpService kiwiNlpService; + private final StatisticsSourceService statisticsSourceService; public List analyze( ProjectRefDto project, String qid, List responses) { @@ -54,18 +55,19 @@ public class StatisticsTextService { /** Answers of the question and its sub-keys, grouped by key in first-appearance order. */ private List answerTexts(String qid, List responses) { + Predicate valueKeys = statisticsSourceService.valueKeys(qid); LinkedHashSet keys = new LinkedHashSet<>(); responses.forEach( response -> response.values().keySet().stream() - .filter(key -> key.equals(qid) || key.startsWith(qid + "_")) + .filter(valueKeys) .forEach(keys::add)); List texts = new ArrayList<>(); for (String key : keys) { responses.stream() .map(response -> response.values().get(key)) .filter(Objects::nonNull) - .map(value -> HtmlUtils.htmlUnescape(value.replace('¸', ','))) + .map(statisticsSourceService::textAnswer) .forEach(texts::add); } return texts;