From 26088f6fd047abb8bc1c9bea8494741d9894d870 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 16 Oct 2026 12:21:37 +0900 Subject: [PATCH] =?UTF-8?q?261016=5F01=5FENH:=201=EC=B0=A8=20=EB=A7=88?= =?UTF-8?q?=EC=9D=B4=EA=B7=B8=EB=A0=88=EC=9D=B4=EC=85=98=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kri-common/platform-capabilities.md | 1 + .agent/profile.yml | 12 +- .agent/references/repository-rules.md | 191 +++++- .env.example | 4 + .gitignore | 9 + AGENTS.md | 1 + README.md | 374 ++++++++-- build.gradle | 38 +- scripts/setup-kiwi-model.ps1 | 40 ++ .../kart/server/KartServerApplication.java | 12 +- .../server/common/consts/ExampleConstant.java | 9 - .../server/common/enums/ExampleStatus.java | 6 - .../kart/server/common/enums/ProjectType.java | 31 + .../intranet/IntranetExtensionApiClient.java | 105 +++ .../external/intranet/IntranetUserDto.java | 16 + .../kart/server/common/util/DateTimeUtil.java | 21 + .../server/common/util/StringNormalizer.java | 13 - .../common/validation/package-info.java | 4 +- .../server/config/IntranetClientConfig.java | 17 + .../kri/kart/server/config/JdbcConfig.java | 15 - .../server/config/KartDatabaseProperties.java | 32 + .../kart/server/config/KartMyBatisConfig.java | 130 ++++ .../kart/server/config/QueryDSLConfig.java | 19 - .../kart/server/config/ShareLinkConfig.java | 23 + .../server/config/ShareLinkProperties.java | 14 + .../kart/server/config/WebResourceConfig.java | 10 +- .../server/controller/AuthController.java | 27 + .../server/controller/BookmarkController.java | 71 ++ .../server/controller/DerivedController.java | 91 +++ .../server/controller/ExampleController.java | 38 -- .../server/controller/ExportController.java | 120 ++++ .../server/controller/ExternalController.java | 28 + .../server/controller/ImportController.java | 52 ++ .../kart/server/controller/LogController.java | 43 ++ .../server/controller/PingController.java | 14 - .../server/controller/ProjectController.java | 84 +++ .../server/controller/QuestionController.java | 40 ++ .../server/controller/QuotaController.java | 45 ++ .../controller/ShareLinkController.java | 40 ++ .../controller/StatisticsController.java | 93 +++ .../kart/server/dto/auth/LoginRequestDto.java | 17 + .../server/dto/auth/LoginResponseDto.java | 13 + .../kart/server/dto/auth/ReportMemberDto.java | 12 + .../kart/server/dto/bookmark/BookmarkDto.java | 17 + .../dto/bookmark/BookmarkSaveRequestDto.java | 34 + .../dto/derived/DerivedCalculationDto.java | 9 + .../server/dto/derived/DerivedDataDto.java | 12 + .../dto/derived/DerivedDefinitionDto.java | 13 + .../dto/derived/DerivedSaveRequestDto.java | 28 + .../dto/derived/DerivedVariableDto.java | 31 + .../dto/export/AggregateExcelRequestDto.java | 20 + .../dto/export/AggregateExcelTableDto.java | 35 + .../kart/server/dto/export/ExportDataDto.java | 16 + .../dto/export/ExportDerivedHeaderDto.java | 12 + .../kart/server/dto/export/ExportFileDto.java | 11 + .../server/dto/export/ExportGuideDto.java | 24 + .../server/dto/export/ExportHeaderDto.java | 12 + .../server/dto/export/ExportTitleDto.java | 21 + .../dto/export/RawDataExportRequestDto.java | 24 + .../server/dto/log/VisitLogRequestDto.java | 24 + .../server/dto/project/CustomProgressDto.java | 18 + .../kri/kart/server/dto/project/LoiDto.java | 14 + .../server/dto/project/ProgressDayDto.java | 15 + .../server/dto/project/ProgressScreenDto.java | 16 + .../server/dto/project/ProgressSearchDto.java | 24 + .../server/dto/project/ProgressTypeDto.java | 14 + .../dto/project/ProjectLinkSearchDto.java | 23 + .../server/dto/project/ProjectListDto.java | 20 + .../server/dto/project/ProjectRefDto.java | 28 + .../server/dto/project/ProjectSummaryDto.java | 22 + .../kart/server/dto/question/QuestionDto.java | 37 + .../kart/server/dto/quota/QuotaCellDto.java | 20 + .../kart/server/dto/quota/QuotaEntryDto.java | 14 + .../kart/server/dto/quota/QuotaResultDto.java | 20 + .../dto/quota/QuotaResultRequestDto.java | 22 + .../kart/server/dto/quota/QuotaRowDto.java | 14 + .../kart/server/dto/quota/QuotaSetDto.java | 14 + .../dto/request/CreateExampleRequest.java | 12 - .../server/dto/response/ExampleResponse.java | 19 - .../dto/share/ExternalLoginResponseDto.java | 9 + .../kart/server/dto/share/ShareLinkDto.java | 15 + .../server/dto/share/ShareLinkRecordDto.java | 19 + .../server/dto/share/ShareLinkRequestDto.java | 19 + .../dto/statistics/NlpDictionaryWordDto.java | 12 + .../server/dto/statistics/NlpTokenDto.java | 3 + .../dto/statistics/StatisticsBatchDto.java | 12 + .../statistics/StatisticsBatchRequestDto.java | 29 + .../dto/statistics/StatisticsCellDto.java | 26 + .../dto/statistics/StatisticsColumnDto.java | 13 + .../dto/statistics/StatisticsDataDto.java | 12 + .../dto/statistics/StatisticsFilterDto.java | 19 + .../dto/statistics/StatisticsOptionsDto.java | 58 ++ .../dto/statistics/StatisticsRequestDto.java | 14 + .../dto/statistics/StatisticsResponseDto.java | 18 + .../dto/statistics/StatisticsRowDto.java | 14 + .../statistics/StatisticsStreamEventDto.java | 23 + .../statistics/StatisticsValueGroupDto.java | 15 + .../dto/statistics/StatisticsWordDto.java | 12 + .../dto/statistics/SurveyResponseDto.java | 11 + .../server/dto/upload/ImportQuestionDto.java | 12 + .../server/dto/upload/ImportResponseDto.java | 12 + .../server/dto/upload/ImportResultDto.java | 11 + .../server/dto/upload/UploadTableDto.java | 10 + .../persistence/SurveySessionProvider.java | 29 + .../persistence/entity/ExampleEntity.java | 42 -- .../entity/id/ExampleEntityId.java | 28 - .../persistence/jdbc/ExampleBulkItem.java | 9 - .../jdbc/ExampleBulkJdbcRepository.java | 47 -- .../persistence/mapper/ExampleMapper.java | 11 - .../persistence/query/ExamplePredicates.java | 15 - .../repository/BookmarkRepository.java | 70 ++ .../repository/DerivedRepository.java | 137 ++++ .../repository/ExampleQueryRepository.java | 8 - .../ExampleQueryRepositoryImpl.java | 25 - .../repository/ExampleRepository.java | 9 - .../repository/ExportRepository.java | 62 ++ .../repository/ImportRepository.java | 59 ++ .../persistence/repository/LogRepository.java | 52 ++ .../persistence/repository/NlpRepository.java | 28 + .../repository/ProgressRepository.java | 67 ++ .../repository/ProjectRepository.java | 86 +++ .../repository/QuestionRepository.java | 25 + .../repository/QuotaRepository.java | 38 ++ .../repository/ShareLinkRepository.java | 51 ++ .../repository/StatisticsRepository.java | 38 ++ .../repository/UserRepository.java | 26 + .../server/scheduler/ExampleScheduler.java | 21 - .../server/service/AggregateExcelService.java | 470 +++++++++++++ .../kri/kart/server/service/AuthService.java | 57 ++ .../kart/server/service/BookmarkService.java | 137 ++++ .../server/service/CustomProgressService.java | 59 ++ .../service/DerivedManagementService.java | 222 ++++++ .../kart/server/service/DerivedService.java | 29 + .../kart/server/service/ExampleService.java | 37 - .../kart/server/service/ExportService.java | 333 +++++++++ .../kart/server/service/ImportService.java | 163 +++++ .../kri/kart/server/service/LogService.java | 83 +++ .../kart/server/service/ProgressService.java | 47 ++ .../kart/server/service/ProjectService.java | 141 ++++ .../kart/server/service/QuestionService.java | 163 +++++ .../kri/kart/server/service/QuotaService.java | 146 ++++ .../kart/server/service/ShareLinkService.java | 213 ++++++ .../server/service/StatisticsService.java | 343 ++++++++++ .../derived/DerivedComputationService.java | 166 +++++ .../export/LegacyExcelWidthService.java | 81 +++ .../quota/QuotaComputationService.java | 218 ++++++ .../share/ExternalAccessInterceptor.java | 114 ++++ .../share/LegacyProjectKeyService.java | 79 +++ .../service/statistics/KiwiNlpService.java | 80 +++ .../statistics/LegacyFilterService.java | 213 ++++++ .../StatisticsAggregationService.java | 645 ++++++++++++++++++ .../statistics/StatisticsArithmetic.java | 56 ++ .../statistics/StatisticsDataService.java | 51 ++ .../statistics/StatisticsDimension.java | 29 + .../StatisticsDimensionService.java | 220 ++++++ .../statistics/StatisticsFilterService.java | 197 ++++++ .../StatisticsSelectionService.java | 144 ++++ .../statistics/StatisticsStreamService.java | 85 +++ .../statistics/StatisticsTableService.java | 169 +++++ .../statistics/StatisticsTextService.java | 83 +++ .../service/upload/QuestionImportService.java | 215 ++++++ .../service/upload/ResponseImportService.java | 160 +++++ .../service/upload/UploadArchiveService.java | 56 ++ .../service/upload/UploadTableService.java | 177 +++++ src/main/resources/application-dev.yml | 19 +- src/main/resources/application-local.yml | 15 +- src/main/resources/application-prod.yml | 17 +- src/main/resources/application.yml | 86 ++- src/main/resources/excel/README.md | 7 + src/main/resources/excel/glyphs-10.gz | Bin 0 -> 24589 bytes src/main/resources/excel/glyphs-9.gz | Bin 0 -> 23099 bytes src/main/resources/excel/malgun-metrics.json | 204 ++++++ .../file_forms/KON 문항 등록 양식.xlsx | Bin 0 -> 16577 bytes .../mybatis/mapper/BookmarkMapper.xml | 42 ++ .../mybatis/mapper/DerivedMapper.xml | 108 +++ .../mybatis/mapper/ExampleMapper.xml | 16 - .../resources/mybatis/mapper/ExportMapper.xml | 90 +++ .../resources/mybatis/mapper/ImportMapper.xml | 57 ++ .../resources/mybatis/mapper/LogMapper.xml | 15 + .../resources/mybatis/mapper/NlpMapper.xml | 24 + .../mybatis/mapper/ProgressMapper.xml | 119 ++++ .../mybatis/mapper/ProjectMapper.xml | 117 ++++ .../mybatis/mapper/QuestionMapper.xml | 63 ++ .../resources/mybatis/mapper/QuotaMapper.xml | 22 + .../mybatis/mapper/ShareLinkMapper.xml | 32 + .../mybatis/mapper/StatisticsMapper.xml | 74 ++ .../resources/mybatis/mapper/UserMapper.xml | 9 + .../kri/kart/server/PackageStructureTest.java | 13 - 188 files changed, 10522 insertions(+), 573 deletions(-) create mode 100644 .env.example create mode 100644 scripts/setup-kiwi-model.ps1 delete mode 100644 src/main/java/com/kri/kart/server/common/consts/ExampleConstant.java delete mode 100644 src/main/java/com/kri/kart/server/common/enums/ExampleStatus.java create mode 100644 src/main/java/com/kri/kart/server/common/enums/ProjectType.java create mode 100644 src/main/java/com/kri/kart/server/common/external/intranet/IntranetExtensionApiClient.java create mode 100644 src/main/java/com/kri/kart/server/common/external/intranet/IntranetUserDto.java create mode 100644 src/main/java/com/kri/kart/server/common/util/DateTimeUtil.java delete mode 100644 src/main/java/com/kri/kart/server/common/util/StringNormalizer.java create mode 100644 src/main/java/com/kri/kart/server/config/IntranetClientConfig.java delete mode 100644 src/main/java/com/kri/kart/server/config/JdbcConfig.java create mode 100644 src/main/java/com/kri/kart/server/config/KartDatabaseProperties.java create mode 100644 src/main/java/com/kri/kart/server/config/KartMyBatisConfig.java delete mode 100644 src/main/java/com/kri/kart/server/config/QueryDSLConfig.java create mode 100644 src/main/java/com/kri/kart/server/config/ShareLinkConfig.java create mode 100644 src/main/java/com/kri/kart/server/config/ShareLinkProperties.java create mode 100644 src/main/java/com/kri/kart/server/controller/AuthController.java create mode 100644 src/main/java/com/kri/kart/server/controller/BookmarkController.java create mode 100644 src/main/java/com/kri/kart/server/controller/DerivedController.java delete mode 100644 src/main/java/com/kri/kart/server/controller/ExampleController.java create mode 100644 src/main/java/com/kri/kart/server/controller/ExportController.java create mode 100644 src/main/java/com/kri/kart/server/controller/ExternalController.java create mode 100644 src/main/java/com/kri/kart/server/controller/ImportController.java create mode 100644 src/main/java/com/kri/kart/server/controller/LogController.java delete mode 100644 src/main/java/com/kri/kart/server/controller/PingController.java create mode 100644 src/main/java/com/kri/kart/server/controller/ProjectController.java create mode 100644 src/main/java/com/kri/kart/server/controller/QuestionController.java create mode 100644 src/main/java/com/kri/kart/server/controller/QuotaController.java create mode 100644 src/main/java/com/kri/kart/server/controller/ShareLinkController.java create mode 100644 src/main/java/com/kri/kart/server/controller/StatisticsController.java create mode 100644 src/main/java/com/kri/kart/server/dto/auth/LoginRequestDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/auth/LoginResponseDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/auth/ReportMemberDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/bookmark/BookmarkDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/bookmark/BookmarkSaveRequestDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/derived/DerivedCalculationDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/derived/DerivedDataDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/derived/DerivedDefinitionDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/derived/DerivedSaveRequestDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/derived/DerivedVariableDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/export/AggregateExcelRequestDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/export/AggregateExcelTableDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/export/ExportDataDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/export/ExportDerivedHeaderDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/export/ExportFileDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/export/ExportGuideDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/export/ExportHeaderDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/export/ExportTitleDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/export/RawDataExportRequestDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/log/VisitLogRequestDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/project/CustomProgressDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/project/LoiDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/project/ProgressDayDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/project/ProgressScreenDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/project/ProgressSearchDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/project/ProgressTypeDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/project/ProjectLinkSearchDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/project/ProjectListDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/project/ProjectRefDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/project/ProjectSummaryDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/question/QuestionDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/quota/QuotaCellDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/quota/QuotaEntryDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/quota/QuotaResultDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/quota/QuotaResultRequestDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/quota/QuotaRowDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/quota/QuotaSetDto.java delete mode 100644 src/main/java/com/kri/kart/server/dto/request/CreateExampleRequest.java delete mode 100644 src/main/java/com/kri/kart/server/dto/response/ExampleResponse.java create mode 100644 src/main/java/com/kri/kart/server/dto/share/ExternalLoginResponseDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/share/ShareLinkDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/share/ShareLinkRecordDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/share/ShareLinkRequestDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/statistics/NlpDictionaryWordDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/statistics/NlpTokenDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/statistics/StatisticsBatchDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/statistics/StatisticsBatchRequestDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/statistics/StatisticsCellDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/statistics/StatisticsColumnDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/statistics/StatisticsDataDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/statistics/StatisticsFilterDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/statistics/StatisticsOptionsDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/statistics/StatisticsRequestDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/statistics/StatisticsResponseDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/statistics/StatisticsRowDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/statistics/StatisticsStreamEventDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/statistics/StatisticsValueGroupDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/statistics/StatisticsWordDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/statistics/SurveyResponseDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/upload/ImportQuestionDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/upload/ImportResponseDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/upload/ImportResultDto.java create mode 100644 src/main/java/com/kri/kart/server/dto/upload/UploadTableDto.java create mode 100644 src/main/java/com/kri/kart/server/persistence/SurveySessionProvider.java delete mode 100644 src/main/java/com/kri/kart/server/persistence/entity/ExampleEntity.java delete mode 100644 src/main/java/com/kri/kart/server/persistence/entity/id/ExampleEntityId.java delete mode 100644 src/main/java/com/kri/kart/server/persistence/jdbc/ExampleBulkItem.java delete mode 100644 src/main/java/com/kri/kart/server/persistence/jdbc/ExampleBulkJdbcRepository.java delete mode 100644 src/main/java/com/kri/kart/server/persistence/mapper/ExampleMapper.java delete mode 100644 src/main/java/com/kri/kart/server/persistence/query/ExamplePredicates.java create mode 100644 src/main/java/com/kri/kart/server/persistence/repository/BookmarkRepository.java create mode 100644 src/main/java/com/kri/kart/server/persistence/repository/DerivedRepository.java delete mode 100644 src/main/java/com/kri/kart/server/persistence/repository/ExampleQueryRepository.java delete mode 100644 src/main/java/com/kri/kart/server/persistence/repository/ExampleQueryRepositoryImpl.java delete mode 100644 src/main/java/com/kri/kart/server/persistence/repository/ExampleRepository.java create mode 100644 src/main/java/com/kri/kart/server/persistence/repository/ExportRepository.java create mode 100644 src/main/java/com/kri/kart/server/persistence/repository/ImportRepository.java create mode 100644 src/main/java/com/kri/kart/server/persistence/repository/LogRepository.java create mode 100644 src/main/java/com/kri/kart/server/persistence/repository/NlpRepository.java create mode 100644 src/main/java/com/kri/kart/server/persistence/repository/ProgressRepository.java create mode 100644 src/main/java/com/kri/kart/server/persistence/repository/ProjectRepository.java create mode 100644 src/main/java/com/kri/kart/server/persistence/repository/QuestionRepository.java create mode 100644 src/main/java/com/kri/kart/server/persistence/repository/QuotaRepository.java create mode 100644 src/main/java/com/kri/kart/server/persistence/repository/ShareLinkRepository.java create mode 100644 src/main/java/com/kri/kart/server/persistence/repository/StatisticsRepository.java create mode 100644 src/main/java/com/kri/kart/server/persistence/repository/UserRepository.java delete mode 100644 src/main/java/com/kri/kart/server/scheduler/ExampleScheduler.java create mode 100644 src/main/java/com/kri/kart/server/service/AggregateExcelService.java create mode 100644 src/main/java/com/kri/kart/server/service/AuthService.java create mode 100644 src/main/java/com/kri/kart/server/service/BookmarkService.java create mode 100644 src/main/java/com/kri/kart/server/service/CustomProgressService.java create mode 100644 src/main/java/com/kri/kart/server/service/DerivedManagementService.java create mode 100644 src/main/java/com/kri/kart/server/service/DerivedService.java delete mode 100644 src/main/java/com/kri/kart/server/service/ExampleService.java create mode 100644 src/main/java/com/kri/kart/server/service/ExportService.java create mode 100644 src/main/java/com/kri/kart/server/service/ImportService.java create mode 100644 src/main/java/com/kri/kart/server/service/LogService.java create mode 100644 src/main/java/com/kri/kart/server/service/ProgressService.java create mode 100644 src/main/java/com/kri/kart/server/service/ProjectService.java create mode 100644 src/main/java/com/kri/kart/server/service/QuestionService.java create mode 100644 src/main/java/com/kri/kart/server/service/QuotaService.java create mode 100644 src/main/java/com/kri/kart/server/service/ShareLinkService.java create mode 100644 src/main/java/com/kri/kart/server/service/StatisticsService.java create mode 100644 src/main/java/com/kri/kart/server/service/derived/DerivedComputationService.java create mode 100644 src/main/java/com/kri/kart/server/service/export/LegacyExcelWidthService.java create mode 100644 src/main/java/com/kri/kart/server/service/quota/QuotaComputationService.java create mode 100644 src/main/java/com/kri/kart/server/service/share/ExternalAccessInterceptor.java create mode 100644 src/main/java/com/kri/kart/server/service/share/LegacyProjectKeyService.java create mode 100644 src/main/java/com/kri/kart/server/service/statistics/KiwiNlpService.java create mode 100644 src/main/java/com/kri/kart/server/service/statistics/LegacyFilterService.java create mode 100644 src/main/java/com/kri/kart/server/service/statistics/StatisticsAggregationService.java create mode 100644 src/main/java/com/kri/kart/server/service/statistics/StatisticsArithmetic.java create mode 100644 src/main/java/com/kri/kart/server/service/statistics/StatisticsDataService.java create mode 100644 src/main/java/com/kri/kart/server/service/statistics/StatisticsDimension.java create mode 100644 src/main/java/com/kri/kart/server/service/statistics/StatisticsDimensionService.java create mode 100644 src/main/java/com/kri/kart/server/service/statistics/StatisticsFilterService.java create mode 100644 src/main/java/com/kri/kart/server/service/statistics/StatisticsSelectionService.java create mode 100644 src/main/java/com/kri/kart/server/service/statistics/StatisticsStreamService.java create mode 100644 src/main/java/com/kri/kart/server/service/statistics/StatisticsTableService.java create mode 100644 src/main/java/com/kri/kart/server/service/statistics/StatisticsTextService.java create mode 100644 src/main/java/com/kri/kart/server/service/upload/QuestionImportService.java create mode 100644 src/main/java/com/kri/kart/server/service/upload/ResponseImportService.java create mode 100644 src/main/java/com/kri/kart/server/service/upload/UploadArchiveService.java create mode 100644 src/main/java/com/kri/kart/server/service/upload/UploadTableService.java create mode 100644 src/main/resources/excel/README.md create mode 100644 src/main/resources/excel/glyphs-10.gz create mode 100644 src/main/resources/excel/glyphs-9.gz create mode 100644 src/main/resources/excel/malgun-metrics.json create mode 100644 src/main/resources/file_forms/KON 문항 등록 양식.xlsx create mode 100644 src/main/resources/mybatis/mapper/BookmarkMapper.xml create mode 100644 src/main/resources/mybatis/mapper/DerivedMapper.xml delete mode 100644 src/main/resources/mybatis/mapper/ExampleMapper.xml create mode 100644 src/main/resources/mybatis/mapper/ExportMapper.xml create mode 100644 src/main/resources/mybatis/mapper/ImportMapper.xml create mode 100644 src/main/resources/mybatis/mapper/LogMapper.xml create mode 100644 src/main/resources/mybatis/mapper/NlpMapper.xml create mode 100644 src/main/resources/mybatis/mapper/ProgressMapper.xml create mode 100644 src/main/resources/mybatis/mapper/ProjectMapper.xml create mode 100644 src/main/resources/mybatis/mapper/QuestionMapper.xml create mode 100644 src/main/resources/mybatis/mapper/QuotaMapper.xml create mode 100644 src/main/resources/mybatis/mapper/ShareLinkMapper.xml create mode 100644 src/main/resources/mybatis/mapper/StatisticsMapper.xml create mode 100644 src/main/resources/mybatis/mapper/UserMapper.xml delete mode 100644 src/test/java/com/kri/kart/server/PackageStructureTest.java diff --git a/.agent-harness/references/kri-common/platform-capabilities.md b/.agent-harness/references/kri-common/platform-capabilities.md index 510ecac..175b115 100644 --- a/.agent-harness/references/kri-common/platform-capabilities.md +++ b/.agent-harness/references/kri-common/platform-capabilities.md @@ -20,6 +20,7 @@ Source: .agent/consumer-references/platform-capabilities.md - JWT and API-key authentication integrate with Spring Security. API-key JPA preload requires Spring Data JPA; a consumer-provided claims provider can be used without JPA. - Common Web may register error handling, tracing/MDC, request-user resolution, enum conversion, and CORS behavior. Check for overlap before defining consumer-local equivalents. - Swagger support requires springdoc and defines the shared Bearer/API-key schemes and grouped paths. +- When Swagger auto-configuration is active (`kri.swagger.enabled=true`, default), `RequestUserContext` controller arguments are ignored as request inputs globally, including their `authenticated`, `clientIp`, and `userRole` properties. Runtime argument resolution is unchanged. - Redis and scheduling are opt-in through their `kri.*.enabled` settings and matching runtime dependencies. - HTTP bypass targets are server-configured. Never accept an arbitrary full target URL from a frontend; retain allowed-path checks and do not forward hop-by-hop headers. - The external API client returns response bodies as documented, while bypass responses preserve raw bytes and target `Content-Type`. diff --git a/.agent/profile.yml b/.agent/profile.yml index b1f98a6..a62d040 100644 --- a/.agent/profile.yml +++ b/.agent/profile.yml @@ -15,7 +15,15 @@ shared_contracts: - kri-common databases: - - id: primary + - id: kon engine: mssql - role: primary + role: survey-data + access: read-write + - id: konkiwi + engine: mssql + role: survey-data + access: read-write + - id: report + engine: mssql + role: shared-report-data access: read-write diff --git a/.agent/references/repository-rules.md b/.agent/references/repository-rules.md index 9934c65..05f872c 100644 --- a/.agent/references/repository-rules.md +++ b/.agent/references/repository-rules.md @@ -1,8 +1,185 @@ -## Generated Spring Boot Repository Rules +## KART Server Repository Rules -- This backend application was generated by `@kri/create-spring-app` with Java 17 and Spring Boot 3.5.7. -- Consume KriCommon through `com.kri.common:starter:beta.1.6.8`; do not change that approved version or duplicate shared behavior without explicit approval. -- The selected primary database is `mssql`. Preserve its configured dialect, driver, transaction, schema, and migration conventions. -- Keep controllers thin and preserve the generated service, DTO, persistence, configuration, QueryDSL, JDBC, and optional MyBatis boundaries. -- `AGENTS.md` and `CLAUDE.md` are central-harness generated outputs. Never edit them directly; update `.agent/profile.yml` or `.agent/project.md` and recompose. -- Use the repository Gradle Wrapper and run `.\gradlew.bat compileJava` followed by focused tests for relevant changes. +- Java 17, Spring Boot 3.5.7, KriCommon `com.kri.common:starter:beta.1.6.9`. +- Use MyBatis with explicit KON, KONKIWI and kart (Report DB) SQL Server sessions and transaction managers. Do not infer a source from pkey alone. +- ProjectType codes are 0=KON and 1=KIWI; reject unsupported types and legacy key markers in new project identifiers. +- This API is for the new system. Legacy API compatibility is not required; shared database compatibility is required. +- Share-link grants allow scoped report reads and aggregate Excel only. Deny raw exports and management writes. Resolve grants from verified authentication and stored permissions, never request JSON. +- Per explicit user instruction and internal convention, connection credentials and runtime settings are stored directly in application.yml. Do not replace them with environment placeholders or print secrets. Do not connect to shared databases without explicit environment authorization. Tests must disable database access or use synthetic settings. +- Bind write transactions to the named source; a default kart (Report DB) transaction cannot encompass KON/KONKIWI writes. No schema creation or automatic migrations. +- Preserve current Excel workbook format and non-weighted calculation semantics. +- Generated AGENTS.md/CLAUDE.md are read-only; change .agent sources and recompose. +- Verify with .\\gradlew.bat compileJava and focused tests, then build. Tests use synthetic values and do not connect to databases. +- Per user decision, src/test (tests and fixtures) is kept locally and excluded from Git by .gitignore. Run local tests when present; do not stage or commit test files. + +- Follow Contact's controller/service/dto/persistence/config/common package structure. Place enums under common/enums and use KriCommon CodeEnum for coded values. Do not introduce domain/access or domain/project packages. + +## User-defined coded enum convention + +- Follow the user's standard form for enums implementing KriCommon CodeEnum. +- Use @Getter(onMethod_ = @JsonValue), @RequiredArgsConstructor and @Schema(description = "..."). +- Store the code in a private final boxed field (e.g. Integer code). +- Declare @JsonCreator(mode = JsonCreator.Mode.DELEGATING) on static fromCode(T code). +- Return null for a null code; iterate values() and compare s.code.equals(code); throw IllegalArgumentException("Unknown code: " + code) for unknown codes. +- Do not replace this pattern with JsonNode parsing, a custom getCode(), or CodeEnumUtils.fromCode. Validate required request fields separately. +- Use the common MVC CodeEnum converter for path/query parameters; do not add a ProjectType-specific converter without a concrete requirement. + +- Do not predefine speculative authentication/permission/page enums or grant abstractions. Add only what actual endpoints and Contact-style authentication require. External-link access restrictions remain requirements for implementation. + +## Authorization implementation convention + +- Follow Contact: inject com.kri.common.feature.web.RequestUserContext ctx into controller methods; use ctx.getUserRole() and ctx.getUserTeam() for authorization and pass them to the service as needed. +- Use only the context resolved by common authentication, never role/team fields submitted in request DTOs. +- Do not introduce separate PrincipalKind/ProjectPermission/ReportPage enums or generic grant models for this purpose. +- External authentication must still enforce its stored project/page scope and restrict access to report reads and aggregate Excel; role/team alone must not authorize access outside the link scope. + +## Phase 1 migration decisions + +- Implement the seven agreed auth/project/quota routes (singular project, /project/list, quota at /quota/{projectType}/{pkey}/list). +- The user approved list/summary team/assignment and derived-management list visibility. Apply the current Read visibility rules below; other general authorization remains separate. Keep common authentication and original business filters/calculations. +- Project list/summary use the current frontend's v2 KON/KIWI portions; progress and quota use the KON v1 functions. Exclude NEWSSAK data, preserve v2 must-view overrides and the two-stage source/merged summary ordering. +- Replace User.getDinIDs() with GET /api/v1/user/list, filtering exact userTeam S101/S201. Bind userId values into MKEY NOT IN before candidate TOP 50 selection; never silently omit the exclusion on upstream failure. +- The user supplied a dedicated KART Intranet API key, configured literally at kri.auth.apikey.key in application.yml. Do not copy Contact credentials or print the key. +- Unit/mocked application checks are not real database result-equivalence verification. Do not claim live migration acceptance without comparing actual old/new results. + +## Latest user conventions + +- Place mapper XML files together in src/main/resources/mybatis/mapper, distinguishing by file names such as ProjectMapper.xml, UserMapper.xml and LogMapper.xml. Keep source-specific SqlSessionFactory registration isolated. +- Use the Intranet userRole value directly in JWT/RequestUserContext; do not convert it back to legacy isAdmin. +- Legacy isAdmin 0/1 correspond to userRole 1001, 5 to userRole 2001 or 3001, and 7 to userRole 9001. Legacy isAdmin 4/6 are abolished. Never infer 2001 versus 3001 from legacy 5 alone. +- All REPORT_MEMBER logins use userRole=9001. Do not query is_kri for role calculation or grant a special administrator role to a particular account. Intranet userRole is preserved directly. + +- Group mapper/repository names by business purpose, not database name. findMember belongs to UserMapper/UserRepository, mustViewPkeys to ProjectMapper/ProjectRepository, loginLog to LogMapper/LogRepository. Use explicit MyBatis databaseId survey/kart to isolate statement registration while retaining each operation's original database source. + +- quotaSets belongs to QuotaMapper/QuotaRepository, using the survey databaseId and the explicitly routed KON/KONKIWI session. Preserve its existing SQL and output ordering. + +- Match Contact application.yml conventions: kri.auth.apikey for key/header/enabled/service-code/allowed-paths/preload/admin fields; kri.api-url for intranet-extension; noti-hub and short-url are unused. Do not invent another Intranet properties prefix. Tests must disable common API-key preload/database access. Do not optimize or rewrite existing queries unless the user explicitly requests application of an agreed change. + +- Like Contact, omit the kri.auth.jwt block from application.yml and use common JWT defaults (24-hour access-token lifetime and default signing settings). Keep JWT login/authentication itself. Tests may override the signing secret with synthetic values. + +- API Key DB settings belong in application-local/dev/prod.yml under kri.auth.apikey.db. Common API Key persistence alone uses JPA/MySQL; KON/KONKIWI/kart (Report DB) remain MyBatis. Exclude default Boot JPA configuration to avoid binding it to a business datasource. +- Follow Contact readability: two-space indentation, explicit main-source imports, separate annotations and fields, braces around conditionals/loops, and clear method spacing. GET query dates use Spring DateTimeFormat; JsonFormat alone only affects JSON mapping. + +- Keep summary in ProjectMapper/ProjectRepository. daily/type/loi and dateRange belong to ProgressMapper/ProgressRepository, namespace kart.Progress and databaseId survey. Preserve SQL text, API paths and source routing during separation. + +- Use CDATA for static SQL sections containing XML-sensitive comparisons instead of lt/gt entity escapes. Keep MyBatis if/foreach/include tags outside CDATA and preserve decoded SQL text. + +## Phase 2 migration decisions + +- Implement only question list/detail, progress screen/custom, and bookmark list. Do not implement auth/session or quota aggregation in this phase. +- QuestionMapper/QuestionRepository use survey sessions. Match KON getQuestionList/organizeQuestionList expansion and select the first exact QID after expansion; return arrays. User explicitly confirmed KIWI profile questions only for userRole=1001. +- ProgressMapper screen preserves OPENJSON value DESC ranking per pkey/idkey, rn=1, Korean_Wansung_CI_AS join and date filtering after ranking. Custom progress is a URL/file list, not aggregate computation. +- Custom progress local files use kri.kart.progress.append-directory; deployment must supply the existing report_append directory. Keep first KON URL then ordered append rows; only type 0 checks local file existence. +- BookmarkMapper/BookmarkRepository use the kart session (Report DB) and the original pure pkey, page, public-or-own-private filter and order. Identity/IS_MINE must use RequestUserContext, never userId submitted as a query parameter. +## Visit/site logging + +- POST /api/v1/log/visit uses LogService/LogRepository/LogMapper, kart session (Report DB) and kartTransactionManager. TB_SITE_LOG is server-owned: expose no /log/site HTTP endpoint; call LogService.writeSiteLog from business operations. Identity and IP come only from RequestUserContext. AuthService calls LogService.writeLoginLog rather than LogRepository directly. +- Preserve TB_VISIT_LOG/TB_SITE_LOG columns and pure pkey. Visit accepts paired optional projectType/pkey. Site JSON uses legacy v2 projectCode/LOGTITLE/LOGCONTENT plus projectType; support serialized JSON content and bind all SQL values. +- Preserve legacy best-effort behavior and text/plain PASS response. Never print payload, SQL, actor or IP on audit failures. Do not add new automatic events to existing reads without a legacy event or a user decision. +- Future report aggregation, bookmark mutations, imports and share-link creation should call LogService.writeSiteLog at their legacy event points. Record QUOTA VIEW in the future quota-result operation instead of a separate frontend logging API; do not record it during quota-list loading. +## Object naming convention + +- Name Repository, Service, Client and session-provider dependencies by their type in lowerCamelCase, e.g. logRepository, authService, intranetExtensionApiClient and surveySessionProvider. Use source-qualified session names such as kartSqlSessionTemplate. +- Name DTO instances by their meaning without the Dto suffix, e.g. IntranetUserDto intranetUser and ReportMemberDto reportMember. Do not abbreviate these as logs, service, repository or employee. + +## KriCommon reuse priority + +- Before adding any utility, helper or infrastructure code, inspect KriCommon's existing capabilities and source. Reuse an existing API whenever its behavior matches; do not duplicate or wrap it only to change its name. +- Blank-to-null trimming uses com.kri.common.feature.util.StringUtil.normalizeBlank(raw). Do not implement a local StringNormalizer or trimToNull equivalent. +- Add local utilities only for behavior absent from KriCommon or when a documented semantic difference prevents reuse. Preserve migration output and validation semantics when replacing existing code. + +## Derived list and bookmark mutations + +- Do not implement assign: current legacy and new frontend sources contain no caller. Implement only GET /project/{projectType}/{pkey}/derived/list and bookmark POST/PUT/DELETE for this phase; keep singular project/bookmark paths. +- DerivedMapper uses survey sources and the KON getOnlyDerivedList SELECT and order. Reuse QuestionService.organize for expansion; expose only original derived-list fields, without reverse/missingValue additions or regular-question/profile filters. Management list visibility is now role 1001 all teams, otherwise authenticated userTeam only; do not apply this filter to regular question/report metadata. +- Bookmark mutations use the kart session (Report DB), existing columns and pure pkey. Preserve timestamp ID, per-page MAX+1 insertion order, JSON text and successful create/update ID responses. Delete returns a JSON boolean: true after successful deletion; frontend owns presentation messages. Keep standard errors for missing/conflicting targets and persistence failures. Owner/team come from RequestUserContext. Update only title/info/JSON/isOpen and constrain lookup/mutation by pkey+ID. +- Preserve legacy deletion order adjustment across all pages of the same pkey; do not add a page condition. Reordering and deletion must roll back together through kartTransactionManager. Do not add schema constraints or pretend existing timestamp/MAX+1 concurrency guarantees uniqueness. +- Call LogService for Insert/Update/Delete Bookmark with NEW/ORIGIN snapshots. Site audit writes use REQUIRES_NEW so best-effort audit failure cannot mark the business transaction rollback-only. Keep the legacy pre-delete audit point; such a log may remain if deletion fails. +- Validation of create-page presence happens before service invocation; update-page is optional and does not change stored page. Preserve empty title/info and raw bookmark JSON text. Missing scoped IDs return 404, disappearing mutation targets 409, persistence failures use common error handling rather than empty success responses. +## Upload forms and variable guide downloads + +- Implement only GET /export/form/question and GET /project/{projectType}/{pkey}/export/form/data, /export/form/title and /export/guide in this phase. Keep existing octet-stream and file/sheet names. +- Bundle the existing KON question-upload workbook unchanged. Its SHA-256 is DC557EC7E3296AA629589FE3BAAC9C4BFF1750205078D8E9CEFD5D71C477E584. Never regenerate it from metadata. +- Header order is the fixed seven columns, add_column, userRole=1001 derived dataset headers, then STRUCTURE QINFO/question headers. Preserve legacy splitting, qid-to-variable replacement and duplicate-key position. Existing missing-project behavior returns the fixed header; actual persistence errors use common error handling. +- Title form uses four original columns and Qorder, excludes description/MM_FILE and does not substitute empty explanation with title. +- Guide uses raw QuestionRepository metadata with includeProfiles=false, not organized/expanded question rows. Preserve original attribute values, multi/open/rank ranges and labels, HTML decoding/tag removal, CR/LF conversion and negative zero-padded labels. +- Reuse current KriCommon ExcelMapper and matching POI 5.5.1. Adapt its automatic widths and blank cells to the legacy plain EPPlus writer rather than duplicate a generic workbook utility. Preserve Unicode names with common basename extraction, unsafe-character removal and UTF-8 Content-Disposition; the common ASCII-only filename sanitizer would change the original name. +- Downloads have no original SiteLog point: do not invent one. Test output against EPPlus-generated synthetic workbook fixtures and preserve the original question template bytes. Do not claim real database/production-file equivalence from synthetic checks. +## General report and Kiwi NLP + +- Implement POST /api/v1/project/{projectType}/{pkey}/statistics/result and common response/filter/dimension/aggregation components under service/statistics. Include text analysis in this operation; quota result and aggregate Excel remain follow-up work. +- Follow existing question organization. Return N and percent together, including Total. Preserve repeated rank/matrix occurrences, original numeric missing/mean/statistic rules, scale/reverse/NPS, grouped values and TABULATION denominators. Frontend chooses PRTMODE presentation without requery. +- Keep original empty-base semantics: ordinary cell/Total percentages are 0; undefined group/statistic values are null with '-' display. Use 15-significant-digit C# double-format behavior and midpoint-away rounding, validated by legacy fixtures. +- StatisticsMapper uses survey sessions, parameterized complete/TEST/date conditions, original distinct derived/profile joins and selected storage-group projection. Filter data is private and separate from projected aggregation data. AST filters never inject user SQL. +- User approved the latest Kiwi model after finding the original DLL was 0.15.2. Use matching official KiwiJava/model 0.24.0 CONG instead of pinning SBG. Model-result changes are allowed; preserve Report NLP dictionary/tag scopes, word scores 10/50/100, tag/length/SL selection and stable top-100 frequency logic. Add no new stopword rules. +- Configure kri.kart.nlp.model-directory as ./nlp_model/v0.24.0, install model separately, ignore runtime models in Git, and choose the platform-specific official jar at build time. Do not claim Ubuntu execution from Windows tests. Missing native/model infrastructure is explicit 503, not empty successful NLP output. +- Per user decision, the legacy external-Referer condition is removed: every general statistics batch writes Get Report Data once through LogService. Quota results write QUOTA VIEW only, never Get Report Data. Do not add a separate logging endpoint. +- Validate through original C# synthetic calculation fixtures, authenticated API/Swagger tests, source-bound MyBatis tests and opt-in actual native analysis with -PkiwiModelDirectory. Actual SQL Server equivalence and deployment performance remain separate checks. +## Statistics batch streaming + +- POST /project/{projectType}/{pkey}/statistics/result accepts StatisticsBatchRequestDto.indexes plus shared StatisticsOptionsDto, and returns application/x-ndjson. No legacy single-index HTTP response is retained. TABULATION_0/1 use indexes=[""]. Keep single StatisticsRequestDto internally for the existing calculation engine. +- Load questions once and union-projected response data once per request. Filter once; before each calculation restrict respondents to the storage roots that the corresponding single-index request would have selected. Preserve input order and duplicate positions, original N/%/NLP calculations and profile role rules. No cross-request cache is added. +- Validate all input/metadata and load shared data before returning a stream. Emit result/error for each position, then complete with total/succeeded/failed. Do not expose internal errors or raw responses. NLP dictionary/tag queries remain per text dimension. +- Use Spring ResponseBodyEmitter/applicationTaskExecutor, one compact JSON line per flush, 10-minute total timeout, request-scoped authentication preservation for ASYNC dispatch, and cancellation checks between calculations. Failed writes terminate the stream; never continue writing events to a lost connection. +- Write the Get Report Data audit through LogService once per general statistics batch, without a Referer condition. Do not change shared DB schema or existing StatisticsMapper SQL. Frontend integration, package publication and operational proxy verification are separate tasks. + +## Quota result + +- POST /quota/{projectType}/{pkey}/{quotaOrder}/result is implemented as a dedicated single JSON operation. Use saved QUOTASET first ROW, joined COL and FILTER; request contains dataScope/startDate/endDate only. Keep quota/list unchanged. +- Reuse common report data/filter/count/header services. Handle empty ROW separately from TABULATION, keep no subtotals, target ori_cnt and stored IS_USE/quotaId only for a single matching target. Never filter out disabled targets. +- Preserve original computeQuota zero-target row removal, case-sum Total recomputation and Total column/row placement. Use null plus explicit undefined/infinite achievement state for zero targets, with original '-'/'∞' display. No targets return empty rows instead of the legacy index exception. Reject unconvertible statistic rows explicitly. +- Parse saved legacy FILTER into AST only; support Q| QID or VARIABLE, boolean precedence/groups and documented condition operators. Reject unsupported grammar rather than ignoring it or executing SQL. No shared DB schema changes or execution. +- Record QUOTA VIEW through LogService after scoped setting lookup, preserving QSTITLE/QSJSON and authenticated identity. Add no frontend logging API. Validate against 8 original C# postprocessing fixtures, filter tests, H2 mapping/routing and authenticated API checks. Live SQL Server/filter cases, frontend and aggregate Excel remain separate work. + +## Share links and External authentication + +- POST /project/{projectType}/{pkey}/share accepts realUrl and P/U; GET /share/{urlKey} is authenticated metadata; public POST /external/{urlKey}/login validates the link, issues common 24-hour JWT and increments landing count exactly once. Preserve case-sensitive URL_KEY and original /External/ public link path. +- New REPORT_URL rows dual-write PKEY/PROJECT_TYPE/SKEY; reuse existing compatible rows without mass backfill. Legacy-only rows decode SKEY internally; partial fields, unknown type, NEWSSAK/mixed markers and mismatched keys are rejected. Do not expose SKEY or run DDL/shared DB changes. +- The approved legacy raw AES-CBC key/IV are configured literally under kri.kart.share, without printing secrets. This narrowly scoped JCE adapter is necessary because common AES always derives its key through PBKDF2 and cannot reproduce original ciphertext. +- Verified common authentication details with KART_EXTERNAL team and EXTERNAL:urlKey identity must pass stored project/page checks on every request. Use an explicit MVC allowlist; deny raw exports, static files, progress/custom links, management and cross-project APIs. Permit only current report/metadata/quota reads and scoped visit logging. Crosstab P forbids TABULATION modes. Ordinary role authorization remains deferred. +- Preserve URL Copy and login logging through LogService, original REPORT ownership for normal identities and KON/KIWI names where applicable. Reuse/create are protected by kartTransactionManager and UPDLOCK/HOLDLOCK reads; do not claim uncoordinated old-server concurrency uniqueness. Frontend External remains separate. Aggregate Excel paths are now explicitly allowed only for matching project/page. + +## Derived management and aggregate Excel + +- Derived create/update/delete and single/all recalculate routes are under /project/{projectType}/{pkey}/derived. Preserve saved QUESTIONJSON/DERIVEDJSON and original single/multi/ELSE/open-num response keys; parse legacy conditions through shared service/statistics/LegacyFilterService and compute with StatisticsFilterService. Unsupported SQL grammar is explicit failure, not SQL execution. Quota retains QUOTA_FILTER_INVALID at its boundary. +- Use KON/KONKIWI-specific TransactionTemplate with project locking for definition/data writes and order changes. Preserve other JSON groups with bound JSON_MODIFY paths and original GETDATE timestamp behavior. actor/team come from RequestUserContext, logs through LogService. Return IDs/boolean/counts; frontend owns messages. Shared DB execution and ordinary role authorization are separate. +- Aggregate Excel POST routes are /project/{projectType}/{pkey}/export/excel/table and /quota/{projectType}/{pkey}/export/excel. Accept typed ordered tables/turn and legacy cell display/span strings, retaining frontend N/% presentation choice; do not requery raw data. Keep original workbook layout, multiple quota sheets and complete/target output. Link scopes must allow only their matching aggregate paths. +- Use KriCommon ExcelMapper then format with current POI, without new dependencies. Wordcloud input is validated PNG Base64 from frontend, preserving original 1000x512 position; no SVG or external URL loading. Use static measured Malgun Gothic glyph advances to avoid platform autoSize changes. Compare original EPPlus workbooks: cells/styles/merged ranges/row sizes exact, column rounding within one 1/256-character unit and image anchor rounding within one pixel. Actual production files, shaping/emoji, frontend PNG/render/download and live SQL checks remain separate. + +## Raw-data downloads + +- POST /project/{projectType}/{pkey}/export/data accepts type COMPLETE(default, old com) or INCOMPLETE(old not), optional startDate/endDate. Exclude TEST for both; do not remove Status 999 from incomplete. Filter FN_LAST_TIME DATE inclusively; start-only means same day; end-only/reversed/unknown type fail 400 before persistence. +- Reuse ExportService headers/guide and current Common ExcelMapper; retain DATA storage header, variable-alias row, respondent rows then GUIDE, plain string cells and original fixed/additional/role1001-derived/STRUCTURE order. No profile join, invented sort, new SiteLog or generic role authorization. Preserve original SQL UPPER/FOR XML PATH, ReplaceUnicodeEmpty, DISTINCT derived join, CAPI interviewer expressions and time functions. +- External raw export remains denied by the existing explicit allowlist. All file responses use no-store. Keep authentication and userRole from RequestUserContext; ordinary visibility rules remain deferred. +- Test against original C# synthetic ordinary/CAPI workbooks and bound MyBatis condition/routing/API checks. No live SQL Server or large-file equivalence claim; current raw query/workbook remain in memory, without new dependencies, cross-request cache or shared DB execution. +## Upload migration + +- Implement POST /project/{projectType}/{pkey}/import/title, /question and /data as multipart file uploads. Return processedRows/affectedRows/removedRows/archivedRows; no presentation messages. Common JWT is required; the existing External allowlist denies all imports. Ordinary role/team restrictions stay deferred. +- Title upload resets eligible explain values, then updates only explain by pkey/QID; variable/title are ignored, unknown IDs no-op and duplicate IDs are sequential. Question upload resets QUESTION/QOPTION/QUOTASET/QUOTA(original QSORDER condition) and STRUCTURE before sequential Q1/Qorder creation; retain existing dataset/option quirks and JSON strings in QINFO/LINFO, never introduce JSON_QUERY around those string parameters. +- Data upload deletes UPLOAD responses, moves actual completed responses to DEL_+PKEY, and inserts UPLOAD rows; do not mutate TEST/incomplete/other projects/DERIVED_DATA. Preserve two header rows, six distinct fixed-group skip, multi pull-up keys including duplicates, INDEX and midpoint/final timestamps, empty defaults and original text normalization. +- Parse/convert the entire file before destructive SQL; all changes use the selected KON/KONKIWI transaction with a project lock and rollback. SQL values/JSON paths are bound. No shared DB execution or schema changes are authorized. +- Preserve xlsx first-sheet/positional columns/blank rows/cached formulas and csv/txt simple delimiter plus EUC-KR/BOM behavior. Use Common ExcelUtil; its map reader drops rows and changes positional/formula rules, so a domain-specific POI reader is necessary. Existing 20MB limit applies. +- Keep original file archives under kri.kart.upload.directory (./upload_data, Git ignored) and Upload File logging through LogService with authenticated context. Archives and best-effort audit attempts may remain after database rollback; do not expose stored paths or raw content on parse errors. +- Validate against original C# SQL-capture synthetic fixtures, actual isolated H2 reset/JSON-string cases, all three operation rollbacks on both sources and multipart/authentication checks. These are not live SQL Server or production-file acceptance. +## Service integration audit + +- Contact calls the legacy scoped project-list endpoint and skey-to-share sequence; KON/KON-KIWI survey.js calls respondent-derived recalculation at END. Preserve new-server-only migration scope: do not modify those consumer repositories automatically. +- GET /project/list without search keeps existing screen-list behavior. With projectType/intranetCode/userTeam, use the legacy linked query: first underscore code segment, R-team exact GKEY else exclude M101, keyword overrides code with pkey/title LIKE, newest first. Do not mix ordinary-screen year/must-view/status/company/din-owner filters or KIWI title prefix into linked results. Query userTeam is not an authentication claim; additionally enforce the authenticated read visibility rules below, without adding ordinary-screen business filters. +- POST /project/{projectType}/{pkey}/derived/respondent/{respondentId}/recalculate reuses current calculation in definition order, ensures the legacy empty derived row, scopes group clear/query/save to PKEY+IDKEY, reads actual completed responses only and uses the selected survey transaction. Preserve historical date values on no match and add no new SiteLog point. +- Local prefix search did not locate a PRJCT_/KRIC_SYS_ caller; do not claim production non-use or remove legacy registrations. Existing Common API Key auth covers new server-to-server calls; verified REPORT_URL covers CLIENT. Do not add unauthenticated system-name/prefix-to-JWT exchange or trust request-supplied identity. Incoming service-code kart-server API Key registration is separate from the outgoing Intranet key. +- Existing browser survey hooks need a server-side proxy/API Key integration at later cutover. Caller conversion, real API Key registration/traffic, shared DB checks, general authorization and deployment remain separate work. + +## Server-to-server authentication + +- User removed the redundant system-login/token-exchange requirement. Authenticate each server call directly through Common API Key; do not add /auth/system/login or consumer-local REPORT_EXTERNAL_SYS validation. Preserve regular login and scoped REPORT_URL external login. Keep incoming API Key claims and configured path restrictions under Common authentication. + + +## Read visibility + +- User approved: userRole 1001 has no authenticated-team/assignment limit in project list/summary. This intentionally unifies legacy admin 0 and DCO 1. Existing business search/exclusion filters still apply. +- Controller RequestUserContext is authoritative for role/team/id for JWT and API Key. No permission enums/grants or user-submitted authorization claims. Missing project identity metadata fails instead of broadening visibility. +- Preserve current frontend v2 KON/KIWI list branching for other roles: team != M101 excludes GKEY M101; R-prefixed teams additionally require own GKEY; team M101 list has no extra team filter. Summary preserves its different legacy if/else-if: M101 team only own GKEY, all other teams exclude M101, including R teams without an added own-team condition. +- Role 9001 additionally intersects REPORT_ASSIGN by exact member_mail=verified userId. Query the kart session (Report DB) once per request for both survey sources, do not add is_use (not used by original), do not append email domains, and empty assignments return no rows. REPORT_MEMBER emits exact member_mail as userId; other authentication also uses verified userId verbatim. +- Apply team/assignment before candidate TOP 50 and ordering, never after Java merge/TOP 6. Must-view does not override authorization. Linked list retains its business query team and adds separately named authenticated-team/role/assignment constraints. +- Derived management list: role 1001 sees all project definitions; others see matching GKEY only. Keep normal questions/report metadata unfiltered by this management rule. +- Scope is these read conditions only. Do not add generic per-project/mutation/owner authorization, change original aggregations/Excel, or weaken External scope. Validate actual bound mapper SQL and H2 results on both sources, empty assignments, precise id routing, trusted JWT/API Key context versus forged query fields; no shared DB execution. diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..f3b0b39 --- /dev/null +++ b/.env.example @@ -0,0 +1,4 @@ +# Runtime DB/auth settings are explicitly stored in src/main/resources/application.yml. +# Optional Maven repository credentials only; prefer user Gradle properties. +GITEA_MAVEN_USER= +GITEA_MAVEN_TOKEN= diff --git a/.gitignore b/.gitignore index 8ff615d..f8235c1 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,12 @@ Thumbs.db .env .env.* !.env.example + +# Kiwi runtime model, installed separately +nlp_model/ + +# Uploaded source files contain respondent data +upload_data/ + +# Tests and fixtures are kept locally and not committed +src/test/ diff --git a/AGENTS.md b/AGENTS.md index e539f56..d818ce6 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -245,6 +245,7 @@ When implementation is complete, report in Korean: - Prefer a shared feature or approved extension point over duplicating authentication, HTTP, error, enum, Excel, Redis, JSON, date/time, JPA, crypto, or utility behavior locally. - For HTTP/2 header safety and original upstream error propagation, use the shared HTTP/bypass features documented in the routed platform-capabilities reference instead of implementing consumer-local header filters and raw-response exception handlers. - Response customizers may call `requireSuccess()`; its upstream exception propagates unchanged. Response charset parsing ignores charset-like text inside other quoted header parameters. +- When Swagger auto-configuration is active, `RequestUserContext` controller arguments are excluded from request input documentation; server-side authentication and client IP injection remain unchanged. - Do not modify KriCommon or another consumer repository unless it is explicitly included in the approved task scope. ### Required Shared References diff --git a/README.md b/README.md index 2291cc1..5d18798 100644 --- a/README.md +++ b/README.md @@ -1,81 +1,357 @@ # kart-server -KART 백엔드 API +KART 백엔드: Java 17 / Spring Boot 3.5.7 / KriCommon beta.1.6.9 / SQL Server + MyBatis, 포트 4015. -## 기술 구성 +## 설정 -- Java 17 -- Spring Boot 3.5.7 -- `com.kri.common:starter:beta.1.6.4` -- JPA + QueryDSL + JdbcTemplate -- EmbeddedId 예제 -- MyBatis는 생성 옵션에 따라 포함 +사내 규약에 따라 DB URL·계정·비밀번호를 src/main/resources/application.yml에 명시한다. KON·KONKIWI·Report 정보는 기존 KART의 KonString·KiwiString·ReportString을 사용한다. local/dev/prod는 공통 설정을 상속하며, API Key 전용 DB 접속정보는 각 프로파일의 kri.auth.apikey.db에 명시한다. JWT는 Contact처럼 common의 기본 서명 설정과 유효기간 86400초를 사용하며 별도 yml 설정을 두지 않는다. -## Gitea Maven 인증 +Contact와 동일하게 Intranet URL은 kri.api-url.intranet-extension, API Key는 kri.auth.apikey.key, 헤더는 kri.auth.apikey.header-name에 둔다. 사용자가 제공한 KART 전용 키를 사용한다. 실제 Intranet 로그인과 프로젝트 목록/summary 조회에 사용한다. 키 미설정 또는 Intranet 로그인 실패·장애 시 REPORT_MEMBER 인증을 시도한다. -Windows 사용자 Gradle 설정: +업무용 SQL Server 풀은 SQL 실행 전까지 연결을 열지 않는다. 공용 API Key 인증은 starter-data-jpa와 MySQL 드라이버를 사용하고 별도의 apiKeyDataSource/EntityManagerFactory/transaction-manager로 분리한다. 기본 Boot JPA 자동 설정은 제외하여 Report DB에 연결되지 않게 한다. API Key가 활성화되면 전용 JPA 초기화 및 preload 과정에서 해당 DB에 연결한다. 테스트는 DB를 비활성화하거나 가상 주소·모의 repository/client를 사용한다. 테스트 및 빌드에서 실제 DB/Intranet을 호출하지 않는다. -```text -%USERPROFILE%\.gradle\gradle.properties -``` +테스트 코드와 fixture(src/test)는 로컬에서만 유지하며 .gitignore로 Git에 올리지 않는다. 아래 각 항목의 "검증"·"테스트" 설명은 로컬 테스트 기준이며, 새로 내려받은 저장소에는 테스트가 포함되지 않는다. -```properties -giteaUser=사용자명 -giteaToken=Gitea토큰 -``` +## 1차 API -또는 다음 환경변수를 사용할 수 있습니다. +| 기능 | 경로 | +|---|---| +| 로그인 | POST /api/v1/auth/login | +| 프로젝트 목록 | GET /api/v1/project/list | +| 프로젝트 현황 최대 6개 | GET /api/v1/project/summary | +| 쿼터 설정 목록 | GET /api/v1/quota/{projectType}/{pkey}/list | +| 일별 현황 | GET /api/v1/project/{projectType}/{pkey}/progress/day | +| 전체 상태 건수 | GET /api/v1/project/{projectType}/{pkey}/progress/type | +| LOI 현황 | GET /api/v1/project/{projectType}/{pkey}/progress/loi | -```text -GITEA_MAVEN_USER -GITEA_MAVEN_TOKEN -``` +projectType은 0=KON, 1=KIWI이며 pkey에는 legacy 마커를 넣지 않는다. type/loi의 날짜 조건은 startDate/endDate(yyyy-MM-dd)이며 양끝을 포함한다. 날짜를 둘 다 생략하면 전체 기간이다. day는 기존처럼 날짜 범위 파라미터가 없다. -## 실행 +로그인 요청은 {userId,userPw}, 응답은 {accessToken,user,memberRedirect}다. user는 공용 JwtUserClaimsDto다. Intranet 실패/장애 시 is_use=1인 REPORT_MEMBER를 조회하고 모든 REPORT_MEMBER 사용자에게 userRole=9001을 부여한다. is_kri 기반 역할 계산과 특정 계정 관리자 예외는 사용하지 않는다. 로그인 이력은 기존 TB_LOGIN_LOG에 저장하며 저장 실패가 성공한 로그인을 취소하지 않는다. -Windows: +조회 응답은 DTO 배열이며 기존 값의 의미를 유지하고 필드명은 camelCase로 정리했다. 목록은 projectType,rowNumber,pkey,title,surveyType,status,gkey,mkey,createDate를 반환한다. summary는 프로젝트 정보와 allCount/ongoingCount/screenCount/quotaCount/completeCount를 반환한다. 암호화 security와 ver/iskiwi는 projectType+pkey로 대체한다. + +프로젝트 목록/summary는 현재 화면의 v2 KON/KIWI SQL을 기준으로 한다. 목록의 REPORT_MUST_VIEW_PROJECT 기간 예외, KIWI 접두 제목 및 통합 정렬을 유지한다. summary는 소스별 후보 TOP 50 → 상태/날짜 정렬 TOP 6 → 통합 날짜 정렬 최대 6개 순서다. CTE 최적화는 사용자 실환경에서 성능이 악화되어 기존 SQL로 복구했다. 원본 SQL fixture를 회귀 비교 기준으로 유지한다. 추가 최적화는 실제 SQL Server 실행계획과 인덱스, IO/TIME 측정 후 진행한다. v1의 단일 소스 ID 기준과 구분한다. + +담당자 제외는 GET /api/v1/user/list에서 S101/S201의 userId를 한 번 조회해 두 소스의 MKEY NOT IN 바인딩 조건으로 적용한다. summary는 후보 TOP 50 선정 전에 제외한다. API 오류/잘못된 응답은 503이며 제외 조건이 빠진 목록을 반환하지 않는다. 정상 빈 사용자 목록은 제외 대상이 없는 것으로 처리한다. 실제 API 목록과 기존 person 테이블의 동등성은 별도 검수가 필요하다. + +progress/type은 조사 유형별 그룹이 아니라 전체 상태 건수 1행이다. day는 기존 INDEX 존재 조건과 날짜 정렬을 유지한다. LOI는 완료/비TEST 응답의 정수 평균·2.5% 순위 경계 및 기존 시간 문자열을 유지한다. quota/list는 저장된 설정 JSON을 문자열 그대로 반환한다. + +## 구조와 후속 범위 + +Contact의 controller/service/dto/persistence/config/common 구조를 따른다. enum은 common/enums에 두고 사용자가 지정한 CodeEnum/Lombok/Jackson 형태를 사용한다. mapper XML은 mybatis/mapper 아래의 ProjectMapper.xml·ProgressMapper.xml·UserMapper.xml·LogMapper.xml·QuotaMapper.xml로 구분하고 SqlSessionTemplate와 transaction-manager를 명시한다. + +프로젝트 목록·최신 6개 및 파생변수 관리 목록의 조회 권한은 RequestUserContext의 getUserRole()/getUserTeam()을 기준으로 적용한다. 상세 규칙은 아래 조회 권한 항목을 따른다. 공용 JWT/API Key 인증은 유지한다. External 전용 인증과 링크의 프로젝트/페이지 제한은 아래 공유 링크 기능에서 구현한다. 현재 상태를 운영 전환 준비 완료로 간주하지 않는다. + +## 검증 ```powershell -.\gradlew.bat bootRun +.\gradlew.bat build ``` -Linux/macOS: +테스트는 로그인 fallback·24시간 JWT·부서 제외·소스 분리·목록/summary 정렬·날짜/LOI·SQL 바인딩·7개 경로·공용 보안 필터·지연 풀 생성과 OpenAPI를 검증한다. 생성된 1차 명세는 테스트 후 build/phase1-openapi.json에서 확인할 수 있다. 실제 SQL Server 결과와 기존 응답 표본의 비교 검수는 아직 수행하지 않았다. -```bash -./gradlew bootRun +Gitea Maven 인증은 사용자 Gradle 설정의 giteaUser/giteaToken 또는 GITEA_MAVEN_USER/GITEA_MAVEN_TOKEN으로 공급한다. + +Agent Harness local ID는 kart-server다. .agent 원본을 수정하고 검증하며 생성된 AGENTS.md/CLAUDE.md는 직접 편집하지 않는다. + +mapper는 업무별 파일로 나누고 databaseId=survey/kart로 쿼리 등록 대상을 분리한다. ProjectMapper의 mustViewPkeys는 kart 세션(Report DB)을 사용하며 설문 쿼리는 KON/KONKIWI 세션을 사용한다. 사용자 인증과 로그인 이력도 각각 UserRepository/LogRepository에서 kart 세션(Report DB)을 명시한다. + +공용 API Key 설정은 enabled/preload-on-startup/admin-api-enabled=true, service-code=kart-server이며 allowed-paths가 빈 목록이므로 경로 제한 없이 API Key 인증을 허용한다. 내부 관리 API 허용 IP는 Contact와 동일한 211.254.145.130이다. 일반 테스트에서는 API Key 활성화·preload·관리 API를 끈다. 전용 분리 테스트는 H2 메모리 DB에만 연결하여 활성 키·서비스 코드 필터 및 업무 DB와의 분리를 검증한다. 실제 키 등록/preload/관리 API 실행은 별도 실환경 검증이 필요하다. + +ProjectMapper는 list/summary/mustViewPkeys를 유지하고 ProgressMapper/ProgressRepository는 daily/type/loi와 날짜 범위 조건을 담당한다. 현황 SQL과 API 경로는 분리 전과 동일하다. + +## 2차 API + +| 기능 | 경로 | +|---|---| +| 문항 목록 | GET /api/v1/project/{projectType}/{pkey}/question/list | +| 문항 상세 | GET /api/v1/project/{projectType}/{pkey}/question/{qid} | +| 스크린 현황 | GET /api/v1/project/{projectType}/{pkey}/progress/screen | +| 사용자 정의 현황 URL/파일 목록 | GET /api/v1/project/{projectType}/{pkey}/progress/custom | +| 북마크 목록 | GET /api/v1/project/{projectType}/{pkey}/bookmark/list?page=TABULATION | + +문항 상세는 일반/파생 문항을 open·rank·attr 규칙대로 펼친 후 정확한 QID의 첫 행을 배열로 반환한다. 없으면 빈 배열이다. 메타데이터 JSON은 문자열 필드를 유지한다. KIWI 프로필 문항은 userRole=1001일 때만 포함한다. QuestionMapper는 KON/KONKIWI 세션을 사용한다. + +스크린 현황은 startDate/endDate(yyyy-MM-dd)를 받으며 기존처럼 마지막 JSON 시간을 선정한 후 날짜 양끝을 포함해 필터링한다. 사용자 정의 현황은 첫 KON report URL과 REPORT_APPEND 첨부 목록이다. append_type=0 파일은 kri.kart.progress.append-directory(기본 ../report_append)에서 존재 여부를 확인하므로 배포 시 기존 파일 디렉터리를 제공해야 한다. 이 API는 파일 다운로드/복사를 하지 않으며 기존 URL·상대 경로를 유지한다. + +북마크는 page가 필수이고 값을 임의 변환하지 않는다. 기존 소비자는 TABULATION/CROSSTAB을 사용한다. BookmarkMapper는 kart 세션(Report DB)에서 공개 항목과 인증된 사용자 본인의 비공개 항목을 BOOKMARK_ORDER로 조회한다. userId는 요청 파라미터로 받지 않으며 isMine은 문자열 0/1이다. Report 테이블의 기존 pure pkey 저장을 유지한다. + +이번 범위에 쿼터 집계와 auth/session은 포함하지 않는다. 조회 권한은 아래 조회 권한 항목에 따라 적용한다. 개별 프로젝트 API의 공통 접근 검사 및 변경 기능의 역할 제한은 별도 범위다. 테스트가 생성하는 build/phase2-openapi.json에는 1·2차 명세가 포함된다. H2 문항/북마크 SQL 및 복합 문항 변환, 인증·입력 검증·명세·파일 존재 여부를 검증하며 실제 SQL Server 응답/OPENJSON/collation 검수는 별도 필요하다. +## 방문·활동 로그 + +- POST /api/v1/log/visit: {projectType,pkey,logContent}. 프로젝트 정보는 함께 생략할 수 있으며 logContent에 페이지 URL/정보를 보낸다. +- TB_SITE_LOG: 서버 내부 LogService.writeSiteLog로 기록한다. 별도 HTTP API는 제공하지 않는다. + +사용자 ID와 IP는 RequestUserContext에서 가져온다. Report DB의 기존 TB_VISIT_LOG/TB_SITE_LOG 컬럼에 바인딩하여 저장한다. SITE JSON은 기존 프런트의 v2 projectCode/LOGTITLE/LOGCONTENT 형식에 projectType을 추가한다. 방문 로그의 V_PKEY는 순수 pkey이며 프로젝트가 없으면 빈 문자열이다. 스키마 변경은 없다. + +방문 로그 응답은 기존처럼 text/plain PASS다. 로그 저장 실패는 경고만 남기는 기존 best-effort 정책을 유지하므로 PASS가 DB 저장 성공을 보장하지는 않는다. 활동 로그는 서버 업무 처리 지점에서 LogService.writeSiteLog를 호출한다. 현재 읽기 기능에는 기존 SITE 로그 지점이 없으며 보고서 집계·북마크 변경·업로드·링크 복사는 후속 구현 때 연결한다. 기존 프런트에서 전송하던 QUOTA VIEW도 후속 쿼터 결과 처리에서 기록한다. AuthService는 LogService.writeLoginLog를 통해 로그인 로그를 기록한다. +## 파생 변수 목록·북마크 변경 + +- GET /api/v1/project/{projectType}/{pkey}/derived/list +- POST /api/v1/project/{projectType}/{pkey}/bookmark +- PUT /api/v1/project/{projectType}/{pkey}/bookmark/{bookmarkId} +- DELETE /api/v1/project/{projectType}/{pkey}/bookmark/{bookmarkId} + +파생 목록은 KON/KONKIWI의 DERIVED_VARIABLE 원본 메타데이터·정렬과 기존 문항 펼치기를 사용한다. userRole=1001은 전체 파생변수, 그 외에는 인증된 본인 팀의 GKEY만 조회한다. assign은 현재 프런트에 사용처가 없어 구현하지 않는다. + +북마크 요청은 bookmarkPage(생성 시 필수), bookmarkTitle, bookmarkInfo, bookmarkJson(원본 JSON 문자열), isOpen(0/1)이다. 생성·수정은 ID를 text/plain으로, 삭제는 성공 여부를 JSON boolean으로 반환한다. 삭제 성공 시 true이며 화면 메시지는 프런트에서 처리한다. 생성 ID와 페이지별 순번을 유지하며 수정은 소유자·페이지·순번을 변경하지 않는다. JSON 원문과 공용 Report 테이블을 유지하고 모든 값을 바인딩한다. 없는 대상은 404, 변경 중 사라진 대상은 409이며 DB 오류는 공용 오류 처리로 전달한다. + +삭제 후 순번 감소는 기존처럼 같은 프로젝트의 모든 페이지에 적용한다. 순번 조정·삭제는 하나의 kart 트랜잭션(Report DB)이다. Insert/Update/Delete Bookmark 활동 로그는 LogService를 통해 별도 트랜잭션으로 기록한다. 삭제 전 로그는 삭제 실패 시에도 남을 수 있으며 감사 로그 실패는 업무 저장을 취소하지 않는다. + +테스트는 H2와 모킹된 인증 환경을 사용한다. 실제 SQL Server 결과 및 기존 서비스 응답 표본의 동등성 검수는 별도 필요하다. build/phase3-openapi.json은 테스트에서 생성하는 최신 명세다. +## 등록 양식·가이드 다운로드 + +- GET /api/v1/export/form/question: KON 문항 등록 양식.xlsx 원본 파일. +- GET /api/v1/project/{projectType}/{pkey}/export/form/data: 등록용 헤더와 별칭 한 행. +- GET /api/v1/project/{projectType}/{pkey}/export/form/title: QID/문번/문항/Title 수정 양식. +- GET /api/v1/project/{projectType}/{pkey}/export/guide: 원본 문항·파생 메타데이터의 GUIDE 시트. + +기존 application/octet-stream과 서버 파일명을 유지한다. UTF-8 Content-Disposition은 한글 이름을 보존하고 경로·제어문자를 제거한다. 데이터 양식의 파생 헤더는 기존 관리자/DCO에 해당하는 userRole=1001일 때만 추가한다. 가이드는 펼치기 전 메타데이터를 사용하며 KIWI 프로필을 제외한다. 전체 권한 제한은 후속 일괄 적용 대상이다. + +현재 설정된 KriCommon beta.1.6.9의 ExcelMapper를 재사용하고 POI 5.5.1을 컴파일 의존성에 명시했다. 공용 자동 열 너비와 빈 셀 생성을 보정해 기존 LoadFromDataTable의 기본 양식을 유지한다. 원본 문항 양식은 재직렬화하지 않는다. + +기존 배포 EPPlus 4.5.3.3으로 생성한 합성 fixture와 셀 값·타입·배치·열 너비·행 높이·기본 서식을 비교한다. 실제 SQL Server OPENJSON/collation 및 운영 다운로드 표본 비교는 별도 검수가 필요하다. build/phase4-openapi.json은 테스트가 생성하는 최신 명세다. + +## 일반 보고서 집계·Kiwi 주관식 분석 + +`POST /api/v1/project/{projectType}/{pkey}/statistics/result` + +```json +{ + "indexes": ["Q1", "Q2"], + "banners": [["Q2", "Q3"], ["Q4"]], + "dataScope": "ACTUAL", + "mode": "STANDARD", + "percentageDecimals": 2, + "statisticDecimals": 2 +} ``` -프로필 지정: +`banners`의 바깥 배열은 가로 묶음, 안쪽 배열은 최대 5단계 중첩이다. 날짜는 `startDate`/`endDate`(yyyy-MM-dd)이며 끝 생략 시 당일이다. `dataScope`는 ACTUAL/TEST/ALL이며 항상 완료 Status=10만 집계한다. 원본·파생 결합과 필요한 KIWI 프로필 결합, 선택한 문항이 포함된 저장 그룹의 투영, 기존 UPPER/FOR XML 처리를 유지한다. KIWI 프로필 메타데이터는 기존 목록처럼 userRole=1001에만 포함한다. 프로젝트/파생변수 관리 목록의 조회 권한은 아래 조회 권한 항목에 적용되어 있으며, 개별 집계 API의 일반 프로젝트 접근 검사는 별도 범위다. -```powershell -.\gradlew.bat bootRun --args="--spring.profiles.active=local" +일반 표는 `type=TABLE`, `columns/headerRows/rows`를 반환한다. 셀은 `columnIndex/rowSpan/colSpan`의 논리 좌표와 `count/percent/base`, 표시 문자열을 갖는다. Total도 N/%를 함께 반환하며 복수·속성 응답의 Total %는 100을 넘을 수 있다. 분모 0 처리는 기존처럼 일반 셀·Total은 0, 척도/값 그룹은 percent=null과 표시="-"다. 숫자 통계는 `statisticValue/measurement`로 분리한다. `PRTMODE`를 받지 않으며 표시 선택은 frontend가 처리한다. `headerMode=NONE/FLAT/MERGED`, `transpose`, `showSubtotals`, `showValueCodes`, `showNumericSum`, 순서 있는 `valueGroups[{label,values}]`를 지원한다. TABULATION_0/1은 indexes=[""]로 호출한다. 쿼터 결과는 아래 전용 API로 분리한다. 집계 Excel 출력은 후속 범위다. + +필터는 `filter`의 AST로 입력한다. 그룹 AND/OR/NOT는 `children`, 조건 EQ/NE/GT/GE/LT/LE/IN/NOT_IN/BETWEEN/IS_ANSWERED/IS_UNANSWERED는 `dimensionId`, `reference=QID|VARIABLE`, `values`를 사용한다. JSON 숫자는 수치 비교, 문자열은 기존 SQL collation처럼 대소문자 무시 비교다. 부정 조건은 일치 응답이 하나라도 있으면 제외하고 해당 키가 없는 응답은 포함하는 기존 NOT EXISTS 의미를 유지한다. IS_ANSWERED는 기존 IS NOT NULL 의미여서 빈 문자열도 포함한다. 필터 문자열을 SQL에 삽입하지 않는다. 필터 깊이는 32, 그룹당 자식은 128까지 허용한다. + +주관식 문자열은 `indexes=["QID_입력칸"]`으로 같은 API를 호출한다. `type=TEXT_ANALYSIS`와 `words[{text,tag,count}]`를 반환하며 원문·IDKEY와 기존의 가짜 제목 데이터 행을 노출하지 않는다. 기존 REPORT_NLP_TAG/WORD의 전체·프로젝트·문항 범위 및 사전 점수 10/50/100, SL 포함·품사/길이 조건, 같은 단어의 품사별 별도 빈도와 빈도 내림차순/동률 최초 등장 순서/상위 100개를 유지한다. 문장별 분리는 토큰을 빠뜨리지 않으므로 결과를 전체 토큰 빈도로 집계한다. 별도의 불용어 규칙을 추가하지 않는다. + +사용자 결정에 따라 최신 공식 KiwiJava·모델 **0.24.0**을 사용한다. 기존 DLL은 실제 실행에서 0.15.2로 확인되었으며 기존 모델은 Java 0.20.4에서도 로딩되지 않았다. 최신 모델 적용에 따른 형태소 결과 변화는 허용하되 Report DB 사전·품사 선택·빈도 집계 규칙은 유지한다. 0.24.0의 CONG 모델, default/typo dictionary 로딩, 이형태 통합 비활성, 오타 교정 비활성, match=0을 사용한다. 모델은 `kri.kart.nlp.model-directory`(기본 `./nlp_model/v0.24.0`)에 별도로 설치한다. `scripts/setup-kiwi-model.ps1`은 공식 모델 다운로드·SHA-256 검증 후 비어 있는 폴더에만 설치한다. 모델은 Git에서 제외한다. Kiwi 라이브러리/모델이 없거나 분석에 실패하면 해당 문항에 status=503, code=KIWI_NLP_UNAVAILABLE인 error 이벤트를 반환하고 다음 문항을 계속한다. + +Gradle은 Windows에서 win-x64, Linux에서 lnx-x86-64 또는 lnx-aarch64 JAR을 선택한다. Windows에서 Linux 배포물을 만들 때 `./gradlew.bat bootJar -PkiwiPlatform=lnx-x86-64`로 명시한다. 배포 JAR과 JVM 플랫폼이 일치해야 하고 모델도 운영에 별도로 배치한다. Kiwi 및 모델의 라이선스는 공식 저장소의 LGPL-2.1 조건을 확인한다: https://github.com/bab2min/Kiwi/tree/v0.24.0/bindings/java . + +검증: 원본 C# Report.cs를 실행한 합성 비교 기준 25개, 필터/좌표/조회 분리/인증·Swagger/API와 실제 Windows Kiwi 0.24.0 분석을 테스트한다. 네이티브 검증은 `./gradlew.bat test '-PkiwiModelDirectory=nlp_model/v0.24.0'`로 실행한다. 이 속성이 없으면 해당 네이티브 테스트 1개만 생략한다. `build/phase5-openapi.json`은 API 테스트에서 생성된다. 실제 SQL Server 결과, Ubuntu 네이티브 실행·운영 성능은 별도 검수 대상이며 합성 테스트 통과로 운영 동등성을 주장하지 않는다. + +### 배열 집계와 NDJSON 스트리밍 + +같은 POST /api/v1/project/{projectType}/{pkey}/statistics/result 경로에서 단일 index 대신 indexes 배열을 받는다. 단일 문항도 indexes=["Q1"]로 요청한다. 기존 단일 index JSON 응답 계약은 종료한다. 배열은 빈 값/null/null 요소를 허용하지 않으며 STANDARD에서 빈 문자열은 거부한다. TABULATION 모드는 indexes=[""]를 사용한다. 배너·필터·기간·표시 옵션은 배열 전체에 공통 적용한다. 중복 index도 생략하지 않고 요청 위치대로 반환한다. + +문항 목록 1회, 필요한 모든 저장 그룹의 합집합을 대상으로 응답 데이터 1회를 조회하고 JSON 변환·공통 필터를 1회 적용한다. 각 문항은 기존 단건 쿼리가 포함했을 응답자 범위만 집계하므로 다른 index의 응답자가 Total에 추가되지 않는다. 주관식의 NLP 태그·사전 조회는 문항별로 유지한다. 요청 간 서버 캐시는 아직 없다. Get Report Data 감사 기록은 사용자 결정에 따라 기존 외부 Referer 조건 없이 모든 일반 통계 배열 요청마다 한 번 남긴다. 쿼터 결과는 QUOTA VIEW만 기록하고 Get Report Data는 기록하지 않는다. + +200 Content-Type은 application/x-ndjson;charset=UTF-8이다. 한 줄에 JSON 이벤트 하나를 쓰고 flush하며 순차 계산한다. result에는 기존 TABLE/TEXT_ANALYSIS 응답을 result 필드로 담는다. position은 0부터 시작하는 요청 배열 위치이고 index는 요청값이다. + +```json +{"type":"result","position":0,"index":"Q1","result":{"type":"TABLE","questionId":"Q1","...":"..."}} +{"type":"error","position":1,"index":"Q2","status":503,"code":"KIWI_NLP_UNAVAILABLE","message":"문항 집계 처리에 실패했습니다."} +{"type":"complete","total":2,"succeeded":1,"failed":1} ``` -## 빌드 +입력·문항·필터 검증과 공통 DB 조회는 스트림 시작 전에 수행한다. 실패 시 기존 HTTP 오류를 반환한다. 스트림 시작 후 문항 계산 오류는 error 이벤트로 반환하고 다음 문항을 계속한다. HTTP 상태는 이미 200이므로 이벤트 status를 확인해야 한다. complete를 받지 못한 종료는 완료로 취급하지 않는다. 내부 경로·응답 원문·예외 상세는 오류 이벤트에 노출하지 않는다. -```powershell -.\gradlew.bat clean build +Spring ResponseBodyEmitter와 기존 applicationTaskExecutor를 사용한다. 스트림 전체 제한은 10분이다. 최초 인증 상태는 Spring Security의 RequestAttributeSecurityContextRepository로 동일 요청의 ASYNC 종료 처리까지 유지하며 세션을 만들거나 최초 인증을 생략하지 않는다. 종료·오류·시간 초과 시 작업 취소를 요청하고 문항 사이에서 중단 상태를 확인한다. 연결 단절은 쓰기 실패 또는 Servlet 콜백으로 감지하며, 진행 중 JDBC/네이티브 계산의 즉시 중단은 보장하지 않는다. + +응답 Cache-Control: no-store, X-Accel-Buffering: no를 설정한다. 운영 프록시의 실제 버퍼링·압축·시간 제한은 배포 시 검증해야 한다. 프런트는 @kri/common 0.19.1의 streamPost로 받으며 Next 중계에서도 본문을 모아 JSON으로 재직렬화하면 안 된다. 프런트 연동은 이번 서버 변경에 포함하지 않는다. + +배열 순서·중복·문항별 모수·응답 조회 1회·오류 이후 진행·취소와 인증된 MockMvc 스트리밍을 검증한다. 두 번째 계산을 대기시킨 동안 첫 NDJSON 결과가 전달되는 테스트를 포함한다. 기존 C# 계산 비교 기준 25개와 네이티브 Kiwi 검증도 유지한다. + +## 쿼터 집계 결과 + +`POST /api/v1/quota/{projectType}/{pkey}/{quotaOrder}/result` + +```json +{"dataScope":"ACTUAL","startDate":"2026-10-01","endDate":"2026-10-13"} ``` -## 인증 설정 +빈 객체 {}도 허용하며 기본은 ACTUAL·전체 기간이다. TEST/ALL, 날짜 형식과 끝 날짜 생략 규칙은 공용 집계와 같다. 기존 quota/list는 설정 목록으로 유지한다. 결과는 단일 JSON이며 일반 보고서의 배열 NDJSON과 별개다. -공용 Starter 설정으로 제어합니다. +해당 프로젝트와 QSORDER로 QUOTASET을 읽고 기존 front처럼 QSJSON.ROW의 **첫 항목만** 사용한다. ROW가 [] 또는 [""]이면 행 문항 없이 집계한다. COL은 기존 join("|")에 해당하는 중첩 배너다(묶음당 최대 5단계). 저장 FILTER는 Q| 접두사가 있으면 QID, 없으면 VARIABLE 참조다. AND/OR·괄호·비교·IN/NOT IN·BETWEEN·IS NULL/IS NOT NULL을 공용 AST로 변환한다. SQL 문자열을 실행하거나 삽입하지 않으며 지원하지 않는 저장 문법은 422 QUOTA_FILTER_INVALID로 거부한다. FILTER가 객체이면 공용 AST로 해석한다. client는 ROW/COL/저장 FILTER를 덮어쓰지 않는다. -```yaml -kri: - security: - enabled: true - auth: - apikey: - enabled: false +공용 StatisticsService의 문항/응답 조회·JSON 정규화·필터, StatisticsAggregationService의 완료수 계산, StatisticsTableService의 헤더 구성을 재사용한다. 소계는 기존처럼 출력하지 않는다. 목표와 상태는 같은 survey DB의 QUOTA에서 pkey+QSORDER로 읽는다. 목표는 현재 잔여량 cnt가 아닌 **ori_cnt**, 사용 여부 IS_USE는 목표 조회에서 제외 조건으로 쓰지 않는다. + +응답은 quotaSetId/quotaOrder/title/index/banners/columns/headerRows/rows이다. 셀에는 complete/target/achievementPercent/achievementDisplayText/displayText와 단일 목표에만 quotaId/isUsed가 있다. isUsed는 DB의 원래 문자열(예: "0", "1")이며 여러 목표가 합쳐지면 null이다. 달성률은 기존처럼 소수 2자리다. 목표=0일 때 숫자는 null, achievementState는 UNDEFINED(완료=0, 표시 "-") 또는 POSITIVE_INFINITY(완료>0, 표시 "∞")로 반환한다. + +쿼터 헤더는 기존처럼 문항 제목을 제거하고 보기 레이블만 표시한다. 기존 computeQuota처럼 목표 합이 0인 행을 제거한 뒤 남은 사례 행의 완료수 합으로 Total을 다시 계산한다. Total 열은 마지막, Total 행은 행 문항이 있을 때만 마지막에 둔다. 다른 index가 없어서 Total을 전체 응답자 수로 바꾸거나 중복 선택을 제거하지 않는다. 목표가 전혀 없으면 기존 인덱스 예외 대신 rows=[]를 반환한다. 주관식 문자 결과를 완료수 표로 바꾸지 않으며 422 QUOTA_TEXT_UNSUPPORTED로 반환한다. 통계량을 완료수로 변환할 수 없는 문항은 422 QUOTA_STATISTIC_UNSUPPORTED이며 임의의 0으로 대체하지 않는다. + +QUOTA VIEW는 설정 조회 후 서버 LogService가 기존 QSTITLE/QSJSON 내용과 인증된 사용자/IP로 한 번 기록한다. 목록 조회에는 남기지 않는다. 설정 없음은 404, 잘못된 요청/문항/날짜는 400, 저장 ROW/COL·쿼터 조건 오류는 422이며 DB 오류를 빈 성공으로 숨기지 않는다. DB 스키마 변경과 공유 DB 실행은 없다. + +검증: 원본 C# computeQuota 후처리 합성 비교 기준 8개, 저장 필터, H2 SQL 바인딩/매핑/소스 분리, JWT API/첫 ROW/행 없는 쿼터/단일 응답 조회/사용 여부/감사 로그/Swagger. 실제 SQL Server의 기존·신규 응답 표본과 저장 FILTER 사례 검수는 별도 필요하다. 일반·쿼터 집계 Excel 및 front 연동은 후속 단계다. + +## 공유 링크·External 인증·REPORT_URL 병행 호환 + +| 작업 | 경로 | +|---|---| +| 링크 발급/재사용 | POST /api/v1/project/{projectType}/{pkey}/share | +| 내부 링크 정보 조회 | GET /api/v1/share/{urlKey} | +| External 랜딩 인증 | POST /api/v1/external/{urlKey}/login | + +발급 JSON은 `{ "realUrl": "/Report/Crosstab", "mode": "P" }`. P=Page Copy, U=URL Copy. 응답은 urlKey/url/realUrl/projectType/pkey/projectTitle/pageOnly이며 SKEY를 반환하지 않는다. 공유 가능한 경로는 기존 /Report/Current, /Report/Quota, /Report/Tabulation, /Report/Crosstab이다. 상대 내부 경로만 허용하며 query/fragment는 탐색 상태로 보존한다. 기존 프런트처럼 문항·필터 선택을 링크에 저장하지 않으며 P는 화면 단위 제한이다. 새로운 프런트도 이 탐색 경로 계약을 따라 연결한다. + +신규 REPORT_URL 행에는 PKEY, PROJECT_TYPE와 기존 URL 인코딩 AES-CBC SKEY를 함께 저장한다. 기존 URL_KEY/소유자/페이지 모드를 보존하고 동일 조건이면 재사용한다. 일반 사용자 owner는 기존 REPORT, KON/KIWI identity는 그 이름을 사용한다. 발급 트랜잭션의 UPDLOCK/HOLDLOCK 조회와 키 중복 확인은 신규 서버의 동시 발급을 직렬화한다. 구서버는 같은 락 규약을 사용하지 않으므로 구서버 동시 발급까지 유일성을 보장하지 않는다. 스키마/인덱스 변경, 일괄 보정, SKEY 제거는 실행하지 않는다. + +PKEY와 PROJECT_TYPE가 모두 NULL인 행만 내부 SKEY 어댑터로 해석한다. 0=KON, 1=KIWI이며 NEWSSAK/혼합 구분자/부분 NULL/잘못된 유형/프로젝트 없음/새 필드와 SKEY 불일치는 거부한다. 새 필드가 정상이고 SKEY가 없는 행도 지원한다. 운영 호환 키/IV는 사용자 규약에 따라 kri.kart.share.legacy-key/legacy-iv에 저장하며 API/로그 응답으로 노출하지 않는다. 공용 AES는 PBKDF2 키 파생을 사용하므로 기존 raw AES 키에 대한 JCE 어댑터를 REPORT_URL에만 둔다. public-origin 기본값은 기존 https://kart.kric.com이다. + +랜딩 POST는 검증된 링크 정보와 accessToken을 반환한다. 공용 JWT 24시간 정책과 서명 검증을 사용하고, 서버가 발급한 KART_EXTERNAL team/EXTERNAL:urlKey identity로 매 요청 REPORT_URL 범위를 다시 확인한다. 랜딩 POST만 LANDING_CNT를 원자적으로 1 증가시키며 내부 GET/범위 검증은 증가시키지 않는다. POST는 재접속마다 한 번 호출하며 자동 재시도는 카운트를 늘릴 수 있다. 원래 랜딩의 로그인 로그와 발급의 URL Copy 로그는 LogService를 통해 기록한다. + +External은 같은 프로젝트의 문항 메타데이터 및 허용 화면 API만 사용할 수 있다. P Current는 기본 현황, P Quota는 쿼터, P Tabulation/Crosstab은 일반 집계와 해당 북마크 조회를 허용한다. Crosstab P는 STANDARD만 허용한다. U는 같은 프로젝트의 위 보고서/쿼터를 허용한다. 외부 URL/파일을 반환하는 progress/custom, 프로젝트 전체 목록·summary, 파생 관리·북마크 쓰기·링크 발급·원자료/등록 양식/가이드 다운로드·정적 파일 접근은 차단한다. 방문 로그도 같은 프로젝트여야 한다. 아래 일반/쿼터 집계 Excel 경로만 해당 공유 화면에서 허용한다. 일반 사용자 역할 제한은 기존 결정대로 별도 단계다. + +검증은 원본 .NET SKEY 합성 비교, 저장 필드/링크 재사용/충돌 재시도, SQL 소스/값 바인딩/대소문자 조건/랜딩 증가, 실제 공용 JWT의 페이지·프로젝트·관리 제한과 External NDJSON ASYNC 응답을 포함한다. H2에서는 SQL Server 전용 힌트/콜레이션을 그대로 실행하지 않으며 실제 SQL Server 동시 발급·구서비스 상호 운용·신규 프런트 랜딩 화면은 후속 실환경 검수다. + +## 파생변수 관리 + +| 작업 | 경로 | +|---|---| +| 등록 | POST /api/v1/project/{projectType}/{pkey}/derived | +| 수정/ID 변경 | PUT /api/v1/project/{projectType}/{pkey}/derived/{variableId} | +| 삭제 | DELETE /api/v1/project/{projectType}/{pkey}/derived/{variableId} | +| 개별 재계산 | POST /api/v1/project/{projectType}/{pkey}/derived/{variableId}/recalculate | +| 전체 재계산 | POST /api/v1/project/{projectType}/{pkey}/derived/recalculate | + +등록/수정 예시: + +```json +{ + "variableId": "D1", "variableTitle": "연령 구분", "variableType": "single", + "variableInfo": { + "1": {"value": "1", "label": "성인", "condition": "AGE >= 18"}, + "ELSE": {"value": "9", "label": "기타"} + } +} ``` -프로젝트 내부에 JWT/API Key 필터를 중복 구현하지 않습니다. +variableInfo는 JSON 문자열 대신 순서 있는 객체를 받으며, 저장된 DERIVEDJSON/QUESTIONJSON 구조를 유지한다. variableType은 single/multi/num이다. condition은 기존 VARIABLE 문법 문자열(Q|는 QID) 또는 기존 보고서 filter AST다. 문법 파서는 LegacyFilterService로 쿼터와 공유하며 계산은 StatisticsFilterService를 사용한다. 지원하지 않는 SQL 문법·식은 422로 거부한다. 조건을 SQL로 실행하거나 새 연산/format 해석을 추가하지 않는다. 실제 저장 조건 사례는 공유 DB 검수가 필요하다. -## Agent Harness +single은 먼저 일치한 규칙, multi는 모든 일치 규칙을 저장한다. ELSE는 미일치 응답에만 적용한다. num은 원본의 open/num 메타데이터 및 기본 변수 응답 키를 그대로 유지한다. 등록·수정 후 실제 완료 응답(Status=10, TEST 제외)을 재계산하며, 전체 재계산은 저장 Qorder 순서로 진행한다. 이전 변수 그룹은 모든 DERIVED_DATA 행에서 정리하고 다른 변수 그룹은 JSON_MODIFY로 보존한다. 빈 그룹은 제거하며 값이 생성된 응답의 DERIVED_DATE만 GETDATE 기존 형식으로 갱신한다. 삭제/ID 변경에서 원본처럼 과거 날짜 키는 별도 삭제하지 않는다. -- 프로젝트 ID: `kart-server` -- 프로젝트 유형: `internal-service` -- 권위 원본: `.agent/profile.yml`, `.agent/project.md`, `.agent/references/*.md` +KON/KONKIWI별 TransactionTemplate과 프로젝트 락을 사용해 정의 저장·순서 조정·JSON 정리·재계산을 함께 롤백한다. kart 트랜잭션(Report DB)으로 survey 쓰기를 묶지 않는다. 변수 중복은 DATA 응답 키/QUESTION/다른 DERIVED_VARIABLE에서 검사한다. actor/team은 인증된 RequestUserContext만 사용하고 기존 SiteLog 이벤트는 LogService를 거친다. 등록·수정은 ID, 삭제는 boolean, 재계산은 variableCount/matchedRespondents를 반환한다. 전체 matchedRespondents는 변수별 일치 건수 합이며 여러 변수에 같은 응답자가 일치하면 반복 집계된다. 프런트가 메시지를 표시한다. -`AGENTS.md`와 `CLAUDE.md`는 중앙 Agent Harness가 합성합니다. 두 파일을 직접 수정하지 않습니다. +검증: 순차 규칙/다중·ELSE/숫자형 저장/빈 그룹/임의 SQL 거부, H2에서 KIWI 변경 롤백과 KON 영향 없음, rename/delete 순서, SQL 바인딩·소스 분리, CRUD/recalculate JWT API. 공유 DB DML/DDL은 실행하지 않았다. + +## 일반·쿼터 집계 Excel + +- POST /api/v1/project/{projectType}/{pkey}/export/excel/table +- POST /api/v1/quota/{projectType}/{pkey}/export/excel + +기존처럼 프런트에서 표시할 집계 표를 확정해 전달한다. ExportTable JSON 문자열 대신 `tables` 배열을 받고, PRTMODE 선택과 N/% 행 구성은 프런트가 맡는다. DB를 다시 집계하거나 원자료를 조회하지 않는다. 쿼터의 모든 대상 설정을 한 요청에 보내면 각 설정이 별도 시트가 된다. + +```json +{ + "turn": false, + "tables": [{ + "head": "문항 제목", "vname": "1", "qtype": "single", + "body": [ + {"label": "항목|1|1", "total": "전체|1|1"}, + {"label": "선택|1|1", "total": "2"} + ] + }] +} +``` + +body 객체의 키 순서가 열 순서이며 각 행의 키/순서가 동일해야 한다. 셀은 기존 표시 문자열 또는 `값|rowSpan|colSpan`을 사용한다. 일반 보고서는 목차/테이블, 제목·목차 링크·틀 고정·간격·병합·테두리·맑은 고딕 글꼴·N 괄호·소수 표시·Mean 2자리 및 전치 single의 계 열을 유지한다. 쿼터는 시트 제목/행 높이/완료·목표/자동 너비를 유지하고 달성률과 내부 quotaId/isUsed를 출력하지 않는다. 파일명은 토큰을 포함하지 않는 [REPORT]/[QUOTA]+pkey+KST 시간이다. 응답은 기존 다운로드 controller의 octet-stream/UTF-8 Content-Disposition 방식이다. + +워드클라우드는 프런트가 흰 배경 PNG를 렌더링해 table.imagePng에 순수 Base64로 전달한다. SVG 문자열은 수용하지 않으며 누락된 그림을 조용히 성공 처리하지 않는다. 이미지 위치는 기존 데이터 시작 행+30px, 표 오른쪽, 크기는 1000×512px다. PNG당 5MB/4096×4096 한도이며 외부 이미지 주소를 조회하지 않는다. table 최대 1000개, body 최대 10000행, 최대 100만 셀이고 유효하지 않은 표/병합/이미지는 422다. null table/잘못된 DTO는 400이다. + +KriCommon ExcelMapper로 workbook을 만들고 기존 양식만 POI로 적용한다. Java 기본 autoSize는 GDI와 다르므로 기존 맑은 고딕 9/10pt 글자 측정 snapshot을 사용한다. BMP glyph 너비와 기본 여백을 함께 저장하며, 합성 비교에서 열 너비 오차는 Excel 1/256문자 단위 한 개 이내다. 다국어 shaping/이모지, 다른 원본 서버 글꼴 버전 및 실제 운영 파일은 별도 표본 검수가 필요하다. Windows DLL/폰트 파일이나 신규 dependency를 서버에 포함하지 않는다. + +검증: 원본 MakeExcel/EPPlus 4.5.3.3 생성 파일 5개를 대상으로 일반·전치·쿼터·다단 병합·여러 표·주관식 이미지를 비교한다. 셀 값·유형·서식·글꼴·정렬·병합·테두리·행 높이·열 너비·목차 링크·이미지 픽셀/크기/anchor를 검증하며 이미지 anchor 끝 좌표는 픽셀 반올림 오차 1px 이내다. External 페이지/프로젝트 다운로드 제한과 raw export 차단도 API 검사한다. 실제 프런트 PNG 생성/다운로드 화면과 실제 DB·운영 Excel 대조는 후속 작업이다. + +## 원자료 Excel 다운로드 + +POST /api/v1/project/{projectType}/{pkey}/export/data + +요청 예시: + +~~~json +{ + "type": "COMPLETE", + "startDate": "2026-10-01", + "endDate": "2026-10-15" +} +~~~ + +type은 COMPLETE(기본값, 기존 com: Status=10) 또는 INCOMPLETE(기존 not: Status<>10)다. 두 유형 모두 TEST 응답을 제외하며 미완료에서 Status=999를 별도로 제외하지 않는다. 날짜는 둘 다 생략하면 전체, startDate만 있으면 당일, 둘 다 있으면 FN_LAST_TIME(survey_date)의 DATE 양끝 포함 조건이다. endDate만 있거나 역전된 범위/알 수 없는 유형은 400이다. DB 함수의 기존 시간 기준을 유지하며 애플리케이션에서 UTC/KST를 재변환하지 않는다. + +파일은 [DATA]pkey_KST시간.xlsx이며 DATA 다음 GUIDE 두 시트다. DATA는 저장 키 헤더 → 변수 별칭 → 응답 행 순서이고 고정 7열/add_column/인증된 userRole=1001의 파생변수/STRUCTURE 순서를 기존 양식 API와 공유한다. GUIDE는 기존 guide API와 같은 원본 메타데이터를 사용한다. 빈 응답 결과에서도 두 헤더 행과 GUIDE를 제공한다. 응답은 octet-stream/UTF-8 Content-Disposition/Cache-Control: no-store다. + +원본·파생 응답의 DISTINCT 조인, SQL UPPER/FOR XML PATH 직렬화와 후속 ReplaceUnicodeEmpty, 빈 DAT 제외 및 잘못된 JSON의 빈 값 처리, CAPI(surveytype=2) 면접원 조회와 시작/종료/분 단위 소요시간을 유지한다. KIWI 프로필은 원본 원자료 경로처럼 결합하지 않는다. 원본 쿼리에 ORDER BY가 없어 임의 정렬을 추가하지 않았다. Excel 값은 원본처럼 문자열이며 수식으로 실행하지 않는다. 기존 HTML entity/대문자화/Unicode escape 처리 결과도 임의로 보정하지 않는다. + +Common JWT 인증을 유지하고 External 링크 인증은 동일 프로젝트라도 원자료 API를 허용하지 않는다. userRole은 RequestUserContext만 사용하며 query의 userRole로 바꿀 수 없다. 일반 사용자 역할/팀/배정에 따른 접근 제한은 기존 결정대로 추후 일괄 적용한다. 기존 다운로드에는 SiteLog 지점이 없어 새로운 로그 이벤트를 추가하지 않았다. + +검증: 원본 makeExportTable 및 Common 메서드/EPPlus 4.5.3.3로 만든 합성 일반·CAPI 파일 2개와 셀 값/유형/빈 셀/별칭/열 순서/시트/너비/서식 비교, survey 전용 동적 SQL의 완료·미완료/기간/CAPI 분기와 값 바인딩, KON/KONKIWI 라우팅, JWT/공유 링크 차단/DTO 검증 API 테스트. 실제 SQL Server 결과·시간 함수/운영 Excel 및 대용량 부하 비교는 별도 검수다. 현재 기존 방식처럼 응답 데이터와 workbook을 메모리에서 생성하며 스트리밍 다운로드나 캐시는 추가하지 않았다. 공유 DB 연결/DDL/DML·의존성 변경은 없다. +## 문항 제목·문항·응답 데이터 업로드 + +모두 인증이 필요한 multipart/form-data POST이며 파일 필드 이름은 file이다. 응답 메시지는 프런트에서 만들고 서버는 처리 건수만 반환한다. + +| 경로 | 동작 | +|---|---| +| /api/v1/project/{projectType}/{pkey}/import/title | 4열 양식의 QID로 QUESTIONJSON.explain만 변경 | +| /api/v1/project/{projectType}/{pkey}/import/question | 6열 양식으로 문항과 STRUCTURE를 재구성 | +| /api/v1/project/{projectType}/{pkey}/import/data | 두 줄 헤더의 응답 파일로 UPLOAD 데이터 교체 | + +성공 응답 예시: + +~~~json +{"processedRows":2,"affectedRows":2,"removedRows":0,"archivedRows":3} +~~~ + +processedRows는 제목 파일의 데이터 행/등록 문항/등록 응답 수다. affectedRows는 제목 UPDATE 영향 행 합 또는 등록 문항·응답 수다. 동일 QID가 여러 번 나오면 제목은 순서대로 갱신하므로 affectedRows는 고유 QID 개수가 아니다. removedRows는 삭제한 QUESTION 또는 이전 UPLOAD 응답 수, archivedRows는 DEL_로 옮긴 완료 응답 수다. 제목 업로드에서는 두 값 모두 0이다. 빈 파일·파일 누락·알 수 없는 형식·파일 내용 검증 실패는 400이며, 존재하지 않는 프로젝트는 404, STRUCTURE 누락/저장 대상 변경은 409다. + +xlsx/csv/txt와 기존 20MB 제한을 사용한다. xlsx는 첫 시트의 첫 행을 건너뛰고 셀의 저장된 수식 결과를 읽으며 수식을 재계산하지 않는다. 응답 파일은 첫 행을 열 이름으로 사용한 뒤 별칭 행 하나를 추가로 제거한다. 제목·문항은 열 이름과 무관하게 순서대로 4열/6열로 해석한다. 텍스트 파일은 기존처럼 EUC-KR 기본/BOM UTF-8·UTF-16 자동 감지를 사용하며 CSV는 쉼표, TXT는 탭을 단순 분리한다. CSV 따옴표로 감싼 쉼표/줄바꿈을 새롭게 해석하지 않는다. 텍스트의 제목·문항 양식은 첫 행을 자동 제거하지 않는 기존 동작을 유지한다. + +제목 업로드는 qid/variable/title/explain 순서다. 먼저 description/MM_FILE이 아닌 프로젝트 문항의 explain을 빈 문자열로 초기화하고 파일 QID별 explain을 적용한다. variable/title은 수정하지 않는다. 파일에 없는 일반 문항의 explain은 비워지며, 없는 QID는 영향 0, 중복 QID는 마지막 행이 적용된다. 초기화에서 제외된 문항도 파일에 QID를 명시하면 기존처럼 직접 갱신 대상이 된다. + +문항 업로드는 variable/explain/qtype/attr_value/max_value/title 순서다. I/S/M/R/C/NPS/N/O와 속성·기타 보기, Q1부터의 QID/Qorder를 유지한다. QUESTION/QOPTION/QUOTASET과 기존 QSORDER 조건에 맞는 QUOTA를 삭제하고 STRUCTURE.QINFO/LINFO를 비운 뒤 저장한다. DERIVED_VARIABLE과 응답 데이터는 이 초기화에서 삭제하지 않는다. STRUCTURE의 문항별 배열/객체는 원본처럼 JSON 문자열 값으로 저장하며 JSON_QUERY로 구조화하지 않는다. 기존 R의 multi dataset/rank 옵션, option.option 중첩, {t}/{T}, 기타/속성 키와 GetStringFromJson의 연속 공백 제거 규칙을 유지한다. + +응답 업로드는 기존 UPLOAD 응답 삭제 → TEST가 아닌 Status=10 응답의 PKEY를 DEL_+PKEY로 이동 → 새 SURVEY_TYPE=UPLOAD 응답 등록 순서다. TEST/미완료/다른 프로젝트/기존 DERIVED_DATA는 건드리지 않는다. 헤더의 구분자 앞부분을 중복 제거한 뒤 처음 6개 그룹을 제외하는 원본 규칙을 사용하므로 다운로드 양식의 고정 7열 순서를 유지해야 한다. 복수형 숫자 응답의 보기 키 당김, TQ·속성 그룹, .00 제거, 공백/따옴표 치환, INDEX/평균 시각/마지막 페이지 종료 시각과 빈 Status=10을 보존한다. 변환 결과에 같은 복수 응답 키가 반복되면 원본 JSON처럼 반복 키를 유지한다. IDKEY가 비거나 문항 응답이 없는 행, 정수가 아닌 Status, 파싱할 수 없는 날짜는 초기화 전에 실패한다. 날짜가 비면 KST 현재 시각을 사용한다. + +파일 전체 해석·변환을 마친 뒤 초기화/저장을 실행하며 프로젝트별 락과 KON/KONKIWI TransactionTemplate으로 실패 시 모두 롤백한다. LogService의 Upload File 이벤트와 원본 파일 보관은 DB 롤백과 별개로 남을 수 있다. 원본 보관 경로는 kri.kart.upload.directory(기본 ./upload_data)이며 Git에서 제외한다. 파일명에는 충돌 방지 접미사를 붙이고 경로는 입력 파일명으로 정하지 않는다. 인증 주체/IP는 RequestUserContext에서만 받으며 External 링크 인증은 업로드 3종 모두 차단한다. 일반 역할/팀/배정 접근 제한은 기존 결정대로 후속 일괄 적용 대상이다. + +검증은 원본 C# uploadQuestion/saveQuestion/saveStructure/uploadProjectData를 SQL 캡처 대역으로 실행해 생성한 합성 문항·응답 파일/JSON 비교, EUC-KR/BOM·파일 검증·보관, 3종×2개 소스 롤백, H2 초기화/문자열 JSON 저장, 매퍼 바인딩/소스 분리, multipart/JWT/External/건수/로그 주체 검사다. 실제 DB 연결·DDL/DML 실행·배포·의존성 변경은 없으며 운영 파일·SQL Server 트리거/제약·동시 운영 검수는 별도로 필요하다. +## 서비스 연동 누락 점검 및 보완 + +### 연동용 프로젝트 검색 + +GET /api/v1/project/list?projectType=1&intranetCode=261000_part&userTeam=R101&keyword= + +검색 조건이 없으면 기존 화면용 KON/KIWI 통합 목록을 그대로 반환한다. 연동 검색을 사용하면 projectType/intranetCode/userTeam을 함께 전달해야 하며 일부만 주면 400이다. keyword는 선택이고 빈 값이면 intranetCode의 첫 _ 앞부분을 PKEY 부분 일치로 검색한다. keyword가 있으면 인트라넷 코드 조건 대신 PKEY 또는 내부 제목 부분 일치를 사용한다. R로 시작하는 팀은 GKEY 일치, 그 외 팀은 GKEY<>M101, 등록일 내림차순이라는 원본 연동 쿼리 조건을 유지한다. SQL LIKE의 %/_ 의미도 원본과 동일하다. + +연동 검색은 화면용 목록과 다른 계약이다. 최근 1년/상시 노출/회사 유형/진행 상태/특정 담당자 제외 조건, KIWI 제목 접두사를 추가하지 않는다. 상태/조사 유형도 원본 코드 문자열로 유지한다. 응답은 기존 ProjectListDto에 맞춰 projectType/rowNumber를 함께 반환한다. 검색의 userTeam은 조회 조건이며 인증된 역할이나 팀 권한을 바꾸지 않는다. 연동 검색에도 인증된 역할/팀/배정 조건을 추가로 적용하므로 검색의 userTeam으로 권한 범위를 넓힐 수 없다. + +실제 호출처는 Contact의 kart/project-list 프록시와 프로젝트 정보 화면이다. 새 경로/쿼리로 바꾸는 Contact 수정은 이번 범위에 포함하지 않았다. Contact의 기존 skey 발급→공유 링크 발급 흐름은 새 POST /project/{projectType}/{pkey}/share로 한 번에 대체할 수 있다. + +### 응답자별 파생변수 재계산 + +POST /api/v1/project/{projectType}/{pkey}/derived/respondent/{respondentId}/recalculate + +요청 본문은 없고 결과는 variableCount/matchedRespondents다. 기존 전체/개별 변수 재계산과 동일한 계산 모듈을 사용하되, 지정한 프로젝트·IDKEY의 파생 응답만 초기화/저장한다. 정의는 Qorder 순서이며 앞 변수의 결과가 뒤 변수 조건에 반영된다. 대상 응답은 기존처럼 Status=10, SURVEY_TYPE<>TEST다. 미완료/TEST/응답 없음에서도 DERIVED_DATA의 빈 행을 보장하고 해당 응답자의 기존 변수 그룹은 제거하는 원본 동작을 유지한다. DERIVED_DATE의 과거 값은 매칭이 없으면 유지한다. 다른 응답자의 그룹을 일괄 정리하지 않는다. + +실제 호출처는 KON 및 KON-KIWI module/survey.js의 설문 END 처리다. 기존 경로는 인증 없이 호출하지만 새 경로는 Common JWT/API Key 인증이 필요하고 External 공유 링크 인증으로는 호출할 수 없다. 기존 소비자가 새 백엔드를 바로 사용하는 것은 아니며 자동으로 이전 서버 호출을 바꾸지 않았다. 향후 설문 시스템 전환 시 서버 측 API Key 호출/프록시가 필요하며 브라우저 코드에 시스템 API Key를 넣지 않는다. + +### 특수 인증의 확인 범위 + +원본은 KON/KIWI/CLIENT 이름 또는 REPORT_EXTERNAL_SYS의 활성 system_key(PRJCT_/KRIC_SYS_)를 확인해 외부 등급 토큰을 발급한다. 로컬에서 확인한 KART 프런트·Contact·KON/KON-KIWI·프로젝트 소스 중 CLIENT 공유 진입과 KON 공유 링크 생성 호출은 확인했다. PRJCT_/KRIC_SYS_ 등록 키를 실제로 전달하는 소비자는 확인하지 못했다. 이는 운영에서 미사용이라는 판정이 아니며, 등록 데이터나 운영 호출 이력은 조회하지 않았다. + +CLIENT는 이미 구현한 REPORT_URL 검증 기반 /external/{urlKey}/login으로 대체한다. 서버 간 호출은 기존 Common API Key 인증으로 검색/공유/재계산 API를 직접 사용할 수 있으므로 이름 문자열만 받는 /encrypt/external 호환 토큰 발급기는 추가하지 않는다. 시스템 키의 prefix/등록 여부만으로 사용자 권한을 발급하거나 API Key를 대신하지 않는다. 수신 API Key는 Common의 service-code=kart-server 등록·claims·활성화 설정에 따라 검증되며, Intranet 호출에 사용하는 발신 키와 자동으로 동일하게 취급하지 않는다. 등록 키를 사용하는 별도 소비자가 확인되면 해당 소비자의 대상 프로젝트/기능 범위와 새 인증 전환 계약을 추가로 확정해야 한다. + +검증: 연동 검색 분기/코드 정규화/원본 조건과 H2 결과, 응답자별 SQL 스코프·완료/TEST 제외, 정의 간 의존 순서·비대상 조회 방지·KON/KONKIWI 롤백, JWT 입력/API 및 External 차단. API Key 실등록·실제 소비자 전환·공유 DB·운영 트래픽 검수는 실행하지 않았다. 일반 권한 적용, Common/Contact/기존 설문 소스 수정, DB 변경, 배포와 의존성 변경은 없다. + +서버 간 연동은 Common API Key로 각 API를 직접 호출한다. 별도 시스템 로그인이나 API Key→JWT 교환, REPORT_EXTERNAL_SYS 추가 조회는 사용하지 않는다. 일반 사용자 로그인과 REPORT_URL 기반 공유 링크 인증은 유지한다. + + +## 조회 권한 + +- 프로젝트 목록(화면/연동)과 최신 6개는 공용 인증이 검증한 RequestUserContext만 사용한다. JWT와 API Key 모두 동일하게 적용한다. userRole=1001은 로그인 팀에 따른 제한 및 REPORT_ASSIGN 제한 없이 조회하며 기존 업무 검색/제외 조건은 유지한다. +- 2001/3001 및 나머지 비관리자 역할의 화면 목록은 기존 v2 분기를 유지한다: 본인 팀이 M101이 아니면 GKEY=M101 제외, R로 시작하면 본인 팀 GKEY만 조회. M101 소속 목록에는 별도 팀 조건이 없다. 최신 6개는 원본 else-if 순서를 유지하여 M101 소속은 M101만, 나머지는 M101 제외이며 R팀의 추가 동일팀 제한은 없다. 두 조회를 임의로 통일하지 않는다. +- userRole=9001은 위 팀 조건과 REPORT_ASSIGN.member_mail=인증된 userId의 배정 PKEY 조건을 함께 적용한다. 배정 조회는 Report DB에서 요청당 한 번 후 KON/KONKIWI에 전달한다. 빈 배정은 0건이며 원본처럼 is_use를 추가하지 않는다. REPORT_MEMBER의 member_mail을 JWT userId로 그대로 사용하고, 다른 인증도 검증된 userId 그대로 사용한다. 도메인 추가/아이디 추정 변환은 하지 않는다. +- 프로젝트 권한 조건은 SQL의 정렬/최신 50개 후보 선정 전에 적용한다. must-view는 기간 예외일 뿐 팀/배정 제한을 우회하지 않는다. 연동 요청의 userTeam은 업무 검색 조건으로 유지하고 인증 팀은 별도 파라미터로 전달한다. +- 파생변수 관리 목록은 userRole=1001만 전체, 그 외는 인증된 본인 팀 GKEY만 조회한다. 일반 문항 목록/집계 메타데이터에는 이 관리 목록 필터를 추가하지 않는다. +- 적용 범위는 세 조회 조건이다. 변경 API 역할/작성자 제한이나 모든 개별 API의 프로젝트 배정 검사는 새로 추가하지 않는다. 기존 External 프로젝트/페이지 검사, KIWI 프로필/출력 파생 컬럼의 1001 조건, 북마크 공개/본인 비공개 조건은 유지한다. +- 검증은 격리된 H2의 실제 매퍼 결과·소스 라우팅, 배정 없는/불일치/주입 문자열/최신 50개 이전 필터, JWT/API Key 컨텍스트 및 위조 요청 파라미터 검증으로 수행한다. 공유 DB 접속/스키마 변경/실데이터 정합성 검수는 별도이며 프론트 변경은 없다. diff --git a/build.gradle b/build.gradle index 05344d8..6fbb0ec 100644 --- a/build.gradle +++ b/build.gradle @@ -27,8 +27,18 @@ def giteaToken = findProperty('giteaToken') ?: System.getenv('GITEA_MAVEN_TOKEN') ?: '' +def kiwiVersion = 'v0.24.0' +def kiwiPlatform = findProperty('kiwiPlatform') ?: (System.getProperty('os.name').toLowerCase().contains('windows') ? 'win-x64' : (System.getProperty('os.arch') == 'aarch64' ? 'lnx-aarch64' : 'lnx-x86-64')) + repositories { mavenCentral() + ivy { + name = 'kiwiReleases' + url = uri('https://github.com/bab2min/Kiwi/releases/download') + patternLayout { artifact '[revision]/[artifact]-[revision]-[classifier].[ext]' } + metadataSources { artifact() } + content { includeModule('kr.pe.bab2min', 'kiwi-java') } + } maven { name = 'gitea' @@ -45,21 +55,21 @@ configurations.configureEach { } dependencies { - implementation 'com.kri.common:starter:beta.1.6.8' + implementation 'com.kri.common:starter:beta.1.6.9' + implementation 'org.apache.poi:poi-ooxml:5.5.1' + implementation "kr.pe.bab2min:kiwi-java:${kiwiVersion}:${kiwiPlatform}@jar" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-jdbc' + // Common API Key persistence only; business databases use MyBatis. + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.11' - implementation 'io.github.openfeign.querydsl:querydsl-jpa:7.1' - annotationProcessor 'com.querydsl:querydsl-apt:5.0.0:jakarta' - annotationProcessor 'jakarta.annotation:jakarta.annotation-api' - annotationProcessor 'jakarta.persistence:jakarta.persistence-api' runtimeOnly 'com.microsoft.sqlserver:mssql-jdbc:13.2.1.jre11' + runtimeOnly 'com.mysql:mysql-connector-j' implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.5' compileOnly 'org.projectlombok:lombok' @@ -70,18 +80,13 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.security:spring-security-test' testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:3.0.5' + testImplementation 'com.h2database:h2' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } -def querydslDir = layout.buildDirectory.dir('generated/querydsl').get().asFile - -sourceSets { - main.java.srcDirs += [querydslDir] -} tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' - options.generatedSourceOutputDirectory.set(file(querydslDir)) } tasks.withType(Test).configureEach { @@ -93,11 +98,8 @@ tasks.withType(JavaExec).configureEach { } tasks.named('test') { + if (project.hasProperty('kiwiModelDirectory')) { + systemProperty 'kart.kiwi.model-directory', project.property('kiwiModelDirectory') + } useJUnitPlatform() } - -tasks.named('clean') { - doLast { - delete querydslDir - } -} diff --git a/scripts/setup-kiwi-model.ps1 b/scripts/setup-kiwi-model.ps1 new file mode 100644 index 0000000..9c5c66f --- /dev/null +++ b/scripts/setup-kiwi-model.ps1 @@ -0,0 +1,40 @@ +param([string]$ModelDirectory = (Join-Path $PSScriptRoot '../nlp_model/v0.24.0')) + +$ErrorActionPreference = 'Stop' +$version = 'v0.24.0' +$archiveHash = '33188BA932BBA4717BAD5244BBEC0EF8B1C9CBB47E26E68394A7976D8D779083' +$target = [System.IO.Path]::GetFullPath($ModelDirectory) +if ((Test-Path -LiteralPath $target) -and (Get-ChildItem -LiteralPath $target -Force | Select-Object -First 1)) { + throw '모델 대상 폴더가 비어 있지 않습니다. 기존 모델을 덮어쓰지 않습니다.' +} +$temporaryRoot = Join-Path ([System.IO.Path]::GetTempPath()) ('kart-kiwi-' + [guid]::NewGuid()) +New-Item -ItemType Directory -Path $temporaryRoot | Out-Null +$archive = Join-Path $temporaryRoot 'kiwi-model.tgz' +try { + Invoke-WebRequest -Uri "https://github.com/bab2min/Kiwi/releases/download/$version/kiwi_model_${version}_base.tgz" -OutFile $archive + if ((Get-FileHash -LiteralPath $archive -Algorithm SHA256).Hash -ne $archiveHash) { + throw 'Kiwi 모델 파일의 SHA-256이 일치하지 않습니다.' + } + tar -xzf $archive -C $temporaryRoot + if ($LASTEXITCODE -ne 0) { + throw 'Kiwi 모델 압축 해제에 실패했습니다.' + } + $source = Join-Path $temporaryRoot 'models/cong/base' + if (!(Test-Path -LiteralPath (Join-Path $source 'cong.mdl'))) { + throw 'Kiwi 모델 파일이 없습니다.' + } + New-Item -ItemType Directory -Path $target -Force | Out-Null + Get-ChildItem -LiteralPath $source -File | ForEach-Object { + Copy-Item -LiteralPath $_.FullName -Destination (Join-Path $target $_.Name) + } + Write-Output 'Kiwi 0.24.0 모델을 설치했습니다.' +} finally { + $resolvedTemporaryRoot = (Resolve-Path -LiteralPath $temporaryRoot).Path + $expectedParent = [System.IO.Path]::GetFullPath([System.IO.Path]::GetTempPath()).TrimEnd('\') + '\' + $validTemporaryParent = $resolvedTemporaryRoot.StartsWith($expectedParent, [System.StringComparison]::OrdinalIgnoreCase) + $validTemporaryName = [System.IO.Path]::GetFileName($resolvedTemporaryRoot) -match '^kart-kiwi-[0-9a-f-]{36}$' + if (!$validTemporaryParent -or !$validTemporaryName) { + throw '임시 폴더 경로 검증 실패: 삭제하지 않습니다.' + } + Remove-Item -LiteralPath $resolvedTemporaryRoot -Recurse -Force +} diff --git a/src/main/java/com/kri/kart/server/KartServerApplication.java b/src/main/java/com/kri/kart/server/KartServerApplication.java index 46a8098..9fa0abb 100644 --- a/src/main/java/com/kri/kart/server/KartServerApplication.java +++ b/src/main/java/com/kri/kart/server/KartServerApplication.java @@ -2,12 +2,20 @@ package com.kri.kart.server; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; -@SpringBootApplication +// Common owns the isolated API Key JPA configuration. +@SpringBootApplication( + exclude = { + DataSourceAutoConfiguration.class, + HibernateJpaAutoConfiguration.class, + JpaRepositoriesAutoConfiguration.class + }) @ConfigurationPropertiesScan public class KartServerApplication { - public static void main(String[] args) { SpringApplication.run(KartServerApplication.class, args); } diff --git a/src/main/java/com/kri/kart/server/common/consts/ExampleConstant.java b/src/main/java/com/kri/kart/server/common/consts/ExampleConstant.java deleted file mode 100644 index 8bfd907..0000000 --- a/src/main/java/com/kri/kart/server/common/consts/ExampleConstant.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.kri.kart.server.common.consts; - -public final class ExampleConstant { - - public static final int DEFAULT_BATCH_SIZE = 1_000; - - private ExampleConstant() { - } -} diff --git a/src/main/java/com/kri/kart/server/common/enums/ExampleStatus.java b/src/main/java/com/kri/kart/server/common/enums/ExampleStatus.java deleted file mode 100644 index 34484d6..0000000 --- a/src/main/java/com/kri/kart/server/common/enums/ExampleStatus.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.kri.kart.server.common.enums; - -public enum ExampleStatus { - ACTIVE, - INACTIVE -} diff --git a/src/main/java/com/kri/kart/server/common/enums/ProjectType.java b/src/main/java/com/kri/kart/server/common/enums/ProjectType.java new file mode 100644 index 0000000..eb0db43 --- /dev/null +++ b/src/main/java/com/kri/kart/server/common/enums/ProjectType.java @@ -0,0 +1,31 @@ +package com.kri.kart.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.feature.enums.CodeEnum; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +@Schema(description = "프로젝트 유형: 0=KON, 1=KIWI") +public enum ProjectType implements CodeEnum { + KON(0), + KIWI(1); + + private final Integer code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ProjectType fromCode(Integer code) { + if (code == null) { + return null; + } + for (ProjectType s : values()) { + if (s.code.equals(code)) { + return s; + } + } + throw new IllegalArgumentException("Unknown ProjectType code: " + code); + } +} diff --git a/src/main/java/com/kri/kart/server/common/external/intranet/IntranetExtensionApiClient.java b/src/main/java/com/kri/kart/server/common/external/intranet/IntranetExtensionApiClient.java new file mode 100644 index 0000000..72a4ebe --- /dev/null +++ b/src/main/java/com/kri/kart/server/common/external/intranet/IntranetExtensionApiClient.java @@ -0,0 +1,105 @@ +package com.kri.kart.server.common.external.intranet; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.kri.common.feature.http.ExternalApiClient; +import com.kri.common.feature.http.ExternalApiResponse; +import com.kri.common.feature.web.BusinessException; +import com.kri.kart.server.dto.auth.LoginRequestDto; +import java.util.List; +import java.util.Map; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Component; + +@Component +public class IntranetExtensionApiClient { + private final ExternalApiClient externalApiClient; + private final ObjectMapper objectMapper; + private final String intranetExtensionBaseUrl; + private final String apiKey; + private final String apiKeyHeaderName; + + public IntranetExtensionApiClient( + ExternalApiClient externalApiClient, + ObjectMapper objectMapper, + @Value("${kri.api-url.intranet-extension}") String intranetExtensionBaseUrl, + @Value("${kri.auth.apikey.key}") String apiKey, + @Value("${kri.auth.apikey.header-name:X-API-Key}") String apiKeyHeaderName) { + this.externalApiClient = externalApiClient; + this.objectMapper = objectMapper; + this.intranetExtensionBaseUrl = intranetExtensionBaseUrl; + this.apiKey = apiKey; + this.apiKeyHeaderName = apiKeyHeaderName; + } + + public IntranetUserDto searchLoginInfo(LoginRequestDto request) { + try { + ExternalApiResponse response = + externalApiClient.post( + url("/user/login-info"), headers(), objectMapper.writeValueAsString(request)); + if (response.getStatusCode() != 200) { + return null; + } + IntranetUserDto intranetUser = + objectMapper.readValue(response.getBody(), IntranetUserDto.class); + if (intranetUser == null + || intranetUser.getUserId() == null + || intranetUser.getUserId().isBlank() + || intranetUser.getUserRole() == null) return null; + return intranetUser; + } catch (Exception ignored) { + // Failed authentication, HTTP errors, timeouts and malformed responses all fall back. + // Never log the request password, headers or upstream response body. + return null; + } + } + + public List getExcludedOwnerIds() { + try { + ExternalApiResponse response = externalApiClient.get(url("/user/list"), headers()); + if (response.getStatusCode() != 200) { + throw new IllegalStateException("Upstream unavailable"); + } + List users = + objectMapper.readValue(response.getBody(), new TypeReference<>() {}); + if (users == null + || users.stream() + .anyMatch(u -> u == null || u.getUserId() == null || u.getUserId().isBlank())) { + throw new IllegalStateException("Invalid upstream response"); + } + return users.stream() + .filter(u -> "S101".equals(u.getUserTeam()) || "S201".equals(u.getUserTeam())) + .map(IntranetUserDto::getUserId) + .map( + id -> { + if (id == null || id.isBlank()) { + throw new IllegalStateException("Missing upstream ID"); + } + return id; + }) + .distinct() + .toList(); + } catch (Exception ignored) { + // Do not silently broaden the project list when the exclusion source is unavailable. + throw BusinessException.of( + HttpStatus.SERVICE_UNAVAILABLE, + "INTRANET_USER_LIST_UNAVAILABLE", + "프로젝트 제외 대상 사용자 목록을 조회할 수 없습니다."); + } + } + + private String url(String path) { + if (intranetExtensionBaseUrl == null || intranetExtensionBaseUrl.isBlank()) { + throw new IllegalStateException("Intranet base URL is not configured"); + } + return intranetExtensionBaseUrl.replaceAll("/+$", "") + path; + } + + private Map headers() { + if (apiKey == null || apiKey.isBlank()) { + throw new IllegalStateException("Intranet API key is not configured"); + } + return Map.of(apiKeyHeaderName, apiKey); + } +} diff --git a/src/main/java/com/kri/kart/server/common/external/intranet/IntranetUserDto.java b/src/main/java/com/kri/kart/server/common/external/intranet/IntranetUserDto.java new file mode 100644 index 0000000..bf5e69d --- /dev/null +++ b/src/main/java/com/kri/kart/server/common/external/intranet/IntranetUserDto.java @@ -0,0 +1,16 @@ +package com.kri.kart.server.common.external.intranet; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@JsonIgnoreProperties(ignoreUnknown = true) +public class IntranetUserDto { + private String userId; + private String userCmpn; + private String userNm; + private String userTeam; + private Integer userRole; +} diff --git a/src/main/java/com/kri/kart/server/common/util/DateTimeUtil.java b/src/main/java/com/kri/kart/server/common/util/DateTimeUtil.java new file mode 100644 index 0000000..a5aac88 --- /dev/null +++ b/src/main/java/com/kri/kart/server/common/util/DateTimeUtil.java @@ -0,0 +1,21 @@ +package com.kri.kart.server.common.util; + +import java.util.Locale; + +public final class DateTimeUtil { + + private DateTimeUtil() {} + + public static String formatSeconds(String seconds) { + if (seconds == null || seconds.isBlank()) { + return ""; + } + try { + int value = Integer.parseInt(seconds); + return String.format( + Locale.ROOT, "%02d:%02d:%02d", value / 3600, value % 3600 / 60, value % 3600 % 60); + } catch (NumberFormatException ignored) { + return ""; + } + } +} diff --git a/src/main/java/com/kri/kart/server/common/util/StringNormalizer.java b/src/main/java/com/kri/kart/server/common/util/StringNormalizer.java deleted file mode 100644 index 6dcc971..0000000 --- a/src/main/java/com/kri/kart/server/common/util/StringNormalizer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.kri.kart.server.common.util; - -public final class StringNormalizer { - - private StringNormalizer() { - } - - public static String trimToNull(String value) { - if (value == null) return null; - String normalized = value.trim(); - return normalized.isEmpty() ? null : normalized; - } -} diff --git a/src/main/java/com/kri/kart/server/common/validation/package-info.java b/src/main/java/com/kri/kart/server/common/validation/package-info.java index 16c88e4..0bdcc2f 100644 --- a/src/main/java/com/kri/kart/server/common/validation/package-info.java +++ b/src/main/java/com/kri/kart/server/common/validation/package-info.java @@ -1,4 +1,2 @@ -/** - * 프로젝트 전용 Bean Validation annotation과 validator를 배치합니다. - */ +/** 프로젝트 전용 Bean Validation annotation과 validator를 배치합니다. */ package com.kri.kart.server.common.validation; diff --git a/src/main/java/com/kri/kart/server/config/IntranetClientConfig.java b/src/main/java/com/kri/kart/server/config/IntranetClientConfig.java new file mode 100644 index 0000000..6e8312f --- /dev/null +++ b/src/main/java/com/kri/kart/server/config/IntranetClientConfig.java @@ -0,0 +1,17 @@ +package com.kri.kart.server.config; + +import com.kri.common.feature.http.ExternalApiClient; +import java.net.http.HttpClient; +import java.time.Duration; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration(proxyBeanMethods = false) +public class IntranetClientConfig { + @Bean + public ExternalApiClient intranetHttpClient() { + return new ExternalApiClient( + HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(10)).build(), + Duration.ofSeconds(15)); + } +} diff --git a/src/main/java/com/kri/kart/server/config/JdbcConfig.java b/src/main/java/com/kri/kart/server/config/JdbcConfig.java deleted file mode 100644 index 6b4c03f..0000000 --- a/src/main/java/com/kri/kart/server/config/JdbcConfig.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.kri.kart.server.config; - -import javax.sql.DataSource; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.jdbc.core.JdbcTemplate; - -@Configuration -public class JdbcConfig { - - @Bean - public JdbcTemplate jdbcTemplate(DataSource dataSource) { - return new JdbcTemplate(dataSource); - } -} diff --git a/src/main/java/com/kri/kart/server/config/KartDatabaseProperties.java b/src/main/java/com/kri/kart/server/config/KartDatabaseProperties.java new file mode 100644 index 0000000..bdaec8c --- /dev/null +++ b/src/main/java/com/kri/kart/server/config/KartDatabaseProperties.java @@ -0,0 +1,32 @@ +package com.kri.kart.server.config; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; + +@Getter +@Setter +@ConfigurationProperties(prefix = "kri.kart.database") +public class KartDatabaseProperties { + private boolean enabled; + @Valid private Source kon = new Source(); + @Valid private Source konkiwi = new Source(); + @Valid private Source kart = new Source(); + + // No toString: credentials must not appear in logs. + @Getter + @Setter + public static class Source { + @NotBlank private String url; + @NotBlank private String username; + @NotBlank private String password; + + @Min(1) + @Max(50) + private int maximumPoolSize = 5; + } +} diff --git a/src/main/java/com/kri/kart/server/config/KartMyBatisConfig.java b/src/main/java/com/kri/kart/server/config/KartMyBatisConfig.java new file mode 100644 index 0000000..d3b5c21 --- /dev/null +++ b/src/main/java/com/kri/kart/server/config/KartMyBatisConfig.java @@ -0,0 +1,130 @@ +package com.kri.kart.server.config; + +import com.zaxxer.hikari.HikariDataSource; +import jakarta.validation.Validator; +import javax.sql.DataSource; +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.jdbc.datasource.DataSourceTransactionManager; + +@Configuration(proxyBeanMethods = false) +@EnableConfigurationProperties(KartDatabaseProperties.class) +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class KartMyBatisConfig { + @Bean(destroyMethod = "close") + public HikariDataSource konDataSource(KartDatabaseProperties properties, Validator validator) { + return dataSource("kon", properties.getKon(), validator); + } + + @Bean(destroyMethod = "close") + public HikariDataSource konkiwiDataSource( + KartDatabaseProperties properties, Validator validator) { + return dataSource("konkiwi", properties.getKonkiwi(), validator); + } + + @Bean(destroyMethod = "close") + @Primary + public HikariDataSource kartDataSource(KartDatabaseProperties properties, Validator validator) { + return dataSource("kart", properties.getKart(), validator); + } + + private HikariDataSource dataSource( + String name, KartDatabaseProperties.Source source, Validator validator) { + if (source == null + || !validator.validate(source).isEmpty() + || !source.getUrl().startsWith("jdbc:sqlserver://")) { + throw new IllegalArgumentException("Invalid " + name + " database configuration"); + } + // Lazy pool: creating beans and SqlSessionFactory never opens a real connection. + HikariDataSource dataSource = new HikariDataSource(); + dataSource.setPoolName("kart".equals(name) ? name : "kart-" + name); + dataSource.setDriverClassName("com.microsoft.sqlserver.jdbc.SQLServerDriver"); + dataSource.setJdbcUrl(source.getUrl()); + dataSource.setUsername(source.getUsername()); + dataSource.setPassword(source.getPassword()); + dataSource.setMaximumPoolSize(source.getMaximumPoolSize()); + dataSource.setMinimumIdle(0); + dataSource.setConnectionTimeout(10000); + dataSource.setInitializationFailTimeout(-1); + return dataSource; + } + + @Bean + public SqlSessionFactory konSqlSessionFactory(@Qualifier("konDataSource") DataSource dataSource) + throws Exception { + return sessionFactory(dataSource, "survey"); + } + + @Bean + public SqlSessionFactory konkiwiSqlSessionFactory( + @Qualifier("konkiwiDataSource") DataSource dataSource) throws Exception { + return sessionFactory(dataSource, "survey"); + } + + @Bean + @Primary + public SqlSessionFactory kartSqlSessionFactory( + @Qualifier("kartDataSource") DataSource dataSource) throws Exception { + return sessionFactory(dataSource, "kart"); + } + + private SqlSessionFactory sessionFactory(DataSource dataSource, String mapperGroup) + throws Exception { + SqlSessionFactoryBean factory = new SqlSessionFactoryBean(); + factory.setDataSource(dataSource); + org.apache.ibatis.session.Configuration configuration = + new org.apache.ibatis.session.Configuration(); + configuration.setMapUnderscoreToCamelCase(true); + configuration.setDatabaseId(mapperGroup); + factory.setConfiguration(configuration); + factory.setMapperLocations( + new PathMatchingResourcePatternResolver().getResources("classpath*:mybatis/mapper/*.xml")); + return factory.getObject(); + } + + @Bean + public SqlSessionTemplate konSqlSessionTemplate( + @Qualifier("konSqlSessionFactory") SqlSessionFactory factory) { + return new SqlSessionTemplate(factory); + } + + @Bean + public SqlSessionTemplate konkiwiSqlSessionTemplate( + @Qualifier("konkiwiSqlSessionFactory") SqlSessionFactory factory) { + return new SqlSessionTemplate(factory); + } + + @Bean + @Primary + public SqlSessionTemplate kartSqlSessionTemplate( + @Qualifier("kartSqlSessionFactory") SqlSessionFactory factory) { + return new SqlSessionTemplate(factory); + } + + @Bean + public DataSourceTransactionManager konTransactionManager( + @Qualifier("konDataSource") DataSource dataSource) { + return new DataSourceTransactionManager(dataSource); + } + + @Bean + public DataSourceTransactionManager konkiwiTransactionManager( + @Qualifier("konkiwiDataSource") DataSource dataSource) { + return new DataSourceTransactionManager(dataSource); + } + + @Bean + @Primary + public DataSourceTransactionManager kartTransactionManager( + @Qualifier("kartDataSource") DataSource dataSource) { + return new DataSourceTransactionManager(dataSource); + } +} diff --git a/src/main/java/com/kri/kart/server/config/QueryDSLConfig.java b/src/main/java/com/kri/kart/server/config/QueryDSLConfig.java deleted file mode 100644 index a6a74df..0000000 --- a/src/main/java/com/kri/kart/server/config/QueryDSLConfig.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.kri.kart.server.config; - -import com.querydsl.jpa.impl.JPAQueryFactory; -import jakarta.persistence.EntityManager; -import lombok.RequiredArgsConstructor; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -@RequiredArgsConstructor -public class QueryDSLConfig { - - private final EntityManager entityManager; - - @Bean - public JPAQueryFactory jpaQueryFactory() { - return new JPAQueryFactory(entityManager); - } -} diff --git a/src/main/java/com/kri/kart/server/config/ShareLinkConfig.java b/src/main/java/com/kri/kart/server/config/ShareLinkConfig.java new file mode 100644 index 0000000..282fbe7 --- /dev/null +++ b/src/main/java/com/kri/kart/server/config/ShareLinkConfig.java @@ -0,0 +1,23 @@ +package com.kri.kart.server.config; + +import com.kri.kart.server.service.ShareLinkService; +import com.kri.kart.server.service.share.ExternalAccessInterceptor; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration(proxyBeanMethods = false) +@EnableConfigurationProperties(ShareLinkProperties.class) +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class ShareLinkConfig implements WebMvcConfigurer { + private final ShareLinkService shareLinkService; + + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(new ExternalAccessInterceptor(shareLinkService)).addPathPatterns("/**"); + } +} diff --git a/src/main/java/com/kri/kart/server/config/ShareLinkProperties.java b/src/main/java/com/kri/kart/server/config/ShareLinkProperties.java new file mode 100644 index 0000000..f85118e --- /dev/null +++ b/src/main/java/com/kri/kart/server/config/ShareLinkProperties.java @@ -0,0 +1,14 @@ +package com.kri.kart.server.config; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; + +@Getter +@Setter +@ConfigurationProperties("kri.kart.share") +public class ShareLinkProperties { + private String publicOrigin = "https://kart.kric.com"; + private String legacyKey; + private String legacyIv; +} diff --git a/src/main/java/com/kri/kart/server/config/WebResourceConfig.java b/src/main/java/com/kri/kart/server/config/WebResourceConfig.java index 14499bc..d141204 100644 --- a/src/main/java/com/kri/kart/server/config/WebResourceConfig.java +++ b/src/main/java/com/kri/kart/server/config/WebResourceConfig.java @@ -14,13 +14,11 @@ public class WebResourceConfig implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { - String location = Path.of(fileStorageProperties.getBaseDir()) - .toAbsolutePath() - .normalize() - .toUri() - .toString(); + String location = + Path.of(fileStorageProperties.getBaseDir()).toAbsolutePath().normalize().toUri().toString(); - registry.addResourceHandler(fileStorageProperties.getResourcePattern()) + registry + .addResourceHandler(fileStorageProperties.getResourcePattern()) .addResourceLocations(location.endsWith("/") ? location : location + "/"); } } diff --git a/src/main/java/com/kri/kart/server/controller/AuthController.java b/src/main/java/com/kri/kart/server/controller/AuthController.java new file mode 100644 index 0000000..cfd1796 --- /dev/null +++ b/src/main/java/com/kri/kart/server/controller/AuthController.java @@ -0,0 +1,27 @@ +package com.kri.kart.server.controller; + +import com.kri.common.feature.web.RequestUserContext; +import com.kri.kart.server.dto.auth.LoginRequestDto; +import com.kri.kart.server.dto.auth.LoginResponseDto; +import com.kri.kart.server.service.AuthService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/auth") +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class AuthController { + private final AuthService authService; + + @PostMapping("/login") + public LoginResponseDto login( + @Valid @RequestBody LoginRequestDto request, RequestUserContext ctx) { + return authService.login(request, ctx.getClientIp()); + } +} diff --git a/src/main/java/com/kri/kart/server/controller/BookmarkController.java b/src/main/java/com/kri/kart/server/controller/BookmarkController.java new file mode 100644 index 0000000..505a602 --- /dev/null +++ b/src/main/java/com/kri/kart/server/controller/BookmarkController.java @@ -0,0 +1,71 @@ +package com.kri.kart.server.controller; + +import com.kri.common.feature.web.RequestUserContext; +import com.kri.kart.server.common.enums.ProjectType; +import com.kri.kart.server.dto.bookmark.BookmarkDto; +import com.kri.kart.server.dto.bookmark.BookmarkSaveRequestDto; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.service.BookmarkService; +import io.swagger.v3.oas.annotations.Parameter; +import jakarta.validation.Valid; +import jakarta.validation.groups.Default; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.http.MediaType; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/project/{projectType}/{pkey}/bookmark") +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class BookmarkController { + private final BookmarkService bookmarkService; + + @GetMapping("/list") + public List list( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @RequestParam String page, + @Parameter(hidden = true) RequestUserContext ctx) { + return bookmarkService.list(new ProjectRefDto(projectType, pkey), page, ctx.getUserId()); + } + + @PostMapping(produces = MediaType.TEXT_PLAIN_VALUE) + public String create( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @Validated({Default.class, BookmarkSaveRequestDto.Create.class}) @RequestBody + BookmarkSaveRequestDto request, + @Parameter(hidden = true) RequestUserContext ctx) { + return bookmarkService.create(new ProjectRefDto(projectType, pkey), request, ctx); + } + + @PutMapping(value = "/{bookmarkId}", produces = MediaType.TEXT_PLAIN_VALUE) + public String update( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @PathVariable String bookmarkId, + @Valid @RequestBody BookmarkSaveRequestDto request, + @Parameter(hidden = true) RequestUserContext ctx) { + return bookmarkService.update(new ProjectRefDto(projectType, pkey), bookmarkId, request, ctx); + } + + @DeleteMapping(value = "/{bookmarkId}", produces = MediaType.APPLICATION_JSON_VALUE) + public boolean delete( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @PathVariable String bookmarkId, + @Parameter(hidden = true) RequestUserContext ctx) { + return bookmarkService.delete(new ProjectRefDto(projectType, pkey), bookmarkId, ctx); + } +} diff --git a/src/main/java/com/kri/kart/server/controller/DerivedController.java b/src/main/java/com/kri/kart/server/controller/DerivedController.java new file mode 100644 index 0000000..bacfaea --- /dev/null +++ b/src/main/java/com/kri/kart/server/controller/DerivedController.java @@ -0,0 +1,91 @@ +package com.kri.kart.server.controller; + +import com.kri.common.feature.web.RequestUserContext; +import com.kri.kart.server.common.enums.ProjectType; +import com.kri.kart.server.dto.derived.DerivedCalculationDto; +import com.kri.kart.server.dto.derived.DerivedSaveRequestDto; +import com.kri.kart.server.dto.derived.DerivedVariableDto; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.service.DerivedManagementService; +import com.kri.kart.server.service.DerivedService; +import jakarta.validation.Valid; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/project/{projectType}/{pkey}/derived") +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class DerivedController { + private final DerivedService derivedService; + private final DerivedManagementService derivedManagementService; + + @GetMapping("/list") + public List list( + @PathVariable ProjectType projectType, @PathVariable String pkey, RequestUserContext ctx) { + return derivedService.list(new ProjectRefDto(projectType, pkey), ctx); + } + + @PostMapping + public String create( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @Valid @RequestBody DerivedSaveRequestDto request, + RequestUserContext ctx) { + return derivedManagementService.save(new ProjectRefDto(projectType, pkey), null, request, ctx); + } + + @PutMapping("/{variableId}") + public String update( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @PathVariable String variableId, + @Valid @RequestBody DerivedSaveRequestDto request, + RequestUserContext ctx) { + return derivedManagementService.save( + new ProjectRefDto(projectType, pkey), variableId, request, ctx); + } + + @DeleteMapping("/{variableId}") + public boolean delete( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @PathVariable String variableId, + RequestUserContext ctx) { + return derivedManagementService.delete(new ProjectRefDto(projectType, pkey), variableId, ctx); + } + + @PostMapping("/{variableId}/recalculate") + public DerivedCalculationDto recalculate( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @PathVariable String variableId, + RequestUserContext ctx) { + return derivedManagementService.recalculate( + new ProjectRefDto(projectType, pkey), variableId, ctx); + } + + @PostMapping("/respondent/{respondentId}/recalculate") + public DerivedCalculationDto recalculateRespondent( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @PathVariable String respondentId) { + return derivedManagementService.recalculateRespondent( + new ProjectRefDto(projectType, pkey), respondentId); + } + + @PostMapping("/recalculate") + public DerivedCalculationDto recalculateAll( + @PathVariable ProjectType projectType, @PathVariable String pkey, RequestUserContext ctx) { + return derivedManagementService.recalculate(new ProjectRefDto(projectType, pkey), null, ctx); + } +} diff --git a/src/main/java/com/kri/kart/server/controller/ExampleController.java b/src/main/java/com/kri/kart/server/controller/ExampleController.java deleted file mode 100644 index 3a72928..0000000 --- a/src/main/java/com/kri/kart/server/controller/ExampleController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.kri.kart.server.controller; - -import com.kri.kart.server.dto.request.CreateExampleRequest; -import com.kri.kart.server.dto.response.ExampleResponse; -import com.kri.kart.server.service.ExampleService; -import jakarta.validation.Valid; -import java.util.List; -import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequiredArgsConstructor -@RequestMapping("/api/v1/examples") -public class ExampleController { - - private final ExampleService exampleService; - - @GetMapping - public List search( - @RequestParam(defaultValue = "") String keyword, - @RequestParam(defaultValue = "20") int limit - ) { - return exampleService.search(keyword, limit); - } - - @PostMapping - @ResponseStatus(HttpStatus.CREATED) - public ExampleResponse create(@Valid @RequestBody CreateExampleRequest request) { - return exampleService.create(request); - } -} diff --git a/src/main/java/com/kri/kart/server/controller/ExportController.java b/src/main/java/com/kri/kart/server/controller/ExportController.java new file mode 100644 index 0000000..031c156 --- /dev/null +++ b/src/main/java/com/kri/kart/server/controller/ExportController.java @@ -0,0 +1,120 @@ +package com.kri.kart.server.controller; + +import com.kri.common.feature.file.FileUtil; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.kart.server.common.enums.ProjectType; +import com.kri.kart.server.dto.export.AggregateExcelRequestDto; +import com.kri.kart.server.dto.export.ExportFileDto; +import com.kri.kart.server.dto.export.RawDataExportRequestDto; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.service.AggregateExcelService; +import com.kri.kart.server.service.ExportService; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.validation.Valid; +import java.nio.charset.StandardCharsets; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.http.ContentDisposition; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1") +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +@ApiResponse( + responseCode = "200", + content = + @Content( + mediaType = "application/octet-stream", + schema = @Schema(type = "string", format = "binary"))) +public class ExportController { + private final ExportService exportService; + private final AggregateExcelService aggregateExcelService; + + @PostMapping("/project/{projectType}/{pkey}/export/excel/table") + public ResponseEntity reportExcel( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @Valid @RequestBody AggregateExcelRequestDto request) { + return download(aggregateExcelService.report(new ProjectRefDto(projectType, pkey), request)); + } + + @PostMapping("/quota/{projectType}/{pkey}/export/excel") + public ResponseEntity quotaExcel( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @Valid @RequestBody AggregateExcelRequestDto request) { + return download(aggregateExcelService.quota(new ProjectRefDto(projectType, pkey), request)); + } + + @GetMapping(value = "/export/form/question", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) + public ResponseEntity questionForm() { + return download(exportService.questionForm()); + } + + @GetMapping( + value = "/project/{projectType}/{pkey}/export/form/data", + produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) + public ResponseEntity dataForm( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @Parameter(hidden = true) RequestUserContext ctx) { + return download( + exportService.dataForm(new ProjectRefDto(projectType, pkey), ctx.getUserRole())); + } + + @GetMapping( + value = "/project/{projectType}/{pkey}/export/form/title", + produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) + public ResponseEntity titleForm( + @PathVariable ProjectType projectType, @PathVariable String pkey) { + return download(exportService.titleForm(new ProjectRefDto(projectType, pkey))); + } + + @GetMapping( + value = "/project/{projectType}/{pkey}/export/guide", + produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) + public ResponseEntity guide( + @PathVariable ProjectType projectType, @PathVariable String pkey) { + return download(exportService.guide(new ProjectRefDto(projectType, pkey))); + } + + @PostMapping( + value = "/project/{projectType}/{pkey}/export/data", + produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) + public ResponseEntity data( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @Valid @RequestBody RawDataExportRequestDto request, + @Parameter(hidden = true) RequestUserContext ctx) { + return download( + exportService.data(new ProjectRefDto(projectType, pkey), ctx.getUserRole(), request)); + } + + private ResponseEntity download(ExportFileDto file) { + String fileName = + FileUtil.extractFileNameFromPath(file.getFileName()) + .replaceAll("[\\p{Cntrl}\\\\/:*?\"<>|]", "_"); + String disposition = + ContentDisposition.attachment() + .filename(fileName, StandardCharsets.UTF_8) + .build() + .toString(); + return ResponseEntity.ok() + .contentType(MediaType.APPLICATION_OCTET_STREAM) + .header(HttpHeaders.CONTENT_DISPOSITION, disposition) + .header(HttpHeaders.CACHE_CONTROL, "no-store") + .body(file.getContent()); + } +} diff --git a/src/main/java/com/kri/kart/server/controller/ExternalController.java b/src/main/java/com/kri/kart/server/controller/ExternalController.java new file mode 100644 index 0000000..ffc2a7f --- /dev/null +++ b/src/main/java/com/kri/kart/server/controller/ExternalController.java @@ -0,0 +1,28 @@ +package com.kri.kart.server.controller; + +import com.kri.common.feature.web.RequestUserContext; +import com.kri.kart.server.dto.share.ExternalLoginResponseDto; +import com.kri.kart.server.service.ShareLinkService; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class ExternalController { + private final ShareLinkService shareLinkService; + + @PostMapping("/api/v1/external/{urlKey}/login") + @Operation(summary = "공유 링크 전용 인증 발급", description = "검증된 링크의 프로젝트·페이지 범위에 제한되는 24시간 인증") + public ResponseEntity login( + @PathVariable String urlKey, RequestUserContext ctx) { + return ResponseEntity.ok() + .header("Cache-Control", "no-store") + .body(shareLinkService.login(urlKey, ctx.getClientIp())); + } +} diff --git a/src/main/java/com/kri/kart/server/controller/ImportController.java b/src/main/java/com/kri/kart/server/controller/ImportController.java new file mode 100644 index 0000000..bc24f41 --- /dev/null +++ b/src/main/java/com/kri/kart/server/controller/ImportController.java @@ -0,0 +1,52 @@ +package com.kri.kart.server.controller; + +import com.kri.common.feature.web.RequestUserContext; +import com.kri.kart.server.common.enums.ProjectType; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.upload.ImportResultDto; +import com.kri.kart.server.service.ImportService; +import io.swagger.v3.oas.annotations.Parameter; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.http.MediaType; +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.RequestPart; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/v1/project/{projectType}/{pkey}/import") +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class ImportController { + private final ImportService importService; + + @PostMapping(value = "/title", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public ImportResultDto titles( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @RequestPart(value = "file", required = false) MultipartFile file, + @Parameter(hidden = true) RequestUserContext ctx) { + return importService.titles(new ProjectRefDto(projectType, pkey), file, ctx); + } + + @PostMapping(value = "/question", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public ImportResultDto questions( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @RequestPart(value = "file", required = false) MultipartFile file, + @Parameter(hidden = true) RequestUserContext ctx) { + return importService.questions(new ProjectRefDto(projectType, pkey), file, ctx); + } + + @PostMapping(value = "/data", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public ImportResultDto data( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @RequestPart(value = "file", required = false) MultipartFile file, + @Parameter(hidden = true) RequestUserContext ctx) { + return importService.data(new ProjectRefDto(projectType, pkey), file, ctx); + } +} diff --git a/src/main/java/com/kri/kart/server/controller/LogController.java b/src/main/java/com/kri/kart/server/controller/LogController.java new file mode 100644 index 0000000..3ba12a9 --- /dev/null +++ b/src/main/java/com/kri/kart/server/controller/LogController.java @@ -0,0 +1,43 @@ +package com.kri.kart.server.controller; + +import com.kri.common.feature.web.BusinessException; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.kart.server.dto.log.VisitLogRequestDto; +import com.kri.kart.server.dto.share.ShareLinkDto; +import com.kri.kart.server.service.LogService; +import com.kri.kart.server.service.ShareLinkService; +import io.swagger.v3.oas.annotations.Parameter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/log") +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class LogController { + private final LogService logService; + + @PostMapping(value = "/visit", produces = MediaType.TEXT_PLAIN_VALUE) + public String visit( + @Valid @RequestBody VisitLogRequestDto request, + @Parameter(hidden = true) RequestUserContext ctx, + HttpServletRequest servletRequest) { + ShareLinkDto link = + (ShareLinkDto) servletRequest.getAttribute(ShareLinkService.REQUEST_LINK_ATTRIBUTE); + if (link != null + && (link.getProjectType() != request.getProjectType() + || !link.getPkey().equals(request.getPkey()))) { + throw BusinessException.forbidden("EXTERNAL_SCOPE_DENIED", "공유 프로젝트의 방문 로그만 기록할 수 있습니다."); + } + logService.writeVisitLog( + request.getProjectType(), request.getPkey(), request.getLogContent(), ctx); + return "PASS"; + } +} diff --git a/src/main/java/com/kri/kart/server/controller/PingController.java b/src/main/java/com/kri/kart/server/controller/PingController.java deleted file mode 100644 index 7d27b4a..0000000 --- a/src/main/java/com/kri/kart/server/controller/PingController.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.kri.kart.server.controller; - -import java.util.Map; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class PingController { - - @GetMapping("/ping") - public Map ping() { - return Map.of("status", "ok"); - } -} diff --git a/src/main/java/com/kri/kart/server/controller/ProjectController.java b/src/main/java/com/kri/kart/server/controller/ProjectController.java new file mode 100644 index 0000000..d1d7316 --- /dev/null +++ b/src/main/java/com/kri/kart/server/controller/ProjectController.java @@ -0,0 +1,84 @@ +package com.kri.kart.server.controller; + +import com.kri.common.feature.web.RequestUserContext; +import com.kri.kart.server.common.enums.ProjectType; +import com.kri.kart.server.dto.project.CustomProgressDto; +import com.kri.kart.server.dto.project.LoiDto; +import com.kri.kart.server.dto.project.ProgressDayDto; +import com.kri.kart.server.dto.project.ProgressScreenDto; +import com.kri.kart.server.dto.project.ProgressSearchDto; +import com.kri.kart.server.dto.project.ProgressTypeDto; +import com.kri.kart.server.dto.project.ProjectLinkSearchDto; +import com.kri.kart.server.dto.project.ProjectListDto; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.project.ProjectSummaryDto; +import com.kri.kart.server.service.CustomProgressService; +import com.kri.kart.server.service.ProgressService; +import com.kri.kart.server.service.ProjectService; +import jakarta.validation.Valid; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/project") +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class ProjectController { + private final ProjectService projectService; + private final ProgressService progressService; + private final CustomProgressService customProgressService; + + @GetMapping("/list") + public List list( + @Valid @ParameterObject @ModelAttribute ProjectLinkSearchDto search, RequestUserContext ctx) { + return projectService.list(search, ctx); + } + + @GetMapping("/summary") + public List summary(RequestUserContext ctx) { + return projectService.summary(ctx); + } + + @GetMapping("/{projectType}/{pkey}/progress/day") + public List daily( + @PathVariable ProjectType projectType, @PathVariable String pkey) { + return progressService.daily(new ProjectRefDto(projectType, pkey)); + } + + @GetMapping("/{projectType}/{pkey}/progress/type") + public List type( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @Valid @ParameterObject @ModelAttribute ProgressSearchDto search) { + return progressService.type(new ProjectRefDto(projectType, pkey), search); + } + + @GetMapping("/{projectType}/{pkey}/progress/loi") + public List loi( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @Valid @ParameterObject @ModelAttribute ProgressSearchDto search) { + return progressService.loi(new ProjectRefDto(projectType, pkey), search); + } + + @GetMapping("/{projectType}/{pkey}/progress/screen") + public List screen( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @Valid @ParameterObject @ModelAttribute ProgressSearchDto search) { + return progressService.screen(new ProjectRefDto(projectType, pkey), search); + } + + @GetMapping("/{projectType}/{pkey}/progress/custom") + public List custom( + @PathVariable ProjectType projectType, @PathVariable String pkey) { + return customProgressService.list(new ProjectRefDto(projectType, pkey)); + } +} diff --git a/src/main/java/com/kri/kart/server/controller/QuestionController.java b/src/main/java/com/kri/kart/server/controller/QuestionController.java new file mode 100644 index 0000000..291a6a3 --- /dev/null +++ b/src/main/java/com/kri/kart/server/controller/QuestionController.java @@ -0,0 +1,40 @@ +package com.kri.kart.server.controller; + +import com.kri.common.feature.web.RequestUserContext; +import com.kri.kart.server.common.enums.ProjectType; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.question.QuestionDto; +import com.kri.kart.server.service.QuestionService; +import io.swagger.v3.oas.annotations.Parameter; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/project/{projectType}/{pkey}/question") +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class QuestionController { + private final QuestionService questionService; + + @GetMapping("/list") + public List list( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @Parameter(hidden = true) RequestUserContext ctx) { + return questionService.list(new ProjectRefDto(projectType, pkey), ctx.getUserRole()); + } + + @GetMapping("/{qid}") + public List detail( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @PathVariable String qid, + @Parameter(hidden = true) RequestUserContext ctx) { + return questionService.detail(new ProjectRefDto(projectType, pkey), qid, ctx.getUserRole()); + } +} diff --git a/src/main/java/com/kri/kart/server/controller/QuotaController.java b/src/main/java/com/kri/kart/server/controller/QuotaController.java new file mode 100644 index 0000000..084d135 --- /dev/null +++ b/src/main/java/com/kri/kart/server/controller/QuotaController.java @@ -0,0 +1,45 @@ +package com.kri.kart.server.controller; + +import com.kri.common.feature.web.RequestUserContext; +import com.kri.kart.server.common.enums.ProjectType; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.quota.QuotaResultDto; +import com.kri.kart.server.dto.quota.QuotaResultRequestDto; +import com.kri.kart.server.dto.quota.QuotaSetDto; +import com.kri.kart.server.service.QuotaService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import jakarta.validation.Valid; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/quota") +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class QuotaController { + private final QuotaService quotaService; + + @GetMapping("/{projectType}/{pkey}/list") + public List list(@PathVariable ProjectType projectType, @PathVariable String pkey) { + return quotaService.list(new ProjectRefDto(projectType, pkey)); + } + + @PostMapping("/{projectType}/{pkey}/{quotaOrder}/result") + @Operation(summary = "저장된 쿼터 설정의 집계 결과", description = "첫 ROW·COL·FILTER로 집계하고 완료수/목표수/달성률 반환") + public QuotaResultDto result( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @PathVariable int quotaOrder, + @Valid @RequestBody QuotaResultRequestDto request, + @Parameter(hidden = true) RequestUserContext ctx) { + return quotaService.result(new ProjectRefDto(projectType, pkey), quotaOrder, request, ctx); + } +} diff --git a/src/main/java/com/kri/kart/server/controller/ShareLinkController.java b/src/main/java/com/kri/kart/server/controller/ShareLinkController.java new file mode 100644 index 0000000..6a115c2 --- /dev/null +++ b/src/main/java/com/kri/kart/server/controller/ShareLinkController.java @@ -0,0 +1,40 @@ +package com.kri.kart.server.controller; + +import com.kri.common.feature.web.RequestUserContext; +import com.kri.kart.server.common.enums.ProjectType; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.share.ShareLinkDto; +import com.kri.kart.server.dto.share.ShareLinkRequestDto; +import com.kri.kart.server.service.ShareLinkService; +import io.swagger.v3.oas.annotations.Operation; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class ShareLinkController { + private final ShareLinkService shareLinkService; + + @PostMapping("/api/v1/project/{projectType}/{pkey}/share") + @Operation(summary = "공유 링크 발급 또는 재사용") + public ShareLinkDto create( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @Valid @RequestBody ShareLinkRequestDto request, + RequestUserContext ctx) { + return shareLinkService.create(new ProjectRefDto(projectType, pkey), request, ctx); + } + + @GetMapping("/api/v1/share/{urlKey}") + @Operation(summary = "공유 링크 정보 조회", description = "내부 인증 필요. 랜딩 횟수를 증가시키지 않는다.") + public ShareLinkDto lookup(@PathVariable String urlKey) { + return shareLinkService.lookup(urlKey); + } +} diff --git a/src/main/java/com/kri/kart/server/controller/StatisticsController.java b/src/main/java/com/kri/kart/server/controller/StatisticsController.java new file mode 100644 index 0000000..8acaae2 --- /dev/null +++ b/src/main/java/com/kri/kart/server/controller/StatisticsController.java @@ -0,0 +1,93 @@ +package com.kri.kart.server.controller; + +import com.kri.common.feature.web.BusinessException; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.kart.server.common.enums.ProjectType; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.share.ShareLinkDto; +import com.kri.kart.server.dto.statistics.StatisticsBatchDto; +import com.kri.kart.server.dto.statistics.StatisticsBatchRequestDto; +import com.kri.kart.server.dto.statistics.StatisticsStreamEventDto; +import com.kri.kart.server.service.ShareLinkService; +import com.kri.kart.server.service.StatisticsService; +import com.kri.kart.server.service.statistics.StatisticsStreamService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import java.net.URI; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.web.context.RequestAttributeSecurityContextRepository; +import org.springframework.security.web.context.SecurityContextRepository; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyEmitter; + +@RestController +@RequestMapping("/api/v1/project/{projectType}/{pkey}/statistics") +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class StatisticsController { + private static final String STANDARD_MODE = "STANDARD"; + private static final String CROSSTAB_PAGE = "/Report/Crosstab"; + + private final StatisticsService statisticsService; + private final StatisticsStreamService statisticsStreamService; + private final SecurityContextRepository securityContextRepository = + new RequestAttributeSecurityContextRepository(); + + @PostMapping(value = "/result", produces = "application/x-ndjson") + @Operation( + summary = "일반 보고서 배열 집계 스트림", + description = "공유 데이터를 한 번 조회하고 indexes 순서대로 result/error, 마지막 complete 전송") + @ApiResponse( + responseCode = "200", + content = + @Content( + mediaType = "application/x-ndjson", + schema = @Schema(implementation = StatisticsStreamEventDto.class))) + public ResponseEntity result( + @PathVariable ProjectType projectType, + @PathVariable String pkey, + @Valid @RequestBody StatisticsBatchRequestDto request, + @Parameter(hidden = true) RequestUserContext ctx, + HttpServletRequest servletRequest, + HttpServletResponse servletResponse) { + if (isCrosstabPageLink(servletRequest) && !STANDARD_MODE.equals(request.getMode())) { + throw BusinessException.forbidden( + "EXTERNAL_SCOPE_DENIED", "Cross Tab 공유 링크에서는 Cross Tab 집계만 허용됩니다."); + } + StatisticsBatchDto statisticsBatch = + statisticsService.prepare( + new ProjectRefDto(projectType, pkey), + request.requests(), + ctx); + // Common authentication is stateless; retain only this request's identity for ASYNC dispatch. + securityContextRepository.saveContext( + SecurityContextHolder.getContext(), servletRequest, servletResponse); + return ResponseEntity.ok() + .header("Cache-Control", "no-store") + .header("X-Accel-Buffering", "no") + .header("Content-Type", "application/x-ndjson;charset=UTF-8") + .body(statisticsStreamService.stream(statisticsBatch)); + } + + /** A page-only Cross Tab share link may request Cross Tab (STANDARD) results only. */ + private boolean isCrosstabPageLink(HttpServletRequest servletRequest) { + ShareLinkDto link = + (ShareLinkDto) servletRequest.getAttribute(ShareLinkService.REQUEST_LINK_ATTRIBUTE); + return link != null + && link.isPageOnly() + && URI.create(link.getRealUrl()).getPath().equals(CROSSTAB_PAGE); + } +} diff --git a/src/main/java/com/kri/kart/server/dto/auth/LoginRequestDto.java b/src/main/java/com/kri/kart/server/dto/auth/LoginRequestDto.java new file mode 100644 index 0000000..6c7fcf9 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/auth/LoginRequestDto.java @@ -0,0 +1,17 @@ +package com.kri.kart.server.dto.auth; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Schema(description = "로그인 요청") +public class LoginRequestDto { + @NotBlank private String userId; + + @NotBlank + @Schema(accessMode = Schema.AccessMode.WRITE_ONLY) + private String userPw; +} diff --git a/src/main/java/com/kri/kart/server/dto/auth/LoginResponseDto.java b/src/main/java/com/kri/kart/server/dto/auth/LoginResponseDto.java new file mode 100644 index 0000000..7793d3b --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/auth/LoginResponseDto.java @@ -0,0 +1,13 @@ +package com.kri.kart.server.dto.auth; + +import com.kri.common.feature.auth.dto.JwtUserClaimsDto; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class LoginResponseDto { + private final String accessToken; + private final JwtUserClaimsDto user; + private final String memberRedirect; +} diff --git a/src/main/java/com/kri/kart/server/dto/auth/ReportMemberDto.java b/src/main/java/com/kri/kart/server/dto/auth/ReportMemberDto.java new file mode 100644 index 0000000..33545ff --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/auth/ReportMemberDto.java @@ -0,0 +1,12 @@ +package com.kri.kart.server.dto.auth; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ReportMemberDto { + private String userId; + private String userName; + private String memberRedirect; +} diff --git a/src/main/java/com/kri/kart/server/dto/bookmark/BookmarkDto.java b/src/main/java/com/kri/kart/server/dto/bookmark/BookmarkDto.java new file mode 100644 index 0000000..8390c42 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/bookmark/BookmarkDto.java @@ -0,0 +1,17 @@ +package com.kri.kart.server.dto.bookmark; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class BookmarkDto { + private String bookmarkId; + private String bookmarkTitle; + private String bookmarkInfo; + private String bookmarkJson; + private String gkey; + private String mkey; + private Integer isOpen; + private String isMine; +} diff --git a/src/main/java/com/kri/kart/server/dto/bookmark/BookmarkSaveRequestDto.java b/src/main/java/com/kri/kart/server/dto/bookmark/BookmarkSaveRequestDto.java new file mode 100644 index 0000000..391860b --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/bookmark/BookmarkSaveRequestDto.java @@ -0,0 +1,34 @@ +package com.kri.kart.server.dto.bookmark; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class BookmarkSaveRequestDto { + public interface Create {} + + @Schema(description = "생성 시 필수. 수정 시 페이지는 변경하지 않음") + @NotNull(groups = Create.class) + @Pattern(regexp = "TABULATION|CROSSTAB") + private String bookmarkPage; + + @NotNull + private String bookmarkTitle; + @NotNull + private String bookmarkInfo; + + @Schema(description = "기존 북마크 설정 JSON 문자열. 저장 시 원문 유지") + @NotNull + private String bookmarkJson; + + @NotNull + @Min(0) + @Max(1) + private Integer isOpen; +} diff --git a/src/main/java/com/kri/kart/server/dto/derived/DerivedCalculationDto.java b/src/main/java/com/kri/kart/server/dto/derived/DerivedCalculationDto.java new file mode 100644 index 0000000..aff62b9 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/derived/DerivedCalculationDto.java @@ -0,0 +1,9 @@ +package com.kri.kart.server.dto.derived; + +import lombok.Value; + +@Value +public class DerivedCalculationDto { + int variableCount; + int matchedRespondents; +} diff --git a/src/main/java/com/kri/kart/server/dto/derived/DerivedDataDto.java b/src/main/java/com/kri/kart/server/dto/derived/DerivedDataDto.java new file mode 100644 index 0000000..8213675 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/derived/DerivedDataDto.java @@ -0,0 +1,12 @@ +package com.kri.kart.server.dto.derived; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DerivedDataDto { + private String idkey; + private String datjson; + private String derivedJson; +} diff --git a/src/main/java/com/kri/kart/server/dto/derived/DerivedDefinitionDto.java b/src/main/java/com/kri/kart/server/dto/derived/DerivedDefinitionDto.java new file mode 100644 index 0000000..656b184 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/derived/DerivedDefinitionDto.java @@ -0,0 +1,13 @@ +package com.kri.kart.server.dto.derived; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DerivedDefinitionDto { + private String qid; + private String questionJson; + private String derivedJson; + private Integer qOrder; +} diff --git a/src/main/java/com/kri/kart/server/dto/derived/DerivedSaveRequestDto.java b/src/main/java/com/kri/kart/server/dto/derived/DerivedSaveRequestDto.java new file mode 100644 index 0000000..266a108 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/derived/DerivedSaveRequestDto.java @@ -0,0 +1,28 @@ +package com.kri.kart.server.dto.derived; + +import com.fasterxml.jackson.databind.JsonNode; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DerivedSaveRequestDto { + @NotBlank + @Size(max = 128) + @Pattern(regexp = "[A-Za-z][A-Za-z0-9_]*") + private String variableId; + + @NotBlank + @Size(max = 4000) + private String variableTitle; + + @NotNull + @Pattern(regexp = "single|multi|num") + private String variableType; + + @NotNull private JsonNode variableInfo; +} diff --git a/src/main/java/com/kri/kart/server/dto/derived/DerivedVariableDto.java b/src/main/java/com/kri/kart/server/dto/derived/DerivedVariableDto.java new file mode 100644 index 0000000..9228c5a --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/derived/DerivedVariableDto.java @@ -0,0 +1,31 @@ +package com.kri.kart.server.dto.derived; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@JsonIgnoreProperties(ignoreUnknown = true) +public class DerivedVariableDto { + private String qid; + + @Getter(onMethod_ = @JsonProperty("qOrder")) + private Integer qOrder; + + private String variable; + private String title; + private String explain; + private String vtype; + private String qtype; + private String isNps; + private String attrInfo; + private String rankInfo; + private String labelInfo; + private String afterLogic; + private String isDerived; + private String derivedJson; + private String gkey; + private String mkey; +} diff --git a/src/main/java/com/kri/kart/server/dto/export/AggregateExcelRequestDto.java b/src/main/java/com/kri/kart/server/dto/export/AggregateExcelRequestDto.java new file mode 100644 index 0000000..bf78579 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/export/AggregateExcelRequestDto.java @@ -0,0 +1,20 @@ +package com.kri.kart.server.dto.export; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.util.List; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class AggregateExcelRequestDto { + @Valid + @NotEmpty + @Size(max = 1000) + private List<@NotNull AggregateExcelTableDto> tables; + + private boolean turn; +} diff --git a/src/main/java/com/kri/kart/server/dto/export/AggregateExcelTableDto.java b/src/main/java/com/kri/kart/server/dto/export/AggregateExcelTableDto.java new file mode 100644 index 0000000..ae3cf74 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/export/AggregateExcelTableDto.java @@ -0,0 +1,35 @@ +package com.kri.kart.server.dto.export; + +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.databind.JsonNode; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.util.LinkedHashMap; +import java.util.List; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class AggregateExcelTableDto { + @NotNull + @Size(max = 4000) + private String head; + + private String vname = ""; + private String qtype = ""; + + @NotEmpty + @Size(min = 2, max = 10000) + private List<@NotNull LinkedHashMap<@NotBlank String, @NotNull @Size(max = 32767) String>> body; + + @Size(max = 7000000) + private String imagePng; + + @JsonAnySetter + public void rejectUnknownField(String name, JsonNode value) { + throw new IllegalArgumentException("지원하지 않는 Excel 표 속성입니다. 워드클라우드는 imagePng를 사용해 주세요."); + } +} diff --git a/src/main/java/com/kri/kart/server/dto/export/ExportDataDto.java b/src/main/java/com/kri/kart/server/dto/export/ExportDataDto.java new file mode 100644 index 0000000..9b2f88e --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/export/ExportDataDto.java @@ -0,0 +1,16 @@ +package com.kri.kart.server.dto.export; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ExportDataDto { + private String dat; + private String status; + private String startDate; + private String endDate; + private String intervalMin; + private String interviewerInfo; + private String interviewerCode; +} diff --git a/src/main/java/com/kri/kart/server/dto/export/ExportDerivedHeaderDto.java b/src/main/java/com/kri/kart/server/dto/export/ExportDerivedHeaderDto.java new file mode 100644 index 0000000..764660c --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/export/ExportDerivedHeaderDto.java @@ -0,0 +1,12 @@ +package com.kri.kart.server.dto.export; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ExportDerivedHeaderDto { + private String qid; + private String qtype; + private String linfo; +} diff --git a/src/main/java/com/kri/kart/server/dto/export/ExportFileDto.java b/src/main/java/com/kri/kart/server/dto/export/ExportFileDto.java new file mode 100644 index 0000000..2dedfd6 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/export/ExportFileDto.java @@ -0,0 +1,11 @@ +package com.kri.kart.server.dto.export; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public class ExportFileDto { + private final String fileName; + private final byte[] content; +} diff --git a/src/main/java/com/kri/kart/server/dto/export/ExportGuideDto.java b/src/main/java/com/kri/kart/server/dto/export/ExportGuideDto.java new file mode 100644 index 0000000..c189b82 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/export/ExportGuideDto.java @@ -0,0 +1,24 @@ +package com.kri.kart.server.dto.export; + +import com.kri.common.feature.excel.ExcelColumn; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class ExportGuideDto { + @ExcelColumn(header = "문항 타입", order = 0) + private String questionType; + + @ExcelColumn(header = "문항 / 보기번호", order = 1) + private String variable; + + @ExcelColumn(header = "내용", order = 2) + private String content; + + @ExcelColumn(header = "VALUE LABEL", order = 3) + private String valueLabel; + + @ExcelColumn(header = "VARIABLE LABEL", order = 4) + private String variableLabel; +} diff --git a/src/main/java/com/kri/kart/server/dto/export/ExportHeaderDto.java b/src/main/java/com/kri/kart/server/dto/export/ExportHeaderDto.java new file mode 100644 index 0000000..5852b66 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/export/ExportHeaderDto.java @@ -0,0 +1,12 @@ +package com.kri.kart.server.dto.export; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ExportHeaderDto { + private String qid; + private String variable; + private String value; +} diff --git a/src/main/java/com/kri/kart/server/dto/export/ExportTitleDto.java b/src/main/java/com/kri/kart/server/dto/export/ExportTitleDto.java new file mode 100644 index 0000000..e1d8dcd --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/export/ExportTitleDto.java @@ -0,0 +1,21 @@ +package com.kri.kart.server.dto.export; + +import com.kri.common.feature.excel.ExcelColumn; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ExportTitleDto { + @ExcelColumn(header = "QID", order = 0) + private String qid; + + @ExcelColumn(header = "문번", order = 1) + private String variable; + + @ExcelColumn(header = "문항", order = 2) + private String title; + + @ExcelColumn(header = "Title", order = 3) + private String explain; +} diff --git a/src/main/java/com/kri/kart/server/dto/export/RawDataExportRequestDto.java b/src/main/java/com/kri/kart/server/dto/export/RawDataExportRequestDto.java new file mode 100644 index 0000000..315b93e --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/export/RawDataExportRequestDto.java @@ -0,0 +1,24 @@ +package com.kri.kart.server.dto.export; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import java.time.LocalDate; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class RawDataExportRequestDto { + @NotNull + @Pattern(regexp = "COMPLETE|INCOMPLETE") + @Schema(description = "COMPLETE: 완료(Status=10), INCOMPLETE: 미완료(Status<>10). TEST 응답 제외") + private String type = "COMPLETE"; + + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate startDate; + + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate endDate; +} diff --git a/src/main/java/com/kri/kart/server/dto/log/VisitLogRequestDto.java b/src/main/java/com/kri/kart/server/dto/log/VisitLogRequestDto.java new file mode 100644 index 0000000..a93f618 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/log/VisitLogRequestDto.java @@ -0,0 +1,24 @@ +package com.kri.kart.server.dto.log; + +import com.kri.kart.server.common.enums.ProjectType; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Schema(description = "화면 방문 로그. 프로젝트 정보는 둘 다 생략하거나 함께 지정한다.") +public class VisitLogRequestDto { + private ProjectType projectType; + + @Size(max = 20) + @Pattern(regexp = "^[^|]*$") + private String pkey; + + @NotBlank + @Schema(description = "방문한 화면 URL 또는 페이지 정보") + private String logContent; +} diff --git a/src/main/java/com/kri/kart/server/dto/project/CustomProgressDto.java b/src/main/java/com/kri/kart/server/dto/project/CustomProgressDto.java new file mode 100644 index 0000000..3882c30 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/project/CustomProgressDto.java @@ -0,0 +1,18 @@ +package com.kri.kart.server.dto.project; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder(toBuilder = true) +@NoArgsConstructor +@AllArgsConstructor +public class CustomProgressDto { + private Integer appendOrder; + private Integer appendType; + private String fileName; +} diff --git a/src/main/java/com/kri/kart/server/dto/project/LoiDto.java b/src/main/java/com/kri/kart/server/dto/project/LoiDto.java new file mode 100644 index 0000000..103be28 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/project/LoiDto.java @@ -0,0 +1,14 @@ +package com.kri.kart.server.dto.project; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class LoiDto { + private Integer cnt; + private String avgLoi; + private String avgLoiModify; + private String minLoi; + private String maxLoi; +} diff --git a/src/main/java/com/kri/kart/server/dto/project/ProgressDayDto.java b/src/main/java/com/kri/kart/server/dto/project/ProgressDayDto.java new file mode 100644 index 0000000..72f1363 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/project/ProgressDayDto.java @@ -0,0 +1,15 @@ +package com.kri.kart.server.dto.project; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ProgressDayDto { + // Legacy SQL returns style 112 in CHAR(10): yyyyMMdd plus two trailing spaces. + private String surveyDate; + private Integer totalCount; + private Integer completeCount; + private Integer screenCount; + private Integer quotaCount; +} diff --git a/src/main/java/com/kri/kart/server/dto/project/ProgressScreenDto.java b/src/main/java/com/kri/kart/server/dto/project/ProgressScreenDto.java new file mode 100644 index 0000000..65acf03 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/project/ProgressScreenDto.java @@ -0,0 +1,16 @@ +package com.kri.kart.server.dto.project; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ProgressScreenDto { + @Getter(onMethod_ = @JsonProperty("qOrder")) + private Integer qOrder; + + private String viewTitle; + private String pageName; + private Long cnt; +} diff --git a/src/main/java/com/kri/kart/server/dto/project/ProgressSearchDto.java b/src/main/java/com/kri/kart/server/dto/project/ProgressSearchDto.java new file mode 100644 index 0000000..a3891d3 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/project/ProgressSearchDto.java @@ -0,0 +1,24 @@ +package com.kri.kart.server.dto.project; + +import com.kri.common.feature.web.BusinessException; +import java.time.LocalDate; +import lombok.Getter; +import lombok.Setter; +import org.springframework.format.annotation.DateTimeFormat; + +@Getter +@Setter +public class ProgressSearchDto { + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) + private LocalDate startDate; + + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) + private LocalDate endDate; + + public void validateRange() { + if ((startDate == null) != (endDate == null) + || (startDate != null && startDate.isAfter(endDate))) { + throw BusinessException.badRequest("시작일과 종료일을 함께 입력하고 시작일을 종료일 이전으로 지정해 주세요."); + } + } +} diff --git a/src/main/java/com/kri/kart/server/dto/project/ProgressTypeDto.java b/src/main/java/com/kri/kart/server/dto/project/ProgressTypeDto.java new file mode 100644 index 0000000..4be0232 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/project/ProgressTypeDto.java @@ -0,0 +1,14 @@ +package com.kri.kart.server.dto.project; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ProgressTypeDto { + private Integer totalCount; + private Integer completeCount; + private Integer screenCount; + private Integer quotaCount; + private Integer goingCount; +} diff --git a/src/main/java/com/kri/kart/server/dto/project/ProjectLinkSearchDto.java b/src/main/java/com/kri/kart/server/dto/project/ProjectLinkSearchDto.java new file mode 100644 index 0000000..12d2b44 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/project/ProjectLinkSearchDto.java @@ -0,0 +1,23 @@ +package com.kri.kart.server.dto.project; + +import com.kri.kart.server.common.enums.ProjectType; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Size; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ProjectLinkSearchDto { + private ProjectType projectType; + + @Size(max = 128) + @Schema(description = "서비스 연동 조회용 인트라넷 프로젝트 코드. 첫 _ 앞 부분으로 검색") + private String intranetCode; + + @Size(max = 32) + private String userTeam; + + @Size(max = 512) + private String keyword; +} diff --git a/src/main/java/com/kri/kart/server/dto/project/ProjectListDto.java b/src/main/java/com/kri/kart/server/dto/project/ProjectListDto.java new file mode 100644 index 0000000..654a90e --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/project/ProjectListDto.java @@ -0,0 +1,20 @@ +package com.kri.kart.server.dto.project; + +import com.kri.kart.server.common.enums.ProjectType; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ProjectListDto { + private ProjectType projectType; + private String rowNumber; + private String pkey; + private String title; + private String surveyType; + private String status; + private String gkey; + private String mkey; + private LocalDateTime createDate; +} diff --git a/src/main/java/com/kri/kart/server/dto/project/ProjectRefDto.java b/src/main/java/com/kri/kart/server/dto/project/ProjectRefDto.java new file mode 100644 index 0000000..64e2cfd --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/project/ProjectRefDto.java @@ -0,0 +1,28 @@ +package com.kri.kart.server.dto.project; + +import com.kri.kart.server.common.enums.ProjectType; +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.Objects; +import lombok.EqualsAndHashCode; +import lombok.Getter; + +@Getter +@EqualsAndHashCode +@Schema(description = "프로젝트 유형과 프로젝트 키") +public final class ProjectRefDto { + @Schema(description = "프로젝트 유형: 0=KON, 1=KIWI") + private final ProjectType projectType; + + @Schema(description = "프로젝트 키", maxLength = 20) + private final String pkey; + + public ProjectRefDto(ProjectType projectType, String pkey) { + Objects.requireNonNull(projectType, "Project type is required"); + if (pkey == null || pkey.isBlank() || pkey.length() > 20 || pkey.contains("|")) { + throw new IllegalArgumentException( + "Project key must be nonblank, at most 20 UTF-16 units, without legacy markers"); + } + this.projectType = projectType; + this.pkey = pkey; + } +} diff --git a/src/main/java/com/kri/kart/server/dto/project/ProjectSummaryDto.java b/src/main/java/com/kri/kart/server/dto/project/ProjectSummaryDto.java new file mode 100644 index 0000000..5414a6d --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/project/ProjectSummaryDto.java @@ -0,0 +1,22 @@ +package com.kri.kart.server.dto.project; + +import com.kri.kart.server.common.enums.ProjectType; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ProjectSummaryDto { + private ProjectType projectType; + private String pkey; + private String title; + private String surveyType; + private String status; + private LocalDateTime createDate; + private Long allCount; + private Long ongoingCount; + private Long screenCount; + private Long quotaCount; + private Long completeCount; +} diff --git a/src/main/java/com/kri/kart/server/dto/question/QuestionDto.java b/src/main/java/com/kri/kart/server/dto/question/QuestionDto.java new file mode 100644 index 0000000..5828d1f --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/question/QuestionDto.java @@ -0,0 +1,37 @@ +package com.kri.kart.server.dto.question; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder(toBuilder = true) +@NoArgsConstructor +@AllArgsConstructor +public class QuestionDto { + private String qid; + + @Getter(onMethod_ = @JsonProperty("qOrder")) + private Integer qOrder; + + private String variable; + private String title; + private String explain; + private String vtype; + private String qtype; + private String isNps; + private String isReverse; + private String missingValue; + private String attrInfo; + private String rankInfo; + private String labelInfo; + private String afterLogic; + private String isDerived; + private String derivedJson; + private String gkey; + private String mkey; +} diff --git a/src/main/java/com/kri/kart/server/dto/quota/QuotaCellDto.java b/src/main/java/com/kri/kart/server/dto/quota/QuotaCellDto.java new file mode 100644 index 0000000..61fe02d --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/quota/QuotaCellDto.java @@ -0,0 +1,20 @@ +package com.kri.kart.server.dto.quota; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class QuotaCellDto { + private int columnIndex; + private String kind; + private String textValue; + private Long complete; + private Long target; + private Double achievementPercent; + private String achievementState; + private String achievementDisplayText; + private String displayText; + private String isUsed; + private Long quotaId; +} diff --git a/src/main/java/com/kri/kart/server/dto/quota/QuotaEntryDto.java b/src/main/java/com/kri/kart/server/dto/quota/QuotaEntryDto.java new file mode 100644 index 0000000..cbc416b --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/quota/QuotaEntryDto.java @@ -0,0 +1,14 @@ +package com.kri.kart.server.dto.quota; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class QuotaEntryDto { + private Long id; + private Long cnt; + private Long oriCnt; + private String quotaJson; + private String isUse; +} diff --git a/src/main/java/com/kri/kart/server/dto/quota/QuotaResultDto.java b/src/main/java/com/kri/kart/server/dto/quota/QuotaResultDto.java new file mode 100644 index 0000000..910edd4 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/quota/QuotaResultDto.java @@ -0,0 +1,20 @@ +package com.kri.kart.server.dto.quota; + +import com.kri.kart.server.dto.statistics.StatisticsColumnDto; +import com.kri.kart.server.dto.statistics.StatisticsRowDto; +import java.util.List; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class QuotaResultDto { + private Long quotaSetId; + private Integer quotaOrder; + private String title; + private String index; + private List> banners; + private List columns; + private List headerRows; + private List rows; +} diff --git a/src/main/java/com/kri/kart/server/dto/quota/QuotaResultRequestDto.java b/src/main/java/com/kri/kart/server/dto/quota/QuotaResultRequestDto.java new file mode 100644 index 0000000..e68bc5e --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/quota/QuotaResultRequestDto.java @@ -0,0 +1,22 @@ +package com.kri.kart.server.dto.quota; + +import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import java.time.LocalDate; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class QuotaResultRequestDto { + @NotNull + @Pattern(regexp = "ACTUAL|TEST|ALL") + private String dataScope = "ACTUAL"; + + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate startDate; + + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate endDate; +} diff --git a/src/main/java/com/kri/kart/server/dto/quota/QuotaRowDto.java b/src/main/java/com/kri/kart/server/dto/quota/QuotaRowDto.java new file mode 100644 index 0000000..be1ad97 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/quota/QuotaRowDto.java @@ -0,0 +1,14 @@ +package com.kri.kart.server.dto.quota; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class QuotaRowDto { + private int rowIndex; + private String rowId; + private String kind; + private List cells; +} diff --git a/src/main/java/com/kri/kart/server/dto/quota/QuotaSetDto.java b/src/main/java/com/kri/kart/server/dto/quota/QuotaSetDto.java new file mode 100644 index 0000000..9824e4e --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/quota/QuotaSetDto.java @@ -0,0 +1,14 @@ +package com.kri.kart.server.dto.quota; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class QuotaSetDto { + private Long id; + private Integer qsOrder; + private String qsTitle; + // Preserve saved configuration verbatim; quota result interprets it without modifying the DB. + private String qsJson; +} diff --git a/src/main/java/com/kri/kart/server/dto/request/CreateExampleRequest.java b/src/main/java/com/kri/kart/server/dto/request/CreateExampleRequest.java deleted file mode 100644 index 1f7d2d4..0000000 --- a/src/main/java/com/kri/kart/server/dto/request/CreateExampleRequest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.kri.kart.server.dto.request; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Positive; - -public record CreateExampleRequest( - @NotNull @Positive Long groupId, - @NotNull @Positive Integer sequence, - @NotBlank String name -) { -} diff --git a/src/main/java/com/kri/kart/server/dto/response/ExampleResponse.java b/src/main/java/com/kri/kart/server/dto/response/ExampleResponse.java deleted file mode 100644 index a964cb5..0000000 --- a/src/main/java/com/kri/kart/server/dto/response/ExampleResponse.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.kri.kart.server.dto.response; - -import com.kri.kart.server.persistence.entity.ExampleEntity; - -public record ExampleResponse( - Long groupId, - Integer sequence, - String name, - String status -) { - public static ExampleResponse from(ExampleEntity entity) { - return new ExampleResponse( - entity.getId().getGroupId(), - entity.getId().getSequence(), - entity.getName(), - entity.getStatus().name() - ); - } -} diff --git a/src/main/java/com/kri/kart/server/dto/share/ExternalLoginResponseDto.java b/src/main/java/com/kri/kart/server/dto/share/ExternalLoginResponseDto.java new file mode 100644 index 0000000..d64a953 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/share/ExternalLoginResponseDto.java @@ -0,0 +1,9 @@ +package com.kri.kart.server.dto.share; + +import lombok.Value; + +@Value +public class ExternalLoginResponseDto { + String accessToken; + ShareLinkDto link; +} diff --git a/src/main/java/com/kri/kart/server/dto/share/ShareLinkDto.java b/src/main/java/com/kri/kart/server/dto/share/ShareLinkDto.java new file mode 100644 index 0000000..5701ea0 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/share/ShareLinkDto.java @@ -0,0 +1,15 @@ +package com.kri.kart.server.dto.share; + +import com.kri.kart.server.common.enums.ProjectType; +import lombok.Value; + +@Value +public class ShareLinkDto { + String urlKey; + String url; + String realUrl; + ProjectType projectType; + String pkey; + String projectTitle; + boolean pageOnly; +} diff --git a/src/main/java/com/kri/kart/server/dto/share/ShareLinkRecordDto.java b/src/main/java/com/kri/kart/server/dto/share/ShareLinkRecordDto.java new file mode 100644 index 0000000..a1cbc33 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/share/ShareLinkRecordDto.java @@ -0,0 +1,19 @@ +package com.kri.kart.server.dto.share; + +import lombok.Getter; +import lombok.Setter; + +/** REPORT_URL 내부 저장 DTO. SKEY는 API 응답에 포함하지 않는다. */ +@Getter +@Setter +public class ShareLinkRecordDto { + private Long id; + private String urlKey; + private String realUrl; + private Integer isPageOnly; + private String skey; + private String pkey; + private Integer projectType; + private String projectTitle; + private String urlOwner; +} diff --git a/src/main/java/com/kri/kart/server/dto/share/ShareLinkRequestDto.java b/src/main/java/com/kri/kart/server/dto/share/ShareLinkRequestDto.java new file mode 100644 index 0000000..734edd4 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/share/ShareLinkRequestDto.java @@ -0,0 +1,19 @@ +package com.kri.kart.server.dto.share; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ShareLinkRequestDto { + @NotBlank + @Size(max = 4096) + private String realUrl; + + @NotBlank + @Pattern(regexp = "P|U") + private String mode; +} diff --git a/src/main/java/com/kri/kart/server/dto/statistics/NlpDictionaryWordDto.java b/src/main/java/com/kri/kart/server/dto/statistics/NlpDictionaryWordDto.java new file mode 100644 index 0000000..60a43f7 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/statistics/NlpDictionaryWordDto.java @@ -0,0 +1,12 @@ +package com.kri.kart.server.dto.statistics; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class NlpDictionaryWordDto { + private String wordText; + private String wordTag; + private Integer wordScore; +} diff --git a/src/main/java/com/kri/kart/server/dto/statistics/NlpTokenDto.java b/src/main/java/com/kri/kart/server/dto/statistics/NlpTokenDto.java new file mode 100644 index 0000000..45b3c35 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/statistics/NlpTokenDto.java @@ -0,0 +1,3 @@ +package com.kri.kart.server.dto.statistics; + +public record NlpTokenDto(String text, String tag) {} diff --git a/src/main/java/com/kri/kart/server/dto/statistics/StatisticsBatchDto.java b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsBatchDto.java new file mode 100644 index 0000000..744cbf3 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsBatchDto.java @@ -0,0 +1,12 @@ +package com.kri.kart.server.dto.statistics; + +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.question.QuestionDto; +import java.util.List; + +/** Questions and filtered responses loaded once and shared by every index in one request. */ +public record StatisticsBatchDto( + ProjectRefDto project, + List requests, + List questions, + List responses) {} diff --git a/src/main/java/com/kri/kart/server/dto/statistics/StatisticsBatchRequestDto.java b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsBatchRequestDto.java new file mode 100644 index 0000000..c15c9c7 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsBatchRequestDto.java @@ -0,0 +1,29 @@ +package com.kri.kart.server.dto.statistics; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import java.util.List; +import lombok.Getter; +import lombok.Setter; +import org.springframework.beans.BeanUtils; + +@Getter +@Setter +public class StatisticsBatchRequestDto extends StatisticsOptionsDto { + @NotEmpty + @Schema(description = "요청 순서대로 집계할 QID 배열. TABULATION 모드는 [\"\"] 사용") + private List<@NotNull String> indexes; + + public List requests() { + return indexes.stream() + .map( + index -> { + StatisticsRequestDto request = new StatisticsRequestDto(); + BeanUtils.copyProperties(this, request); + request.setIndex(index); + return request; + }) + .toList(); + } +} diff --git a/src/main/java/com/kri/kart/server/dto/statistics/StatisticsCellDto.java b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsCellDto.java new file mode 100644 index 0000000..d97390a --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsCellDto.java @@ -0,0 +1,26 @@ +package com.kri.kart.server.dto.statistics; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder(toBuilder = true) +public class StatisticsCellDto { + private int columnIndex; + @Builder.Default private int rowSpan = 1; + @Builder.Default private int colSpan = 1; + private String kind; + private String textValue; + private Long count; + private Double percent; + + @Schema(description = "해당 셀의 백분율 분모") + private Long base; + + private Double statisticValue; + private String measurement; + private String countDisplayText; + private String percentDisplayText; + private String statisticDisplayText; +} diff --git a/src/main/java/com/kri/kart/server/dto/statistics/StatisticsColumnDto.java b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsColumnDto.java new file mode 100644 index 0000000..dca9109 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsColumnDto.java @@ -0,0 +1,13 @@ +package com.kri.kart.server.dto.statistics; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class StatisticsColumnDto { + private final String columnId; + private final String kind; + private final List labels; +} diff --git a/src/main/java/com/kri/kart/server/dto/statistics/StatisticsDataDto.java b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsDataDto.java new file mode 100644 index 0000000..8410073 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsDataDto.java @@ -0,0 +1,12 @@ +package com.kri.kart.server.dto.statistics; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class StatisticsDataDto { + private String idkey; + private String dat; + private String filterDat; +} diff --git a/src/main/java/com/kri/kart/server/dto/statistics/StatisticsFilterDto.java b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsFilterDto.java new file mode 100644 index 0000000..14f883a --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsFilterDto.java @@ -0,0 +1,19 @@ +package com.kri.kart.server.dto.statistics; + +import com.fasterxml.jackson.databind.JsonNode; +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.ArrayList; +import java.util.List; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Schema(description = "AND/OR/NOT는 children, 조건은 dimensionId와 values 사용. 숫자 JSON 값은 수치 비교") +public class StatisticsFilterDto { + private String operator; + private String dimensionId; + private String reference = "QID"; + private List values = new ArrayList<>(); + private List children = new ArrayList<>(); +} diff --git a/src/main/java/com/kri/kart/server/dto/statistics/StatisticsOptionsDto.java b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsOptionsDto.java new file mode 100644 index 0000000..d4b66db --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsOptionsDto.java @@ -0,0 +1,58 @@ +package com.kri.kart.server.dto.statistics; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class StatisticsOptionsDto { + @NotNull + @Schema(description = "가로 배너 묶음과 묶음별 중첩 문항. 한 묶음 최대 5단계") + private List<@NotNull @Size(min = 1, max = 5) List<@NotNull String>> banners = new ArrayList<>(); + + @Valid private StatisticsFilterDto filter; + + @NotNull + @Pattern(regexp = "STANDARD|TABULATION_0|TABULATION_1") + private String mode = "STANDARD"; + + @NotNull + @Pattern(regexp = "ACTUAL|TEST|ALL") + private String dataScope = "ACTUAL"; + + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate startDate; + + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate endDate; + + @Min(0) + @Max(14) + private int percentageDecimals = 14; + + @Min(0) + @Max(14) + private int statisticDecimals = 14; + + @NotNull + @Pattern(regexp = "NONE|FLAT|MERGED") + private String headerMode = "MERGED"; + + private boolean transpose; + private boolean showSubtotals = true; + private boolean showValueCodes; + private boolean showNumericSum; + + @Valid @NotNull private List valueGroups = new ArrayList<>(); +} diff --git a/src/main/java/com/kri/kart/server/dto/statistics/StatisticsRequestDto.java b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsRequestDto.java new file mode 100644 index 0000000..f56d7c6 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsRequestDto.java @@ -0,0 +1,14 @@ +package com.kri.kart.server.dto.statistics; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class StatisticsRequestDto extends StatisticsOptionsDto { + @NotNull + @Schema(description = "집계 문항 QID. 속성 투영은 #A. TABULATION 모드만 빈 값 허용", example = "Q1") + private String index; +} diff --git a/src/main/java/com/kri/kart/server/dto/statistics/StatisticsResponseDto.java b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsResponseDto.java new file mode 100644 index 0000000..7c7d0be --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsResponseDto.java @@ -0,0 +1,18 @@ +package com.kri.kart.server.dto.statistics; + +import java.util.List; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class StatisticsResponseDto { + private String type; + private String questionId; + private String title; + private List columns; + private List headerRows; + private List rows; + private List words; + private StatisticsRequestDto appliedOptions; +} diff --git a/src/main/java/com/kri/kart/server/dto/statistics/StatisticsRowDto.java b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsRowDto.java new file mode 100644 index 0000000..5292016 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsRowDto.java @@ -0,0 +1,14 @@ +package com.kri.kart.server.dto.statistics; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class StatisticsRowDto { + private final int rowIndex; + private final String rowId; + private final String kind; + private final List cells; +} diff --git a/src/main/java/com/kri/kart/server/dto/statistics/StatisticsStreamEventDto.java b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsStreamEventDto.java new file mode 100644 index 0000000..fd1d638 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsStreamEventDto.java @@ -0,0 +1,23 @@ +package com.kri.kart.server.dto.statistics; + +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +@JsonInclude(JsonInclude.Include.NON_NULL) +@Schema(description = "NDJSON 한 줄 이벤트. result/error는 문항별, complete는 스트림 완료") +public class StatisticsStreamEventDto { + private String type; + private Integer position; + private String index; + private StatisticsResponseDto result; + private Integer status; + private String code; + private String message; + private Integer total; + private Integer succeeded; + private Integer failed; +} diff --git a/src/main/java/com/kri/kart/server/dto/statistics/StatisticsValueGroupDto.java b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsValueGroupDto.java new file mode 100644 index 0000000..a718d4d --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsValueGroupDto.java @@ -0,0 +1,15 @@ +package com.kri.kart.server.dto.statistics; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import java.util.List; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class StatisticsValueGroupDto { + @NotBlank private String label; + + @NotEmpty private List<@NotBlank String> values; +} diff --git a/src/main/java/com/kri/kart/server/dto/statistics/StatisticsWordDto.java b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsWordDto.java new file mode 100644 index 0000000..190e051 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/statistics/StatisticsWordDto.java @@ -0,0 +1,12 @@ +package com.kri.kart.server.dto.statistics; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class StatisticsWordDto { + private final String text; + private final String tag; + private final long count; +} diff --git a/src/main/java/com/kri/kart/server/dto/statistics/SurveyResponseDto.java b/src/main/java/com/kri/kart/server/dto/statistics/SurveyResponseDto.java new file mode 100644 index 0000000..70c1612 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/statistics/SurveyResponseDto.java @@ -0,0 +1,11 @@ +package com.kri.kart.server.dto.statistics; + +import java.util.Map; + +/** Internal flattened survey response. Never returned by report APIs. */ +public record SurveyResponseDto( + String idkey, Map values, Map filterValues) { + public SurveyResponseDto(String idkey, Map values) { + this(idkey, values, values); + } +} diff --git a/src/main/java/com/kri/kart/server/dto/upload/ImportQuestionDto.java b/src/main/java/com/kri/kart/server/dto/upload/ImportQuestionDto.java new file mode 100644 index 0000000..1ed2c46 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/upload/ImportQuestionDto.java @@ -0,0 +1,12 @@ +package com.kri.kart.server.dto.upload; + +import lombok.Value; + +@Value +public class ImportQuestionDto { + String qid; + int qOrder; + String questionJson; + String qinfo; + String linfo; +} diff --git a/src/main/java/com/kri/kart/server/dto/upload/ImportResponseDto.java b/src/main/java/com/kri/kart/server/dto/upload/ImportResponseDto.java new file mode 100644 index 0000000..fb40eae --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/upload/ImportResponseDto.java @@ -0,0 +1,12 @@ +package com.kri.kart.server.dto.upload; + +import lombok.Value; + +@Value +public class ImportResponseDto { + String idkey; + String status; + String pageName; + String datjson; + String surveyDate; +} diff --git a/src/main/java/com/kri/kart/server/dto/upload/ImportResultDto.java b/src/main/java/com/kri/kart/server/dto/upload/ImportResultDto.java new file mode 100644 index 0000000..8d113d3 --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/upload/ImportResultDto.java @@ -0,0 +1,11 @@ +package com.kri.kart.server.dto.upload; + +import lombok.Value; + +@Value +public class ImportResultDto { + int processedRows; + int affectedRows; + int removedRows; + int archivedRows; +} diff --git a/src/main/java/com/kri/kart/server/dto/upload/UploadTableDto.java b/src/main/java/com/kri/kart/server/dto/upload/UploadTableDto.java new file mode 100644 index 0000000..f3a5c3c --- /dev/null +++ b/src/main/java/com/kri/kart/server/dto/upload/UploadTableDto.java @@ -0,0 +1,10 @@ +package com.kri.kart.server.dto.upload; + +import java.util.List; +import lombok.Value; + +@Value +public class UploadTableDto { + List headers; + List> rows; +} diff --git a/src/main/java/com/kri/kart/server/persistence/SurveySessionProvider.java b/src/main/java/com/kri/kart/server/persistence/SurveySessionProvider.java new file mode 100644 index 0000000..874f3b3 --- /dev/null +++ b/src/main/java/com/kri/kart/server/persistence/SurveySessionProvider.java @@ -0,0 +1,29 @@ +package com.kri.kart.server.persistence; + +import com.kri.kart.server.common.enums.ProjectType; +import java.util.Objects; +import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; + +@Component +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class SurveySessionProvider { + private final SqlSessionTemplate konSqlSessionTemplate; + private final SqlSessionTemplate konkiwiSqlSessionTemplate; + + public SurveySessionProvider( + @Qualifier("konSqlSessionTemplate") SqlSessionTemplate konSqlSessionTemplate, + @Qualifier("konkiwiSqlSessionTemplate") SqlSessionTemplate konkiwiSqlSessionTemplate) { + this.konSqlSessionTemplate = konSqlSessionTemplate; + this.konkiwiSqlSessionTemplate = konkiwiSqlSessionTemplate; + } + + public SqlSessionTemplate forProject(ProjectType type) { + return switch (Objects.requireNonNull(type, "Project type is required")) { + case KON -> konSqlSessionTemplate; + case KIWI -> konkiwiSqlSessionTemplate; + }; + } +} diff --git a/src/main/java/com/kri/kart/server/persistence/entity/ExampleEntity.java b/src/main/java/com/kri/kart/server/persistence/entity/ExampleEntity.java deleted file mode 100644 index c0fd210..0000000 --- a/src/main/java/com/kri/kart/server/persistence/entity/ExampleEntity.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.kri.kart.server.persistence.entity; - -import com.kri.kart.server.common.enums.ExampleStatus; -import com.kri.kart.server.persistence.entity.id.ExampleEntityId; -import jakarta.persistence.Column; -import jakarta.persistence.EmbeddedId; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Entity -@Table(name = "t_example") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class ExampleEntity { - - @EmbeddedId - private ExampleEntityId id; - - @Column(name = "name", nullable = false, length = 100) - private String name; - - @Enumerated(EnumType.STRING) - @Column(name = "status", nullable = false, length = 20) - private ExampleStatus status; - - @Builder - public ExampleEntity(ExampleEntityId id, String name, ExampleStatus status) { - this.id = id; - this.name = name; - this.status = status == null ? ExampleStatus.ACTIVE : status; - } - - public void changeName(String name) { - this.name = name; - } -} diff --git a/src/main/java/com/kri/kart/server/persistence/entity/id/ExampleEntityId.java b/src/main/java/com/kri/kart/server/persistence/entity/id/ExampleEntityId.java deleted file mode 100644 index b2c6b62..0000000 --- a/src/main/java/com/kri/kart/server/persistence/entity/id/ExampleEntityId.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.kri.kart.server.persistence.entity.id; - -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import java.io.Serial; -import java.io.Serializable; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Embeddable -@EqualsAndHashCode -@AllArgsConstructor -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class ExampleEntityId implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @Column(name = "group_id", nullable = false) - private Long groupId; - - @Column(name = "sequence", nullable = false) - private Integer sequence; -} diff --git a/src/main/java/com/kri/kart/server/persistence/jdbc/ExampleBulkItem.java b/src/main/java/com/kri/kart/server/persistence/jdbc/ExampleBulkItem.java deleted file mode 100644 index 405ce50..0000000 --- a/src/main/java/com/kri/kart/server/persistence/jdbc/ExampleBulkItem.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.kri.kart.server.persistence.jdbc; - -public record ExampleBulkItem( - Long groupId, - Integer sequence, - String name, - String status -) { -} diff --git a/src/main/java/com/kri/kart/server/persistence/jdbc/ExampleBulkJdbcRepository.java b/src/main/java/com/kri/kart/server/persistence/jdbc/ExampleBulkJdbcRepository.java deleted file mode 100644 index 4c2a1ca..0000000 --- a/src/main/java/com/kri/kart/server/persistence/jdbc/ExampleBulkJdbcRepository.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.kri.kart.server.persistence.jdbc; - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.List; -import lombok.RequiredArgsConstructor; -import org.springframework.jdbc.core.BatchPreparedStatementSetter; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.stereotype.Repository; - -@Repository -@RequiredArgsConstructor -public class ExampleBulkJdbcRepository { - - private final JdbcTemplate jdbcTemplate; - - public void insertAll(List items, int batchSize) { - if (items == null || items.isEmpty()) return; - - String sql = """ - insert into t_example (group_id, sequence, name, status) - values (?, ?, ?, ?) - """; - - int safeBatchSize = Math.max(batchSize, 1); - for (int from = 0; from < items.size(); from += safeBatchSize) { - int to = Math.min(from + safeBatchSize, items.size()); - List batch = items.subList(from, to); - - jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() { - @Override - public void setValues(PreparedStatement statement, int index) throws SQLException { - ExampleBulkItem item = batch.get(index); - statement.setLong(1, item.groupId()); - statement.setInt(2, item.sequence()); - statement.setString(3, item.name()); - statement.setString(4, item.status()); - } - - @Override - public int getBatchSize() { - return batch.size(); - } - }); - } - } -} diff --git a/src/main/java/com/kri/kart/server/persistence/mapper/ExampleMapper.java b/src/main/java/com/kri/kart/server/persistence/mapper/ExampleMapper.java deleted file mode 100644 index 20ea6a6..0000000 --- a/src/main/java/com/kri/kart/server/persistence/mapper/ExampleMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.kri.kart.server.persistence.mapper; - -import com.kri.kart.server.dto.response.ExampleResponse; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface ExampleMapper { - List findByName(@Param("keyword") String keyword); -} diff --git a/src/main/java/com/kri/kart/server/persistence/query/ExamplePredicates.java b/src/main/java/com/kri/kart/server/persistence/query/ExamplePredicates.java deleted file mode 100644 index 9c0c3f3..0000000 --- a/src/main/java/com/kri/kart/server/persistence/query/ExamplePredicates.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.kri.kart.server.persistence.query; - -import com.kri.kart.server.persistence.entity.QExampleEntity; -import com.querydsl.core.types.dsl.BooleanExpression; - -public final class ExamplePredicates { - - private ExamplePredicates() { - } - - public static BooleanExpression nameContains(QExampleEntity example, String keyword) { - if (keyword == null || keyword.isBlank()) return null; - return example.name.containsIgnoreCase(keyword.trim()); - } -} diff --git a/src/main/java/com/kri/kart/server/persistence/repository/BookmarkRepository.java b/src/main/java/com/kri/kart/server/persistence/repository/BookmarkRepository.java new file mode 100644 index 0000000..90c748e --- /dev/null +++ b/src/main/java/com/kri/kart/server/persistence/repository/BookmarkRepository.java @@ -0,0 +1,70 @@ +package com.kri.kart.server.persistence.repository; + +import com.kri.kart.server.dto.bookmark.BookmarkDto; +import com.kri.kart.server.dto.bookmark.BookmarkSaveRequestDto; +import com.kri.kart.server.dto.project.ProjectRefDto; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class BookmarkRepository { + private final SqlSessionTemplate kartSqlSessionTemplate; + + public BookmarkRepository( + @Qualifier("kartSqlSessionTemplate") SqlSessionTemplate kartSqlSessionTemplate) { + this.kartSqlSessionTemplate = kartSqlSessionTemplate; + } + + public List list(ProjectRefDto project, String page, String userId) { + Map params = new HashMap<>(); + params.put("pkey", project.getPkey()); + params.put("page", page); + params.put("userId", userId); + return kartSqlSessionTemplate.selectList("kart.Bookmark.list", params); + } + + public BookmarkDto find(ProjectRefDto project, String bookmarkId) { + return kartSqlSessionTemplate.selectOne("kart.Bookmark.find", keys(project, bookmarkId)); + } + + public int create( + ProjectRefDto project, + String bookmarkId, + BookmarkSaveRequestDto request, + String userTeam, + String userId) { + Map params = keys(project, bookmarkId); + params.put("request", request); + params.put("userTeam", userTeam); + params.put("userId", userId); + return kartSqlSessionTemplate.insert("kart.Bookmark.create", params); + } + + public int update(ProjectRefDto project, String bookmarkId, BookmarkSaveRequestDto request) { + Map params = keys(project, bookmarkId); + params.put("request", request); + return kartSqlSessionTemplate.update("kart.Bookmark.update", params); + } + + public int shiftOrderAfterDelete(ProjectRefDto project, String bookmarkId) { + return kartSqlSessionTemplate.update( + "kart.Bookmark.shiftOrderAfterDelete", keys(project, bookmarkId)); + } + + public int delete(ProjectRefDto project, String bookmarkId) { + return kartSqlSessionTemplate.delete("kart.Bookmark.delete", keys(project, bookmarkId)); + } + + private Map keys(ProjectRefDto project, String bookmarkId) { + Map params = new HashMap<>(); + params.put("pkey", project.getPkey()); + params.put("bookmarkId", bookmarkId); + return params; + } +} diff --git a/src/main/java/com/kri/kart/server/persistence/repository/DerivedRepository.java b/src/main/java/com/kri/kart/server/persistence/repository/DerivedRepository.java new file mode 100644 index 0000000..80ccf49 --- /dev/null +++ b/src/main/java/com/kri/kart/server/persistence/repository/DerivedRepository.java @@ -0,0 +1,137 @@ +package com.kri.kart.server.persistence.repository; + +import com.kri.kart.server.dto.derived.DerivedDataDto; +import com.kri.kart.server.dto.derived.DerivedDefinitionDto; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.question.QuestionDto; +import com.kri.kart.server.persistence.SurveySessionProvider; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class DerivedRepository { + private final SurveySessionProvider surveySessionProvider; + + public List list(ProjectRefDto project, Integer userRole, String userTeam) { + Map params = new HashMap<>(); + params.put("pkey", project.getPkey()); + params.put("userRole", userRole); + params.put("userTeam", userTeam); + return surveySessionProvider + .forProject(project.getProjectType()) + .selectList("kart.Derived.list", params); + } + + public String lockProject(ProjectRefDto project) { + return surveySessionProvider + .forProject(project.getProjectType()) + .selectOne("kart.Derived.lockProject", Map.of("pkey", project.getPkey())); + } + + public List definitions(ProjectRefDto project) { + return surveySessionProvider + .forProject(project.getProjectType()) + .selectList("kart.Derived.definitions", Map.of("pkey", project.getPkey())); + } + + public DerivedDefinitionDto find(ProjectRefDto project, String qid) { + return surveySessionProvider + .forProject(project.getProjectType()) + .selectOne("kart.Derived.find", keys(project, qid)); + } + + public boolean duplicate(ProjectRefDto project, String qid, String originId) { + var params = keys(project, qid); + params.put("originId", originId == null ? "" : originId); + return surveySessionProvider + .forProject(project.getProjectType()) + .selectOne("kart.Derived.duplicate", params) + > 0; + } + + public int save( + ProjectRefDto project, + DerivedDefinitionDto definition, + String originId, + String userTeam, + String userId) { + var params = keys(project, definition.getQid()); + params.put("questionJson", definition.getQuestionJson()); + params.put("derivedJson", definition.getDerivedJson()); + params.put("originId", originId); + params.put("userTeam", userTeam); + params.put("userId", userId); + var session = surveySessionProvider.forProject(project.getProjectType()); + return originId == null + ? session.insert("kart.Derived.create", params) + : session.update("kart.Derived.update", params); + } + + public void shiftOrder(ProjectRefDto project, String qid) { + surveySessionProvider + .forProject(project.getProjectType()) + .update("kart.Derived.shiftOrder", keys(project, qid)); + } + + public int delete(ProjectRefDto project, String qid) { + return surveySessionProvider + .forProject(project.getProjectType()) + .delete("kart.Derived.delete", keys(project, qid)); + } + + public void clearData(ProjectRefDto project, String qid) { + surveySessionProvider + .forProject(project.getProjectType()) + .update("kart.Derived.clearData", keys(project, qid)); + } + + public List responses(ProjectRefDto project) { + return surveySessionProvider + .forProject(project.getProjectType()) + .selectList("kart.Derived.responses", Map.of("pkey", project.getPkey())); + } + + public void ensureRespondent(ProjectRefDto project, String idkey) { + surveySessionProvider + .forProject(project.getProjectType()) + .update("kart.Derived.ensureRespondent", Map.of("pkey", project.getPkey(), "idkey", idkey)); + } + + public void clearRespondentData(ProjectRefDto project, String qid, String idkey) { + var params = keys(project, qid); + params.put("idkey", idkey); + surveySessionProvider + .forProject(project.getProjectType()) + .update("kart.Derived.clearRespondentData", params); + } + + public List respondentResponses(ProjectRefDto project, String idkey) { + return surveySessionProvider + .forProject(project.getProjectType()) + .selectList( + "kart.Derived.respondentResponses", Map.of("pkey", project.getPkey(), "idkey", idkey)); + } + + public void saveData(ProjectRefDto project, String qid, String idkey, String groupJson) { + var params = keys(project, qid); + params.put("idkey", idkey); + params.put("groupJson", groupJson); + surveySessionProvider + .forProject(project.getProjectType()) + .update("kart.Derived.saveData", params); + } + + private Map keys(ProjectRefDto project, String qid) { + var params = new HashMap(); + params.put("pkey", project.getPkey()); + params.put("qid", qid); + params.put("jsonPath", "$.\"" + qid + "\""); + return params; + } +} diff --git a/src/main/java/com/kri/kart/server/persistence/repository/ExampleQueryRepository.java b/src/main/java/com/kri/kart/server/persistence/repository/ExampleQueryRepository.java deleted file mode 100644 index 70c69f4..0000000 --- a/src/main/java/com/kri/kart/server/persistence/repository/ExampleQueryRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.kri.kart.server.persistence.repository; - -import com.kri.kart.server.persistence.entity.ExampleEntity; -import java.util.List; - -public interface ExampleQueryRepository { - List findByNameContains(String keyword, int limit); -} diff --git a/src/main/java/com/kri/kart/server/persistence/repository/ExampleQueryRepositoryImpl.java b/src/main/java/com/kri/kart/server/persistence/repository/ExampleQueryRepositoryImpl.java deleted file mode 100644 index 2f87ef3..0000000 --- a/src/main/java/com/kri/kart/server/persistence/repository/ExampleQueryRepositoryImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.kri.kart.server.persistence.repository; - -import static com.kri.kart.server.persistence.entity.QExampleEntity.exampleEntity; - -import com.kri.kart.server.persistence.entity.ExampleEntity; -import com.kri.kart.server.persistence.query.ExamplePredicates; -import com.querydsl.jpa.impl.JPAQueryFactory; -import java.util.List; -import lombok.RequiredArgsConstructor; - -@RequiredArgsConstructor -public class ExampleQueryRepositoryImpl implements ExampleQueryRepository { - - private final JPAQueryFactory jpaQueryFactory; - - @Override - public List findByNameContains(String keyword, int limit) { - return jpaQueryFactory - .selectFrom(exampleEntity) - .where(ExamplePredicates.nameContains(exampleEntity, keyword)) - .orderBy(exampleEntity.id.groupId.asc(), exampleEntity.id.sequence.asc()) - .limit(Math.max(limit, 1)) - .fetch(); - } -} diff --git a/src/main/java/com/kri/kart/server/persistence/repository/ExampleRepository.java b/src/main/java/com/kri/kart/server/persistence/repository/ExampleRepository.java deleted file mode 100644 index a632bde..0000000 --- a/src/main/java/com/kri/kart/server/persistence/repository/ExampleRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.kri.kart.server.persistence.repository; - -import com.kri.kart.server.persistence.entity.ExampleEntity; -import com.kri.kart.server.persistence.entity.id.ExampleEntityId; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface ExampleRepository - extends JpaRepository, ExampleQueryRepository { -} diff --git a/src/main/java/com/kri/kart/server/persistence/repository/ExportRepository.java b/src/main/java/com/kri/kart/server/persistence/repository/ExportRepository.java new file mode 100644 index 0000000..868afef --- /dev/null +++ b/src/main/java/com/kri/kart/server/persistence/repository/ExportRepository.java @@ -0,0 +1,62 @@ +package com.kri.kart.server.persistence.repository; + +import com.kri.kart.server.dto.export.ExportDataDto; +import com.kri.kart.server.dto.export.ExportDerivedHeaderDto; +import com.kri.kart.server.dto.export.ExportHeaderDto; +import com.kri.kart.server.dto.export.ExportTitleDto; +import com.kri.kart.server.dto.export.RawDataExportRequestDto; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.persistence.SurveySessionProvider; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class ExportRepository { + private final SurveySessionProvider surveySessionProvider; + + public String additionalColumns(ProjectRefDto project) { + return session(project) + .selectOne("kart.Export.additionalColumns", Map.of("pkey", project.getPkey())); + } + + public List derivedHeaders(ProjectRefDto project) { + return session(project) + .selectList("kart.Export.derivedHeaders", Map.of("pkey", project.getPkey())); + } + + public List questionHeaders(ProjectRefDto project) { + return session(project) + .selectList("kart.Export.questionHeaders", Map.of("pkey", project.getPkey())); + } + + public List titles(ProjectRefDto project) { + return session(project).selectList("kart.Export.titles", Map.of("pkey", project.getPkey())); + } + + public String surveyType(ProjectRefDto project) { + return session(project).selectOne("kart.Export.surveyType", Map.of("pkey", project.getPkey())); + } + + public List data( + ProjectRefDto project, RawDataExportRequestDto request, boolean includeInterviewer) { + Map parameters = new HashMap<>(); + parameters.put("pkey", project.getPkey()); + parameters.put("type", request.getType()); + parameters.put("startDate", request.getStartDate()); + parameters.put( + "endDate", request.getEndDate() == null ? request.getStartDate() : request.getEndDate()); + parameters.put("includeInterviewer", includeInterviewer); + return session(project).selectList("kart.Export.data", parameters); + } + + private SqlSessionTemplate session(ProjectRefDto project) { + return surveySessionProvider.forProject(project.getProjectType()); + } +} diff --git a/src/main/java/com/kri/kart/server/persistence/repository/ImportRepository.java b/src/main/java/com/kri/kart/server/persistence/repository/ImportRepository.java new file mode 100644 index 0000000..bdb35b2 --- /dev/null +++ b/src/main/java/com/kri/kart/server/persistence/repository/ImportRepository.java @@ -0,0 +1,59 @@ +package com.kri.kart.server.persistence.repository; + +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.upload.ImportQuestionDto; +import com.kri.kart.server.dto.upload.ImportResponseDto; +import com.kri.kart.server.persistence.SurveySessionProvider; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class ImportRepository { + private final SurveySessionProvider surveySessionProvider; + + public String lockProject(ProjectRefDto project) { + return session(project).selectOne("kart.Import.lockProject", Map.of("pkey", project.getPkey())); + } + + public int command(ProjectRefDto project, String statement) { + return session(project).update("kart.Import." + statement, Map.of("pkey", project.getPkey())); + } + + public int title(ProjectRefDto project, String qid, String explain) { + return session(project) + .update( + "kart.Import.title", Map.of("pkey", project.getPkey(), "qid", qid, "explain", explain)); + } + + public int question(ProjectRefDto project, ImportQuestionDto question) { + return session(project) + .insert("kart.Import.question", Map.of("pkey", project.getPkey(), "question", question)); + } + + public int structure(ProjectRefDto project, ImportQuestionDto question) { + return session(project) + .update( + "kart.Import.structure", + Map.of( + "pkey", + project.getPkey(), + "question", + question, + "jsonPath", + "$." + question.getQid())); + } + + public int response(ProjectRefDto project, ImportResponseDto response) { + return session(project) + .insert("kart.Import.response", Map.of("pkey", project.getPkey(), "response", response)); + } + + private SqlSessionTemplate session(ProjectRefDto project) { + return surveySessionProvider.forProject(project.getProjectType()); + } +} diff --git a/src/main/java/com/kri/kart/server/persistence/repository/LogRepository.java b/src/main/java/com/kri/kart/server/persistence/repository/LogRepository.java new file mode 100644 index 0000000..a1441a1 --- /dev/null +++ b/src/main/java/com/kri/kart/server/persistence/repository/LogRepository.java @@ -0,0 +1,52 @@ +package com.kri.kart.server.persistence.repository; + +import java.util.Map; +import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Repository +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class LogRepository { + private final SqlSessionTemplate kartSqlSessionTemplate; + + public LogRepository( + @Qualifier("kartSqlSessionTemplate") SqlSessionTemplate kartSqlSessionTemplate) { + this.kartSqlSessionTemplate = kartSqlSessionTemplate; + } + + @Transactional(transactionManager = "kartTransactionManager") + public void writeLoginLog(String userId, String clientIp) { + kartSqlSessionTemplate.insert( + "kart.Log.loginLog", + Map.of("userId", userId, "clientIp", clientIp == null ? "" : clientIp)); + } + + @Transactional(transactionManager = "kartTransactionManager") + public void writeVisitLog(String userId, String pkey, String pageInfo, String clientIp) { + kartSqlSessionTemplate.insert( + "kart.Log.visitLog", + Map.of( + "userId", + userId, + "pkey", + pkey, + "pageInfo", + pageInfo, + "clientIp", + clientIp == null ? "" : clientIp)); + } + + @Transactional( + transactionManager = "kartTransactionManager", + propagation = Propagation.REQUIRES_NEW) + public void writeSiteLog(String userId, String pageInfo, String clientIp) { + kartSqlSessionTemplate.insert( + "kart.Log.siteLog", + Map.of( + "userId", userId, "pageInfo", pageInfo, "clientIp", clientIp == null ? "" : clientIp)); + } +} diff --git a/src/main/java/com/kri/kart/server/persistence/repository/NlpRepository.java b/src/main/java/com/kri/kart/server/persistence/repository/NlpRepository.java new file mode 100644 index 0000000..c0e0f69 --- /dev/null +++ b/src/main/java/com/kri/kart/server/persistence/repository/NlpRepository.java @@ -0,0 +1,28 @@ +package com.kri.kart.server.persistence.repository; + +import com.kri.kart.server.dto.statistics.NlpDictionaryWordDto; +import java.util.List; +import java.util.Map; +import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class NlpRepository { + private final SqlSessionTemplate kartSqlSessionTemplate; + + public NlpRepository( + @Qualifier("kartSqlSessionTemplate") SqlSessionTemplate kartSqlSessionTemplate) { + this.kartSqlSessionTemplate = kartSqlSessionTemplate; + } + + public List tags(String pkey, String qid) { + return kartSqlSessionTemplate.selectList("kart.Nlp.tags", Map.of("pkey", pkey, "qid", qid)); + } + + public List words(String pkey, String qid) { + return kartSqlSessionTemplate.selectList("kart.Nlp.words", Map.of("pkey", pkey, "qid", qid)); + } +} diff --git a/src/main/java/com/kri/kart/server/persistence/repository/ProgressRepository.java b/src/main/java/com/kri/kart/server/persistence/repository/ProgressRepository.java new file mode 100644 index 0000000..ae9cba9 --- /dev/null +++ b/src/main/java/com/kri/kart/server/persistence/repository/ProgressRepository.java @@ -0,0 +1,67 @@ +package com.kri.kart.server.persistence.repository; + +import com.kri.kart.server.dto.project.CustomProgressDto; +import com.kri.kart.server.dto.project.LoiDto; +import com.kri.kart.server.dto.project.ProgressDayDto; +import com.kri.kart.server.dto.project.ProgressScreenDto; +import com.kri.kart.server.dto.project.ProgressSearchDto; +import com.kri.kart.server.dto.project.ProgressTypeDto; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.persistence.SurveySessionProvider; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class ProgressRepository { + private final SurveySessionProvider surveySessionProvider; + + public List daily(ProjectRefDto project) { + return surveySessionProvider + .forProject(project.getProjectType()) + .selectList("kart.Progress.daily", Map.of("pkey", project.getPkey())); + } + + public List type(ProjectRefDto project, ProgressSearchDto search) { + return surveySessionProvider + .forProject(project.getProjectType()) + .selectList("kart.Progress.type", params(project, search)); + } + + public List loi(ProjectRefDto project, ProgressSearchDto search) { + return surveySessionProvider + .forProject(project.getProjectType()) + .selectList("kart.Progress.loi", params(project, search)); + } + + public List screen(ProjectRefDto project, ProgressSearchDto search) { + return surveySessionProvider + .forProject(project.getProjectType()) + .selectList("kart.Progress.screen", params(project, search)); + } + + public List reportUrls(ProjectRefDto project) { + return surveySessionProvider + .forProject(project.getProjectType()) + .selectList("kart.Progress.reportUrls", Map.of("pkey", project.getPkey())); + } + + public List appendFiles(ProjectRefDto project) { + return surveySessionProvider + .forProject(project.getProjectType()) + .selectList("kart.Progress.appendFiles", Map.of("pkey", project.getPkey())); + } + + private Map params(ProjectRefDto project, ProgressSearchDto search) { + Map result = new HashMap<>(); + result.put("pkey", project.getPkey()); + result.put("startDate", search.getStartDate()); + result.put("endDate", search.getEndDate()); + return result; + } +} diff --git a/src/main/java/com/kri/kart/server/persistence/repository/ProjectRepository.java b/src/main/java/com/kri/kart/server/persistence/repository/ProjectRepository.java new file mode 100644 index 0000000..6b5b076 --- /dev/null +++ b/src/main/java/com/kri/kart/server/persistence/repository/ProjectRepository.java @@ -0,0 +1,86 @@ +package com.kri.kart.server.persistence.repository; + +import com.kri.kart.server.common.enums.ProjectType; +import com.kri.kart.server.dto.project.ProjectListDto; +import com.kri.kart.server.dto.project.ProjectSummaryDto; +import com.kri.kart.server.persistence.SurveySessionProvider; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class ProjectRepository { + private final SurveySessionProvider surveySessionProvider; + private final SqlSessionTemplate kartSqlSessionTemplate; + + public ProjectRepository( + SurveySessionProvider surveySessionProvider, + @Qualifier("kartSqlSessionTemplate") SqlSessionTemplate kartSqlSessionTemplate) { + this.surveySessionProvider = surveySessionProvider; + this.kartSqlSessionTemplate = kartSqlSessionTemplate; + } + + public List findMustViewPkeys(ProjectType type) { + return kartSqlSessionTemplate.selectList( + "kart.Project.mustViewPkeys", Map.of("projectType", type.getCode())); + } + + public List findAssignedPkeys(String userId) { + return kartSqlSessionTemplate.selectList( + "kart.Project.assignedPkeys", Map.of("userId", userId)); + } + + public List list( + ProjectType type, + List excluded, + List mustView, + Integer userRole, + String userTeam, + List assignedPkeys) { + var params = visibility(userRole, userTeam, assignedPkeys); + params.put("projectType", type.getCode()); + params.put("excludedOwnerIds", excluded); + params.put("mustViewPkeys", mustView); + return surveySessionProvider.forProject(type).selectList("kart.Project.list", params); + } + + public List linkedList( + ProjectType type, + String intranetCode, + String userTeam, + String keyword, + Integer userRole, + String authenticatedUserTeam, + List assignedPkeys) { + var params = visibility(userRole, authenticatedUserTeam, assignedPkeys); + params.put("intranetCode", intranetCode); + params.put("userTeam", userTeam); + params.put("keyword", keyword); + return surveySessionProvider.forProject(type).selectList("kart.Project.linkedList", params); + } + + public List summary( + ProjectType type, + List excluded, + Integer userRole, + String userTeam, + List assignedPkeys) { + var params = visibility(userRole, userTeam, assignedPkeys); + params.put("excludedOwnerIds", excluded); + return surveySessionProvider.forProject(type).selectList("kart.Project.summary", params); + } + + private Map visibility( + Integer userRole, String userTeam, List assignedPkeys) { + Map params = new HashMap<>(); + params.put("userRole", userRole); + params.put("authenticatedUserTeam", userTeam); + params.put("assignedPkeys", assignedPkeys); + return params; + } +} diff --git a/src/main/java/com/kri/kart/server/persistence/repository/QuestionRepository.java b/src/main/java/com/kri/kart/server/persistence/repository/QuestionRepository.java new file mode 100644 index 0000000..00f5ec6 --- /dev/null +++ b/src/main/java/com/kri/kart/server/persistence/repository/QuestionRepository.java @@ -0,0 +1,25 @@ +package com.kri.kart.server.persistence.repository; + +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.question.QuestionDto; +import com.kri.kart.server.persistence.SurveySessionProvider; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class QuestionRepository { + private final SurveySessionProvider surveySessionProvider; + + public List list(ProjectRefDto project, boolean includeProfiles) { + return surveySessionProvider + .forProject(project.getProjectType()) + .selectList( + "kart.Question.list", + Map.of("pkey", project.getPkey(), "includeProfiles", includeProfiles)); + } +} diff --git a/src/main/java/com/kri/kart/server/persistence/repository/QuotaRepository.java b/src/main/java/com/kri/kart/server/persistence/repository/QuotaRepository.java new file mode 100644 index 0000000..243d97b --- /dev/null +++ b/src/main/java/com/kri/kart/server/persistence/repository/QuotaRepository.java @@ -0,0 +1,38 @@ +package com.kri.kart.server.persistence.repository; + +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.quota.QuotaEntryDto; +import com.kri.kart.server.dto.quota.QuotaSetDto; +import com.kri.kart.server.persistence.SurveySessionProvider; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class QuotaRepository { + private final SurveySessionProvider surveySessionProvider; + + public List quotaSets(ProjectRefDto project) { + return surveySessionProvider + .forProject(project.getProjectType()) + .selectList("kart.Quota.quotaSets", Map.of("pkey", project.getPkey())); + } + + public QuotaSetDto quotaSet(ProjectRefDto project, int quotaOrder) { + return surveySessionProvider + .forProject(project.getProjectType()) + .selectOne( + "kart.Quota.quotaSet", Map.of("pkey", project.getPkey(), "quotaOrder", quotaOrder)); + } + + public List quotaEntries(ProjectRefDto project, int quotaOrder) { + return surveySessionProvider + .forProject(project.getProjectType()) + .selectList( + "kart.Quota.quotaEntries", Map.of("pkey", project.getPkey(), "quotaOrder", quotaOrder)); + } +} diff --git a/src/main/java/com/kri/kart/server/persistence/repository/ShareLinkRepository.java b/src/main/java/com/kri/kart/server/persistence/repository/ShareLinkRepository.java new file mode 100644 index 0000000..6f0f4f0 --- /dev/null +++ b/src/main/java/com/kri/kart/server/persistence/repository/ShareLinkRepository.java @@ -0,0 +1,51 @@ +package com.kri.kart.server.persistence.repository; + +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.share.ShareLinkRecordDto; +import com.kri.kart.server.persistence.SurveySessionProvider; +import java.util.Map; +import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class ShareLinkRepository { + private final SqlSessionTemplate kartSqlSessionTemplate; + private final SurveySessionProvider surveySessionProvider; + + public ShareLinkRepository( + @Qualifier("kartSqlSessionTemplate") SqlSessionTemplate kartSqlSessionTemplate, + SurveySessionProvider surveySessionProvider) { + this.kartSqlSessionTemplate = kartSqlSessionTemplate; + this.surveySessionProvider = surveySessionProvider; + } + + public ShareLinkRecordDto find(String urlKey) { + return kartSqlSessionTemplate.selectOne("kart.ShareLink.find", urlKey); + } + + public String projectTitle(ProjectRefDto project) { + return surveySessionProvider + .forProject(project.getProjectType()) + .selectOne("kart.ShareLink.projectTitle", project.getPkey()); + } + + public ShareLinkRecordDto reusable(ShareLinkRecordDto link) { + return kartSqlSessionTemplate.selectOne("kart.ShareLink.reusable", link); + } + + public boolean keyExists(String urlKey) { + return kartSqlSessionTemplate.selectOne("kart.ShareLink.keyExists", urlKey) > 0; + } + + public int create(ShareLinkRecordDto link) { + return kartSqlSessionTemplate.insert("kart.ShareLink.create", link); + } + + public int incrementLanding(ShareLinkRecordDto link) { + return kartSqlSessionTemplate.update( + "kart.ShareLink.incrementLanding", Map.of("id", link.getId(), "urlKey", link.getUrlKey())); + } +} diff --git a/src/main/java/com/kri/kart/server/persistence/repository/StatisticsRepository.java b/src/main/java/com/kri/kart/server/persistence/repository/StatisticsRepository.java new file mode 100644 index 0000000..e6ee328 --- /dev/null +++ b/src/main/java/com/kri/kart/server/persistence/repository/StatisticsRepository.java @@ -0,0 +1,38 @@ +package com.kri.kart.server.persistence.repository; + +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.statistics.StatisticsDataDto; +import com.kri.kart.server.dto.statistics.StatisticsRequestDto; +import com.kri.kart.server.persistence.SurveySessionProvider; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class StatisticsRepository { + private final SurveySessionProvider surveySessionProvider; + + public List data( + ProjectRefDto project, + StatisticsRequestDto request, + boolean includeProfiles, + List selectedRoots) { + Map params = new HashMap<>(); + params.put("pkey", project.getPkey()); + params.put("dataScope", request.getDataScope()); + params.put("startDate", request.getStartDate()); + params.put( + "endDate", request.getEndDate() == null ? request.getStartDate() : request.getEndDate()); + params.put("includeProfiles", includeProfiles); + params.put("selectedRoots", selectedRoots); + params.put("hasFilter", request.getFilter() != null); + return surveySessionProvider + .forProject(project.getProjectType()) + .selectList("kart.Statistics.data", params); + } +} diff --git a/src/main/java/com/kri/kart/server/persistence/repository/UserRepository.java b/src/main/java/com/kri/kart/server/persistence/repository/UserRepository.java new file mode 100644 index 0000000..acec4cc --- /dev/null +++ b/src/main/java/com/kri/kart/server/persistence/repository/UserRepository.java @@ -0,0 +1,26 @@ +package com.kri.kart.server.persistence.repository; + +import com.kri.kart.server.dto.auth.LoginRequestDto; +import com.kri.kart.server.dto.auth.ReportMemberDto; +import java.util.List; +import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Repository; + +@Repository +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class UserRepository { + private final SqlSessionTemplate kartSqlSessionTemplate; + + public UserRepository( + @Qualifier("kartSqlSessionTemplate") SqlSessionTemplate kartSqlSessionTemplate) { + this.kartSqlSessionTemplate = kartSqlSessionTemplate; + } + + public ReportMemberDto findMember(LoginRequestDto request) { + List users = + kartSqlSessionTemplate.selectList("kart.User.findMember", request); + return users.isEmpty() ? null : users.get(0); + } +} diff --git a/src/main/java/com/kri/kart/server/scheduler/ExampleScheduler.java b/src/main/java/com/kri/kart/server/scheduler/ExampleScheduler.java deleted file mode 100644 index c9d8a75..0000000 --- a/src/main/java/com/kri/kart/server/scheduler/ExampleScheduler.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.kri.kart.server.scheduler; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -@Slf4j -@Component -@ConditionalOnProperty( - prefix = "app.scheduler.example", - name = "enabled", - havingValue = "true" -) -public class ExampleScheduler { - - @Scheduled(cron = "${app.scheduler.example.cron:0 0 1 * * *}") - public void execute() { - log.info("Example scheduler executed"); - } -} diff --git a/src/main/java/com/kri/kart/server/service/AggregateExcelService.java b/src/main/java/com/kri/kart/server/service/AggregateExcelService.java new file mode 100644 index 0000000..98992f5 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/AggregateExcelService.java @@ -0,0 +1,470 @@ +package com.kri.kart.server.service; + +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.excel.ExcelMapper; +import com.kri.common.feature.web.BusinessException; +import com.kri.kart.server.dto.export.AggregateExcelRequestDto; +import com.kri.kart.server.dto.export.AggregateExcelTableDto; +import com.kri.kart.server.dto.export.ExportFileDto; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.service.export.LegacyExcelWidthService; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.Base64; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; +import javax.imageio.ImageIO; +import lombok.RequiredArgsConstructor; +import org.apache.poi.common.usermodel.HyperlinkType; +import org.apache.poi.ss.usermodel.BorderStyle; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.FillPatternType; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.ss.util.CellUtil; +import org.apache.poi.ss.util.RegionUtil; +import org.apache.poi.util.Units; +import org.apache.poi.xssf.usermodel.XSSFCellStyle; +import org.apache.poi.xssf.usermodel.XSSFColor; +import org.apache.poi.xssf.usermodel.XSSFFont; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.springframework.stereotype.Service; +import org.springframework.web.util.HtmlUtils; + +@Service +@RequiredArgsConstructor +public class AggregateExcelService { + private final LegacyExcelWidthService legacyExcelWidthService; + private static final Pattern HTML = Pattern.compile("<[a-zA-Z/].*?>"); + private static final DateTimeFormatter TIMESTAMP = + DateTimeFormatter.ofPattern("yyyy-MM-dd HHmmss"); + + public ExportFileDto report(ProjectRefDto project, AggregateExcelRequestDto request) { + return export(project, request, false); + } + + public ExportFileDto quota(ProjectRefDto project, AggregateExcelRequestDto request) { + return export(project, request, true); + } + + private ExportFileDto export( + ProjectRefDto project, AggregateExcelRequestDto request, boolean quota) { + validate(request); + String firstSheet = quota ? clean(request.getTables().get(0).getHead()) : "목차"; + try (Workbook workbook = ExcelMapper.writeFromMapList(List.of(), firstSheet); + var output = new ByteArrayOutputStream()) { + if (quota) { + for (int i = 0; i < request.getTables().size(); i++) { + var table = request.getTables().get(i); + Sheet sheet = + i == 0 ? workbook.getSheetAt(0) : workbook.createSheet(clean(table.getHead())); + CellStyle base = baseStyle(workbook, 9, false); + initializeSheet(sheet, base); + table(sheet, table, 1, false, true, base); + for (int col = 0; col < table.getBody().get(0).size(); col++) { + legacyExcelWidthService.autoFit(sheet, col, 9); + } + } + } else { + Sheet contents = workbook.getSheetAt(0); + Sheet tables = workbook.createSheet("테이블"); + CellStyle contentsStyle = baseStyle(workbook, 10, false); + contentsStyle.setVerticalAlignment(VerticalAlignment.CENTER); + CellStyle bodyStyle = baseStyle(workbook, 9, true); + initializeSheet(contents, contentsStyle); + initializeSheet(tables, bodyStyle); + var heading = titleStyle(workbook, contentsStyle, 25, true); + for (int row = 0; row < request.getTables().size() + 4; row++) { + contents.createRow(row).setHeightInPoints(20); + } + rectangle( + contents, + new CellRangeAddress(0, 3, 0, 1), + cell -> { + cell.setCellStyle(heading); + cell.setCellValue("목차"); + }); + contents.addMergedRegion(new CellRangeAddress(0, 3, 0, 1)); + var area = new CellRangeAddress(4, request.getTables().size() + 3, 0, 1); + rectangle( + contents, + area, + cell -> { + cell.setCellStyle(contentsStyle); + CellUtil.setCellStyleProperties( + cell, + Map.of( + CellUtil.BORDER_TOP, + BorderStyle.HAIR, + CellUtil.BORDER_BOTTOM, + BorderStyle.HAIR, + CellUtil.BORDER_LEFT, + BorderStyle.HAIR, + CellUtil.BORDER_RIGHT, + BorderStyle.HAIR)); + }); + border(contents, area, BorderStyle.THIN); + int nextRow = 1; + for (int i = 0; i < request.getTables().size(); i++) { + var item = request.getTables().get(i); + cell(contents, i + 5, 1).setCellValue(title(item)); + var link = cell(contents, i + 5, 2); + link.setCellValue("Go"); + var hyperlink = workbook.getCreationHelper().createHyperlink(HyperlinkType.DOCUMENT); + hyperlink.setAddress( + java.net.URI.create("#'테이블'!A" + nextRow).toASCIIString().substring(1)); + link.setHyperlink(hyperlink); + var font = workbook.createFont(); + font.setFontName("맑은 고딕"); + font.setFontHeightInPoints((short) 10); + font.setUnderline(org.apache.poi.ss.usermodel.Font.U_SINGLE); + font.setColor(org.apache.poi.ss.usermodel.IndexedColors.BLUE.getIndex()); + CellUtil.setCellStyleProperty(link, CellUtil.FONT, font.getIndex()); + nextRow = table(tables, item, nextRow, request.isTurn(), false, bodyStyle) + 1; + } + legacyExcelWidthService.autoFit(contents, 0, 10); + contents.createFreezePane(0, 4); + } + workbook.write(output); + return new ExportFileDto( + "[" + + (quota ? "QUOTA" : "REPORT") + + "]" + + project.getPkey() + + "_" + + DateTimeUtil.nowKstLocalDateTime().format(TIMESTAMP) + + ".xlsx", + output.toByteArray()); + } catch (IllegalArgumentException exception) { + throw invalid(); + } catch (IOException exception) { + throw new IllegalStateException("Excel 파일을 생성할 수 없습니다.", exception); + } + } + + private int table( + Sheet sheet, + AggregateExcelTableDto item, + int titleRow, + boolean turn, + boolean quota, + CellStyle base) { + var rows = item.getBody().stream().map(row -> new ArrayList<>(row.values())).toList(); + boolean addTotal = !quota && turn && "single".equals(item.getQtype()); + int columns = rows.get(0).size() + (addTotal ? 1 : 0); + var titleStyle = titleStyle(sheet.getWorkbook(), base, quota ? 14 : 9, false); + if (quota) { + titleStyle.setAlignment(HorizontalAlignment.CENTER); + titleStyle.setVerticalAlignment(VerticalAlignment.CENTER); + sheet.createRow(titleRow - 1).setHeightInPoints(30); + } + rectangle( + sheet, + new CellRangeAddress(titleRow - 1, titleRow - 1, 0, columns - 1), + c -> { + c.setCellStyle(titleStyle); + c.setCellValue(quota ? clean(item.getHead()) : title(item)); + }); + if (columns > 1) { + sheet.addMergedRegion(new CellRangeAddress(titleRow - 1, titleRow - 1, 0, columns - 1)); + } + int start = titleRow + 1; + rectangle( + sheet, + new CellRangeAddress(start - 1, start + rows.size() - 2, 0, columns - 1), + c -> c.setCellStyle(base)); + int rowSpan = 0, colSpan = 0, meanPoint = 0; + for (int row = 0; row < rows.size(); row++) { + var values = rows.get(row); + if (addTotal) { + values.add(row == 0 ? "계||" : "100.0"); + } + for (int col = 0; col < columns; col++) { + String[] detail = values.get(col).split("\\|", -1); + if (detail.length == 3) { + int vertical = span(detail[1]), horizontal = span(detail[2]); + if (row == 0 && col == 0) { + rowSpan = vertical; + colSpan = horizontal; + } + var range = + new CellRangeAddress( + start + row - 1, start + row + vertical - 1, col, col + horizontal); + if (range.getLastRow() >= start + rows.size() - 1 || range.getLastColumn() >= columns) { + throw invalid(); + } + if (vertical > 0 || horizontal > 0) { + sheet.addMergedRegion(range); + } + VerticalAlignment align = + quota + ? VerticalAlignment.CENTER + : (row > rowSpan - 1 && col < colSpan + 1 + ? VerticalAlignment.TOP + : VerticalAlignment.BOTTOM); + rectangle( + sheet, + range, + c -> + CellUtil.setCellStyleProperties( + c, + Map.of( + CellUtil.ALIGNMENT, + HorizontalAlignment.CENTER, + CellUtil.VERTICAL_ALIGNMENT, + align))); + border(sheet, range, BorderStyle.THIN); + } + Cell cell = cell(sheet, start + row, col + 1); + String text = clean(detail[0]); + if (text.equals("Mean")) { + meanPoint = turn ? col + 1 : start + row; + } + if (quota && row > rowSpan && col > colSpan) { + int first = text.indexOf('/'), second = text.indexOf('/', first + 1); + if (first < 0 || second < 0) { + throw invalid(); + } + text = text.substring(0, second); + } + cell.setCellValue(text); + CellUtil.setCellStyleProperty(cell, CellUtil.BORDER_LEFT, BorderStyle.THIN); + if (quota) { + CellUtil.setCellStyleProperties( + cell, + Map.of( + CellUtil.ALIGNMENT, + HorizontalAlignment.CENTER, + CellUtil.VERTICAL_ALIGNMENT, + VerticalAlignment.CENTER)); + } + } + } + int midRow = start + rowSpan, midCol = 1 + colSpan, end = start + rows.size() - 1; + border(sheet, new CellRangeAddress(start - 1, midRow - 1, 0, midCol - 1), BorderStyle.THICK); + border( + sheet, new CellRangeAddress(start - 1, midRow - 1, midCol, columns - 1), BorderStyle.THICK); + border(sheet, new CellRangeAddress(midRow, end - 1, 0, midCol - 1), BorderStyle.THICK); + border(sheet, new CellRangeAddress(midRow, end - 1, midCol, columns - 1), BorderStyle.THICK); + if (!quota) { + for (int row = midRow + 1; row <= end; row++) { + for (int col = midCol + 1; col <= columns; col++) { + var cell = cell(sheet, row, col); + String value = cell.getStringCellValue(); + Double number = number(value); + if (number != null) { + if (!value.contains(".")) { + cell.setCellValue("(" + value + ")"); + } else { + cell.setCellValue(number); + String format = + (!turn && row == meanPoint) || (turn && col == meanPoint) ? "0.00" : "0.0"; + CellUtil.setCellStyleProperty( + cell, + CellUtil.DATA_FORMAT, + sheet.getWorkbook().createDataFormat().getFormat(format)); + } + } else { + CellUtil.setCellStyleProperty(cell, CellUtil.ALIGNMENT, HorizontalAlignment.CENTER); + } + } + } + picture(sheet, item.getImagePng(), start, columns); + } + return end + 1; + } + + private void picture(Sheet sheet, String png, int start, int columns) { + if (png == null || png.isBlank()) { + return; + } + try { + byte[] bytes = Base64.getDecoder().decode(png); + if (bytes.length > 5000000 + || bytes.length < 8 + || bytes[0] != (byte) 137 + || bytes[1] != 80 + || bytes[2] != 78 + || bytes[3] != 71) { + throw invalid(); + } + try (var imageInput = ImageIO.createImageInputStream(new ByteArrayInputStream(bytes))) { + var readers = ImageIO.getImageReaders(imageInput); + if (!readers.hasNext()) { + throw invalid(); + } + var reader = readers.next(); + try { + reader.setInput(imageInput); + if (reader.getWidth(0) > 4096 || reader.getHeight(0) > 4096) { + throw invalid(); + } + reader.read(0); + } finally { + reader.dispose(); + } + } + int imageId = sheet.getWorkbook().addPicture(bytes, Workbook.PICTURE_TYPE_PNG); + var anchor = sheet.getWorkbook().getCreationHelper().createClientAnchor(); + anchor.setCol1(columns); + anchor.setRow1(start - 1); + anchor.setDy1(Units.pixelToEMU(30)); + int col = columns; + double width = 1000; + while (width >= sheet.getColumnWidthInPixels(col)) { + width -= sheet.getColumnWidthInPixels(col++); + } + anchor.setCol2(col); + anchor.setDx2(Units.pixelToEMU((int) Math.round(width))); + int row = start - 1; + double height = 542; + while (height >= rowPixels(sheet, row)) { + height -= rowPixels(sheet, row++); + } + anchor.setRow2(row); + anchor.setDy2(Units.pixelToEMU((int) Math.round(height))); + var imageShape = sheet.createDrawingPatriarch().createPicture(anchor, imageId); + ((org.apache.poi.xssf.usermodel.XSSFPicture) imageShape) + .getCTPicture() + .getSpPr() + .getXfrm() + .getExt() + .setCx(Units.pixelToEMU(1000)); + ((org.apache.poi.xssf.usermodel.XSSFPicture) imageShape) + .getCTPicture() + .getSpPr() + .getXfrm() + .getExt() + .setCy(Units.pixelToEMU(512)); + } catch (IOException | IllegalArgumentException exception) { + throw invalid(); + } + } + + private double rowPixels(Sheet sheet, int row) { + return (sheet.getRow(row) == null + ? sheet.getDefaultRowHeightInPoints() + : sheet.getRow(row).getHeightInPoints()) + * 96 + / 72; + } + + private void initializeSheet(Sheet sheet, CellStyle base) { + sheet.setColumnWidth(0, 2340); + sheet.setDefaultColumnStyle(0, base); + ((XSSFSheet) sheet).getColumnHelper().getColumn(0, false).setMax(16384); + } + + private int span(String value) { + int span = value.isEmpty() ? 0 : Integer.parseInt(value); + if (span < 0 || span > 10000) { + throw invalid(); + } + return Math.max(0, span - 1); + } + + private Double number(String value) { + try { + double result = Double.parseDouble(value.replace(",", "").trim()); + return Double.isFinite(result) ? result : null; + } catch (NumberFormatException exception) { + return null; + } + } + + private String title(AggregateExcelTableDto table) { + return (table.getVname() == null || table.getVname().isEmpty() + ? "" + : "<표 " + table.getVname() + "> ") + + clean(table.getHead()).replace("
", ""); + } + + private String clean(String value) { + return HTML.matcher(HtmlUtils.htmlUnescape(value)).replaceAll(""); + } + + private Cell cell(Sheet sheet, int row, int col) { + var target = sheet.getRow(row - 1); + if (target == null) { + target = sheet.createRow(row - 1); + } + var cell = target.getCell(col - 1); + return cell == null ? target.createCell(col - 1) : cell; + } + + private void rectangle( + Sheet sheet, CellRangeAddress range, java.util.function.Consumer action) { + for (int row = range.getFirstRow(); row <= range.getLastRow(); row++) { + for (int col = range.getFirstColumn(); col <= range.getLastColumn(); col++) { + action.accept(cell(sheet, row + 1, col + 1)); + } + } + } + + private void border(Sheet sheet, CellRangeAddress range, BorderStyle style) { + RegionUtil.setBorderTop(style, range, sheet); + RegionUtil.setBorderBottom(style, range, sheet); + RegionUtil.setBorderLeft(style, range, sheet); + RegionUtil.setBorderRight(style, range, sheet); + } + + private CellStyle baseStyle(Workbook workbook, int size, boolean wrap) { + var font = workbook.createFont(); + font.setFontName("맑은 고딕"); + font.setFontHeightInPoints((short) size); + var style = workbook.createCellStyle(); + style.setFont(font); + style.setWrapText(wrap); + return style; + } + + private CellStyle titleStyle(Workbook workbook, CellStyle base, int size, boolean dark) { + var style = (XSSFCellStyle) workbook.createCellStyle(); + style.cloneStyleFrom(base); + var font = (XSSFFont) workbook.createFont(); + font.setFontName("맑은 고딕"); + font.setFontHeightInPoints((short) size); + font.setBold(true); + if (dark) { + font.setColor(new XSSFColor(new byte[] {(byte) 255, (byte) 255, (byte) 255})); + style.setFillForegroundColor(new XSSFColor(new byte[] {51, 51, 51})); + style.setFillPattern(FillPatternType.SOLID_FOREGROUND); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + } + style.setFont(font); + return style; + } + + private void validate(AggregateExcelRequestDto request) { + long total = 0; + for (var table : request.getTables()) { + var keys = new ArrayList<>(table.getBody().get(0).keySet()); + if (keys.size() < 2 || keys.size() > 1024) { + throw invalid(); + } + for (var row : table.getBody()) { + if (!keys.equals(new ArrayList<>(row.keySet()))) { + throw invalid(); + } + } + total += (long) keys.size() * table.getBody().size(); + } + if (total > 1000000) { + throw invalid(); + } + } + + private BusinessException invalid() { + return BusinessException.validationError( + "EXCEL_TABLE_INVALID", "Excel 출력 표·병합·이미지 형식을 확인해 주세요."); + } +} diff --git a/src/main/java/com/kri/kart/server/service/AuthService.java b/src/main/java/com/kri/kart/server/service/AuthService.java new file mode 100644 index 0000000..1c0e352 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/AuthService.java @@ -0,0 +1,57 @@ +package com.kri.kart.server.service; + +import com.kri.common.feature.auth.dto.JwtUserClaimsDto; +import com.kri.common.feature.auth.jwt.JwtService; +import com.kri.common.feature.web.BusinessException; +import com.kri.kart.server.common.external.intranet.IntranetExtensionApiClient; +import com.kri.kart.server.common.external.intranet.IntranetUserDto; +import com.kri.kart.server.dto.auth.LoginRequestDto; +import com.kri.kart.server.dto.auth.LoginResponseDto; +import com.kri.kart.server.dto.auth.ReportMemberDto; +import com.kri.kart.server.persistence.repository.UserRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class AuthService { + private final IntranetExtensionApiClient intranetExtensionApiClient; + private final UserRepository userRepository; + private final LogService logService; + private final JwtService jwtService; + + public LoginResponseDto login(LoginRequestDto request, String clientIp) { + IntranetUserDto intranetUser = intranetExtensionApiClient.searchLoginInfo(request); + JwtUserClaimsDto claims; + String redirect = ""; + if (intranetUser != null) { + claims = + JwtUserClaimsDto.builder() + .userId(intranetUser.getUserId()) + .userName(intranetUser.getUserNm()) + .userCmpn(intranetUser.getUserCmpn()) + .userTeam(intranetUser.getUserTeam()) + .userRole(intranetUser.getUserRole()) + .build(); + } else { + ReportMemberDto reportMember = userRepository.findMember(request); + if (reportMember == null) { + throw BusinessException.unauthorized("LOGIN_FAILED", "아이디 또는 비밀번호를 확인해 주세요."); + } + redirect = reportMember.getMemberRedirect(); + claims = + JwtUserClaimsDto.builder() + .userId(reportMember.getUserId()) + .userName(reportMember.getUserName()) + .userCmpn("") + .userTeam("CLIENT") + .userRole(9001) + .build(); + } + String token = jwtService.generateAccessToken(claims); + logService.writeLoginLog(claims.getUserId(), clientIp); + return new LoginResponseDto(token, claims, redirect); + } +} diff --git a/src/main/java/com/kri/kart/server/service/BookmarkService.java b/src/main/java/com/kri/kart/server/service/BookmarkService.java new file mode 100644 index 0000000..b3fd1af --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/BookmarkService.java @@ -0,0 +1,137 @@ +package com.kri.kart.server.service; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.kri.common.feature.datetime.DateTimeUtil; +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.bookmark.BookmarkDto; +import com.kri.kart.server.dto.bookmark.BookmarkSaveRequestDto; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.persistence.repository.BookmarkRepository; +import java.time.format.DateTimeFormatter; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class BookmarkService { + private static final DateTimeFormatter ID_TIMESTAMP = + DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss_SSSS"); + + private final BookmarkRepository bookmarkRepository; + private final LogService logService; + private final ObjectMapper objectMapper; + + public List list(ProjectRefDto project, String page, String userId) { + return bookmarkRepository.list(project, page, userId); + } + + @Transactional(transactionManager = "kartTransactionManager") + public String create( + ProjectRefDto project, BookmarkSaveRequestDto request, RequestUserContext ctx) { + if (!StringUtil.hasText(request.getBookmarkPage())) { + throw BusinessException.badRequest("생성할 북마크 페이지를 입력해 주세요."); + } + String bookmarkId = + project.getPkey() + + "_" + + request.getBookmarkPage().charAt(0) + + "_" + + DateTimeUtil.nowKstLocalDateTime().format(ID_TIMESTAMP); + bookmarkRepository.create(project, bookmarkId, request, ctx.getUserTeam(), ctx.getUserId()); + ObjectNode content = objectMapper.createObjectNode(); + content.set("NEW", snapshot(bookmarkId, request)); + logService.writeSiteLog(project, "Insert Bookmark", content, ctx); + return bookmarkId; + } + + @Transactional(transactionManager = "kartTransactionManager") + public String update( + ProjectRefDto project, + String bookmarkId, + BookmarkSaveRequestDto request, + RequestUserContext ctx) { + BookmarkDto origin = find(project, bookmarkId); + if (bookmarkRepository.update(project, bookmarkId, request) != 1) { + throw BusinessException.conflict("북마크가 변경되었습니다. 다시 조회해 주세요."); + } + ObjectNode content = objectMapper.createObjectNode(); + content.set("ORIGIN", snapshot(origin)); + content.set("NEW", snapshot(bookmarkId, request)); + logService.writeSiteLog(project, "Update Bookmark", content, ctx); + return bookmarkId; + } + + @Transactional(transactionManager = "kartTransactionManager") + public boolean delete(ProjectRefDto project, String bookmarkId, RequestUserContext ctx) { + BookmarkDto origin = find(project, bookmarkId); + ObjectNode content = objectMapper.createObjectNode(); + content.set("ORIGIN", snapshot(origin)); + // Legacy deletion logs the original values before reordering/deleting. + logService.writeSiteLog(project, "Delete Bookmark", content, ctx); + bookmarkRepository.shiftOrderAfterDelete(project, bookmarkId); + if (bookmarkRepository.delete(project, bookmarkId) != 1) { + throw BusinessException.conflict("북마크가 변경되었습니다. 다시 조회해 주세요."); + } + return true; + } + + private BookmarkDto find(ProjectRefDto project, String bookmarkId) { + BookmarkDto bookmark = bookmarkRepository.find(project, bookmarkId); + if (bookmark == null) { + throw BusinessException.notFound("북마크를 찾을 수 없습니다."); + } + return bookmark; + } + + private ObjectNode snapshot(String bookmarkId, BookmarkSaveRequestDto request) { + return snapshot( + bookmarkId, + request.getBookmarkTitle(), + request.getBookmarkInfo(), + request.getBookmarkJson(), + request.getIsOpen()); + } + + private ObjectNode snapshot(BookmarkDto bookmark) { + return snapshot( + bookmark.getBookmarkId(), + bookmark.getBookmarkTitle(), + bookmark.getBookmarkInfo(), + bookmark.getBookmarkJson(), + bookmark.getIsOpen()); + } + + private ObjectNode snapshot( + String bookmarkId, String title, String info, String json, Integer isOpen) { + ObjectNode node = objectMapper.createObjectNode(); + node.put("BOOKMARK_ID", bookmarkId); + node.put("BOOKMARK_TITLE", title); + node.put("BOOKMARK_INFO", info); + node.set("BOOKMARK_JSON", jsonContent(json)); + node.put("IS_OPEN", isOpen); + return node; + } + + private JsonNode jsonContent(String value) { + if (value != null) { + try { + JsonNode parsed = JsonUtil.fromJson(objectMapper, value, JsonNode.class); + if (parsed != null) { + return parsed; + } + } catch (IllegalArgumentException ignored) { + // Existing database content may be plain text; keep the audit envelope valid JSON. + } + } + return objectMapper.getNodeFactory().textNode(value); + } +} diff --git a/src/main/java/com/kri/kart/server/service/CustomProgressService.java b/src/main/java/com/kri/kart/server/service/CustomProgressService.java new file mode 100644 index 0000000..6b622d2 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/CustomProgressService.java @@ -0,0 +1,59 @@ +package com.kri.kart.server.service; + +import com.kri.kart.server.dto.project.CustomProgressDto; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.persistence.repository.ProgressRepository; +import java.nio.file.Files; +import java.nio.file.InvalidPathException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; + +@Service +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class CustomProgressService { + private static final String LEGACY_APPEND_PREFIX = "../report_append/"; + private final ProgressRepository progressRepository; + private final Path appendDirectory; + + public CustomProgressService( + ProgressRepository progressRepository, + @Value("${kri.kart.progress.append-directory:../report_append}") String appendDirectory) { + this.progressRepository = progressRepository; + this.appendDirectory = Path.of(appendDirectory).toAbsolutePath().normalize(); + } + + public List list(ProjectRefDto project) { + List reportUrls = progressRepository.reportUrls(project); + List appendFiles = progressRepository.appendFiles(project); + List result = new ArrayList<>(); + if (!reportUrls.isEmpty()) { + CustomProgressDto first = reportUrls.get(0).toBuilder().build(); + String url = first.getFileName(); + first.setFileName(url.contains("http") ? url : "https://kon.kric.com" + url); + result.add(first); + } + for (CustomProgressDto row : appendFiles) { + if (!Integer.valueOf(0).equals(row.getAppendType()) || localFileExists(row.getFileName())) { + result.add(row); + } + } + return result; + } + + private boolean localFileExists(String fileName) { + if (fileName == null || !fileName.startsWith(LEGACY_APPEND_PREFIX)) { + return false; + } + try { + Path path = + appendDirectory.resolve(fileName.substring(LEGACY_APPEND_PREFIX.length())).normalize(); + return path.startsWith(appendDirectory) && Files.isRegularFile(path); + } catch (InvalidPathException ignored) { + return false; + } + } +} diff --git a/src/main/java/com/kri/kart/server/service/DerivedManagementService.java b/src/main/java/com/kri/kart/server/service/DerivedManagementService.java new file mode 100644 index 0000000..827e262 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/DerivedManagementService.java @@ -0,0 +1,222 @@ +package com.kri.kart.server.service; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.kri.common.feature.json.JsonUtil; +import com.kri.common.feature.web.BusinessException; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.kart.server.common.enums.ProjectType; +import com.kri.kart.server.dto.derived.DerivedCalculationDto; +import com.kri.kart.server.dto.derived.DerivedDefinitionDto; +import com.kri.kart.server.dto.derived.DerivedSaveRequestDto; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.persistence.repository.DerivedRepository; +import com.kri.kart.server.service.derived.DerivedComputationService; +import java.util.List; +import java.util.Objects; +import java.util.function.Supplier; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.support.TransactionTemplate; + +@Service +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class DerivedManagementService { + private final DerivedRepository derivedRepository; + private final QuestionService questionService; + private final DerivedComputationService derivedComputationService; + private final LogService logService; + private final ObjectMapper objectMapper; + private final PlatformTransactionManager konTransactionManager; + private final PlatformTransactionManager konkiwiTransactionManager; + + public DerivedManagementService( + DerivedRepository derivedRepository, + QuestionService questionService, + DerivedComputationService derivedComputationService, + LogService logService, + ObjectMapper objectMapper, + @Qualifier("konTransactionManager") PlatformTransactionManager konTransactionManager, + @Qualifier("konkiwiTransactionManager") + PlatformTransactionManager konkiwiTransactionManager) { + this.derivedRepository = derivedRepository; + this.questionService = questionService; + this.derivedComputationService = derivedComputationService; + this.logService = logService; + this.objectMapper = objectMapper; + this.konTransactionManager = konTransactionManager; + this.konkiwiTransactionManager = konkiwiTransactionManager; + } + + public String save( + ProjectRefDto project, + String originId, + DerivedSaveRequestDto request, + RequestUserContext ctx) { + validateId(request.getVariableId()); + if (originId != null) { + validateId(originId); + } + var definition = derivedComputationService.definition(request); + return transaction( + project, + () -> { + requireProject(project); + var original = originId == null ? null : requireDefinition(project, originId); + if (derivedRepository.duplicate(project, definition.getQid(), originId)) { + throw BusinessException.conflict("DERIVED_ID_DUPLICATE", "이미 사용 중인 변수 ID입니다."); + } + if (derivedRepository.save( + project, definition, originId, ctx.getUserTeam(), ctx.getUserId()) + != 1) { + throw BusinessException.conflict("DERIVED_CHANGED", "파생변수 상태가 변경되었습니다."); + } + if (original != null && !original.getQid().equals(definition.getQid())) { + derivedRepository.clearData(project, original.getQid()); + } + calculate(project, definition); + var content = objectMapper.createObjectNode(); + content.set("NEW", objectMapper.valueToTree(definition)); + if (original != null) { + content.set("ORIGIN", objectMapper.valueToTree(original)); + } + logService.writeSiteLog( + project, + original == null ? "Insert Derived Variable" : "Update Derived Variable", + content, + ctx); + return definition.getQid(); + }); + } + + public boolean delete(ProjectRefDto project, String qid, RequestUserContext ctx) { + validateId(qid); + return transaction( + project, + () -> { + requireProject(project); + var original = requireDefinition(project, qid); + var content = + objectMapper.createObjectNode().set("ORIGIN", objectMapper.valueToTree(original)); + logService.writeSiteLog(project, "Delete Derived Variable", content, ctx); + derivedRepository.shiftOrder(project, original.getQid()); + if (derivedRepository.delete(project, original.getQid()) != 1) { + throw BusinessException.conflict("DERIVED_CHANGED", "파생변수 상태가 변경되었습니다."); + } + derivedRepository.clearData(project, original.getQid()); + return true; + }); + } + + public DerivedCalculationDto recalculate( + ProjectRefDto project, String qid, RequestUserContext ctx) { + if (qid != null) { + validateId(qid); + } + return transaction( + project, + () -> { + requireProject(project); + List definitions = + qid == null + ? derivedRepository.definitions(project) + : List.of(requireDefinition(project, qid)); + int matched = 0; + for (var definition : definitions) { + matched += calculate(project, definition); + } + if (qid == null) { + logService.writeSiteLog( + project, + "Update All Derived Variable", + objectMapper.createObjectNode().put("COUNT", Integer.toString(definitions.size())), + ctx); + } + return new DerivedCalculationDto(definitions.size(), matched); + }); + } + + public DerivedCalculationDto recalculateRespondent(ProjectRefDto project, String idkey) { + if (idkey == null || idkey.isBlank() || idkey.length() > 512) { + throw BusinessException.badRequest("응답자 ID를 확인해 주세요."); + } + return transaction( + project, + () -> { + requireProject(project); + // Legacy creates an empty DERIVED_DATA row even if there is no eligible completed + // response. + derivedRepository.ensureRespondent(project, idkey); + var definitions = derivedRepository.definitions(project); + int matched = 0; + for (var definition : definitions) { + matched += calculate(project, definition, idkey); + } + return new DerivedCalculationDto(definitions.size(), matched); + }); + } + + private int calculate(ProjectRefDto project, DerivedDefinitionDto definition) { + return calculate(project, definition, null); + } + + private int calculate(ProjectRefDto project, DerivedDefinitionDto definition, String idkey) { + validateId(definition.getQid()); + if (idkey == null) { + derivedRepository.clearData(project, definition.getQid()); + } else { + derivedRepository.clearRespondentData(project, definition.getQid(), idkey); + } + var data = + idkey == null + ? derivedRepository.responses(project) + : derivedRepository.respondentResponses(project, idkey); + var results = + derivedComputationService.calculate( + definition, questionService.list(project, idkey == null ? 0 : 1001), data); + int matched = 0; + for (int i = 0; i < data.size(); i++) { + var group = results.get(i); + derivedRepository.saveData( + project, + definition.getQid(), + data.get(i).getIdkey(), + group.isEmpty() ? null : JsonUtil.toJson(objectMapper, group)); + if (!group.isEmpty()) { + matched++; + } + } + return matched; + } + + private void requireProject(ProjectRefDto project) { + if (derivedRepository.lockProject(project) == null) { + throw BusinessException.notFound("PROJECT_NOT_FOUND", "프로젝트를 찾을 수 없습니다."); + } + } + + private DerivedDefinitionDto requireDefinition(ProjectRefDto project, String qid) { + var definition = derivedRepository.find(project, qid); + if (definition == null) { + throw BusinessException.notFound("DERIVED_NOT_FOUND", "파생변수를 찾을 수 없습니다."); + } + validateId(definition.getQid()); + return definition; + } + + private void validateId(String qid) { + if (qid == null || !qid.matches("[A-Za-z][A-Za-z0-9_]{0,127}")) { + throw BusinessException.badRequest("파생변수 ID 형식을 확인해 주세요."); + } + } + + private T transaction(ProjectRefDto project, Supplier action) { + var transactionTemplate = + new TransactionTemplate( + project.getProjectType() == ProjectType.KON + ? konTransactionManager + : konkiwiTransactionManager); + return Objects.requireNonNull(transactionTemplate.execute(status -> action.get())); + } +} diff --git a/src/main/java/com/kri/kart/server/service/DerivedService.java b/src/main/java/com/kri/kart/server/service/DerivedService.java new file mode 100644 index 0000000..8ad25fc --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/DerivedService.java @@ -0,0 +1,29 @@ +package com.kri.kart.server.service; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.kri.common.feature.json.JsonUtil; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.kart.server.dto.derived.DerivedVariableDto; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.persistence.repository.DerivedRepository; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class DerivedService { + private final DerivedRepository derivedRepository; + private final QuestionService questionService; + private final ObjectMapper objectMapper; + + public List list(ProjectRefDto project, RequestUserContext ctx) { + return questionService + .organize(derivedRepository.list(project, ctx.getUserRole(), ctx.getUserTeam())) + .stream() + .map(question -> JsonUtil.convert(objectMapper, question, DerivedVariableDto.class)) + .toList(); + } +} diff --git a/src/main/java/com/kri/kart/server/service/ExampleService.java b/src/main/java/com/kri/kart/server/service/ExampleService.java deleted file mode 100644 index d882669..0000000 --- a/src/main/java/com/kri/kart/server/service/ExampleService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.kri.kart.server.service; - -import com.kri.kart.server.common.enums.ExampleStatus; -import com.kri.kart.server.dto.request.CreateExampleRequest; -import com.kri.kart.server.dto.response.ExampleResponse; -import com.kri.kart.server.persistence.entity.ExampleEntity; -import com.kri.kart.server.persistence.entity.id.ExampleEntityId; -import com.kri.kart.server.persistence.repository.ExampleRepository; -import java.util.List; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -@RequiredArgsConstructor -@Transactional(readOnly = true) -public class ExampleService { - - private final ExampleRepository exampleRepository; - - @Transactional - public ExampleResponse create(CreateExampleRequest request) { - ExampleEntity entity = ExampleEntity.builder() - .id(new ExampleEntityId(request.groupId(), request.sequence())) - .name(request.name()) - .status(ExampleStatus.ACTIVE) - .build(); - return ExampleResponse.from(exampleRepository.save(entity)); - } - - public List search(String keyword, int limit) { - return exampleRepository.findByNameContains(keyword == null ? "" : keyword, limit) - .stream() - .map(ExampleResponse::from) - .toList(); - } -} diff --git a/src/main/java/com/kri/kart/server/service/ExportService.java b/src/main/java/com/kri/kart/server/service/ExportService.java new file mode 100644 index 0000000..a8630d1 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/ExportService.java @@ -0,0 +1,333 @@ +package com.kri.kart.server.service; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.excel.ExcelMapper; +import com.kri.common.feature.json.JsonUtil; +import com.kri.common.feature.web.BusinessException; +import com.kri.kart.server.dto.export.ExportDataDto; +import com.kri.kart.server.dto.export.ExportDerivedHeaderDto; +import com.kri.kart.server.dto.export.ExportFileDto; +import com.kri.kart.server.dto.export.ExportGuideDto; +import com.kri.kart.server.dto.export.ExportHeaderDto; +import com.kri.kart.server.dto.export.ExportTitleDto; +import com.kri.kart.server.dto.export.RawDataExportRequestDto; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.question.QuestionDto; +import com.kri.kart.server.persistence.repository.ExportRepository; +import com.kri.kart.server.persistence.repository.QuestionRepository; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.regex.Pattern; +import lombok.RequiredArgsConstructor; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.core.io.ClassPathResource; +import org.springframework.stereotype.Service; +import org.springframework.web.util.HtmlUtils; + +@Service +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class ExportService { + private static final String QUESTION_FORM = "KON 문항 등록 양식.xlsx"; + private static final List FIXED_HEADERS = + List.of( + "IDKEY", + "Status", + "start_date", + "end_date", + "interval_min", + "INTERVIEWER_INFO", + "INTERVIEWER_CODE"); + private static final DateTimeFormatter FILE_TIMESTAMP = + DateTimeFormatter.ofPattern("yyyy-MM-dd HHmmss"); + private static final Pattern HTML_TAG = Pattern.compile("<[a-zA-Z/][^\\n]*?>"); + + private final ExportRepository exportRepository; + private final QuestionRepository questionRepository; + private final ObjectMapper objectMapper; + + public ExportFileDto questionForm() { + try (var input = new ClassPathResource("file_forms/" + QUESTION_FORM).getInputStream()) { + return new ExportFileDto(QUESTION_FORM, input.readAllBytes()); + } catch (IOException exception) { + throw new IllegalStateException("문항 등록 양식을 읽을 수 없습니다.", exception); + } + } + + public ExportFileDto dataForm(ProjectRefDto project, Integer userRole) { + return file( + "Header", + project, + ExcelMapper.writeFromMapList(List.of(headers(project, userRole)), "Sheet1")); + } + + private Map headers(ProjectRefDto project, Integer userRole) { + // This ordered map is the dynamic Excel column boundary, not an untyped database result. + Map headers = new LinkedHashMap<>(); + FIXED_HEADERS.forEach(value -> headers.put(value, value)); + String additionalColumns = exportRepository.additionalColumns(project); + if (additionalColumns != null) { + if (!"[]".equals(additionalColumns)) { + // Preserve the legacy split/trim/quote removal rather than reinterpret stored column names. + for (String value : additionalColumns.replace("[", "").replace("]", "").split(",", -1)) { + String column = value.trim().replace("\"", ""); + headers.put(column, column); + } + } + if (Integer.valueOf(1001).equals(userRole)) { + for (ExportDerivedHeaderDto row : exportRepository.derivedHeaders(project)) { + addHeader(headers, row.getQid(), row.getQid(), derivedColumns(row)); + } + } + for (ExportHeaderDto row : exportRepository.questionHeaders(project)) { + addHeader(headers, row.getQid(), Objects.toString(row.getVariable(), ""), row.getValue()); + } + } + return headers; + } + + public ExportFileDto titleForm(ProjectRefDto project) { + return file( + "Explain", + project, + ExcelMapper.writeToWorkbook( + exportRepository.titles(project), ExportTitleDto.class, "Sheet1")); + } + + public ExportFileDto guide(ProjectRefDto project) { + return file( + "GUIDE", + project, + ExcelMapper.writeToWorkbook(guideRows(project), ExportGuideDto.class, "GUIDE")); + } + + private List guideRows(ProjectRefDto project) { + List rows = new ArrayList<>(); + // getQuestionList(..., isGuid=1) returns raw metadata and omits KIWI profile questions. + for (QuestionDto question : questionRepository.list(project, false)) { + appendGuide(question, rows); + } + return rows; + } + + public ExportFileDto data( + ProjectRefDto project, Integer userRole, RawDataExportRequestDto request) { + if (!List.of("COMPLETE", "INCOMPLETE").contains(Objects.toString(request.getType(), "")) + || (request.getStartDate() == null && request.getEndDate() != null) + || (request.getStartDate() != null + && request.getEndDate() != null + && request.getEndDate().isBefore(request.getStartDate()))) { + throw BusinessException.badRequest("다운로드 유형과 날짜 범위를 확인해 주세요."); + } + Map headers = headers(project, userRole); + List> rows = new ArrayList<>(); + rows.add(headers); // Row 1 contains storage keys, row 2 contains variable aliases. + boolean includeInterviewer = "2".equals(exportRepository.surveyType(project)); + for (ExportDataDto response : exportRepository.data(project, request, includeInterviewer)) { + String dat = response.getDat(); + if (dat == null || dat.isEmpty()) { + continue; // SQL STUFF returns NULL when all response groups are empty. + } + // Preserve legacy ReplaceUnicodeEmpty after SQL UPPER/FOR XML serialization. + JsonNode values = jsonObject(dat.replaceAll("\\\\U\\d*", "")); + Map row = new LinkedHashMap<>(); + for (String key : headers.keySet()) { + row.put(key, responseValue(response, values, key, includeInterviewer)); + } + rows.add(row); + } + Workbook workbook = ExcelMapper.writeFromMapList(rows, "DATA"); + try { + ExcelMapper.appendSheetToWorkbook( + workbook, guideRows(project), ExportGuideDto.class, "GUIDE", 1); + return file("DATA", project, workbook); + } catch (RuntimeException exception) { + try { + workbook.close(); + } catch (IOException closeException) { + exception.addSuppressed(closeException); + } + throw exception; + } + } + + private String responseValue( + ExportDataDto response, JsonNode values, String key, boolean includeInterviewer) { + // Fixed SQL columns take precedence; IDKEY remains the value embedded in DAT. + switch (key) { + case "Status": + return Objects.toString(response.getStatus(), ""); + case "start_date": + return Objects.toString(response.getStartDate(), ""); + case "end_date": + return Objects.toString(response.getEndDate(), ""); + case "interval_min": + return Objects.toString(response.getIntervalMin(), ""); + case "INTERVIEWER_INFO": + if (includeInterviewer) { + return Objects.toString(response.getInterviewerInfo(), ""); + } + break; + case "INTERVIEWER_CODE": + if (includeInterviewer) { + return Objects.toString(response.getInterviewerCode(), ""); + } + break; + default: + break; + } + // Non-CAPI interviewer columns fall back to response JSON in the original writer. + JsonNode value = values.get(key.toUpperCase(Locale.ROOT)); + if (value == null || value.isNull()) { + return ""; + } + return value.isValueNode() ? value.asText() : value.toPrettyString(); + } + + private void addHeader(Map headers, String qid, String variable, String values) { + for (String value : Objects.toString(values, "").split(",", -1)) { + headers.put(value, value.replace(qid, variable)); + } + } + + private String derivedColumns(ExportDerivedHeaderDto row) { + if ("num".equals(row.getQtype())) { + return row.getQid() + "_1"; + } + if ("multi".equals(row.getQtype())) { + List values = new ArrayList<>(); + JsonNode labels = jsonObject(row.getLinfo()); + for (int index = 1; index <= labels.size(); index++) { + values.add(row.getQid() + "_" + labels.get(Integer.toString(index)).get("value").asText()); + } + return String.join(",", values); + } + return row.getQid(); + } + + private void appendGuide(QuestionDto question, List rows) { + String variable = Objects.toString(question.getVariable(), ""); + String title = + HTML_TAG + .matcher(HtmlUtils.htmlUnescape(Objects.toString(question.getTitle(), ""))) + .replaceAll("") + .replace("\r", "") + .replace("\n", " "); + String qtype = question.getQtype(); + boolean attribute = "attr".equals(question.getVtype()); + JsonNode attributes = jsonObject(question.getAttrInfo()); + JsonNode labels = jsonObject(question.getLabelInfo()); + int attributeCount = attribute ? attributes.size() : 1; + for (int index = 1; index <= attributeCount; index++) { + String suffix = ""; + String outTitle = title; + if (attribute) { + JsonNode item = attributes.get(Integer.toString(index)); + suffix = "_" + item.get("value").asText(); + outTitle += item.get("label").asText(); + } + int rankCount = + "rank".equals(qtype) + ? Integer.parseInt(jsonObject(question.getRankInfo()).get("val").asText().trim()) + : 0; + String outName = variable + suffix; + if ("multi".equals(qtype) || "open".equals(qtype) || "rank".equals(qtype)) { + String start = "multi".equals(qtype) ? labels.get("1").get("value").asText() : "1"; + String end = + "multi".equals(qtype) + ? labels.get(Integer.toString(labels.size())).get("value").asText() + : Integer.toString("rank".equals(qtype) ? rankCount : labels.size()); + outName = variable + "_" + start + suffix + " To " + variable + "_" + end + suffix; + } + String variableLabel = + ("single".equals(qtype) || "scale".equals(qtype) || attribute) + ? "/" + outName + " '" + outTitle + "'" + : ""; + rows.add( + new ExportGuideDto( + attribute ? "attr" : qtype, outName, outTitle, "/" + outName, variableLabel)); + int labelIndex = 0; + for (JsonNode label : labels) { + labelIndex++; + String value = + "open".equals(qtype) ? Integer.toString(labelIndex) : label.get("value").asText(); + String labelText = "open".equals(qtype) ? value : label.get("label").asText(); + String valueLabel = + numericLabel(value) + "'" + ("open".equals(qtype) ? "" : labelText) + "'"; + variableLabel = ""; + if ("open".equals(qtype) || "multi".equals(qtype)) { + variableLabel = "/" + variable + "_" + value + suffix + " '" + outTitle + "'"; + } else if ("rank".equals(qtype) && labelIndex <= rankCount) { + variableLabel = "/" + variable + "_" + labelIndex + suffix + " '" + outTitle + "'"; + } + rows.add(new ExportGuideDto("", value, labelText, valueLabel, variableLabel)); + } + } + } + + private String numericLabel(String value) { + int number = Integer.parseInt(value.trim()); + return (number < 0 ? "-" : "") + String.format(Locale.ROOT, "%04d", Math.abs((long) number)); + } + + private JsonNode jsonObject(String value) { + try { + JsonNode node = JsonUtil.fromJson(objectMapper, value, JsonNode.class); + if (node != null && node.isObject()) { + return node; + } + } catch (IllegalArgumentException ignored) { + // Legacy GetJObjectFromString returns an empty object for malformed metadata. + } + return objectMapper.createObjectNode(); + } + + private ExportFileDto file(String prefix, ProjectRefDto project, Workbook workbook) { + try (workbook; + var output = new ByteArrayOutputStream()) { + // Common ExcelMapper autosizes; legacy LoadFromDataTable has default widths and no styles. + for (int index = 0; index < workbook.getNumberOfSheets(); index++) { + var sheet = workbook.getSheetAt(index); + for (var row : sheet) { + List emptyCells = new ArrayList<>(); + for (var cell : row) { + if (cell.getCellType() == CellType.BLANK + || (cell.getCellType() == CellType.STRING && cell.getStringCellValue().isEmpty())) { + emptyCells.add(cell); + } + } + emptyCells.forEach(row::removeCell); + } + var worksheet = ((XSSFSheet) sheet).getCTWorksheet(); + while (worksheet.sizeOfColsArray() > 0) { + worksheet.removeCols(0); + } + } + workbook.write(output); + String fileName = + "[" + + prefix + + "]" + + project.getPkey() + + "_" + + DateTimeUtil.nowKstLocalDateTime().format(FILE_TIMESTAMP) + + ".xlsx"; + return new ExportFileDto(fileName, output.toByteArray()); + } catch (IOException exception) { + throw new IllegalStateException("Excel 파일을 생성할 수 없습니다.", exception); + } + } +} diff --git a/src/main/java/com/kri/kart/server/service/ImportService.java b/src/main/java/com/kri/kart/server/service/ImportService.java new file mode 100644 index 0000000..be54c1d --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/ImportService.java @@ -0,0 +1,163 @@ +package com.kri.kart.server.service; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.kri.common.feature.file.FileUtil; +import com.kri.common.feature.web.BusinessException; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.kart.server.common.enums.ProjectType; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.upload.ImportResultDto; +import com.kri.kart.server.dto.upload.UploadTableDto; +import com.kri.kart.server.persistence.repository.ImportRepository; +import com.kri.kart.server.service.upload.QuestionImportService; +import com.kri.kart.server.service.upload.ResponseImportService; +import com.kri.kart.server.service.upload.UploadArchiveService; +import com.kri.kart.server.service.upload.UploadTableService; +import java.util.List; +import java.util.Objects; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.support.TransactionTemplate; +import org.springframework.web.multipart.MultipartFile; + +@Service +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class ImportService { + private final ImportRepository importRepository; + private final QuestionService questionService; + private final UploadTableService uploadTableService; + private final QuestionImportService questionImportService; + private final ResponseImportService responseImportService; + private final UploadArchiveService uploadArchiveService; + private final LogService logService; + private final ObjectMapper objectMapper; + private final PlatformTransactionManager konTransactionManager; + private final PlatformTransactionManager konkiwiTransactionManager; + + public ImportService( + ImportRepository importRepository, + QuestionService questionService, + UploadTableService uploadTableService, + QuestionImportService questionImportService, + ResponseImportService responseImportService, + UploadArchiveService uploadArchiveService, + LogService logService, + ObjectMapper objectMapper, + @Qualifier("konTransactionManager") PlatformTransactionManager konTransactionManager, + @Qualifier("konkiwiTransactionManager") + PlatformTransactionManager konkiwiTransactionManager) { + this.importRepository = importRepository; + this.questionService = questionService; + this.uploadTableService = uploadTableService; + this.questionImportService = questionImportService; + this.responseImportService = responseImportService; + this.uploadArchiveService = uploadArchiveService; + this.logService = logService; + this.objectMapper = objectMapper; + this.konTransactionManager = konTransactionManager; + this.konkiwiTransactionManager = konkiwiTransactionManager; + } + + public ImportResultDto titles(ProjectRefDto project, MultipartFile file, RequestUserContext ctx) { + UploadTableDto table = + uploadTableService.read(file, List.of("qid", "variable", "title", "explain")); + archive(project, "TITLE", file, ctx); + return transaction( + project, + () -> { + requireProject(project); + importRepository.command(project, "resetTitles"); + int affected = 0; + for (var row : table.getRows()) { + affected += importRepository.title(project, row.get(0), row.get(3)); + } + return new ImportResultDto(table.getRows().size(), affected, 0, 0); + }); + } + + public ImportResultDto questions( + ProjectRefDto project, MultipartFile file, RequestUserContext ctx) { + UploadTableDto table = + uploadTableService.read( + file, List.of("variable", "explain", "qtype", "attr_value", "max_value", "title")); + var questions = questionImportService.prepare(table); + archive(project, "QUESTION", file, ctx); + return transaction( + project, + () -> { + requireProject(project); + int removed = importRepository.command(project, "deleteQuestions"); + importRepository.command(project, "deleteOptions"); + importRepository.command(project, "deleteQuotaSets"); + importRepository.command(project, "deleteQuotas"); + if (importRepository.command(project, "resetStructure") != 1) { + throw BusinessException.conflict("STRUCTURE_NOT_FOUND", "프로젝트 STRUCTURE를 확인해 주세요."); + } + for (var question : questions) { + requireOne(importRepository.question(project, question)); + requireOne(importRepository.structure(project, question)); + } + return new ImportResultDto(questions.size(), questions.size(), removed, 0); + }); + } + + public ImportResultDto data(ProjectRefDto project, MultipartFile file, RequestUserContext ctx) { + UploadTableDto table = uploadTableService.read(file, null); + archive(project, "DATA", file, ctx); + return transaction( + project, + () -> { + requireProject(project); + // The old converter explicitly requests isAdmin=0 when finding multi-question metadata. + var multi = + questionService.list(project, 1001).stream() + .filter(question -> "multi".equalsIgnoreCase(question.getQtype())) + .map(question -> question.getQid().split("_", -1)[0]) + .collect(Collectors.toSet()); + var responses = responseImportService.prepare(table, multi); + int removed = importRepository.command(project, "deleteUploaded"); + int archived = importRepository.command(project, "archiveCompleted"); + for (var response : responses) { + requireOne(importRepository.response(project, response)); + } + return new ImportResultDto(responses.size(), responses.size(), removed, archived); + }); + } + + private void archive( + ProjectRefDto project, String type, MultipartFile file, RequestUserContext ctx) { + String name = + uploadArchiveService.store(project, type, uploadTableService.extension(file), file); + var content = + objectMapper + .createObjectNode() + .put("Type", type) + .put("Origin", FileUtil.extractFileNameFromPath(file.getOriginalFilename())) + .put("FileName", name); + logService.writeSiteLog(project, "Upload File", content, ctx); + } + + private void requireProject(ProjectRefDto project) { + if (importRepository.lockProject(project) == null) { + throw BusinessException.notFound("PROJECT_NOT_FOUND", "프로젝트를 찾을 수 없습니다."); + } + } + + private void requireOne(int count) { + if (count != 1) { + throw BusinessException.conflict("IMPORT_CHANGED", "저장 대상의 상태가 변경되었습니다."); + } + } + + private T transaction(ProjectRefDto project, Supplier action) { + var manager = + project.getProjectType() == ProjectType.KON + ? konTransactionManager + : konkiwiTransactionManager; + return Objects.requireNonNull(new TransactionTemplate(manager).execute(status -> action.get())); + } +} diff --git a/src/main/java/com/kri/kart/server/service/LogService.java b/src/main/java/com/kri/kart/server/service/LogService.java new file mode 100644 index 0000000..351401b --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/LogService.java @@ -0,0 +1,83 @@ +package com.kri.kart.server.service; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.kri.common.feature.web.BusinessException; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.kart.server.common.enums.ProjectType; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.persistence.repository.LogRepository; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +@Slf4j +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class LogService { + private final LogRepository logRepository; + private final ObjectMapper objectMapper; + + public void writeLoginLog(String userId, String clientIp) { + try { + logRepository.writeLoginLog(userId, clientIp); + } catch (Exception ignored) { + log.warn("로그인 이력 저장 실패"); + } + } + + public void writeVisitLog( + ProjectType projectType, String pkey, String content, RequestUserContext ctx) { + String projectKey = visitProjectKey(projectType, pkey); + try { + logRepository.writeVisitLog(ctx.getUserId(), projectKey, content, ctx.getClientIp()); + } catch (Exception ignored) { + // Preserve legacy best-effort logging; do not log SQL, identity, IP or supplied content. + log.warn("방문 로그 기록 실패"); + } + } + + public void writeSiteLog( + ProjectRefDto project, String title, JsonNode content, RequestUserContext ctx) { + var pageInfo = objectMapper.createObjectNode(); + // The existing frontend calls the v2 endpoint, which stores projectCode rather than PKEY. + pageInfo.put("projectCode", project.getPkey()); + pageInfo.put("projectType", project.getProjectType().getCode()); + pageInfo.put("LOGTITLE", title); + pageInfo.set("LOGCONTENT", normalizeContent(content)); + try { + logRepository.writeSiteLog( + ctx.getUserId(), objectMapper.writeValueAsString(pageInfo), ctx.getClientIp()); + } catch (Exception ignored) { + log.warn("활동 로그 기록 실패"); + } + } + + private String visitProjectKey(ProjectType projectType, String pkey) { + boolean hasKey = pkey != null && !pkey.isBlank(); + if (projectType == null && !hasKey) { + return ""; + } + if (projectType == null || !hasKey) { + throw BusinessException.badRequest("프로젝트 유형과 키는 함께 입력하거나 모두 생략해 주세요."); + } + return new ProjectRefDto(projectType, pkey).getPkey(); + } + + private JsonNode normalizeContent(JsonNode content) { + if (content != null && content.isTextual()) { + try { + JsonNode parsed = objectMapper.readTree(content.asText()); + if (parsed != null) { + return parsed; + } + } catch (JsonProcessingException ignored) { + // Plain text is safely stored as a JSON string; never concatenate raw JSON/SQL. + } + } + return content; + } +} diff --git a/src/main/java/com/kri/kart/server/service/ProgressService.java b/src/main/java/com/kri/kart/server/service/ProgressService.java new file mode 100644 index 0000000..bd184b7 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/ProgressService.java @@ -0,0 +1,47 @@ +package com.kri.kart.server.service; + +import com.kri.kart.server.common.util.DateTimeUtil; +import com.kri.kart.server.dto.project.LoiDto; +import com.kri.kart.server.dto.project.ProgressDayDto; +import com.kri.kart.server.dto.project.ProgressScreenDto; +import com.kri.kart.server.dto.project.ProgressSearchDto; +import com.kri.kart.server.dto.project.ProgressTypeDto; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.persistence.repository.ProgressRepository; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class ProgressService { + private final ProgressRepository progressRepository; + + public List daily(ProjectRefDto project) { + return progressRepository.daily(project); + } + + public List type(ProjectRefDto project, ProgressSearchDto search) { + search.validateRange(); + return progressRepository.type(project, search); + } + + public List loi(ProjectRefDto project, ProgressSearchDto search) { + search.validateRange(); + List rows = progressRepository.loi(project, search); + for (LoiDto row : rows) { + row.setAvgLoi(DateTimeUtil.formatSeconds(row.getAvgLoi())); + row.setAvgLoiModify(DateTimeUtil.formatSeconds(row.getAvgLoiModify())); + row.setMinLoi(DateTimeUtil.formatSeconds(row.getMinLoi())); + row.setMaxLoi(DateTimeUtil.formatSeconds(row.getMaxLoi())); + } + return rows; + } + + public List screen(ProjectRefDto project, ProgressSearchDto search) { + search.validateRange(); + return progressRepository.screen(project, search); + } +} diff --git a/src/main/java/com/kri/kart/server/service/ProjectService.java b/src/main/java/com/kri/kart/server/service/ProjectService.java new file mode 100644 index 0000000..277f522 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/ProjectService.java @@ -0,0 +1,141 @@ +package com.kri.kart.server.service; + +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.common.enums.ProjectType; +import com.kri.kart.server.common.external.intranet.IntranetExtensionApiClient; +import com.kri.kart.server.dto.project.ProjectLinkSearchDto; +import com.kri.kart.server.dto.project.ProjectListDto; +import com.kri.kart.server.dto.project.ProjectSummaryDto; +import com.kri.kart.server.persistence.repository.ProjectRepository; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class ProjectService { + private final ProjectRepository projectRepository; + private final IntranetExtensionApiClient intranetExtensionApiClient; + + public List list(ProjectLinkSearchDto search, RequestUserContext ctx) { + requireIdentity(ctx); + boolean hasKeyword = search.getKeyword() != null && !search.getKeyword().isEmpty(); + if (search.getProjectType() == null + && search.getIntranetCode() == null + && search.getUserTeam() == null + && !hasKeyword) { + return list(ctx); + } + if (search.getProjectType() == null + || search.getIntranetCode() == null + || search.getUserTeam() == null) { + throw BusinessException.badRequest("연동 조회에는 projectType/intranetCode/userTeam을 함께 입력해 주세요."); + } + String intranetCode = search.getIntranetCode().split("_", -1)[0]; + String keyword = search.getKeyword() == null ? "" : search.getKeyword(); + var rows = + projectRepository.linkedList( + search.getProjectType(), + intranetCode, + search.getUserTeam(), + keyword, + ctx.getUserRole(), + ctx.getUserTeam(), + assignedPkeys(ctx)); + for (int index = 0; index < rows.size(); index++) { + rows.get(index).setProjectType(search.getProjectType()); + rows.get(index).setRowNumber(Integer.toString(index + 1)); + } + return rows; + } + + public List list(RequestUserContext ctx) { + requireIdentity(ctx); + List assignedPkeys = assignedPkeys(ctx); + // Fetch once for both sources and filter in SQL before ordering/selecting candidates. + List excluded = intranetExtensionApiClient.getExcludedOwnerIds(); + List results = new ArrayList<>(); + for (ProjectType type : ProjectType.values()) { + List rows = + projectRepository.list( + type, + excluded, + projectRepository.findMustViewPkeys(type), + ctx.getUserRole(), + ctx.getUserTeam(), + assignedPkeys); + for (ProjectListDto row : rows) { + row.setProjectType(type); + } + results.addAll(rows); + } + results.sort( + Comparator.comparing( + ProjectListDto::getCreateDate, Comparator.nullsLast(Comparator.reverseOrder()))); + for (int i = 0; i < results.size(); i++) { + results.get(i).setRowNumber(Integer.toString(i + 1)); + } + return results; + } + + public List summary(RequestUserContext ctx) { + requireIdentity(ctx); + List assignedPkeys = assignedPkeys(ctx); + List excluded = intranetExtensionApiClient.getExcludedOwnerIds(); + List results = new ArrayList<>(); + for (ProjectType type : ProjectType.values()) { + List rows = + projectRepository.summary( + type, excluded, ctx.getUserRole(), ctx.getUserTeam(), assignedPkeys); + for (ProjectSummaryDto row : rows) { + row.setProjectType(type); + } + results.addAll(rows); + } + // v2: each source TOP 6 after status/date ordering, then merge by date and take 6. + results.sort( + Comparator.comparing( + ProjectSummaryDto::getCreateDate, Comparator.nullsLast(Comparator.reverseOrder()))); + List selected = + new ArrayList<>(results.subList(0, Math.min(6, results.size()))); + for (ProjectSummaryDto row : selected) { + row.setSurveyType(label(row.getSurveyType(), new String[] {"온라인", "CAPI", "GANG"})); + row.setStatus(label(row.getStatus(), new String[] {"준비", "진행", "완료"})); + } + return selected; + } + + private void requireIdentity(RequestUserContext ctx) { + if (ctx.getUserRole() == null + || (!Integer.valueOf(1001).equals(ctx.getUserRole()) + && StringUtil.normalizeBlank(ctx.getUserTeam()) == null) + || (Integer.valueOf(9001).equals(ctx.getUserRole()) + && StringUtil.normalizeBlank(ctx.getUserId()) == null)) { + throw BusinessException.unauthorized("PROJECT_IDENTITY_REQUIRED", "프로젝트 조회 인증 정보가 부족합니다."); + } + } + + private List assignedPkeys(RequestUserContext ctx) { + return Integer.valueOf(9001).equals(ctx.getUserRole()) + ? projectRepository.findAssignedPkeys(ctx.getUserId()) + : List.of(); + } + + private String label(String code, String[] labels) { + if (code == null) { + return ""; + } + try { + int index = Integer.parseInt(code); + return index >= 1 && index <= labels.length ? labels[index - 1] : ""; + } catch (NumberFormatException ignored) { + return ""; + } + } +} diff --git a/src/main/java/com/kri/kart/server/service/QuestionService.java b/src/main/java/com/kri/kart/server/service/QuestionService.java new file mode 100644 index 0000000..a66c53a --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/QuestionService.java @@ -0,0 +1,163 @@ +package com.kri.kart.server.service; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.kri.kart.server.common.enums.ProjectType; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.question.QuestionDto; +import com.kri.kart.server.persistence.repository.QuestionRepository; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class QuestionService { + private final QuestionRepository questionRepository; + private final ObjectMapper objectMapper; + + public List list(ProjectRefDto project, Integer userRole) { + boolean profiles = + project.getProjectType() == ProjectType.KIWI && Integer.valueOf(1001).equals(userRole); + return organize(questionRepository.list(project, profiles)); + } + + public List organize(List questions) { + List result = new ArrayList<>(); + for (QuestionDto question : questions) { + if ("open".equals(question.getQtype())) { + expandOpen(question, result); + } else if ("rank".equals(question.getQtype())) { + expandRank(question, result); + } else { + result.add(question.toBuilder().build()); + expandAttributes(question, result); + } + } + return result; + } + + public List detail(ProjectRefDto project, String qid, Integer userRole) { + // The old API selects the first matching QID only after composite questions are expanded. + return list(project, userRole).stream() + .filter(row -> qid.equals(row.getQid())) + .limit(1) + .toList(); + } + + private void expandOpen(QuestionDto question, List result) { + JsonNode labels = object(question.getLabelInfo()); + JsonNode attributes = object(question.getAttrInfo()); + for (int index = 1; index <= labels.size(); index++) { + JsonNode label = entry(labels, index); + String suffix = " - " + text(label.get("label")); + if (suffix.equals(" - ")) { + suffix = ""; + } + QuestionDto open = + question.toBuilder() + .qid(question.getQid() + "_" + index) + .variable(question.getVariable() + "_" + index) + .title(question.getTitle() + suffix) + .explain(question.getExplain() + suffix) + .qtype("num".equals(text(label.get("option"))) ? "num" : "text") + .labelInfo(label.toString()) + .build(); + result.add(open); + if ("attr".equals(question.getVtype())) { + for (int attributeIndex = 1; attributeIndex <= attributes.size(); attributeIndex++) { + JsonNode attribute = entry(attributes, attributeIndex); + result.add( + open.toBuilder() + .qid(open.getQid() + "_" + attributeIndex) + .variable(open.getVariable() + "_" + attributeIndex) + .title(open.getTitle() + " - " + requiredText(attribute, "label")) + .explain(open.getExplain() + " - " + requiredText(attribute, "label")) + .attrInfo(attribute.toString()) + .build()); + } + } + } + } + + private void expandRank(QuestionDto question, List result) { + JsonNode value = object(question.getRankInfo()).get("val"); + int count = value == null || value.isNull() ? 0 : Integer.parseInt(value.asText()); + for (int rank = 1; rank <= count; rank++) { + String ranks = + IntStream.rangeClosed(1, rank) + .mapToObj(Integer::toString) + .collect(Collectors.joining("+")); + String suffix = " - " + ranks + "순위 까지"; + // Preserve the old string replacement, including its handling of numeric/spaced JSON val. + String rankInfo = + question + .getRankInfo() + .replace("\r\n", "") + .replace("\"val\":\"" + count + "\"", "\"val\":\"" + rank + "\""); + result.add( + question.toBuilder() + .qid(question.getQid() + "_" + rank) + .variable(question.getVariable() + "_" + rank) + .title(question.getTitle() + suffix) + .explain(question.getExplain() + suffix) + .rankInfo(rankInfo) + .build()); + } + } + + private void expandAttributes(QuestionDto question, List result) { + if (!"attr".equals(question.getVtype())) { + return; + } + JsonNode attributes = object(question.getAttrInfo()); + for (int index = 1; index <= attributes.size(); index++) { + JsonNode attribute = entry(attributes, index); + String suffix = "_" + requiredText(attribute, "value"); + result.add( + question.toBuilder() + .qid(question.getQid() + suffix) + .variable(question.getVariable() + suffix) + .title(question.getTitle() + " - " + requiredText(attribute, "label")) + .explain(question.getExplain() + " - " + requiredText(attribute, "label")) + .attrInfo(attribute.toString()) + .build()); + } + } + + private JsonNode object(String json) { + try { + JsonNode parsed = json == null || json.isEmpty() ? null : objectMapper.readTree(json); + return parsed != null && parsed.isObject() ? parsed : objectMapper.createObjectNode(); + } catch (JsonProcessingException ignored) { + // Match Common.GetJObjectFromString: invalid metadata becomes an empty object. + return objectMapper.createObjectNode(); + } + } + + private JsonNode entry(JsonNode object, int index) { + JsonNode value = object.get(Integer.toString(index)); + if (value == null || !value.isObject()) { + throw new IllegalStateException("Missing sequential question label " + index); + } + return value; + } + + private String requiredText(JsonNode object, String field) { + JsonNode value = object.get(field); + if (value == null) { + throw new IllegalStateException("Missing question label field " + field); + } + return text(value); + } + + private String text(JsonNode value) { + return value == null || value.isNull() ? "" : value.asText(); + } +} diff --git a/src/main/java/com/kri/kart/server/service/QuotaService.java b/src/main/java/com/kri/kart/server/service/QuotaService.java new file mode 100644 index 0000000..e7f88e4 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/QuotaService.java @@ -0,0 +1,146 @@ +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.QuotaResultDto; +import com.kri.kart.server.dto.quota.QuotaResultRequestDto; +import com.kri.kart.server.dto.quota.QuotaSetDto; +import com.kri.kart.server.dto.statistics.StatisticsBatchDto; +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.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; + +@Service +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class QuotaService { + private final QuotaRepository quotaRepository; + private final StatisticsService statisticsService; + private final StatisticsAggregationService statisticsAggregationService; + private final StatisticsDimensionService statisticsDimensionService; + private final LegacyFilterService legacyFilterService; + private final QuotaComputationService quotaComputationService; + private final LogService logService; + private final ObjectMapper objectMapper; + + public List list(ProjectRefDto project) { + return quotaRepository.quotaSets(project); + } + + public QuotaResultDto result( + ProjectRefDto project, + int quotaOrder, + QuotaResultRequestDto request, + RequestUserContext ctx) { + QuotaSetDto quotaSet = quotaRepository.quotaSet(project, quotaOrder); + if (quotaSet == null) { + throw BusinessException.notFound("QUOTA_SET_NOT_FOUND", "쿼터 설정을 찾을 수 없습니다."); + } + var content = objectMapper.createObjectNode(); + 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(); + } + 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.setDataScope(request.getDataScope()); + statisticsRequest.setStartDate(request.getStartDate()); + statisticsRequest.setEndDate(request.getEndDate()); + statisticsRequest.setShowSubtotals(false); + statisticsRequest.setHeaderMode("NONE"); + StatisticsBatchDto statisticsBatch = + statisticsService.prepareQuota(project, statisticsRequest, ctx); + StatisticsDimension indexDimension = + statisticsDimensionService.resolve( + index, statisticsBatch.questions(), statisticsBatch.responses()); + if ("text".equals(indexDimension.getQuestion().getQtype()) + && !indexDimension.isAttributeProjection()) { + throw BusinessException.validationError( + "QUOTA_TEXT_UNSUPPORTED", "주관식 문자 문항은 쿼터 완료수 표로 집계할 수 없습니다."); + } + StatisticsResponseDto table = + statisticsAggregationService.aggregate( + statisticsRequest, statisticsBatch.questions(), statisticsBatch.responses()); + String matchIndex = indexDimension.getBaseKey(); + QuotaResultDto result = + quotaComputationService.compute( + quotaSet, + index, + matchIndex, + banners, + table, + 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/ShareLinkService.java b/src/main/java/com/kri/kart/server/service/ShareLinkService.java new file mode 100644 index 0000000..7899f77 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/ShareLinkService.java @@ -0,0 +1,213 @@ +package com.kri.kart.server.service; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.kri.common.feature.auth.dto.JwtUserClaimsDto; +import com.kri.common.feature.auth.jwt.JwtService; +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.common.enums.ProjectType; +import com.kri.kart.server.config.ShareLinkProperties; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.share.ExternalLoginResponseDto; +import com.kri.kart.server.dto.share.ShareLinkDto; +import com.kri.kart.server.dto.share.ShareLinkRecordDto; +import com.kri.kart.server.dto.share.ShareLinkRequestDto; +import com.kri.kart.server.persistence.repository.ShareLinkRepository; +import com.kri.kart.server.service.share.LegacyProjectKeyService; +import java.net.URI; +import java.security.SecureRandom; +import java.util.Base64; +import java.util.Set; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class ShareLinkService { + public static final String EXTERNAL_TEAM = "KART_EXTERNAL"; + public static final String EXTERNAL_USER_PREFIX = "EXTERNAL:"; + public static final String REQUEST_LINK_ATTRIBUTE = ShareLinkService.class.getName() + ".link"; + private static final Set REPORT_PATHS = + Set.of("/Report/Current", "/Report/Quota", "/Report/Tabulation", "/Report/Crosstab"); + private final ShareLinkRepository shareLinkRepository; + private final LegacyProjectKeyService legacyProjectKeyService; + private final ShareLinkProperties shareLinkProperties; + private final JwtService jwtService; + private final LogService logService; + private final ObjectMapper objectMapper; + private final SecureRandom secureRandom = new SecureRandom(); + + @Transactional(transactionManager = "kartTransactionManager") + public ShareLinkDto create( + ProjectRefDto project, ShareLinkRequestDto request, RequestUserContext ctx) { + String path = allowedUrl(request.getRealUrl()); + String title = requireProject(project); + ShareLinkRecordDto candidate = new ShareLinkRecordDto(); + candidate.setPkey(project.getPkey()); + candidate.setProjectType(project.getProjectType().getCode()); + candidate.setRealUrl(path); + candidate.setIsPageOnly("P".equals(request.getMode()) ? 1 : 0); + candidate.setSkey(legacyProjectKeyService.encode(project)); + candidate.setProjectTitle(title); + // Ordinary legacy users share REPORT ownership, preserving existing URL reuse. + String owner = + ctx.getUserId() != null && Set.of("KON", "KIWI").contains(ctx.getUserId()) + ? ctx.getUserId() + : "REPORT"; + candidate.setUrlOwner(owner); + ShareLinkRecordDto existing = shareLinkRepository.reusable(candidate); + ShareLinkDto link; + if (existing != null) { + link = resolve(existing); + } else { + for (int attempt = 0; attempt < 10; attempt++) { + byte[] bytes = new byte[16]; + secureRandom.nextBytes(bytes); + String key = Base64.getUrlEncoder().withoutPadding().encodeToString(bytes); + if (!shareLinkRepository.keyExists(key)) { + candidate.setUrlKey(key); + break; + } + } + if (candidate.getUrlKey() == null || shareLinkRepository.create(candidate) != 1) { + throw BusinessException.conflict("SHARE_LINK_CREATE_CONFLICT", "공유 링크를 다시 발급해 주세요."); + } + link = view(candidate, project); + } + var content = objectMapper.createObjectNode(); + content.put("REAL_URI", path); + content.put("MODE", request.getMode()); + content.put("COPY_URI", link.getUrl()); + logService.writeSiteLog(project, "URL Copy", content, ctx); + return link; + } + + public ShareLinkDto lookup(String urlKey) { + return resolve(record(urlKey)); + } + + @Transactional(transactionManager = "kartTransactionManager") + public ExternalLoginResponseDto login(String urlKey, String clientIp) { + ShareLinkRecordDto stored = record(urlKey); + ShareLinkDto link = resolve(stored); + String userId = EXTERNAL_USER_PREFIX + link.getUrlKey(); + String token = + jwtService.generateAccessToken( + JwtUserClaimsDto.builder() + .userId(userId) + .userName("CLIENT") + .userTeam(EXTERNAL_TEAM) + .userCmpn("") + .userRole(9001) + .build()); + if (shareLinkRepository.incrementLanding(stored) != 1) { + throw BusinessException.conflict("SHARE_LINK_CHANGED", "공유 링크를 다시 열어 주세요."); + } + logService.writeLoginLog(userId, clientIp); + return new ExternalLoginResponseDto(token, link); + } + + private ShareLinkRecordDto record(String urlKey) { + if (urlKey == null || !urlKey.matches("[A-Za-z0-9_-]{1,128}")) { + throw BusinessException.notFound("SHARE_LINK_NOT_FOUND", "공유 링크를 찾을 수 없습니다."); + } + ShareLinkRecordDto stored = shareLinkRepository.find(urlKey); + if (stored == null) { + throw BusinessException.notFound("SHARE_LINK_NOT_FOUND", "공유 링크를 찾을 수 없습니다."); + } + return stored; + } + + private ShareLinkDto resolve(ShareLinkRecordDto stored) { + ProjectRefDto project; + try { + if (stored.getPkey() == null && stored.getProjectType() == null) { + project = legacyProjectKeyService.decode(stored.getSkey()); + } else if (stored.getPkey() == null || stored.getProjectType() == null) { + throw invalid(); + } else { + project = + new ProjectRefDto(ProjectType.fromCode(stored.getProjectType()), stored.getPkey()); + // A mismatch must never open another project, even during rollback. + if (StringUtil.normalizeBlank(stored.getSkey()) != null + && !project.equals(legacyProjectKeyService.decode(stored.getSkey()))) { + throw invalid(); + } + } + } catch (IllegalArgumentException exception) { + throw invalid(); + } + if (stored.getIsPageOnly() == null + || (stored.getIsPageOnly() != 0 && stored.getIsPageOnly() != 1)) { + throw invalid(); + } + allowedUrl(stored.getRealUrl()); + requireProject(project); + return view(stored, project); + } + + private String requireProject(ProjectRefDto project) { + String title = shareLinkRepository.projectTitle(project); + if (title == null) { + throw BusinessException.notFound("PROJECT_NOT_FOUND", "프로젝트를 찾을 수 없습니다."); + } + return title; + } + + private ShareLinkDto view(ShareLinkRecordDto stored, ProjectRefDto project) { + URI origin; + try { + origin = URI.create(shareLinkProperties.getPublicOrigin()); + if (!Set.of("https", "http").contains(origin.getScheme()) + || origin.getHost() == null + || origin.getUserInfo() != null + || origin.getQuery() != null + || origin.getFragment() != null + || !(origin.getPath().isEmpty() || origin.getPath().equals("/"))) { + throw new IllegalArgumentException(); + } + } catch (RuntimeException exception) { + throw BusinessException.internalError("SHARE_ORIGIN_INVALID", "공유 링크 공개 주소 설정을 확인해 주세요."); + } + String absolute = origin.resolve("/External/" + stored.getUrlKey()).toString(); + return new ShareLinkDto( + stored.getUrlKey(), + absolute, + allowedUrl(stored.getRealUrl()), + project.getProjectType(), + project.getPkey(), + stored.getProjectTitle(), + stored.getIsPageOnly() == 1); + } + + public String allowedUrl(String value) { + try { + URI uri = URI.create(value); + if (value.length() > 4096 + || !value.startsWith("/") + || uri.isAbsolute() + || uri.getRawAuthority() != null + || value.chars().anyMatch(c -> c < 32 || c == 127 || c == '\\')) { + throw new IllegalArgumentException(); + } + // Query/fragment are retained as navigation state, not an authorization source. + String path = uri.getRawPath().replaceFirst("/+$", ""); + String canonical = + REPORT_PATHS.stream() + .filter(allowed -> allowed.equalsIgnoreCase(path)) + .findFirst() + .orElseThrow(IllegalArgumentException::new); + return canonical + value.substring(uri.getRawPath().length()); + } catch (RuntimeException exception) { + throw BusinessException.validationError("SHARE_PATH_INVALID", "공유 가능한 보고서 화면 경로를 입력해 주세요."); + } + } + + private BusinessException invalid() { + return BusinessException.validationError("SHARE_PROJECT_INVALID", "공유 링크의 프로젝트 정보가 올바르지 않습니다."); + } +} diff --git a/src/main/java/com/kri/kart/server/service/StatisticsService.java b/src/main/java/com/kri/kart/server/service/StatisticsService.java new file mode 100644 index 0000000..ed91c53 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/StatisticsService.java @@ -0,0 +1,343 @@ +package com.kri.kart.server.service; + +import com.fasterxml.jackson.databind.ObjectMapper; +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.common.enums.ProjectType; +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.question.QuestionDto; +import com.kri.kart.server.dto.statistics.StatisticsBatchDto; +import com.kri.kart.server.dto.statistics.StatisticsDataDto; +import com.kri.kart.server.dto.statistics.StatisticsFilterDto; +import com.kri.kart.server.dto.statistics.StatisticsRequestDto; +import com.kri.kart.server.dto.statistics.StatisticsResponseDto; +import com.kri.kart.server.dto.statistics.StatisticsStreamEventDto; +import com.kri.kart.server.dto.statistics.SurveyResponseDto; +import com.kri.kart.server.persistence.repository.QuestionRepository; +import com.kri.kart.server.persistence.repository.StatisticsRepository; +import com.kri.kart.server.service.statistics.StatisticsAggregationService; +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.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; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class StatisticsService { + private static final String STANDARD_MODE = "STANDARD"; + // TABULATION requests have no single index; their rows are stored under the INDEX root. + private static final String TABULATION_STORAGE_ROOT = "INDEX"; + private static final String ATTRIBUTE_PROJECTION_SUFFIX = "#A"; + private static final int PROFILE_QUESTION_ROLE = 1001; + private static final List PROFILE_ID_PREFIXES = List.of("PF", "PS"); + private static final String AUDIT_EVENT = "Get Report Data"; + private static final String CALCULATION_FAILED_CODE = "REPORT_CALCULATION_FAILED"; + private static final String CALCULATION_FAILED_MESSAGE = "문항 집계 처리에 실패했습니다."; + + private final StatisticsRepository statisticsRepository; + private final QuestionRepository questionRepository; + private final QuestionService questionService; + private final StatisticsDataService statisticsDataService; + private final StatisticsDimensionService statisticsDimensionService; + private final StatisticsFilterService statisticsFilterService; + private final StatisticsAggregationService statisticsAggregationService; + private final StatisticsTextService statisticsTextService; + private final LogService logService; + private final ObjectMapper objectMapper; + + @FunctionalInterface + public interface StatisticsEventConsumer { + void accept(StatisticsStreamEventDto event) throws IOException; + } + + public StatisticsResponseDto result( + ProjectRefDto project, + StatisticsRequestDto request, + RequestUserContext ctx) { + StatisticsBatchDto statisticsBatch = prepare(project, List.of(request), ctx); + return calculate(statisticsBatch, request); + } + + /** + * Validates every index, then loads questions and responses once for the whole batch. Every + * general statistics batch is audited once as "Get Report Data". + */ + public StatisticsBatchDto prepare( + ProjectRefDto project, + List requests, + RequestUserContext ctx) { + StatisticsBatchDto statisticsBatch = prepare(project, requests, ctx, false); + logService.writeSiteLog(project, AUDIT_EVENT, objectMapper.valueToTree(requests), ctx); + return statisticsBatch; + } + + /** + * Quota tables may use an empty STANDARD index. QuotaService audits them as "QUOTA VIEW", so no + * "Get Report Data" event is written here. + */ + public StatisticsBatchDto prepareQuota( + ProjectRefDto project, StatisticsRequestDto request, RequestUserContext ctx) { + return prepare(project, List.of(request), ctx, true); + } + + public void stream( + StatisticsBatchDto statisticsBatch, + BooleanSupplier cancelled, + StatisticsEventConsumer eventConsumer) + throws IOException { + List requests = statisticsBatch.requests(); + int succeeded = 0; + int failed = 0; + for (int position = 0; position < requests.size(); position++) { + if (isCancelled(cancelled)) { + return; + } + StatisticsRequestDto request = requests.get(position); + StatisticsStreamEventDto event; + try { + event = resultEvent(position, request, calculate(statisticsBatch, request)); + succeeded++; + } catch (BusinessException error) { + int status = error.getStatus().value(); + event = errorEvent(position, request, status, error.getCode(), clientMessage(error)); + failed++; + } catch (RuntimeException error) { + event = + errorEvent( + position, request, 500, CALCULATION_FAILED_CODE, CALCULATION_FAILED_MESSAGE); + failed++; + } + // A calculation can take a while; never write to a stream cancelled in the meantime. + if (isCancelled(cancelled)) { + return; + } + eventConsumer.accept(event); + } + if (!isCancelled(cancelled)) { + eventConsumer.accept(completeEvent(requests.size(), succeeded, failed)); + } + } + + private StatisticsBatchDto prepare( + ProjectRefDto project, + List requests, + RequestUserContext ctx, + boolean quotaRequest) { + requests.forEach(request -> validate(request, quotaRequest)); + // Banners, filter and date options are shared, so the first request carries them for all. + StatisticsRequestDto sharedRequest = requests.get(0); + List questions = loadQuestions(project, ctx); + validateDimensions(requests, sharedRequest, questions); + Predicate filter = + statisticsFilterService.compile(sharedRequest.getFilter(), questions); + List responses = + loadResponses(project, requests, sharedRequest, questions, filter); + return new StatisticsBatchDto(project, requests, questions, responses); + } + + private void validate(StatisticsRequestDto request, boolean quotaRequest) { + boolean standard = isStandard(request); + boolean hasIndex = StringUtil.hasText(request.getIndex()); + if (!standard && hasIndex) { + throw BusinessException.badRequest("TABULATION 모드는 index를 빈 문자열로 입력해 주세요."); + } + if (standard && !hasIndex && !quotaRequest) { + throw BusinessException.badRequest("집계할 문항을 입력해 주세요."); + } + if (request.getEndDate() != null + && (request.getStartDate() == null + || request.getStartDate().isAfter(request.getEndDate()))) { + throw BusinessException.badRequest("집계 날짜 범위를 확인해 주세요."); + } + } + + private List loadQuestions(ProjectRefDto project, RequestUserContext ctx) { + boolean includeProfileQuestions = + project.getProjectType() == ProjectType.KIWI + && Integer.valueOf(PROFILE_QUESTION_ROLE).equals(ctx.getUserRole()); + return questionService.organize(questionRepository.list(project, includeProfileQuestions)); + } + + /** Resolving every index and banner rejects unknown questions before any data is loaded. */ + private void validateDimensions( + List requests, + StatisticsRequestDto sharedRequest, + List questions) { + for (StatisticsRequestDto request : requests) { + statisticsDimensionService.resolve(request.getIndex(), questions, List.of()); + } + for (List bannerGroup : sharedRequest.getBanners()) { + for (String bannerId : bannerGroup) { + statisticsDimensionService.resolve(bannerId, questions, List.of()); + } + } + } + + private List loadResponses( + ProjectRefDto project, + List requests, + StatisticsRequestDto sharedRequest, + List questions, + Predicate filter) { + boolean includeProfileResponses = + 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(); + List data = + statisticsRepository.data(project, sharedRequest, includeProfileResponses, storageRoots); + return statisticsDataService.normalize(data).stream().filter(filter).toList(); + } + + /** KIWI profile answers live in a separate table and are joined only when referenced. */ + private boolean needsProfileResponses( + ProjectRefDto project, + List requests, + StatisticsRequestDto sharedRequest, + List questions) { + if (project.getProjectType() != ProjectType.KIWI) { + return false; + } + return requests.stream().anyMatch(request -> isProfileId(request.getIndex())) + || sharedRequest.getBanners().stream().flatMap(List::stream).anyMatch(this::isProfileId) + || filterUsesProfile(sharedRequest.getFilter(), questions); + } + + private boolean filterUsesProfile(StatisticsFilterDto filter, List questions) { + if (filter == null) { + return false; + } + if (filter.getDimensionId() != null + && 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 PROFILE_ID_PREFIXES.stream().anyMatch(upperCaseId::startsWith); + } + + private StatisticsResponseDto calculate( + StatisticsBatchDto statisticsBatch, StatisticsRequestDto request) { + List responses = + withinStorageRoots(statisticsBatch.responses(), storageRoots(request)); + StatisticsDimension index = + statisticsDimensionService.resolve( + request.getIndex(), statisticsBatch.questions(), responses); + if (isOpenText(index)) { + return textAnalysis(statisticsBatch.project(), index, request, responses); + } + return statisticsAggregationService.aggregate( + 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() : 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(ATTRIBUTE_PROJECTION_SUFFIX, "") + .split("_")[0]; + } + + private boolean isOpenText(StatisticsDimension index) { + return "text".equals(index.getQuestion().getQtype()) && !index.isAttributeProjection(); + } + + private StatisticsResponseDto textAnalysis( + ProjectRefDto project, + StatisticsDimension index, + StatisticsRequestDto request, + List responses) { + return StatisticsResponseDto.builder() + .type("TEXT_ANALYSIS") + .questionId(index.getDimensionId()) + .title(index.getQuestion().getTitle()) + .columns(List.of()) + .headerRows(List.of()) + .rows(List.of()) + .words(statisticsTextService.analyze(project, index.getDimensionId(), responses)) + .appliedOptions(request) + .build(); + } + + private boolean isStandard(StatisticsRequestDto request) { + return STANDARD_MODE.equals(request.getMode()); + } + + private boolean isCancelled(BooleanSupplier cancelled) { + return cancelled.getAsBoolean() || Thread.currentThread().isInterrupted(); + } + + /** Server-side failures must not expose internal details to the client. */ + private String clientMessage(BusinessException error) { + return error.getStatus().is5xxServerError() ? CALCULATION_FAILED_MESSAGE : error.getMessage(); + } + + private StatisticsStreamEventDto resultEvent( + int position, StatisticsRequestDto request, StatisticsResponseDto result) { + return StatisticsStreamEventDto.builder() + .type("result") + .position(position) + .index(request.getIndex()) + .result(result) + .build(); + } + + private StatisticsStreamEventDto errorEvent( + int position, StatisticsRequestDto request, int status, String code, String message) { + return StatisticsStreamEventDto.builder() + .type("error") + .position(position) + .index(request.getIndex()) + .status(status) + .code(code) + .message(message) + .build(); + } + + private StatisticsStreamEventDto completeEvent(int total, int succeeded, int failed) { + return StatisticsStreamEventDto.builder() + .type("complete") + .total(total) + .succeeded(succeeded) + .failed(failed) + .build(); + } +} diff --git a/src/main/java/com/kri/kart/server/service/derived/DerivedComputationService.java b/src/main/java/com/kri/kart/server/service/derived/DerivedComputationService.java new file mode 100644 index 0000000..4290910 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/derived/DerivedComputationService.java @@ -0,0 +1,166 @@ +package com.kri.kart.server.service.derived; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.kri.common.feature.json.JsonUtil; +import com.kri.common.feature.web.BusinessException; +import com.kri.kart.server.dto.derived.DerivedDataDto; +import com.kri.kart.server.dto.derived.DerivedDefinitionDto; +import com.kri.kart.server.dto.derived.DerivedSaveRequestDto; +import com.kri.kart.server.dto.question.QuestionDto; +import com.kri.kart.server.dto.statistics.SurveyResponseDto; +import com.kri.kart.server.service.statistics.LegacyFilterService; +import com.kri.kart.server.service.statistics.StatisticsFilterService; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.function.Predicate; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class DerivedComputationService { + private final ObjectMapper objectMapper; + private final LegacyFilterService legacyFilterService; + private final StatisticsFilterService statisticsFilterService; + + public DerivedDefinitionDto definition(DerivedSaveRequestDto request) { + JsonNode info = request.getVariableInfo(); + if (!info.isObject() || info.isEmpty() || info.size() > 1000) { + throw invalid(); + } + info.fields().forEachRemaining(entry -> validateRule(entry.getKey(), entry.getValue())); + var question = objectMapper.createObjectNode(); + question.put("variable", request.getVariableId()); + question.put("explain", ""); + question.put("title", request.getVariableTitle()); + var dataset = question.putObject("dataset"); + if (request.getVariableType().equals("num")) { + dataset.putObject("open").putObject("1").put("label", "").put("option", "num"); + question.put("qtype", "open"); + } else { + var labels = objectMapper.createObjectNode(); + info.fields() + .forEachRemaining( + entry -> + labels.set( + entry.getKey().equals("ELSE") + ? Integer.toString(info.size()) + : entry.getKey(), + entry.getValue().deepCopy())); + dataset.set(request.getVariableType(), labels); + question.put("qtype", request.getVariableType()); + } + var definition = new DerivedDefinitionDto(); + definition.setQid(request.getVariableId()); + definition.setDerivedJson(JsonUtil.toJson(objectMapper, info)); + definition.setQuestionJson(JsonUtil.toJson(objectMapper, question)); + return definition; + } + + public List calculate( + DerivedDefinitionDto definition, List questions, List data) { + ObjectNode info = object(definition.getDerivedJson()); + String type = object(definition.getQuestionJson()).path("qtype").asText(); + String qid = definition.getQid(); + List rules = new ArrayList<>(); + info.fields() + .forEachRemaining( + entry -> { + validateRule(entry.getKey(), entry.getValue()); + boolean otherwise = entry.getKey().equalsIgnoreCase("ELSE"); + Predicate condition = + otherwise + ? response -> true + : statisticsFilterService.compile( + legacyFilterService.parse(entry.getValue().get("condition")), questions); + rules.add(new Rule(otherwise, entry.getValue().path("value").asText(), condition)); + }); + List results = new ArrayList<>(); + for (DerivedDataDto row : data) { + Map flat = new LinkedHashMap<>(); + flatten(object(row.getDatjson()), flat); + if (row.getDerivedJson() != null) { + ObjectNode derived = object(row.getDerivedJson()); + derived.remove(qid); + flatten(derived, flat); + } + ObjectNode result = objectMapper.createObjectNode(); + SurveyResponseDto response = new SurveyResponseDto(row.getIdkey(), flat, flat); + for (Rule rule : rules) { + // Non-multi uses first matching rule. ELSE applies only when no value exists. + if ((rule.otherwise || !type.equals("multi")) && !result.isEmpty()) { + continue; + } + if (rule.condition.test(response)) { + String valueKey = + qid + (type.equals("multi") ? "_" + rule.value : type.equals("num") ? "_1" : ""); + result.put(valueKey, rule.value); + flat.put(valueKey.toUpperCase(Locale.ROOT), rule.value.toUpperCase(Locale.ROOT)); + } + } + results.add(result); + } + return results; + } + + private void flatten(ObjectNode grouped, Map flat) { + grouped + .fields() + .forEachRemaining( + group -> { + if (!group.getValue().isObject()) { + throw invalid(); + } + group + .getValue() + .fields() + .forEachRemaining( + value -> { + if (!value.getValue().isValueNode()) { + throw invalid(); + } + flat.put( + value.getKey().toUpperCase(Locale.ROOT), + value.getValue().isNull() + ? null + : value.getValue().asText().toUpperCase(Locale.ROOT)); + }); + }); + } + + private void validateRule(String key, JsonNode rule) { + if ((!key.equalsIgnoreCase("ELSE") && !key.matches("[0-9]+")) + || !rule.isObject() + || !rule.path("value").isValueNode() + || rule.path("value").isNull() + || rule.path("value").asText().isBlank() + || !rule.path("label").isTextual()) { + throw invalid(); + } + if (!key.equalsIgnoreCase("ELSE") + && (rule.get("condition") == null + || (rule.path("condition").isTextual() && rule.path("condition").asText().isBlank()))) { + throw invalid(); + } + } + + private ObjectNode object(String json) { + JsonNode node = JsonUtil.fromJson(objectMapper, json, JsonNode.class); + if (node == null || !node.isObject()) { + throw invalid(); + } + return (ObjectNode) node; + } + + private BusinessException invalid() { + return BusinessException.validationError( + "DERIVED_CONFIGURATION_INVALID", "파생변수 설정이나 응답 형식을 확인해 주세요."); + } + + private record Rule(boolean otherwise, String value, Predicate condition) {} +} diff --git a/src/main/java/com/kri/kart/server/service/export/LegacyExcelWidthService.java b/src/main/java/com/kri/kart/server/service/export/LegacyExcelWidthService.java new file mode 100644 index 0000000..e7319ea --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/export/LegacyExcelWidthService.java @@ -0,0 +1,81 @@ +package com.kri.kart.server.service.export; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.kri.common.feature.json.JsonUtil; +import java.io.IOException; +import org.apache.poi.ss.usermodel.DataFormatter; +import org.apache.poi.ss.usermodel.Sheet; +import org.springframework.core.io.ClassPathResource; +import org.springframework.stereotype.Service; + +/** 기존 GDI Malgun Gothic 측정값으로 한글·ASCII 너비를 플랫폼과 무관하게 유지한다. */ +@Service +public class LegacyExcelWidthService { + private final JsonNode metrics; + private final java.util.Map glyphs = new java.util.HashMap<>(); + + public LegacyExcelWidthService(ObjectMapper objectMapper) { + try (var input = new ClassPathResource("excel/malgun-metrics.json").getInputStream()) { + metrics = + JsonUtil.fromJson( + objectMapper, + new String(input.readAllBytes(), java.nio.charset.StandardCharsets.UTF_8), + JsonNode.class); + for (int size : new int[] {9, 10}) { + try (var glyphInput = + new java.util.zip.GZIPInputStream( + new ClassPathResource("excel/glyphs-" + size + ".gz").getInputStream())) { + var bytes = + java.nio.ByteBuffer.wrap(glyphInput.readAllBytes()) + .order(java.nio.ByteOrder.LITTLE_ENDIAN); + if (bytes.remaining() != 65536 * 4) { + throw new IOException("Invalid glyph metrics"); + } + float[] advances = new float[65536]; + for (int index = 0; index < advances.length; index++) { + advances[index] = bytes.getFloat(); + } + glyphs.put(size, advances); + } + } + } catch (IOException exception) { + throw new IllegalStateException("Excel 글꼴 측정 정보를 읽을 수 없습니다.", exception); + } + } + + public void autoFit(Sheet sheet, int column, int fontSize) { + var font = metrics.path(Integer.toString(fontSize)); + double maximum = 9.140625; + var formatter = new DataFormatter(java.util.Locale.KOREA); + for (var row : sheet) { + var cell = row.getCell(column); + if (cell == null + || cell.getCellStyle().getWrapText() + || sheet.getMergedRegions().stream().anyMatch(range -> range.isInRange(cell))) { + continue; + } + String text = formatter.formatCellValue(cell); + for (String line : text.split("\\R", -1)) { + float width = 0; + String measured = line.replaceFirst(" +$", ""); + for (int i = 0; i < measured.length(); i++) { + char character = measured.charAt(i); + if (Character.isHighSurrogate(character) + && i + 1 < measured.length() + && Character.isLowSurrogate(measured.charAt(i + 1))) { + width += (float) font.path("korean").asDouble() * 2; + i++; + } else { + width += glyphs.get(fontSize)[character]; + } + } + if (!measured.isEmpty()) { + width += (float) font.path("padding").asDouble(); + } + maximum = Math.max(maximum, (width + 5d) / 7d); + } + } + sheet.setColumnWidth(column, Math.min(255 * 256, (int) Math.round(maximum * 256))); + } +} 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 new file mode 100644 index 0000000..ab072f0 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/quota/QuotaComputationService.java @@ -0,0 +1,218 @@ +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.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; +import com.kri.kart.server.dto.statistics.StatisticsColumnDto; +import com.kri.kart.server.dto.statistics.StatisticsResponseDto; +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.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class QuotaComputationService { + private final ObjectMapper objectMapper; + private final StatisticsTableService statisticsTableService; + + private record Entry(QuotaEntryDto quotaEntry, JsonNode values) {} + + private record Target(long count, String isUsed, Long quotaId) {} + + public QuotaResultDto compute( + QuotaSetDto quotaSet, + String index, + 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 columns = new ArrayList<>(); + columns.add(table.getColumns().get(0)); + table.getColumns().stream() + .filter(column -> !List.of("LABEL", "TOTAL").contains(column.getKind())) + .forEach( + column -> { + // Legacy quota removes the question-title header rows and retains choice labels only. + List labels = new ArrayList<>(); + for (int depth = 1; depth < column.getLabels().size(); depth += 2) { + labels.add(column.getLabels().get(depth)); + } + columns.add(new StatisticsColumnDto(column.getColumnId(), column.getKind(), labels)); + }); + columns.add( + table.getColumns().stream() + .filter(column -> "TOTAL".equals(column.getKind())) + .findFirst() + .orElseThrow()); + List headers = + statisticsTableService.headers(quotaSet.getQsTitle(), columns, "MERGED"); + List rows = new ArrayList<>(); + for (StatisticsRowDto row : table.getRows()) { + List cells = new ArrayList<>(); + cells.add( + QuotaCellDto.builder() + .columnIndex(0) + .kind("LABEL") + .textValue( + "TOTAL".equals(row.getKind()) ? "Total" : row.getCells().get(0).getTextValue()) + .build()); + long rowTargetSum = 0; + for (int columnIndex = 1; columnIndex < columns.size(); columnIndex++) { + String columnId = columns.get(columnIndex).getColumnId(); + int sourceColumn = 0; + while (!table.getColumns().get(sourceColumn).getColumnId().equals(columnId)) { + sourceColumn++; + } + Long complete = row.getCells().get(sourceColumn).getCount(); + if (complete == null) { + throw BusinessException.validationError( + "QUOTA_STATISTIC_UNSUPPORTED", "통계량 문항은 기존 쿼터 집계에서 지원하지 않습니다."); + } + Target target = + target( + entries, row, matchIndex, columnId, banners.isEmpty() ? List.of() : banners.get(0)); + rowTargetSum += target.count(); + cells.add(cell(columnIndex, complete, target)); + } + if (rowTargetSum != 0) { + rows.add(new QuotaRowDto(0, row.getRowId(), row.getKind(), cells)); + } + } + QuotaRowDto total = + rows.stream().filter(row -> "TOTAL".equals(row.getKind())).findFirst().orElse(null); + if (total != null) { + List cells = new ArrayList<>(); + cells.add(total.getCells().get(0)); + for (int columnIndex = 1; columnIndex < columns.size(); columnIndex++) { + long complete = 0; + for (QuotaRowDto row : rows) { + if (!"TOTAL".equals(row.getKind())) { + complete += row.getCells().get(columnIndex).getComplete(); + } + } + QuotaCellDto original = total.getCells().get(columnIndex); + cells.add( + cell( + columnIndex, + complete, + new Target(original.getTarget(), original.getIsUsed(), original.getQuotaId()))); + } + rows.remove(total); + if (!index.isEmpty()) { + rows.add(new QuotaRowDto(0, total.getRowId(), "TOTAL", cells)); + } + } + List positionedRows = new ArrayList<>(); + for (int rowIndex = 0; rowIndex < rows.size(); rowIndex++) { + QuotaRowDto row = rows.get(rowIndex); + positionedRows.add( + new QuotaRowDto( + headers.size() + rowIndex, row.getRowId(), row.getKind(), row.getCells())); + } + return QuotaResultDto.builder() + .quotaSetId(quotaSet.getId()) + .quotaOrder(quotaSet.getQsOrder()) + .title(quotaSet.getQsTitle()) + .index(index) + .banners(banners) + .columns(columns) + .headerRows(headers) + .rows(positionedRows) + .build(); + } + + private Target target( + List entries, StatisticsRowDto row, String index, String columnId, List banners) { + List matching = entries; + if (!index.isEmpty() + && StatisticsArithmetic.number(row.getRowId()) != null + && !"TOTAL".equals(row.getKind())) { + matching = + matching.stream() + .filter(entry -> value(entry.values(), index).equals(row.getRowId())) + .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(); + } + } + long count = + matching.stream() + .map(Entry::quotaEntry) + .mapToLong(entry -> entry.getOriCnt() == null ? 0 : entry.getOriCnt()) + .sum(); + QuotaEntryDto only = matching.size() == 1 ? matching.get(0).quotaEntry() : 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(); + } + + private QuotaCellDto cell(int columnIndex, long complete, Target target) { + Double percent = + target.count() == 0 ? null : StatisticsArithmetic.round(complete * 100.0 / target.count(), 2); + String state = + target.count() != 0 ? "FINITE" : complete == 0 ? "UNDEFINED" : "POSITIVE_INFINITY"; + String percentText = + "FINITE".equals(state) + ? StatisticsArithmetic.display(percent, 2) + : "UNDEFINED".equals(state) ? "-" : "∞"; + return QuotaCellDto.builder() + .columnIndex(columnIndex) + .kind("QUOTA") + .complete(complete) + .target(target.count()) + .achievementPercent(percent) + .achievementState(state) + .achievementDisplayText(percentText) + .displayText(complete + "/" + target.count() + "/" + percentText) + .isUsed(target.isUsed()) + .quotaId(target.quotaId()) + .build(); + } +} diff --git a/src/main/java/com/kri/kart/server/service/share/ExternalAccessInterceptor.java b/src/main/java/com/kri/kart/server/service/share/ExternalAccessInterceptor.java new file mode 100644 index 0000000..f783407 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/share/ExternalAccessInterceptor.java @@ -0,0 +1,114 @@ +package com.kri.kart.server.service.share; + +import com.kri.common.feature.auth.dto.JwtUserClaimsDto; +import com.kri.common.feature.web.BusinessException; +import com.kri.kart.server.dto.share.ShareLinkDto; +import com.kri.kart.server.service.ShareLinkService; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.net.URI; +import java.util.Map; +import java.util.Set; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.HandlerMapping; + +/** 공용 인증이 검증한 identity와 REPORT_URL을 사용한다. 일반 사용자 역할 제한과는 별개다. */ +@RequiredArgsConstructor +public class ExternalAccessInterceptor implements HandlerInterceptor { + private final ShareLinkService shareLinkService; + + @Override + public boolean preHandle( + HttpServletRequest request, HttpServletResponse response, Object handler) { + String pattern = + String.valueOf(request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE)); + if ("POST".equals(request.getMethod()) + && Set.of("/api/v1/external/{urlKey}/login", "/api/v1/auth/login").contains(pattern)) { + // A new link or credential login may replace a previous external identity. + return true; + } + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication == null + || !authentication.isAuthenticated() + || !(authentication.getDetails() instanceof JwtUserClaimsDto claims) + || !ShareLinkService.EXTERNAL_TEAM.equals(claims.getUserTeam())) { + return true; + } + String userId = claims.getUserId(); + if (!Integer.valueOf(9001).equals(claims.getUserRole()) + || userId == null + || !userId.startsWith(ShareLinkService.EXTERNAL_USER_PREFIX)) { + throw denied(); + } + String urlKey = userId.substring(ShareLinkService.EXTERNAL_USER_PREFIX.length()); + ShareLinkDto link = + (ShareLinkDto) request.getAttribute(ShareLinkService.REQUEST_LINK_ATTRIBUTE); + if (link == null || !urlKey.equals(link.getUrlKey())) { + link = shareLinkService.lookup(urlKey); + } + @SuppressWarnings("unchecked") + Map variables = + (Map) request.getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE); + if (variables == null + || !link.getProjectType().getCode().toString().equals(variables.get("projectType")) + || !link.getPkey().equals(variables.get("pkey"))) { + // Visit body scope is checked in LogController after JSON binding. + if (!"/api/v1/log/visit".equals(pattern) || !"POST".equals(request.getMethod())) { + throw denied(); + } + } + String page = URI.create(link.getRealUrl()).getPath(); + boolean allowed = "/api/v1/log/visit".equals(pattern); + if ("GET".equals(request.getMethod())) { + allowed |= + Set.of( + "/api/v1/project/{projectType}/{pkey}/question/list", + "/api/v1/project/{projectType}/{pkey}/question/{qid}") + .contains(pattern); + allowed |= + (!link.isPageOnly() || page.equals("/Report/Current")) + && Set.of( + "/api/v1/project/{projectType}/{pkey}/progress/day", + "/api/v1/project/{projectType}/{pkey}/progress/type", + "/api/v1/project/{projectType}/{pkey}/progress/loi", + "/api/v1/project/{projectType}/{pkey}/progress/screen") + .contains(pattern); + allowed |= + (!link.isPageOnly() || page.equals("/Report/Quota")) + && pattern.equals("/api/v1/quota/{projectType}/{pkey}/list"); + if (pattern.equals("/api/v1/project/{projectType}/{pkey}/bookmark/list")) { + String bookmarkPage = request.getParameter("page"); + allowed |= + Set.of("TABULATION", "CROSSTAB").contains(bookmarkPage == null ? "" : bookmarkPage) + && (!link.isPageOnly() + || (page.equals("/Report/Tabulation") && "TABULATION".equals(bookmarkPage)) + || (page.equals("/Report/Crosstab") && "CROSSTAB".equals(bookmarkPage))); + } + } else if ("POST".equals(request.getMethod())) { + allowed |= + (!link.isPageOnly() || Set.of("/Report/Tabulation", "/Report/Crosstab").contains(page)) + && pattern.equals("/api/v1/project/{projectType}/{pkey}/export/excel/table"); + allowed |= + (!link.isPageOnly() || page.equals("/Report/Quota")) + && pattern.equals("/api/v1/quota/{projectType}/{pkey}/export/excel"); + allowed |= + (!link.isPageOnly() || Set.of("/Report/Tabulation", "/Report/Crosstab").contains(page)) + && pattern.equals("/api/v1/project/{projectType}/{pkey}/statistics/result"); + allowed |= + (!link.isPageOnly() || page.equals("/Report/Quota")) + && pattern.equals("/api/v1/quota/{projectType}/{pkey}/{quotaOrder}/result"); + } + if (!allowed) { + throw denied(); + } + request.setAttribute(ShareLinkService.REQUEST_LINK_ATTRIBUTE, link); + return true; + } + + private BusinessException denied() { + return BusinessException.forbidden("EXTERNAL_SCOPE_DENIED", "이 공유 링크에서 허용되지 않는 요청입니다."); + } +} diff --git a/src/main/java/com/kri/kart/server/service/share/LegacyProjectKeyService.java b/src/main/java/com/kri/kart/server/service/share/LegacyProjectKeyService.java new file mode 100644 index 0000000..b85fca7 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/share/LegacyProjectKeyService.java @@ -0,0 +1,79 @@ +package com.kri.kart.server.service.share; + +import com.kri.common.feature.web.BusinessException; +import com.kri.kart.server.common.enums.ProjectType; +import com.kri.kart.server.config.ShareLinkProperties; +import com.kri.kart.server.dto.project.ProjectRefDto; +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.security.GeneralSecurityException; +import java.util.Base64; +import javax.crypto.Cipher; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; + +/** 기존 raw AES-CBC 키는 공용 PBKDF2 AES와 호환되지 않는다. REPORT_URL에만 사용한다. */ +@Service +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class LegacyProjectKeyService { + private final ShareLinkProperties shareLinkProperties; + + public String encode(ProjectRefDto project) { + String plain = + (project.getProjectType() == ProjectType.KIWI ? "|K|W|" : "") + project.getPkey(); + byte[] cipher = transform(Cipher.ENCRYPT_MODE, plain.getBytes(StandardCharsets.UTF_8)); + return URLEncoder.encode(Base64.getEncoder().encodeToString(cipher), StandardCharsets.UTF_8); + } + + public ProjectRefDto decode(String skey) { + if (skey == null || skey.isBlank() || skey.length() > 512) { + throw invalid(); + } + try { + // Existing stored keys are URL encoded; raw Base64 '+' must not become a space. + String encoded = skey.contains("%") ? URLDecoder.decode(skey, StandardCharsets.UTF_8) : skey; + String plain = + new String( + transform(Cipher.DECRYPT_MODE, Base64.getDecoder().decode(encoded)), + StandardCharsets.UTF_8); + ProjectType type = plain.startsWith("|K|W|") ? ProjectType.KIWI : ProjectType.KON; + return new ProjectRefDto(type, type == ProjectType.KIWI ? plain.substring(5) : plain); + } catch (IllegalArgumentException exception) { + throw invalid(); + } + } + + private byte[] transform(int mode, byte[] input) { + String key = shareLinkProperties.getLegacyKey(); + String iv = shareLinkProperties.getLegacyIv(); + if (key == null + || iv == null + || key.getBytes(StandardCharsets.UTF_8).length != 32 + || iv.getBytes(StandardCharsets.UTF_8).length != 16) { + throw BusinessException.of( + org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE, + "SHARE_LEGACY_CONFIGURATION", + "공유 링크 호환 설정을 확인해 주세요."); + } + try { + Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + cipher.init( + mode, + new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "AES"), + new IvParameterSpec(iv.getBytes(StandardCharsets.UTF_8))); + return cipher.doFinal(input); + } catch (GeneralSecurityException exception) { + throw invalid(); + } + } + + private BusinessException invalid() { + return BusinessException.validationError( + "SHARE_LEGACY_KEY_INVALID", "지원하지 않거나 손상된 공유 프로젝트 정보입니다."); + } +} diff --git a/src/main/java/com/kri/kart/server/service/statistics/KiwiNlpService.java b/src/main/java/com/kri/kart/server/service/statistics/KiwiNlpService.java new file mode 100644 index 0000000..c387ad7 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/statistics/KiwiNlpService.java @@ -0,0 +1,80 @@ +package com.kri.kart.server.service.statistics; + +import com.kri.common.feature.web.BusinessException; +import com.kri.kart.server.dto.statistics.NlpDictionaryWordDto; +import com.kri.kart.server.dto.statistics.NlpTokenDto; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import kr.pe.bab2min.Kiwi; +import kr.pe.bab2min.KiwiBuilder; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; + +@Service +public class KiwiNlpService { + private final Path modelDirectory; + + public KiwiNlpService( + @Value("${kri.kart.nlp.model-directory:./nlp_model/v0.24.0}") String modelDirectory) { + this.modelDirectory = Path.of(modelDirectory); + } + + public List tokenize(List texts, List dictionary) { + if (texts.isEmpty()) { + return List.of(); + } + if (!Files.isRegularFile(modelDirectory.resolve("cong.mdl"))) { + throw unavailable(); + } + Map tags = tags(); + List result = new ArrayList<>(); + int options = KiwiBuilder.BuildOption.loadDefaultDict | KiwiBuilder.BuildOption.loadTypoDict; + // Use the user-approved latest model; retain dictionary, allomorph and typo-processing rules. + try (KiwiBuilder kiwiBuilder = + new KiwiBuilder(modelDirectory.toString(), 1, options, KiwiBuilder.ModelType.cong)) { + for (NlpDictionaryWordDto word : dictionary) { + Byte tag = tags.get(word.getWordTag()); + if (tag != null && word.getWordText() != null && word.getWordScore() != null) { + try { + kiwiBuilder.addWord(word.getWordText(), tag, word.getWordScore()); + } catch (RuntimeException ignored) { + // Existing dictionary registration ignores an individually invalid word. + } + } + } + try (Kiwi kiwi = kiwiBuilder.build()) { + for (String text : texts) { + for (Kiwi.Token token : kiwi.tokenize(text, new Kiwi.AnalyzeOption(0))) { + String tag = Kiwi.POSTag.toString(token.tag); + result.add(new NlpTokenDto(token.form, tag == null ? "UNK" : tag)); + } + } + } + } catch (Exception | LinkageError ignored) { + // Never expose respondents' text, dictionary words, native errors or machine paths. + throw unavailable(); + } + return result; + } + + private Map tags() { + Map result = new LinkedHashMap<>(); + for (int code = Byte.MIN_VALUE; code <= Byte.MAX_VALUE; code++) { + String tag = Kiwi.POSTag.toString((byte) code); + if (tag != null) { + result.put(tag, (byte) code); + } + } + return result; + } + + private BusinessException unavailable() { + return BusinessException.of( + HttpStatus.SERVICE_UNAVAILABLE, "KIWI_NLP_UNAVAILABLE", "Kiwi NLP 라이브러리와 모델 설정을 확인해 주세요."); + } +} diff --git a/src/main/java/com/kri/kart/server/service/statistics/LegacyFilterService.java b/src/main/java/com/kri/kart/server/service/statistics/LegacyFilterService.java new file mode 100644 index 0000000..92e3092 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/statistics/LegacyFilterService.java @@ -0,0 +1,213 @@ +package com.kri.kart.server.service.statistics; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.DecimalNode; +import com.fasterxml.jackson.databind.node.TextNode; +import com.kri.common.feature.util.StringUtil; +import com.kri.common.feature.web.BusinessException; +import com.kri.kart.server.dto.statistics.StatisticsFilterDto; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +/** Adapts only the saved legacy condition grammar. No expression is executed as SQL. */ +@Service +@RequiredArgsConstructor +public class LegacyFilterService { + // One token: quoted string, signed number, identifier/keyword, or comparison/punctuation. + private static final Pattern TOKEN = + Pattern.compile( + "\\G\\s*('(?:[^']|'')*'|[+-]?(?:\\d+(?:\\.\\d*)?|\\.\\d+)|[A-Z][A-Z0-9_]*|>=|<=|<>|!=|[=><(),])"); + private static final int MAX_TOKENS = 2048; + private static final int MAX_DEPTH = 32; + private static final Map COMPARISON_OPERATORS = + Map.of("=", "EQ", "!=", "NE", "<>", "NE", ">", "GT", ">=", "GE", "<", "LT", "<=", "LE"); + + private final ObjectMapper objectMapper; + + /** + * Converts a saved FILTER into the filter AST. A JSON object is already an AST; a string is a + * legacy condition such as {@code Q|Q1 = 1 AND (Q2 IN (1, 2) OR Q3 IS NOT NULL)}. + */ + public StatisticsFilterDto parse(JsonNode savedFilter) { + if (savedFilter == null || savedFilter.isNull()) { + return null; + } + if (savedFilter.isObject()) { + return objectMapper.convertValue(savedFilter, StatisticsFilterDto.class); + } + if (!savedFilter.isTextual()) { + throw invalid(); + } + String expression = StringUtil.normalizeBlank(savedFilter.asText()); + if (expression == null) { + return null; + } + expression = expression.toUpperCase(Locale.ROOT); + // A "Q|" prefix means the condition names QIDs; otherwise it names variables. + String reference = expression.startsWith("Q|") ? "QID" : "VARIABLE"; + if ("QID".equals(reference)) { + expression = expression.substring(2).trim(); + } + List tokens = tokenize(expression); + Parser parser = new Parser(tokens, reference); + StatisticsFilterDto result = parser.or(0); + if (parser.position != tokens.size()) { + throw invalid(); + } + return result; + } + + /** Splits the whole expression into tokens; any unrecognized character rejects it. */ + private List tokenize(String expression) { + List tokens = new ArrayList<>(); + Matcher matcher = TOKEN.matcher(expression); + int position = 0; + while (position < expression.length()) { + if (!matcher.find(position) || matcher.start() != position || tokens.size() >= MAX_TOKENS) { + throw invalid(); + } + tokens.add(matcher.group(1)); + position = matcher.end(); + } + return tokens; + } + + private static BusinessException invalid() { + return BusinessException.validationError("LEGACY_FILTER_INVALID", "저장된 조건식 형식을 확인해 주세요."); + } + + /** Recursive descent parser. Precedence: parentheses, then AND, then OR. */ + private static final class Parser { + private final List tokens; + private final String reference; + private int position; + + private Parser(List tokens, String reference) { + this.tokens = tokens; + this.reference = reference; + } + + private StatisticsFilterDto or(int depth) { + List children = new ArrayList<>(); + children.add(and(depth)); + while (take("OR")) { + children.add(and(depth)); + } + return group("OR", children); + } + + private StatisticsFilterDto and(int depth) { + List children = new ArrayList<>(); + children.add(condition(depth)); + while (take("AND")) { + children.add(condition(depth)); + } + return group("AND", children); + } + + private StatisticsFilterDto condition(int depth) { + if (depth > MAX_DEPTH) { + throw invalid(); + } + if (take("(")) { + StatisticsFilterDto filter = or(depth + 1); + require(")"); + return filter; + } + String dimension = next(); + if (!dimension.matches("[A-Z][A-Z0-9_]*")) { + throw invalid(); + } + StatisticsFilterDto filter = new StatisticsFilterDto(); + filter.setDimensionId(dimension); + filter.setReference(reference); + if (take("IS")) { + boolean not = take("NOT"); + require("NULL"); + filter.setOperator(not ? "IS_ANSWERED" : "IS_UNANSWERED"); + } else if (take("BETWEEN")) { + JsonNode minimum = value(); + require("AND"); + filter.setValues(List.of(minimum, value())); + filter.setOperator("BETWEEN"); + } else if (take("NOT")) { + require("IN"); + filter.setOperator("NOT_IN"); + filter.setValues(values()); + } else if (take("IN")) { + filter.setOperator("IN"); + filter.setValues(values()); + } else { + String operator = COMPARISON_OPERATORS.get(next()); + if (operator == null) { + throw invalid(); + } + filter.setOperator(operator); + filter.setValues(List.of(value())); + } + return filter; + } + + private List values() { + require("("); + List values = new ArrayList<>(); + values.add(value()); + while (take(",")) { + values.add(value()); + } + require(")"); + return values; + } + + private JsonNode value() { + String token = next(); + if (token.startsWith("'")) { + return TextNode.valueOf(token.substring(1, token.length() - 1).replace("''", "'")); + } + try { + return DecimalNode.valueOf(new BigDecimal(token)); + } catch (NumberFormatException error) { + throw invalid(); + } + } + + private StatisticsFilterDto group(String operator, List children) { + if (children.size() == 1) { + return children.get(0); + } + StatisticsFilterDto filter = new StatisticsFilterDto(); + filter.setOperator(operator); + filter.setChildren(children); + return filter; + } + + private boolean take(String token) { + if (position < tokens.size() && token.equals(tokens.get(position))) { + position++; + return true; + } + return false; + } + + private void require(String token) { + if (!take(token)) { + throw invalid(); + } + } + + private String next() { + if (position >= tokens.size()) { + throw invalid(); + } + return tokens.get(position++); + } + } +} 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 new file mode 100644 index 0000000..443ec63 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsAggregationService.java @@ -0,0 +1,645 @@ +package com.kri.kart.server.service.statistics; + +import com.kri.common.feature.web.BusinessException; +import com.kri.kart.server.dto.question.QuestionDto; +import com.kri.kart.server.dto.statistics.StatisticsCellDto; +import com.kri.kart.server.dto.statistics.StatisticsColumnDto; +import com.kri.kart.server.dto.statistics.StatisticsRequestDto; +import com.kri.kart.server.dto.statistics.StatisticsResponseDto; +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; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.regex.Pattern; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class StatisticsAggregationService { + private static final String TOTAL_COLUMN_ID = "i"; + private static final String CASE_COUNT_LABEL = "사례수"; + // TABULATION_0 divides each banner column by the total of its sibling columns. + private static final String SIBLING_BASE_MODE = "TABULATION_0"; + // TABULATION_1 crosses every banner column with every other banner column. + private static final String BANNER_CROSS_MODE = "TABULATION_1"; + private static final Set OPEN_QUESTION_TYPES = Set.of("num", "text"); + private static final String MEAN = "Mean"; + private static final String SUM = "Sum"; + private static final List NUMERIC_STATISTICS = + List.of("Median", "SD", "Max", "Min", "Mode"); + private static final String[] SCALE_GROUP_LABELS = {"Top", "Mid", "Bottom"}; + private static final String[] NPS_GROUP_LABELS = {"Promoters", "Passives", "Detractors"}; + private static final int NPS_SCALE_SIZE = 11; + + private final StatisticsDimensionService statisticsDimensionService; + private final StatisticsSelectionService statisticsSelectionService; + private final StatisticsTableService statisticsTableService; + + /** + * One output column. + * + * @param id column id: "i" for Total, then "b{group}_{code}[_{code}...]" for banners + * @param labels header labels from the outermost banner to this column + * @param total respondents counted in this column + * @param cases respondents per index choice, in index choice order + * @param subtotal whether this column sums nested banner columns + */ + private record Column( + String id, + List labels, + List total, + List> cases, + boolean subtotal) {} + + public StatisticsResponseDto aggregate( + StatisticsRequestDto request, + List questions, + List responses) { + StatisticsDimension index = + statisticsDimensionService.resolve(request.getIndex(), questions, responses); + List columns = columns(index, request, questions, responses); + if (BANNER_CROSS_MODE.equals(request.getMode())) { + return bannerCrossTable(index, columns, request); + } + List rows = new ArrayList<>(); + rows.add(totalRow(columns, request)); + addChoiceRows(rows, index, columns, request); + addSummaryRows(rows, index, columns, request); + return statisticsTableService.table( + index.getDimensionId(), + index.getQuestion().getTitle(), + columnHeaders(index, columns), + rows, + request); + } + + /** The Total column first, then one column per banner choice (nested banners recurse). */ + private List columns( + StatisticsDimension index, + StatisticsRequestDto request, + List questions, + List responses) { + List total = statisticsSelectionService.total(responses, index); + List> cases = + index.getChoices().stream() + .map(choice -> statisticsSelectionService.cases(responses, index, choice.value())) + .toList(); + List columns = new ArrayList<>(); + columns.add(new Column(TOTAL_COLUMN_ID, List.of("Total"), total, cases, false)); + 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")); + } + for (int group = 0; group < banners.size(); group++) { + List dimensions = + banners.get(group).stream() + .map(id -> statisticsDimensionService.resolve(id, questions, responses)) + .toList(); + if (dimensions.stream().anyMatch(this::isOpenAnswer)) { + throw BusinessException.badRequest("주관식 문자·숫자 문항은 배너로 사용할 수 없습니다."); + } + // An attribute projection banner counts all responses, not only the index population. + boolean attribute = dimensions.get(0).isAttributeProjection(); + List bannerTotal = attribute ? responses : total; + List> bannerCases = + attribute ? index.getChoices().stream().map(choice -> responses).toList() : cases; + addBanner( + columns, dimensions, 0, "b" + group, List.of(), bannerTotal, bannerCases, index, request); + } + return columns; + } + + private void addBanner( + List columns, + List dimensions, + int depth, + String parentId, + List parentLabels, + List total, + List> cases, + StatisticsDimension index, + StatisticsRequestDto request) { + StatisticsDimension banner = dimensions.get(depth); + int indexChoiceCount = index.getChoices().size(); + for (StatisticsDimension.Choice choice : banner.getChoices()) { + String columnId = parentId + "_" + choice.value(); + List labels = new ArrayList<>(parentLabels); + labels.add(banner.getQuestion().getTitle()); + labels.add(choice.label()); + List bannerTotal = + statisticsSelectionService.bannerTotal(total, banner, choice.value()); + List> bannerCases = new ArrayList<>(); + for (int row = 0; row < cases.size(); row++) { + bannerCases.add( + statisticsSelectionService.bannerCases( + cases.get(row), + banner, + choice.value(), + index.getChoices().get(row).value(), + indexChoiceCount)); + } + boolean hasNestedBanner = depth + 1 < dimensions.size(); + if (!hasNestedBanner || request.isShowSubtotals()) { + List columnLabels = new ArrayList<>(labels); + if (hasNestedBanner) { + columnLabels.add("Sub Total"); + } + columns.add(new Column(columnId, columnLabels, bannerTotal, bannerCases, hasNestedBanner)); + } + if (hasNestedBanner) { + addBanner( + columns, + dimensions, + depth + 1, + columnId, + labels, + bannerTotal, + bannerCases, + index, + request); + } + } + } + + private boolean isOpenAnswer(StatisticsDimension dimension) { + return OPEN_QUESTION_TYPES.contains(dimension.getQuestion().getQtype()) + && !dimension.isAttributeProjection(); + } + + private StatisticsRowDto totalRow(List columns, StatisticsRequestDto request) { + List cells = new ArrayList<>(); + cells.add(StatisticsTableService.text(0, CASE_COUNT_LABEL)); + for (int column = 0; column < columns.size(); column++) { + Column source = columns.get(column); + long base = percentBase(columns, column, request); + // The legacy Total percent is the sum of every choice percent in the column. + double totalPercent = 0; + for (List choiceCases : source.cases()) { + totalPercent += base == 0 ? 0 : choiceCases.size() * 100.0 / base; + } + cells.add( + cell( + column + 1, + source.total().size(), + StatisticsArithmetic.round(totalPercent, request.getPercentageDecimals()), + source.total().size(), + request)); + } + return new StatisticsRowDto(0, "TOTAL", "TOTAL", cells); + } + + private void addChoiceRows( + List rows, + StatisticsDimension index, + List columns, + StatisticsRequestDto request) { + for (int choice = 0; choice < index.getChoices().size(); choice++) { + String value = index.getChoices().get(choice).value(); + String label = request.isShowValueCodes() ? value : index.label(value); + List cells = new ArrayList<>(); + cells.add(StatisticsTableService.text(0, label)); + for (int column = 0; column < columns.size(); column++) { + cells.add( + countCell( + column + 1, + columns.get(column).cases().get(choice).size(), + percentBase(columns, column, request), + request)); + } + rows.add(new StatisticsRowDto(rows.size(), value, "VALUE", cells)); + } + } + + /** Statistics, scale groups and user value groups below the choice rows. */ + private void addSummaryRows( + List rows, + StatisticsDimension index, + List columns, + StatisticsRequestDto request) { + String type = index.getQuestion().getQtype(); + if ("num".equals(type)) { + addStatistic(rows, columns, index, MEAN, request); + for (String statistic : NUMERIC_STATISTICS) { + addStatistic(rows, columns, index, statistic, request); + } + if (request.isShowNumericSum()) { + addStatistic(rows, columns, index, SUM, request); + } + } + if ("scale".equals(type)) { + addScaleGroups(rows, columns, index, request); + } + for (StatisticsValueGroupDto group : request.getValueGroups()) { + addGroup(rows, columns, index, group.getLabel(), group.getValues(), request); + } + if ("scale".equals(type) && !isNps(index)) { + addStatistic(rows, columns, index, MEAN, request); + } + } + + /** + * Denominator for a column percent. TABULATION_0 divides a banner column by the summed total of + * its sibling columns: ids equal except for a last character that is a digit. + */ + private long percentBase(List columns, int column, StatisticsRequestDto request) { + if (!SIBLING_BASE_MODE.equals(request.getMode()) || column == 0) { + return columns.get(column).total().size(); + } + String id = columns.get(column).id(); + // Preserve the existing sibling-name rule, including code strings longer than one digit. + Pattern siblings = Pattern.compile(Pattern.quote(id.substring(0, id.length() - 1)) + "\\d$"); + List matches = + columns.stream().filter(candidate -> siblings.matcher(candidate.id()).matches()).toList(); + return matches.isEmpty() + ? columns.get(0).total().size() + : matches.stream().mapToLong(candidate -> candidate.total().size()).sum(); + } + + /** TABULATION_1: rows and columns are both banner columns, counting their overlap. */ + private StatisticsResponseDto bannerCrossTable( + StatisticsDimension index, List columns, StatisticsRequestDto request) { + List rows = new ArrayList<>(); + List totalCells = new ArrayList<>(); + totalCells.add(StatisticsTableService.text(0, CASE_COUNT_LABEL)); + for (int column = 0; column < columns.size(); column++) { + double totalPercent = 0; + for (int row = 1; row < columns.size(); row++) { + long base = crossBase(columns, row, column); + totalPercent += base == 0 ? 0 : crossCount(columns, row, column) * 100.0 / base; + } + totalCells.add( + cell( + column + 1, + columns.get(column).total().size(), + StatisticsArithmetic.round(totalPercent, request.getPercentageDecimals()), + columns.get(column).total().size(), + request)); + } + rows.add(new StatisticsRowDto(0, "TOTAL", "TOTAL", totalCells)); + for (int row = 1; row < columns.size(); row++) { + Column source = columns.get(row); + List cells = new ArrayList<>(); + cells.add(StatisticsTableService.text(0, String.join(" - ", source.labels()))); + for (int column = 0; column < columns.size(); column++) { + cells.add( + countCell( + column + 1, + crossCount(columns, row, column), + crossBase(columns, row, column), + request)); + } + String kind = source.subtotal() ? "SUBTOTAL" : "VALUE"; + rows.add(new StatisticsRowDto(row, source.id(), kind, cells)); + } + return statisticsTableService.table( + index.getDimensionId(), "전체", columnHeaders(index, columns), rows, request); + } + + /** Total column: the row's own size; other columns: respondents shared by row and column. */ + private long crossCount(List columns, int row, int column) { + return column == 0 + ? columns.get(row).total().size() + : overlapCount(columns.get(row).total(), columns.get(column).total()); + } + + private long crossBase(List columns, int row, int column) { + return column == 0 ? groupBase(columns, row) : columns.get(column).total().size(); + } + + /** Distinct respondents across the row's sibling columns (same parent id, numeric code). */ + private long groupBase(List columns, int row) { + String id = columns.get(row).id(); + Pattern siblings = + Pattern.compile(Pattern.quote(id.substring(0, id.lastIndexOf('_') + 1)) + "\\d+$"); + return columns.stream() + .filter(column -> siblings.matcher(column.id()).matches()) + .flatMap(column -> column.total().stream()) + .map(SurveyResponseDto::idkey) + .distinct() + .count(); + } + + /** Counts every left/right pair with the same respondent, like the legacy nested loop. */ + private long overlapCount(List left, List right) { + Map frequencies = new LinkedHashMap<>(); + left.forEach(response -> frequencies.merge(response.idkey(), 1L, Long::sum)); + return right.stream() + .mapToLong(response -> frequencies.getOrDefault(response.idkey(), 0L)) + .sum(); + } + + private void addStatistic( + List rows, + List columns, + StatisticsDimension index, + String statistic, + StatisticsRequestDto request) { + boolean mean = MEAN.equals(statistic); + int decimals = mean ? request.getStatisticDecimals() : request.getPercentageDecimals(); + List cells = new ArrayList<>(); + cells.add(StatisticsTableService.text(0, statistic)); + for (int column = 0; column < columns.size(); column++) { + Double value = + mean + ? mean(columns.get(column), index) + : calculate(numericValues(columns.get(column), index, column == 0), statistic); + Double rounded = value == null ? null : StatisticsArithmetic.round(value, decimals); + cells.add( + StatisticsCellDto.builder() + .columnIndex(column + 1) + .kind(rounded == null ? "MISSING" : "STATISTIC") + .measurement(statistic.toUpperCase(Locale.ROOT)) + .statisticValue(rounded) + .statisticDisplayText(StatisticsArithmetic.display(rounded, decimals)) + .build()); + } + rows.add(new StatisticsRowDto(rows.size(), statistic, "STATISTIC", cells)); + } + + /** Mean of choice codes weighted by case counts, excluding missing codes and reversing scales. */ + private Double mean(Column column, StatisticsDimension index) { + List missing = missingValues(index); + double maximum = + index.getChoices().stream() + .map(choice -> StatisticsArithmetic.number(choice.value())) + .filter(value -> value != null && !missing.contains(value)) + .mapToDouble(Double::doubleValue) + .max() + .orElse(0); + double sum = 0; + long missingCount = 0; + for (int row = 0; row < index.getChoices().size(); row++) { + Double value = StatisticsArithmetic.number(index.getChoices().get(row).value()); + if (value == null) { + continue; + } + int count = column.cases().get(row).size(); + if (missing.contains(value)) { + missingCount += count; + } else { + sum += (isReverse(index) ? maximum - value + 1 : value) * count; + } + } + long base = column.total().size() - missingCount; + return base == 0 ? null : sum / base; + } + + /** Raw numeric answers; the Total column reads its total, banner columns read their cases. */ + private List numericValues( + 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 + "_")) + .forEach(keys::add)); + List numbers = new ArrayList<>(); + for (String key : keys) { + source.stream() + .map(response -> StatisticsArithmetic.number(response.values().get(key))) + .filter(Objects::nonNull) + .forEach(numbers::add); + } + // Legacy Median sorts the same list before Mode is calculated: ties select the lowest value. + Collections.sort(numbers); + return numbers; + } + + /** Statistic over ascending values. */ + private Double calculate(List values, String statistic) { + if (values.isEmpty()) { + return SUM.equals(statistic) ? 0.0 : null; + } + int middle = values.size() / 2; + return switch (statistic) { + case "Median" -> + values.size() % 2 == 1 + ? values.get(middle) + : (values.get(middle) + values.get(middle - 1)) / 2; + case "SD" -> { + // Population standard deviation: sqrt(mean of squares - square of mean). + double meanOfSquares = + values.stream().mapToDouble(value -> value * value).average().orElse(0); + double average = values.stream().mapToDouble(Double::doubleValue).average().orElse(0); + yield Math.sqrt(meanOfSquares - Math.pow(average, 2)); + } + case "Max" -> values.get(values.size() - 1); + case "Min" -> values.get(0); + case "Mode" -> { + LinkedHashMap counts = new LinkedHashMap<>(); + values.forEach(value -> counts.merge(value, 1, Integer::sum)); + yield counts.entrySet().stream().max(Map.Entry.comparingByValue()).orElseThrow().getKey(); + } + case SUM -> values.stream().mapToDouble(Double::doubleValue).sum(); + default -> throw new IllegalArgumentException("Unknown statistic"); + }; + } + + /** Top/Mid/Bottom (or NPS Promoters/Passives/Detractors), Missing and the NPS score rows. */ + private void addScaleGroups( + List rows, + List columns, + StatisticsDimension index, + StatisticsRequestDto request) { + List missing = missingValues(index); + // Top group first: highest codes first, or lowest codes first for a reversed scale. + List values = + new ArrayList<>( + index.getChoices().stream() + .map(choice -> StatisticsArithmetic.number(choice.value())) + .filter(Objects::nonNull) + .distinct() + .filter(value -> !missing.contains(value)) + .sorted() + .toList()); + if (!isReverse(index)) { + Collections.reverse(values); + } + boolean nps = isNps(index); + int[] groupSizes = scaleGroupSizes(values.size(), nps); + if (nps && values.size() != NPS_SCALE_SIZE) { + throw BusinessException.badRequest("NPS 문항은 결측을 제외한 11개 척도 값이 필요합니다."); + } + String[] labels = nps ? NPS_GROUP_LABELS : SCALE_GROUP_LABELS; + int offset = 0; + int firstGroupRow = rows.size(); + for (int group = 0; group < groupSizes.length; group++) { + int size = groupSizes[group]; + if (size > 0) { + addGroup( + rows, + columns, + index, + labels[group] + (nps ? "" : " " + size), + values.subList(offset, offset + size).stream().map(StatisticsArithmetic::code).toList(), + request); + } + offset += size; + } + if (!missing.isEmpty()) { + List missingCodes = missing.stream().map(StatisticsArithmetic::code).toList(); + addGroup( + rows, + columns, + index, + "Missing (" + String.join(",", missingCodes) + ")", + missingCodes, + request); + } + if (nps) { + addNpsRow(rows, columns, firstGroupRow, request); + } + } + + /** Top/Mid/Bottom sizes by scale length; other lengths have no groups. */ + private int[] scaleGroupSizes(int scaleSize, boolean nps) { + if (nps) { + return new int[] {2, 2, 7}; + } + return switch (scaleSize) { + case 4 -> new int[] {2, 0, 2}; + case 5 -> new int[] {2, 1, 2}; + case 7 -> new int[] {3, 1, 3}; + case 10 -> new int[] {3, 4, 3}; + case 11 -> new int[] {4, 3, 4}; + default -> new int[] {0, 0, 0}; + }; + } + + /** NPS = Promoters - Detractors, read from the group rows just added. */ + private void addNpsRow( + List rows, + List columns, + int promotersRow, + StatisticsRequestDto request) { + int detractorsRow = promotersRow + 2; + List cells = new ArrayList<>(); + cells.add(StatisticsTableService.text(0, "NPS")); + for (int column = 1; column <= columns.size(); column++) { + StatisticsCellDto promoters = rows.get(promotersRow).getCells().get(column); + StatisticsCellDto detractors = rows.get(detractorsRow).getCells().get(column); + Double percent = + promoters.getPercent() == null || detractors.getPercent() == null + ? null + : StatisticsArithmetic.round( + promoters.getPercent() - detractors.getPercent(), + request.getPercentageDecimals()); + cells.add( + cell( + column, + promoters.getCount() - detractors.getCount(), + percent, + columns.get(column - 1).total().size(), + request) + .toBuilder() + .measurement("NPS") + .build()); + } + rows.add(new StatisticsRowDto(rows.size(), "NPS", "VALUE", cells)); + } + + 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(); + } + + private boolean isReverse(StatisticsDimension index) { + return "1".equals(index.getQuestion().getIsReverse()); + } + + private boolean isNps(StatisticsDimension index) { + return "1".equals(index.getQuestion().getIsNps()); + } + + /** One row summing the cases of the given choice codes. */ + private void addGroup( + List rows, + List columns, + StatisticsDimension index, + String label, + List values, + StatisticsRequestDto request) { + List positions = values.stream().map(value -> choicePosition(index, value)).toList(); + List cells = new ArrayList<>(); + cells.add(StatisticsTableService.text(0, label)); + for (int column = 0; column < columns.size(); column++) { + Column source = columns.get(column); + long count = + positions.stream().mapToLong(position -> source.cases().get(position).size()).sum(); + Double percent = + source.total().isEmpty() + ? null + : StatisticsArithmetic.round( + count * 100.0 / source.total().size(), request.getPercentageDecimals()); + cells.add(cell(column + 1, count, percent, source.total().size(), request)); + } + rows.add(new StatisticsRowDto(rows.size(), label, "GROUP", cells)); + } + + private int choicePosition(StatisticsDimension index, String value) { + for (int row = 0; row < index.getChoices().size(); row++) { + if (index.getChoices().get(row).value().equals(value)) { + return row; + } + } + throw BusinessException.badRequest("그룹에 집계 대상이 아닌 값이 있습니다: " + value); + } + + private List columnHeaders(StatisticsDimension index, List columns) { + List result = new ArrayList<>(); + result.add(new StatisticsColumnDto("LABEL", "LABEL", List.of(index.getQuestion().getTitle()))); + for (Column column : columns) { + result.add(new StatisticsColumnDto(column.id(), columnKind(column), column.labels())); + } + return result; + } + + private String columnKind(Column column) { + if (column.id().equals(TOTAL_COLUMN_ID)) { + return "TOTAL"; + } + return column.subtotal() ? "SUBTOTAL" : "VALUE"; + } + + private StatisticsCellDto countCell( + int column, long count, long base, StatisticsRequestDto request) { + Double percent = + base == 0 + ? 0.0 + : StatisticsArithmetic.round(count * 100.0 / base, request.getPercentageDecimals()); + return cell(column, count, percent, base, request); + } + + private StatisticsCellDto cell( + int column, long count, Double percent, long base, StatisticsRequestDto request) { + // TODO(weighting): keep the legacy non-weighted count location for a separately approved phase. + return StatisticsCellDto.builder() + .columnIndex(column) + .kind("VALUE") + .count(count) + .percent(percent) + .base(base) + .countDisplayText(Long.toString(count)) + .percentDisplayText(StatisticsArithmetic.display(percent, request.getPercentageDecimals())) + .build(); + } +} diff --git a/src/main/java/com/kri/kart/server/service/statistics/StatisticsArithmetic.java b/src/main/java/com/kri/kart/server/service/statistics/StatisticsArithmetic.java new file mode 100644 index 0000000..1f9065b --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsArithmetic.java @@ -0,0 +1,56 @@ +package com.kri.kart.server.service.statistics; + +import java.math.BigDecimal; +import java.math.MathContext; +import java.math.RoundingMode; + +/** + * Legacy report arithmetic accepts signed/fractional values, unlike common digits-only isNumeric. + */ +public final class StatisticsArithmetic { + private StatisticsArithmetic() {} + + public static Double number(String value) { + if (value == null || value.isBlank()) { + return null; + } + try { + double number = Double.parseDouble(value.trim()); + return Double.isFinite(number) ? number : null; + } catch (NumberFormatException ignored) { + return null; + } + } + + public static String code(double value) { + return BigDecimal.valueOf(value).stripTrailingZeros().toPlainString(); + } + + public static Double round(double value, int decimals) { + if (!Double.isFinite(value)) { + return null; + } + // Existing Common.RoundValue scales doubles, then rounds midpoint away from zero. + double scale = Math.pow(10, decimals); + double scaled = value * scale; + if (!Double.isFinite(scaled)) { + return null; + } + double rounded = + BigDecimal.valueOf(scaled).setScale(0, RoundingMode.HALF_UP).doubleValue() / scale; + // C#'s custom double format emits at most 15 significant digits before decimal padding. + return BigDecimal.valueOf(rounded) + .round(new MathContext(15, RoundingMode.HALF_UP)) + .setScale(decimals, RoundingMode.HALF_UP) + .doubleValue(); + } + + public static String display(Double value, int decimals) { + return value == null + ? "-" + : BigDecimal.valueOf(value) + .round(new MathContext(15, RoundingMode.HALF_UP)) + .setScale(decimals, RoundingMode.HALF_UP) + .toPlainString(); + } +} diff --git a/src/main/java/com/kri/kart/server/service/statistics/StatisticsDataService.java b/src/main/java/com/kri/kart/server/service/statistics/StatisticsDataService.java new file mode 100644 index 0000000..95aa67e --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsDataService.java @@ -0,0 +1,51 @@ +package com.kri.kart.server.service.statistics; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.kri.common.feature.json.JsonUtil; +import com.kri.kart.server.dto.statistics.StatisticsDataDto; +import com.kri.kart.server.dto.statistics.SurveyResponseDto; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class StatisticsDataService { + private final ObjectMapper objectMapper; + + public List normalize(List data) { + return data.stream().filter(row -> row.getDat() != null).map(this::normalize).toList(); + } + + private SurveyResponseDto normalize(StatisticsDataDto row) { + Map values = flatten(row.getDat()); + return new SurveyResponseDto( + row.getIdkey(), values, row.getFilterDat() == null ? values : flatten(row.getFilterDat())); + } + + private Map flatten(String json) { + JsonNode parsed = JsonUtil.fromJson(objectMapper, json, JsonNode.class); + if (parsed == null || !parsed.isObject()) { + throw new IllegalArgumentException("저장된 응답 데이터가 올바른 객체가 아닙니다."); + } + LinkedHashMap values = new LinkedHashMap<>(); + parsed + .fields() + .forEachRemaining( + entry -> { + if (!"IDKEY".equalsIgnoreCase(entry.getKey())) { + if (!entry.getValue().isValueNode()) { + throw new IllegalArgumentException("응답 값은 평면 값이어야 합니다."); + } + values.put( + entry.getKey().toUpperCase(Locale.ROOT), + entry.getValue().isNull() ? null : entry.getValue().asText()); + } + }); + return values; + } +} 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 new file mode 100644 index 0000000..dd74c4a --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsDimension.java @@ -0,0 +1,29 @@ +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; + + public record Choice(String value, String label) {} + + public String label(String value) { + return choices.stream() + .filter(choice -> choice.value().equals(value)) + .map(Choice::label) + .findFirst() + .orElse(value); + } +} 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 new file mode 100644 index 0000000..eaa7d53 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsDimensionService.java @@ -0,0 +1,220 @@ +package com.kri.kart.server.service.statistics; + +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.question.QuestionDto; +import com.kri.kart.server.dto.statistics.SurveyResponseDto; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Objects; +import java.util.Set; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class StatisticsDimensionService { + private static final String ATTRIBUTE_PROJECTION_SUFFIX = "#A"; + private static final Set OPEN_QUESTION_TYPES = Set.of("num", "text"); + private static final Set UNSUPPORTED_QUESTION_TYPES = Set.of("com", "come"); + + private final ObjectMapper objectMapper; + + /** + * Resolves an index or banner id. A blank id is the whole sample; "Q1#A" projects the attributes + * of attribute question Q1 as choices. + */ + public StatisticsDimension resolve( + String dimensionId, List questions, List responses) { + String id = StringUtil.normalizeBlank(dimensionId); + if (id == null) { + return wholeSample(); + } + id = id.toUpperCase(Locale.ROOT); + boolean projection = id.endsWith(ATTRIBUTE_PROJECTION_SUFFIX); + String qid = + projection ? id.substring(0, id.length() - ATTRIBUTE_PROJECTION_SUFFIX.length()) : id; + QuestionDto question = + questions.stream() + .filter(row -> qid.equalsIgnoreCase(row.getQid())) + .findFirst() + .orElseThrow(() -> BusinessException.badRequest("집계 문항을 찾을 수 없습니다: " + qid)); + if (UNSUPPORTED_QUESTION_TYPES.contains(question.getQtype())) { + throw BusinessException.badRequest("com 문항은 기존 집계에서도 지원하지 않습니다."); + } + JsonNode attributeInfo = metadata(question.getAttrInfo()); + boolean attributeQuestion = "attr".equals(question.getVtype()); + if (projection && (!attributeQuestion || attributeInfo.isEmpty())) { + throw BusinessException.badRequest("속성이 없는 문항은 #A로 집계할 수 없습니다."); + } + String baseKey = qid; + String attributeValue = ""; + List attributes = new ArrayList<>(); + int rankCount = 0; + if ("rank".equals(question.getQtype())) { + // Rank answers are stored as BASE_1..BASE_n. + baseKey = qid.split("_")[0]; + rankCount = metadata(question.getRankInfo()).path("val").asInt(0); + } else if (attributeQuestion) { + // Q1 (or open Q1_2) covers every attribute; Q1_A (or open Q1_2_A) selects attribute A. + boolean open = OPEN_QUESTION_TYPES.contains(question.getQtype()); + String[] parts = qid.split("_"); + if (!qid.contains("_") || (open && parts.length < 3)) { + attributeInfo + .elements() + .forEachRemaining(value -> attributes.add(value.path("value").asText())); + } else { + baseKey = parts[0] + (open ? "_" + parts[1] : ""); + attributeValue = parts[parts.length - 1]; + } + } + List choices = choices(question, qid, projection, responses); + excludeScreenedOutChoices(question, qid, choices); + return new StatisticsDimension( + id, question, baseKey, attributeValue, attributes, rankCount, projection, choices); + } + + public JsonNode metadata(String json) { + try { + JsonNode parsed = JsonUtil.fromJson(objectMapper, json, JsonNode.class); + return parsed != null && parsed.isObject() ? parsed : objectMapper.createObjectNode(); + } catch (IllegalArgumentException ignored) { + return objectMapper.createObjectNode(); + } + } + + private StatisticsDimension wholeSample() { + QuestionDto question = + QuestionDto.builder() + .qid("") + .title("전체") + .qtype("single") + .vtype("normal") + .missingValue("") + .build(); + return new StatisticsDimension( + "", + question, + "", + "", + List.of(), + 0, + false, + List.of(new StatisticsDimension.Choice("0", "전체"))); + } + + private List choices( + QuestionDto question, String qid, boolean projection, List responses) { + if (!projection && OPEN_QUESTION_TYPES.contains(question.getQtype())) { + return answeredChoices(question, qid, responses); + } + List choices = new ArrayList<>(); + JsonNode info = metadata(projection ? question.getAttrInfo() : question.getLabelInfo()); + info.elements() + .forEachRemaining( + value -> { + String code = value.path("value").asText(); + String label = value.path("label").asText().replace('|', '#'); + choices.add( + new StatisticsDimension.Choice(code, StringUtil.hasText(label) ? label : code)); + }); + return choices; + } + + /** Open questions have no label metadata; every distinct answer becomes a choice. */ + private List answeredChoices( + QuestionDto question, String qid, List responses) { + LinkedHashSet keys = new LinkedHashSet<>(); + responses.forEach( + response -> + response.values().keySet().stream() + .filter(key -> key.equals(qid) || key.startsWith(qid + "_")) + .forEach(keys::add)); + LinkedHashSet values = new LinkedHashSet<>(); + for (String key : keys) { + responses.stream() + .map(response -> response.values().get(key)) + .filter(Objects::nonNull) + .forEach(values::add); + } + List choices = new ArrayList<>(); + if ("num".equals(question.getQtype())) { + values.stream() + .map(StatisticsArithmetic::number) + .filter(Objects::nonNull) + .distinct() + .sorted() + .map(StatisticsArithmetic::code) + .forEach(code -> choices.add(new StatisticsDimension.Choice(code, code))); + } else { + values.stream() + .sorted() + .forEach(value -> choices.add(new StatisticsDimension.Choice(value, value))); + } + return choices; + } + + /** + * Drops choices that a single-condition "screen" after-logic sends out of the survey, like the + * legacy report. Conditions combined with AND are ignored. + */ + private void excludeScreenedOutChoices( + QuestionDto question, String qid, List choices) { + JsonNode logic = parseJson(question.getAfterLogic()); + if (logic == null || !logic.isArray()) { + return; + } + for (JsonNode step : logic) { + String condition = step.path("condition").asText(); + if (!"screen".equalsIgnoreCase(step.path("nextpage").asText()) + || condition.toLowerCase(Locale.ROOT).contains("and")) { + continue; + } + JsonNode conditions = parseJson(condition); + if (conditions == null || !conditions.isArray()) { + continue; + } + for (JsonNode item : conditions) { + String variable = item.path("va").asText(); + String operandText = item.path("co").asText().trim(); + Double operand = StatisticsArithmetic.number(operandText); + if (operand == null || !(variable.equals(qid) || variable.split("_")[0].equals(qid))) { + continue; + } + String operator = item.path("op").asText().trim(); + choices.removeIf(choice -> satisfies(choice, operator, operandText, operand)); + } + } + } + + private boolean satisfies( + StatisticsDimension.Choice choice, String operator, String operandText, double operand) { + Double value = StatisticsArithmetic.number(choice.value()); + if (value == null) { + return false; + } + return switch (operator) { + case "=" -> choice.value().equals(operandText); + case "!=" -> !choice.value().equals(operandText); + case "<" -> value < operand; + case ">" -> value > operand; + case "<=" -> value <= operand; + case ">=" -> value >= operand; + default -> false; + }; + } + + /** Invalid saved logic JSON is ignored, as before. */ + private JsonNode parseJson(String json) { + try { + return JsonUtil.fromJson(objectMapper, json, JsonNode.class); + } catch (IllegalArgumentException ignored) { + return null; + } + } +} 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 new file mode 100644 index 0000000..f133203 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsFilterService.java @@ -0,0 +1,197 @@ +package com.kri.kart.server.service.statistics; + +import com.fasterxml.jackson.databind.JsonNode; +import com.kri.common.feature.util.StringUtil; +import com.kri.common.feature.web.BusinessException; +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 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 +public class StatisticsFilterService { + private static final int MAX_DEPTH = 32; + private static final int MAX_GROUP_CHILDREN = 128; + private static final Set GROUP_OPERATORS = Set.of("AND", "OR", "NOT"); + private static final Set CONDITION_OPERATORS = + Set.of( + "EQ", + "NE", + "GT", + "GE", + "LT", + "LE", + "IN", + "NOT_IN", + "BETWEEN", + "IS_ANSWERED", + "IS_UNANSWERED"); + private static final Set NEGATED_OPERATORS = Set.of("NE", "NOT_IN", "IS_UNANSWERED"); + // Returned by order() when a numeric operand cannot be compared with a non-numeric answer. + private static final int NOT_COMPARABLE = Integer.MIN_VALUE; + + public Predicate compile( + StatisticsFilterDto filter, List questions) { + return filter == null ? response -> true : compile(filter, questions, 0); + } + + 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("필터 문항을 찾을 수 없습니다."); + } + + private Predicate compile( + StatisticsFilterDto filter, List questions, int depth) { + if (filter == null + || depth > MAX_DEPTH + || filter.getChildren() == null + || filter.getValues() == null) { + throw BusinessException.badRequest("필터 구조가 올바르지 않습니다."); + } + if (GROUP_OPERATORS.contains(Objects.toString(filter.getOperator(), ""))) { + return compileGroup(filter, questions, depth); + } + return compileCondition(filter, questions); + } + + private Predicate compileGroup( + StatisticsFilterDto filter, List questions, int depth) { + String operator = filter.getOperator(); + List children = filter.getChildren(); + if (children.isEmpty() + || ("NOT".equals(operator) && children.size() != 1) + || children.size() > MAX_GROUP_CHILDREN + || !filter.getValues().isEmpty() + || StringUtil.hasText(filter.getDimensionId())) { + throw BusinessException.badRequest("필터 그룹의 조건 개수가 올바르지 않습니다."); + } + List> predicates = + children.stream().map(child -> compile(child, questions, depth + 1)).toList(); + return switch (operator) { + case "AND" -> response -> predicates.stream().allMatch(child -> child.test(response)); + case "OR" -> response -> predicates.stream().anyMatch(child -> child.test(response)); + default -> predicates.get(0).negate(); + }; + } + + private Predicate compileCondition( + StatisticsFilterDto filter, List questions) { + String operator = filter.getOperator(); + if (!CONDITION_OPERATORS.contains(Objects.toString(operator, "")) + || !filter.getChildren().isEmpty()) { + throw BusinessException.badRequest("지원하지 않는 필터 연산자입니다."); + } + if (!hasValidValues(operator, filter.getValues())) { + throw BusinessException.badRequest("필터 비교 값의 개수나 유형이 올바르지 않습니다."); + } + String qid = resolveQid(filter, questions); + Predicate predicate = + response -> + response.filterValues().entrySet().stream() + .filter(entry -> matchingKey(qid, 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 NEGATED_OPERATORS.contains(operator) ? predicate.negate() : predicate; + } + + private boolean hasValidValues(String operator, List values) { + int count = values.size(); + boolean validCount = + switch (operator) { + case "IS_ANSWERED", "IS_UNANSWERED" -> count == 0; + case "BETWEEN" -> count == 2; + case "IN", "NOT_IN" -> count > 0; + default -> count == 1; + }; + return validCount && values.stream().allMatch(this::isComparableValue); + } + + private boolean isComparableValue(JsonNode value) { + return value != null + && !value.isNull() + && (value.isTextual() || value.isNumber()) + && !(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; + } + if (actual == null) { + return false; + } + if (Set.of("IN", "NOT_IN").contains(operator)) { + return operands.stream().anyMatch(operand -> order(actual, operand) == 0); + } + if ("BETWEEN".equals(operator)) { + return order(actual, operands.get(0)) >= 0 && order(actual, operands.get(1)) <= 0; + } + int comparison = order(actual, operands.get(0)); + if (comparison == NOT_COMPARABLE) { + return false; + } + return switch (operator) { + case "EQ", "NE" -> comparison == 0; + case "GT" -> comparison > 0; + case "GE" -> comparison >= 0; + case "LT" -> comparison < 0; + case "LE" -> comparison <= 0; + default -> false; + }; + } + + private int order(String actual, JsonNode expected) { + if (expected.isNumber()) { + Double number = StatisticsArithmetic.number(actual); + return number == null ? 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(" +$", "") + .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 new file mode 100644 index 0000000..1e544a5 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsSelectionService.java @@ -0,0 +1,144 @@ +package com.kri.kart.server.service.statistics; + +import com.kri.kart.server.dto.statistics.SurveyResponseDto; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import org.springframework.stereotype.Service; + +/** + * Selects respondents by answer keys shaped like {@code BASE[_SLOT][_ATTRIBUTE]}, where SLOT is a + * rank position (1..n) or a multi-choice code. + */ +@Service +public class StatisticsSelectionService { + /** Respondents who answered the dimension at all. */ + public List total( + List source, StatisticsDimension dimension) { + return select( + source, + dimension.getBaseKey(), + true, + dimension.getAttributeValue(), + "", + "", + dimension.getAttributes(), + 0); + } + + /** Respondents who chose the given value. */ + public List cases( + List source, StatisticsDimension dimension, String value) { + String multiValue = isMulti(dimension) ? value : ""; + return select( + source, + dimension.getBaseKey(), + false, + dimension.getAttributeValue(), + multiValue, + value, + dimension.getAttributes(), + dimension.getRankCount()); + } + + /** Respondents of a banner column total: anyone matching the banner choice. */ + public List bannerTotal( + List source, StatisticsDimension banner, String value) { + boolean multi = isMulti(banner); + boolean projection = banner.isAttributeProjection(); + return select( + source, + banner.getBaseKey(), + multi || projection, + projection ? value : banner.getAttributeValue(), + multi && !projection ? value : "", + value, + List.of(), + multi ? 0 : banner.getRankCount()); + } + + /** + * Respondents of one banner column cell. For an attribute projection, the banner value selects + * the attribute and the index value is compared instead. + */ + public List bannerCases( + List source, + StatisticsDimension banner, + String value, + String indexValue, + int indexChoiceCount) { + boolean multi = isMulti(banner); + boolean projection = banner.isAttributeProjection(); + return select( + source, + banner.getBaseKey(), + false, + projection ? value : banner.getAttributeValue(), + multi && !projection ? value : "", + projection ? indexValue : value, + List.of(), + multi && projection ? indexChoiceCount : banner.getRankCount()); + } + + private boolean isMulti(StatisticsDimension dimension) { + return "multi".equals(dimension.getQuestion().getQtype()); + } + + /** + * @param anyAnswer match any non-empty answer instead of comparing with {@code choiceValue} + * @param numberedSlots when positive, check slots _1.._n instead of {@code multiValue} + */ + private List select( + List source, + String baseKey, + boolean anyAnswer, + String attributeValue, + String multiValue, + String choiceValue, + 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); + } + } + } + } + return result; + } + + private boolean matches( + Map values, + String baseKey, + String suffix, + 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()); + }); + } + Double actual = StatisticsArithmetic.number(values.get(baseKey + suffix)); + 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/StatisticsStreamService.java b/src/main/java/com/kri/kart/server/service/statistics/StatisticsStreamService.java new file mode 100644 index 0000000..70c57c6 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsStreamService.java @@ -0,0 +1,85 @@ +package com.kri.kart.server.service.statistics; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.kri.common.feature.json.JsonUtil; +import com.kri.kart.server.dto.statistics.StatisticsBatchDto; +import com.kri.kart.server.dto.statistics.StatisticsStreamEventDto; +import com.kri.kart.server.service.StatisticsService; +import java.io.IOException; +import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.core.task.AsyncTaskExecutor; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Service; +import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyEmitter; + +@Service +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class StatisticsStreamService { + private static final long STREAM_TIMEOUT_MILLIS = 600_000L; + + private final StatisticsService statisticsService; + private final ObjectMapper objectMapper; + private final AsyncTaskExecutor applicationTaskExecutor; + + public StatisticsStreamService( + StatisticsService statisticsService, + ObjectMapper objectMapper, + @Qualifier("applicationTaskExecutor") AsyncTaskExecutor applicationTaskExecutor) { + this.statisticsService = statisticsService; + this.objectMapper = objectMapper.copy().disable(SerializationFeature.INDENT_OUTPUT); + this.applicationTaskExecutor = applicationTaskExecutor; + } + + public ResponseBodyEmitter stream(StatisticsBatchDto statisticsBatch) { + ResponseBodyEmitter emitter = new ResponseBodyEmitter(STREAM_TIMEOUT_MILLIS); + AtomicBoolean cancelled = new AtomicBoolean(); + AtomicReference> task = new AtomicReference<>(); + Runnable cancel = + () -> { + cancelled.set(true); + Future future = task.get(); + if (future != null) { + future.cancel(true); + } + }; + emitter.onTimeout(cancel); + emitter.onError(error -> cancel.run()); + emitter.onCompletion(cancel); + Future future = + applicationTaskExecutor.submit(() -> writeEvents(statisticsBatch, emitter, cancelled)); + task.set(future); + // The emitter may already have completed before the task reference was stored. + if (cancelled.get()) { + future.cancel(true); + } + return emitter; + } + + private void writeEvents( + StatisticsBatchDto statisticsBatch, ResponseBodyEmitter emitter, AtomicBoolean cancelled) { + try { + statisticsService.stream( + statisticsBatch, cancelled::get, event -> send(emitter, event)); + if (!cancelled.get()) { + emitter.complete(); + } + } catch (IOException disconnected) { + // The Servlet container owns cleanup after a failed write. Do not write an error response. + cancelled.set(true); + } catch (RuntimeException error) { + cancelled.set(true); + emitter.completeWithError(error); + } + } + + /** One event per physical UTF-8 line; JSON escapes any line breaks inside values. */ + private void send(ResponseBodyEmitter emitter, StatisticsStreamEventDto event) + throws IOException { + emitter.send(JsonUtil.toJson(objectMapper, event) + "\n", MediaType.TEXT_PLAIN); + } +} diff --git a/src/main/java/com/kri/kart/server/service/statistics/StatisticsTableService.java b/src/main/java/com/kri/kart/server/service/statistics/StatisticsTableService.java new file mode 100644 index 0000000..7acb750 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsTableService.java @@ -0,0 +1,169 @@ +package com.kri.kart.server.service.statistics; + +import com.kri.kart.server.dto.statistics.StatisticsCellDto; +import com.kri.kart.server.dto.statistics.StatisticsColumnDto; +import com.kri.kart.server.dto.statistics.StatisticsRequestDto; +import com.kri.kart.server.dto.statistics.StatisticsResponseDto; +import com.kri.kart.server.dto.statistics.StatisticsRowDto; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import org.springframework.stereotype.Service; + +/** Adds header rows to calculated rows and optionally transposes the whole table. */ +@Service +public class StatisticsTableService { + private static final String NO_HEADER_MODE = "NONE"; + private static final String FLAT_HEADER_MODE = "FLAT"; + + private record Layout( + List columns, + List headers, + List rows) {} + + public StatisticsResponseDto table( + String questionId, + String title, + List columns, + List body, + StatisticsRequestDto request) { + List headers = headers(title, columns, request.getHeaderMode()); + Layout layout = new Layout(columns, headers, placeBelowHeaders(body, headers.size())); + if (request.isTranspose()) { + layout = transpose(layout); + } + return StatisticsResponseDto.builder() + .type("TABLE") + .questionId(questionId) + .title(title) + .columns(layout.columns()) + .headerRows(layout.headers()) + .rows(layout.rows()) + .words(List.of()) + .appliedOptions(request) + .build(); + } + + /** + * MERGED headers stack each column's labels vertically and merge equal neighbours; FLAT joins + * them into one row; NONE omits headers. + */ + public List headers( + String title, List columns, String mode) { + if (NO_HEADER_MODE.equals(mode)) { + return List.of(); + } + boolean flat = FLAT_HEADER_MODE.equals(mode); + int height = + flat + ? 1 + : Math.max( + 1, columns.stream().mapToInt(column -> column.getLabels().size()).max().orElse(1)); + List> cells = new ArrayList<>(); + for (int row = 0; row < height; row++) { + cells.add(new ArrayList<>()); + } + cells.get(0).add(text(0, title).toBuilder().rowSpan(height).build()); + for (int column = 1; column < columns.size(); column++) { + List labels = columns.get(column).getLabels(); + if (flat) { + cells.get(0).add(text(column, String.join(" - ", labels))); + continue; + } + int used = Math.max(1, labels.size()); + for (int row = 0; row < used; row++) { + String label = row < labels.size() ? labels.get(row) : ""; + List rowCells = cells.get(row); + StatisticsCellDto previous = rowCells.isEmpty() ? null : rowCells.get(rowCells.size() - 1); + if (canMergeWithPrevious(previous, columns, column, row)) { + rowCells.set( + rowCells.size() - 1, previous.toBuilder().colSpan(previous.getColSpan() + 1).build()); + } else { + // The last label of a short column stretches down to the bottom header row. + int rowSpan = row == used - 1 ? height - row : 1; + rowCells.add(text(column, label).toBuilder().rowSpan(rowSpan).build()); + } + } + } + List result = new ArrayList<>(); + for (int row = 0; row < height; row++) { + result.add(new StatisticsRowDto(row, "header_" + row, "HEADER", cells.get(row))); + } + return result; + } + + public static StatisticsCellDto text(int column, String value) { + return StatisticsCellDto.builder() + .columnIndex(column) + .kind(value.isEmpty() ? "EMPTY" : "TEXT") + .textValue(value) + .build(); + } + + /** Merge adjacent anchors only when every parent label is also the same. */ + private boolean canMergeWithPrevious( + StatisticsCellDto previous, List columns, int column, int row) { + if (previous == null || column <= 1) { + return false; + } + List labels = columns.get(column).getLabels(); + List previousLabels = columns.get(column - 1).getLabels(); + return previous.getRowSpan() == 1 + && previous.getColumnIndex() + previous.getColSpan() == column + && labels.size() == previousLabels.size() + && labels.subList(0, row + 1).equals(previousLabels.subList(0, row + 1)); + } + + private List placeBelowHeaders(List body, int headerCount) { + List rows = new ArrayList<>(); + for (int rowIndex = 0; rowIndex < body.size(); rowIndex++) { + StatisticsRowDto row = body.get(rowIndex); + rows.add( + new StatisticsRowDto( + rowIndex + headerCount, row.getRowId(), row.getKind(), row.getCells())); + } + return rows; + } + + /** Swaps rows and columns, including row/column spans; the first new row becomes the header. */ + private Layout transpose(Layout layout) { + List columns = layout.columns(); + List source = new ArrayList<>(layout.headers()); + source.addAll(layout.rows()); + List transposed = new ArrayList<>(); + for (int rowIndex = 0; rowIndex < columns.size(); rowIndex++) { + List cells = new ArrayList<>(); + for (StatisticsRowDto row : source) { + for (StatisticsCellDto cell : row.getCells()) { + if (cell.getColumnIndex() == rowIndex) { + cells.add( + cell.toBuilder() + .columnIndex(row.getRowIndex()) + .rowSpan(cell.getColSpan()) + .colSpan(cell.getRowSpan()) + .build()); + } + } + } + cells.sort(Comparator.comparingInt(StatisticsCellDto::getColumnIndex)); + transposed.add( + new StatisticsRowDto( + rowIndex, + columns.get(rowIndex).getColumnId(), + rowIndex == 0 ? "HEADER" : columns.get(rowIndex).getKind(), + cells)); + } + List transposedColumns = + source.stream() + .map( + row -> + new StatisticsColumnDto(row.getRowId(), row.getKind(), List.of(row.getRowId()))) + .toList(); + List headers = transposed.isEmpty() ? List.of() : List.of(transposed.get(0)); + List rows = + transposed.size() < 2 + ? List.of() + : new ArrayList<>(transposed.subList(1, transposed.size())); + return new Layout(transposedColumns, headers, rows); + } +} 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 new file mode 100644 index 0000000..342b0a6 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/statistics/StatisticsTextService.java @@ -0,0 +1,83 @@ +package com.kri.kart.server.service.statistics; + +import com.kri.kart.server.dto.project.ProjectRefDto; +import com.kri.kart.server.dto.statistics.NlpTokenDto; +import com.kri.kart.server.dto.statistics.StatisticsWordDto; +import com.kri.kart.server.dto.statistics.SurveyResponseDto; +import com.kri.kart.server.persistence.repository.NlpRepository; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +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 +@RequiredArgsConstructor +@ConditionalOnProperty(prefix = "kri.kart.database", name = "enabled", havingValue = "true") +public class StatisticsTextService { + private static final int TOP_WORD_LIMIT = 100; + private static final String FOREIGN_WORD_TAG = "SL"; + + private final NlpRepository nlpRepository; + private final KiwiNlpService kiwiNlpService; + + public List analyze( + ProjectRefDto project, String qid, List responses) { + List texts = answerTexts(qid, responses); + Set selectedTags = new LinkedHashSet<>(nlpRepository.tags(project.getPkey(), qid)); + List tokens = + kiwiNlpService.tokenize(texts, nlpRepository.words(project.getPkey(), qid)); + // The same word with a different tag is counted separately, in first-appearance order. + LinkedHashMap counts = new LinkedHashMap<>(); + for (NlpTokenDto token : tokens) { + if (isCounted(token, selectedTags)) { + counts.merge(token, 1L, Long::sum); + } + } + // Stable sort: equal counts keep their first-appearance order. + return counts.entrySet().stream() + .sorted(Map.Entry.comparingByValue().reversed()) + .limit(TOP_WORD_LIMIT) + .map(entry -> toWord(entry.getKey(), entry.getValue())) + .toList(); + } + + private StatisticsWordDto toWord(NlpTokenDto token, long count) { + return new StatisticsWordDto(token.text(), token.tag(), count); + } + + /** Answers of the question and its sub-keys, grouped by key in first-appearance order. */ + private List answerTexts(String qid, List responses) { + LinkedHashSet keys = new LinkedHashSet<>(); + responses.forEach( + response -> + response.values().keySet().stream() + .filter(key -> key.equals(qid) || key.startsWith(qid + "_")) + .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('¸', ','))) + .forEach(texts::add); + } + return texts; + } + + /** Selected tags count nouns and words longer than one character; SL always counts. */ + private boolean isCounted(NlpTokenDto token, Set selectedTags) { + boolean selected = + selectedTags.contains(token.tag()) + && (token.tag().startsWith("N") || token.text().length() > 1); + // Preserve SL inclusion regardless of the configured tags and its one-character allowance. + return selected || FOREIGN_WORD_TAG.equals(token.tag()); + } +} diff --git a/src/main/java/com/kri/kart/server/service/upload/QuestionImportService.java b/src/main/java/com/kri/kart/server/service/upload/QuestionImportService.java new file mode 100644 index 0000000..163cdee --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/upload/QuestionImportService.java @@ -0,0 +1,215 @@ +package com.kri.kart.server.service.upload; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.kri.common.feature.json.JsonUtil; +import com.kri.common.feature.web.BusinessException; +import com.kri.kart.server.dto.upload.ImportQuestionDto; +import com.kri.kart.server.dto.upload.UploadTableDto; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class QuestionImportService { + private final ObjectMapper objectMapper; + + public List prepare(UploadTableDto table) { + List result = new ArrayList<>(); + List> rows = table.getRows(); + int first = 0; + while (first < rows.size() && !rows.get(first).get(0).matches("[A-Za-z][A-Za-z0-9]*")) { + first++; + } + for (int index = first; index < rows.size(); ) { + List row = rows.get(index); + String type = row.get(2).toLowerCase(Locale.ROOT); + String itemType = + switch (type) { + case "s" -> "single"; + case "m", "r" -> "multi"; // Original R uses the multi dataset, plus dataset.rank. + case "c", "nps" -> "scale"; + case "n", "o" -> "open"; + case "i" -> ""; + default -> throw BusinessException.badRequest("문항 유형 I/S/M/R/C/NPS/N/O를 확인해 주세요."); + }; + String stype = + switch (type) { + case "s" -> "SM2"; + case "m" -> "MM2"; + case "r" -> "RM1"; + case "c", "nps" -> "SCM1"; + case "n", "o" -> "OM1"; + default -> "DM1"; + }; + String qtype = type.equals("i") ? "description" : type.equals("r") ? "rank" : itemType; + ObjectNode labels = objectMapper.createObjectNode(); + ObjectNode attrs = objectMapper.createObjectNode(); + int next = index + 1; + while (next < rows.size() && rows.get(next).get(0).isEmpty()) { + List labelRow = rows.get(next++); + if (type.equals("i")) { + continue; + } + String title = labelRow.get(5); + boolean etc = title.toLowerCase(Locale.ROOT).contains("{t}"); + String cleaned = title.replace("{t}", "").replace("{T}", ""); + if (!labelRow.get(3).isEmpty()) { + attrs.set( + Integer.toString(attrs.size() + 1), + objectMapper + .createObjectNode() + .put("etc", etc ? "1" : "0") + .put("except", "0") + .put("label", cleaned) + .put("value", labelRow.get(3))); + } else if (!title.isEmpty()) { + ObjectNode label = objectMapper.createObjectNode().put("label", cleaned); + if (itemType.equals("open")) { + label.put("option", type.equals("n") ? "num" : "all").put("must", "1"); + } else { + label.put("value", labelRow.get(4)); + if (!itemType.equals("scale")) { + label.put("etc", etc ? "1" : "0").put("except", "0"); + } + } + labels.set(Integer.toString(labels.size() + 1), label); + } + } + ObjectNode dataset = objectMapper.createObjectNode(); + if (!labels.isEmpty()) { + dataset.set(itemType, labels); + } + if (!attrs.isEmpty()) { + dataset.set("attr", attrs); + qtype = "attr"; + stype = "AM1"; + } + // Preserve uppercase-only max capture and the original nested option.option shape. + String max = row.get(2).equals("R") || row.get(2).equals("M") ? row.get(4) : ""; + if (type.equals("r")) { + dataset.set("rank", objectMapper.createObjectNode().put("val", max).put("max", max)); + } + ObjectNode option = objectMapper.createObjectNode(); + if (type.equals("m") && !max.isEmpty()) { + option.put("max", max); + } else if (type.equals("nps")) { + option + .put("arrow", "") + .put("under_label", "") + .put("reverse", "") + .put("break", "") + .put("npsFlag", "1"); + } + if (!itemType.isEmpty() && labels.isEmpty()) { + throw BusinessException.badRequest("문항별 보기 또는 입력 항목을 확인해 주세요."); + } + ObjectNode question = + objectMapper + .createObjectNode() + .put("qgroup", "") + .put("rota", "") + .put("variable", row.get(0)) + .put("explain", row.get(1)) + .put("title", row.get(5)) + .put("stype", stype) + .put("description", ""); + question.set("dataset", dataset); + question.put("datagroup", "").put("qtype", qtype); + if (option.isEmpty()) { + question.put("option", ""); + } else { + question.set("option", objectMapper.createObjectNode().set("option", option)); + } + String qid = "Q" + (result.size() + 1); + var structure = structure(qid, itemType, labels, attrs); + result.add( + new ImportQuestionDto( + qid, result.size() + 1, legacyJson(question), structure.get(0), structure.get(1))); + index = next; + } + if (result.isEmpty()) { + throw BusinessException.badRequest("등록할 문항이 없습니다."); + } + return result; + } + + private String legacyJson(ObjectNode value) { + String json = JsonUtil.toJson(objectMapper, value); + // Original GetStringFromJson strips every pair of spaces, including inside JSON string values. + while (json.contains(" ")) { + json = json.replace(" ", ""); + } + return json; + } + + private List structure(String qid, String itemType, ObjectNode labels, ObjectNode attrs) { + var keys = objectMapper.createArrayNode(); + var info = objectMapper.createObjectNode(); + int attrCount = Math.max(1, attrs.size()); + if (itemType.isEmpty()) { + return List.of("[]", "{}"); + } + for (int attr = 1; attr <= attrCount; attr++) { + String suffix = + attrs.isEmpty() ? "" : "_" + attrs.get(Integer.toString(attr)).get("value").asText(); + int count = itemType.equals("single") || itemType.equals("scale") ? 1 : labels.size(); + ObjectNode allLabels = objectMapper.createObjectNode(); + if (itemType.equals("single") || itemType.equals("scale")) { + labels.forEach( + label -> allLabels.put(label.get("value").asText(), label.get("label").asText())); + } + for (int item = 1; item <= count; item++) { + var label = labels.get(Integer.toString(item)); + String itemSuffix = + itemType.equals("multi") + ? "_" + label.get("value").asText() + : itemType.equals("open") ? "_" + item : ""; + String key = qid + itemSuffix + suffix; + if (info.has(key)) { + throw BusinessException.badRequest("중복된 보기 값 또는 속성 값을 확인해 주세요."); + } + keys.add(key); + if (itemType.equals("multi")) { + info.set( + key, + objectMapper + .createObjectNode() + .put(label.get("value").asText(), label.get("label").asText())); + } else { + info.set( + key, allLabels.deepCopy()); // Original Common.GetJObjectFromString("open") yields {}. + } + if (itemType.equals("multi") && label.path("etc").asText().equals("1")) { + String textKey = "T" + key; + keys.add(textKey); + info.put(textKey, label.get("label").asText() + "(기타)"); + } + } + if (itemType.equals("single")) { + for (var label : labels) { + if (label.path("etc").asText().equals("1")) { + String value = label.get("value").asText(); + // Original lookup uses the value as the ordinal key; do not silently reinterpret it. + var etcLabel = labels.get(value); + if (etcLabel == null) { + throw BusinessException.badRequest("단일 문항 기타 보기의 값과 순서를 확인해 주세요."); + } + String key = "T" + qid + "_" + value + suffix; + keys.add(key); + info.put(key, etcLabel.get("label").asText() + "(기타)"); + } + } + } + if (!attrs.isEmpty() && attrs.get(Integer.toString(attr)).path("etc").asText().equals("1")) { + String key = qid + suffix + "_AT"; + keys.add(key); + info.put(key, attrs.get(Integer.toString(attr)).get("label").asText() + "_기타"); + } + } + return List.of(JsonUtil.toJson(objectMapper, keys), legacyJson(info)); + } +} diff --git a/src/main/java/com/kri/kart/server/service/upload/ResponseImportService.java b/src/main/java/com/kri/kart/server/service/upload/ResponseImportService.java new file mode 100644 index 0000000..1398852 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/upload/ResponseImportService.java @@ -0,0 +1,160 @@ +package com.kri.kart.server.service.upload; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.json.JsonUtil; +import com.kri.common.feature.web.BusinessException; +import com.kri.kart.server.dto.upload.ImportResponseDto; +import com.kri.kart.server.dto.upload.UploadTableDto; +import java.time.Duration; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Set; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ResponseImportService { + private static final DateTimeFormatter TIMESTAMP = + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + private final ObjectMapper objectMapper; + + public List prepare(UploadTableDto table, Set multiQuestions) { + List headers = table.getHeaders(); + for (String required : List.of("IDKEY", "Status", "start_date", "end_date")) { + if (headers.stream().noneMatch(header -> header.equalsIgnoreCase(required))) { + throw BusinessException.badRequest("응답 파일의 고정 헤더를 확인해 주세요."); + } + } + if (table.getRows().size() < 2) { + throw BusinessException.badRequest("별칭 행 다음에 업로드할 응답이 필요합니다."); + } + List roots = + headers.stream() + .map(header -> header.split("_", -1)[0].replace("TQ", "Q")) + .distinct() + .skip(6) + .toList(); + List result = new ArrayList<>(); + String now = DateTimeUtil.nowKstLocalDateTime().format(TIMESTAMP); + for (int rowIndex = 1; rowIndex < table.getRows().size(); rowIndex++) { + var row = table.getRows().get(rowIndex); + String idkey = value(headers, row, "IDKEY"); + String status = value(headers, row, "Status"); + String start = value(headers, row, "start_date"); + String end = value(headers, row, "end_date"); + if (idkey.isBlank()) { + throw BusinessException.badRequest("응답 IDKEY가 비어 있는 행을 확인해 주세요."); + } + status = status.isEmpty() ? "10" : status; + try { + Integer.parseInt(status); + } catch (NumberFormatException exception) { + throw BusinessException.badRequest("응답 Status는 정수여야 합니다."); + } + start = start.isEmpty() ? now : start; + end = end.isEmpty() ? now : end; + LocalDateTime startTime = parseTime(start); + LocalDateTime endTime = parseTime(end); + String middle = + startTime.plus(Duration.between(startTime, endTime).dividedBy(2)).format(TIMESTAMP); + List groups = new ArrayList<>(); + List times = new ArrayList<>(); + String pageName = ""; + for (String root : roots) { + List fields = new ArrayList<>(); + for (int col = 0; col < headers.size(); col++) { + String key = headers.get(col); + if (!(key.equals(root) + || key.startsWith(root + "_") + || key.startsWith("T" + root + "_"))) { + continue; + } + String cell = row.get(col).trim().replace(".00", ""); + if (cell.isEmpty()) { + continue; + } + if (multiQuestions.contains(root) && numeric(cell)) { + String[] parts = key.split("_", -1); + if (parts.length < 2) { + throw BusinessException.badRequest("복수 응답의 열 이름을 확인해 주세요."); + } + parts[1] = cell; + key = String.join("_", parts); + } + cell = cell.replace("\n", " ").replace("\"", """).replace("'", "‘"); + fields.add(json(key) + ":" + json(cell)); + } + if (!fields.isEmpty()) { + groups.add(json(root) + ":{" + String.join(",", fields) + "}"); + times.add(json(root) + ":" + json(middle)); + pageName = root; + } + } + if (groups.isEmpty()) { + throw BusinessException.badRequest("문항 응답이 없는 행 또는 고정 열 순서를 확인해 주세요."); + } + times.set(times.size() - 1, json(pageName) + ":" + json(end)); + String datjson = + "{\"INDEX\":{\"USERAGENT\":\"\",\"USERIP\":\"\",\"TK\":\"\"}," + + String.join(",", groups) + + "}"; + String surveyDate = "{\"INDEX\":" + json(start) + "," + String.join(",", times) + "}"; + result.add(new ImportResponseDto(idkey, status, pageName, datjson, surveyDate)); + } + return result; + } + + private String value(List headers, List row, String key) { + for (int index = 0; index < headers.size(); index++) { + if (headers.get(index).equalsIgnoreCase(key)) { + return row.get(index); + } + } + return ""; + } + + private boolean numeric(String value) { + try { + Float.parseFloat(value.replace(",", "")); + return true; + } catch (NumberFormatException exception) { + return false; + } + } + + private LocalDateTime parseTime(String value) { + LocalDateTime time = DateTimeUtil.parseLocalDateTime(value); + if (time != null && time.format(TIMESTAMP).equals(value.trim())) { + return time; + } + for (var formatter : + List.of( + DateTimeFormatter.ISO_LOCAL_DATE_TIME, + DateTimeFormatter.ofPattern("uuuu-M-d H:m:s", Locale.ROOT) + .withResolverStyle(java.time.format.ResolverStyle.STRICT), + DateTimeFormatter.ofPattern("uuuu/M/d H:m:s", Locale.ROOT) + .withResolverStyle(java.time.format.ResolverStyle.STRICT), + DateTimeFormatter.ofPattern("M/d/uuuu H:m:s", Locale.US) + .withResolverStyle(java.time.format.ResolverStyle.STRICT))) { + try { + return LocalDateTime.parse(value.trim(), formatter); + } catch (java.time.format.DateTimeParseException ignored) { + // Try the remaining legacy date representations. + } + } + var date = DateTimeUtil.parseLocalDate(value); + if (date != null && date.toString().equals(value.trim())) { + return date.atStartOfDay(); + } + throw BusinessException.badRequest("응답 시작/종료 일시를 확인해 주세요."); + } + + private String json(String value) { + return JsonUtil.toJson(objectMapper, value); + } +} diff --git a/src/main/java/com/kri/kart/server/service/upload/UploadArchiveService.java b/src/main/java/com/kri/kart/server/service/upload/UploadArchiveService.java new file mode 100644 index 0000000..8efa41e --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/upload/UploadArchiveService.java @@ -0,0 +1,56 @@ +package com.kri.kart.server.service.upload; + +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.kart.server.dto.project.ProjectRefDto; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.time.format.DateTimeFormatter; +import java.util.UUID; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +@Service +public class UploadArchiveService { + private final Path directory; + + public UploadArchiveService( + @Value("${kri.kart.upload.directory:./upload_data}") String directory) { + this.directory = Path.of(directory).toAbsolutePath().normalize(); + } + + public String store(ProjectRefDto project, String type, String extension, MultipartFile file) { + String pkey = project.getPkey().replaceAll("[^A-Za-z0-9_-]", "_"); + String name = + type + + "_" + + pkey + + "_" + + DateTimeUtil.nowKstLocalDateTime() + .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HHmmss")) + + "_" + + UUID.randomUUID().toString().substring(0, 8) + + extension; + Path target = directory.resolve(name).normalize(); + if (!directory.equals(target.getParent())) { + throw new IllegalStateException("업로드 보관 경로가 올바르지 않습니다."); + } + try { + Files.createDirectories(directory); + Path temporary = Files.createTempFile(directory, ".upload-", ".tmp"); + try { + try (var input = file.getInputStream()) { + Files.copy(input, temporary, StandardCopyOption.REPLACE_EXISTING); + } + Files.move(temporary, target); + } finally { + Files.deleteIfExists(temporary); + } + return name; + } catch (IOException exception) { + throw new IllegalStateException("업로드 파일을 보관할 수 없습니다."); + } + } +} diff --git a/src/main/java/com/kri/kart/server/service/upload/UploadTableService.java b/src/main/java/com/kri/kart/server/service/upload/UploadTableService.java new file mode 100644 index 0000000..ca95489 --- /dev/null +++ b/src/main/java/com/kri/kart/server/service/upload/UploadTableService.java @@ -0,0 +1,177 @@ +package com.kri.kart.server.service.upload; + +import com.kri.common.feature.excel.ExcelUtil; +import com.kri.common.feature.file.FileUtil; +import com.kri.common.feature.web.BusinessException; +import com.kri.kart.server.dto.upload.UploadTableDto; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.charset.Charset; +import java.nio.charset.CodingErrorAction; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Objects; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.DataFormatter; +import org.apache.poi.ss.usermodel.WorkbookFactory; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +@Service +public class UploadTableService { + public String extension(MultipartFile file) { + if (file == null) { + throw BusinessException.badRequest("업로드할 file 항목을 전달해 주세요."); + } + String name = + Objects.toString(FileUtil.extractFileNameFromPath(file.getOriginalFilename()), ""); + int dot = name.lastIndexOf('.'); + String extension = dot < 0 ? "" : name.substring(dot).toLowerCase(Locale.ROOT); + if (file.isEmpty() + || file.getSize() > 20L * 1024 * 1024 + || !List.of(".xlsx", ".csv", ".txt").contains(extension)) { + throw BusinessException.badRequest("비어 있지 않은 20MB 이하의 xlsx/csv/txt 파일을 선택해 주세요."); + } + return extension; + } + + public UploadTableDto read(MultipartFile file, List positionalHeaders) { + String extension = extension(file); + try { + return extension.equals(".xlsx") + ? excel(file.getBytes(), positionalHeaders) + : text(file.getBytes(), extension, positionalHeaders); + } catch (BusinessException exception) { + throw exception; + } catch (Exception exception) { + // Do not expose parser exceptions, paths or uploaded respondent values. + throw BusinessException.badRequest("업로드 파일의 형식과 내용을 확인해 주세요."); + } + } + + private UploadTableDto excel(byte[] bytes, List positionalHeaders) throws IOException { + try (var workbook = WorkbookFactory.create(new ByteArrayInputStream(bytes))) { + if (!(workbook instanceof org.apache.poi.xssf.usermodel.XSSFWorkbook) + || workbook.getNumberOfSheets() == 0) { + throw BusinessException.badRequest("xlsx 파일의 첫 시트를 확인해 주세요."); + } + var sheet = workbook.getSheetAt(0); + int width = + positionalHeaders == null + ? (sheet.getRow(0) == null ? 0 : sheet.getRow(0).getLastCellNum()) + : positionalHeaders.size(); + if (width < 1) { + throw BusinessException.badRequest("업로드 파일의 헤더를 확인해 주세요."); + } + var formatter = new DataFormatter(Locale.KOREA); + formatter.setUseCachedValuesForFormulaCells(true); + List> rows = new ArrayList<>(); + // Unlike Common.readAsMapList, retain blank rows, positional headers and cached formulas. + for (int index = 0; index <= sheet.getLastRowNum(); index++) { + var source = sheet.getRow(index); + List row = new ArrayList<>(); + if (source != null && source.getLastCellNum() > width) { + for (int col = width; col < source.getLastCellNum(); col++) { + if (!Objects.toString(ExcelUtil.getStringCell(source.getCell(col)), "").isEmpty()) { + throw BusinessException.badRequest("양식의 열 개수를 확인해 주세요."); + } + } + } + for (int col = 0; col < width; col++) { + var cell = source == null ? null : source.getCell(col); + String value = displayValue(cell, formatter); + row.add(Objects.toString(value, "")); + } + rows.add(row); + } + List headers = positionalHeaders == null ? rows.get(0) : positionalHeaders; + return table(headers, rows.subList(1, rows.size())); + } + } + + private String displayValue(Cell cell, DataFormatter formatter) { + if (cell == null) { + return ""; + } + CellType type = + cell.getCellType() == CellType.FORMULA + ? cell.getCachedFormulaResultType() + : cell.getCellType(); + // EPPlus.Text uses 1/0 for Boolean cells and preserves displayed numeric/date formats. + if (type == CellType.BOOLEAN) { + return cell.getBooleanCellValue() ? "1" : "0"; + } + if (type == CellType.NUMERIC || type == CellType.ERROR) { + return formatter.formatCellValue(cell); + } + return Objects.toString(ExcelUtil.getStringCell(cell, null, formatter), ""); + } + + private UploadTableDto text(byte[] bytes, String extension, List positionalHeaders) + throws Exception { + Charset charset = Charset.forName("EUC-KR"); + int offset = 0; + if (bytes.length >= 3 + && bytes[0] == (byte) 0xef + && bytes[1] == (byte) 0xbb + && bytes[2] == (byte) 0xbf) { + charset = StandardCharsets.UTF_8; + offset = 3; + } else if (bytes.length >= 2 && bytes[0] == (byte) 0xff && bytes[1] == (byte) 0xfe) { + charset = StandardCharsets.UTF_16LE; + offset = 2; + } else if (bytes.length >= 2 && bytes[0] == (byte) 0xfe && bytes[1] == (byte) 0xff) { + charset = StandardCharsets.UTF_16BE; + offset = 2; + } + String content = + charset + .newDecoder() + .onMalformedInput(CodingErrorAction.REPORT) + .onUnmappableCharacter(CodingErrorAction.REPORT) + .decode(ByteBuffer.wrap(bytes, offset, bytes.length - offset)) + .toString(); + List> rows = new ArrayList<>(); + try (var reader = new java.io.BufferedReader(new java.io.StringReader(content))) { + String line; + while ((line = reader.readLine()) != null) { + rows.add(Arrays.asList(line.split(extension.equals(".csv") ? "," : "\t", -1))); + } + } + if (rows.isEmpty()) { + throw BusinessException.badRequest("업로드 파일에 데이터가 없습니다."); + } + List headers = positionalHeaders == null ? rows.remove(0) : positionalHeaders; + return table(headers, rows); + } + + private UploadTableDto table(List headers, List> source) { + var unique = new HashSet(); + for (String header : headers) { + if (header.isBlank() || !unique.add(header.toUpperCase(Locale.ROOT))) { + throw BusinessException.badRequest("비어 있거나 중복된 열 이름을 확인해 주세요."); + } + } + List> rows = new ArrayList<>(); + for (List values : source) { + if (values.size() > headers.size()) { + throw BusinessException.badRequest("양식의 열 개수를 확인해 주세요."); + } + List row = new ArrayList<>(values); + while (row.size() < headers.size()) { + row.add(""); + } + rows.add(List.copyOf(row)); + } + if (rows.isEmpty()) { + throw BusinessException.badRequest("업로드 파일에 데이터가 없습니다."); + } + return new UploadTableDto(List.copyOf(headers), rows); + } +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 406227f..3f65783 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,10 +1,9 @@ -spring: - datasource: - url: "${DB_URL}" - username: "${DB_USERNAME}" - password: "${DB_PASSWORD}" - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - -logging: - level: - org.hibernate.SQL: DEBUG +# apikey 보관 DB(MySQL) +kri: + auth: + apikey: + db: + url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/kri_common?characterEncoding=UTF-8 + username: kriit + password: it#51304 + driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 817a80d..e335fc6 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -1,6 +1,9 @@ -spring: - datasource: - url: "${DB_URL:jdbc:sqlserver://localhost:1433;databaseName=sample;encrypt=false}" - username: "${DB_USERNAME:sample}" - password: "${DB_PASSWORD:sample}" - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver +# apikey 보관 DB(MySQL) +kri: + auth: + apikey: + db: + url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/kri_common?characterEncoding=UTF-8 + username: kriit + password: it#51304 + driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 874a0ec..3f65783 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,10 +1,9 @@ -spring: - datasource: - url: "${DB_URL}" - username: "${DB_USERNAME}" - password: "${DB_PASSWORD}" - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - +# apikey 보관 DB(MySQL) kri: - swagger: - enabled: ${KRI_SWAGGER_ENABLED:false} + auth: + apikey: + db: + url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/kri_common?characterEncoding=UTF-8 + username: kriit + password: it#51304 + driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 61b1074..8eaeed8 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -7,17 +7,6 @@ spring: name: kart-server profiles: default: local - jpa: - open-in-view: false - hibernate: - ddl-auto: none - properties: - hibernate: - jdbc: - batch_size: 1000 - order_inserts: true - order_updates: true - format_sql: true servlet: multipart: max-file-size: 20MB @@ -36,46 +25,73 @@ springdoc: kri: auth: apikey: - enabled: ${KRI_API_KEY_ENABLED:false} - key: ${KRI_API_KEY:} - header-name: ${KRI_API_KEY_HEADER_NAME:X-API-Key} - service-code: ${KRI_API_KEY_SERVICE_CODE:kart-server} - preload-on-startup: ${KRI_API_KEY_PRELOAD_ON_STARTUP:false} - admin-api-enabled: ${KRI_API_KEY_ADMIN_ENABLED:false} - admin-allow-ips: [] + key: '4B726963-416E616C79736973-5265706F7274-546F6F6C-405E31293132' + header-name: "X-API-Key" + enabled: true + service-code: kart-server + allowed-paths: [] + preload-on-startup: true + admin-api-enabled: true + admin-allow-ips: + - 211.254.145.130 + + api-url: + intranet-extension: https://intranet-ext.kric.com/api/v1 + security: - enabled: ${KRI_SECURITY_ENABLED:true} + enabled: true public-paths: - /v3/api-docs/** - /swagger-ui.html - /swagger-ui/** - /ping - - /files/** + - /api/v1/auth/login + - /api/v1/external/*/login + - /internal/apikey/** + swagger: - enabled: ${KRI_SWAGGER_ENABLED:true} + enabled: true title: "kart-server API" description: "KART 백엔드 API" version: "v1.0.0" base-package: "com.kri.kart.server" - allowed-ips: [] + allowed-ips: + - 211.254.145.130 file: - base-dir: ${FILE_STORAGE_BASE_DIR:./upload-file} + base-dir: ./upload-file resource-pattern: /files/** web: enabled: true redis: enabled: false scheduling: - enabled: true + enabled: false -app: - scheduler: - example: - enabled: ${EXAMPLE_SCHEDULER_ENABLED:false} - cron: ${EXAMPLE_SCHEDULER_CRON:0 0 1 * * *} - -mybatis: - mapper-locations: classpath:/mybatis/mapper/**/*.xml - type-aliases-package: com.kri.kart.server.persistence.entity - configuration: - map-underscore-to-camel-case: true + kart: + share: + public-origin: https://kart.kric.com + legacy-key: 'kriT#3415%130$^$tuDi0_Ds34155100' + legacy-iv: 'kriT#3415%130$^$' + nlp: + model-directory: ./nlp_model/v0.24.0 + upload: + directory: ./upload_data + progress: + append-directory: ../report_append + database: + enabled: true + kon: + url: 'jdbc:sqlserver://1.235.195.8:20022;databaseName={KON};encrypt=false' + username: 'kon' + password: 'kon#51304' + maximum-pool-size: 5 + konkiwi: + url: 'jdbc:sqlserver://mssql-7sq2n-kr.vpc-pub-cdb.ntruss.com;databaseName={konkiwi};encrypt=false' + username: 'kadmin' + password: 'it#51304' + maximum-pool-size: 5 + kart: + url: 'jdbc:sqlserver://1.235.195.8:20022;databaseName={REPORT_KON};encrypt=false' + username: 'kon' + password: 'kon#51304' + maximum-pool-size: 5 diff --git a/src/main/resources/excel/README.md b/src/main/resources/excel/README.md new file mode 100644 index 0000000..b870b08 --- /dev/null +++ b/src/main/resources/excel/README.md @@ -0,0 +1,7 @@ +# Legacy Excel font measurements + +malgun-metrics.json and glyphs-9.gz / glyphs-10.gz contain measured advances and padding for the existing report font, Malgun Gothic at 9/10pt, using Windows GDI Graphics.MeasureString with StringFormat.GenericDefault. Each gzip contains 65536 little-endian IEEE-754 float advances indexed by UTF-16 code unit. No font outlines, font binaries or customer data are included. + +The [original EPPlus AutoFitColumns implementation](https://github.com/JanKallman/EPPlus/blob/master/EPPlus/ExcelRangeBase.cs) excludes merged/wrapped cells and retains the default minimum width. ASCII spaces are measured inside a non-space string because GDI discards trailing spaces. BMP text uses measured advances; supplementary characters use a conservative width. Complex shaping, emoji and a different original server font version need production sample checks. + +Java does not load System.Drawing or platform fonts for sizing. Golden fixtures compare rounded column widths within one Excel 1/256-character unit. These are presentation compatibility assets, not a project-data cache. diff --git a/src/main/resources/excel/glyphs-10.gz b/src/main/resources/excel/glyphs-10.gz new file mode 100644 index 0000000000000000000000000000000000000000..6c931be9db3d95b396745ef610c96605e5eb0cf8 GIT binary patch literal 24589 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 W9I4yxfAZs}#l`ct=i*T)0QDb;|CdJq literal 0 HcmV?d00001 diff --git a/src/main/resources/excel/glyphs-9.gz b/src/main/resources/excel/glyphs-9.gz new file mode 100644 index 0000000000000000000000000000000000000000..bf735fe352e9f903f76b359a31b61fe09ffa218a GIT binary patch literal 23099 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 M#W)0*{sRE~e`e_Uw*UYD literal 0 HcmV?d00001 diff --git a/src/main/resources/mybatis/mapper/BookmarkMapper.xml b/src/main/resources/mybatis/mapper/BookmarkMapper.xml new file mode 100644 index 0000000..75fb1e6 --- /dev/null +++ b/src/main/resources/mybatis/mapper/BookmarkMapper.xml @@ -0,0 +1,42 @@ + + + + + + + INSERT INTO REPORT_BOOKMARK + (PKEY, BOOKMARK_PAGE, BOOKMARK_ID, BOOKMARK_ORDER, BOOKMARK_TITLE, + BOOKMARK_INFO, BOOKMARK_JSON, GKEY, MKEY, IS_OPEN) + VALUES (#{pkey}, #{request.bookmarkPage}, #{bookmarkId}, + (SELECT ISNULL(MAX(BOOKMARK_ORDER), 0) + 1 FROM REPORT_BOOKMARK + WHERE PKEY = #{pkey} AND BOOKMARK_PAGE = #{request.bookmarkPage}), + #{request.bookmarkTitle}, #{request.bookmarkInfo}, #{request.bookmarkJson}, + #{userTeam}, #{userId}, #{request.isOpen}) + + + UPDATE REPORT_BOOKMARK SET BOOKMARK_TITLE = #{request.bookmarkTitle}, + BOOKMARK_INFO = #{request.bookmarkInfo}, BOOKMARK_JSON = #{request.bookmarkJson}, + IS_OPEN = #{request.isOpen} + WHERE PKEY = #{pkey} AND BOOKMARK_ID = #{bookmarkId} + + + + (SELECT BOOKMARK_ORDER FROM REPORT_BOOKMARK WHERE PKEY = #{pkey} AND BOOKMARK_ID = #{bookmarkId}) + ]]> + + + DELETE FROM REPORT_BOOKMARK WHERE PKEY = #{pkey} AND BOOKMARK_ID = #{bookmarkId} + + diff --git a/src/main/resources/mybatis/mapper/DerivedMapper.xml b/src/main/resources/mybatis/mapper/DerivedMapper.xml new file mode 100644 index 0000000..4c33db6 --- /dev/null +++ b/src/main/resources/mybatis/mapper/DerivedMapper.xml @@ -0,0 +1,108 @@ + + + + + + + + + + INSERT INTO DERIVED_VARIABLE(PKEY, QID, Qorder, QUESTIONJSON, DERIVEDJSON, GKEY, MKEY) + VALUES(#{pkey}, #{qid}, (SELECT COUNT(*) + 1 FROM DERIVED_VARIABLE WHERE PKEY = #{pkey}), #{questionJson}, #{derivedJson}, #{userTeam}, #{userId}) + + + UPDATE DERIVED_VARIABLE SET QID = #{qid}, QUESTIONJSON = #{questionJson}, DERIVEDJSON = #{derivedJson}, GKEY = #{userTeam}, MKEY = #{userId} + WHERE PKEY = #{pkey} AND QID = #{originId} + + + (SELECT Qorder FROM DERIVED_VARIABLE WHERE PKEY = #{pkey} AND QID = #{qid}) + ]]> + + + DELETE FROM DERIVED_VARIABLE WHERE PKEY = #{pkey} AND QID = #{qid} + + + UPDATE DERIVED_DATA SET DATJSON = JSON_MODIFY(DATJSON, #{jsonPath}, NULL) WHERE PKEY = #{pkey} + + + + IF NOT EXISTS (SELECT 1 FROM DERIVED_DATA WITH(UPDLOCK, HOLDLOCK) WHERE PKEY = #{pkey} AND IDKEY = #{idkey}) + INSERT INTO DERIVED_DATA(PKEY, IDKEY, DATJSON, DERIVED_DATE) VALUES(#{pkey}, #{idkey}, '{}', '{}'); + UPDATE DERIVED_DATA SET DATJSON = JSON_MODIFY(DATJSON, #{jsonPath}, JSON_QUERY(#{groupJson,jdbcType=NVARCHAR})), + DERIVED_DATE = CASE WHEN #{groupJson,jdbcType=NVARCHAR} IS NULL THEN DERIVED_DATE + ELSE JSON_MODIFY(DERIVED_DATE, #{jsonPath}, CONVERT(VARCHAR, GETDATE(), 20)) END + WHERE PKEY = #{pkey} AND IDKEY = #{idkey} + + + IF NOT EXISTS (SELECT 1 FROM DERIVED_DATA WITH(UPDLOCK,HOLDLOCK) WHERE PKEY = #{pkey} AND IDKEY = #{idkey}) + INSERT INTO DERIVED_DATA(PKEY, IDKEY, DATJSON, DERIVED_DATE) VALUES(#{pkey}, #{idkey}, '{}', '{}') + + + UPDATE DERIVED_DATA SET DATJSON = JSON_MODIFY(DATJSON, #{jsonPath}, NULL) + WHERE PKEY = #{pkey} AND IDKEY = #{idkey} + + + diff --git a/src/main/resources/mybatis/mapper/ExampleMapper.xml b/src/main/resources/mybatis/mapper/ExampleMapper.xml deleted file mode 100644 index 0d0df6b..0000000 --- a/src/main/resources/mybatis/mapper/ExampleMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - diff --git a/src/main/resources/mybatis/mapper/ExportMapper.xml b/src/main/resources/mybatis/mapper/ExportMapper.xml new file mode 100644 index 0000000..bd419a1 --- /dev/null +++ b/src/main/resources/mybatis/mapper/ExportMapper.xml @@ -0,0 +1,90 @@ + + + + + + + + + + diff --git a/src/main/resources/mybatis/mapper/ImportMapper.xml b/src/main/resources/mybatis/mapper/ImportMapper.xml new file mode 100644 index 0000000..d79fea3 --- /dev/null +++ b/src/main/resources/mybatis/mapper/ImportMapper.xml @@ -0,0 +1,57 @@ + + + + + + 'description' + AND JSON_VALUE(QUESTIONJSON, '$.stype') <> 'MM_FILE' + ]]> + + + UPDATE QUESTION SET QUESTIONJSON = JSON_MODIFY(QUESTIONJSON, '$.explain', #{explain,jdbcType=NVARCHAR}) + WHERE PKEY = #{pkey} AND QID = #{qid} + + + DELETE FROM QUESTION WHERE PKEY = #{pkey} + + + DELETE FROM QOPTION WHERE PKEY = #{pkey} + + + DELETE FROM QUOTASET WHERE PKEY = #{pkey} + + + '')]]> + + + UPDATE STRUCTURE SET QINFO = N'{}', LINFO = N'{}' WHERE PKEY = #{pkey} + + + INSERT INTO QUESTION(PKEY, QID, Qorder, QUESTIONJSON, LOGICJSON) + VALUES(#{pkey}, #{question.qid}, #{question.qOrder}, JSON_QUERY(#{question.questionJson,jdbcType=NVARCHAR}), '') + + + UPDATE STRUCTURE SET + QINFO = JSON_MODIFY(QINFO, #{jsonPath}, #{question.qinfo,jdbcType=NVARCHAR}), + LINFO = JSON_MODIFY(LINFO, #{jsonPath}, #{question.linfo,jdbcType=NVARCHAR}) + WHERE PKEY = #{pkey} + + + DELETE FROM DATA WHERE PKEY = #{pkey} AND SURVEY_TYPE = 'UPLOAD' + + + 'TEST' AND Status = '10' + ]]> + + + INSERT INTO DATA(IDKEY, PKEY, PAGENAME, SURVEY_TYPE, Status, DATJSON, survey_date) + VALUES(#{response.idkey}, #{pkey}, #{response.pageName}, 'UPLOAD', #{response.status}, + #{response.datjson,jdbcType=NVARCHAR}, #{response.surveyDate,jdbcType=NVARCHAR}) + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/LogMapper.xml b/src/main/resources/mybatis/mapper/LogMapper.xml new file mode 100644 index 0000000..6c92abb --- /dev/null +++ b/src/main/resources/mybatis/mapper/LogMapper.xml @@ -0,0 +1,15 @@ + + + + + INSERT INTO dbo.TB_LOGIN_LOG(M_USER, L_IP) VALUES(#{userId}, #{clientIp}) + + + INSERT INTO dbo.TB_VISIT_LOG(M_USER, V_PAGE_INFO, V_PKEY, V_IP) + VALUES(#{userId}, #{pageInfo}, #{pkey}, #{clientIp}) + + + INSERT INTO dbo.TB_SITE_LOG(M_USER, S_PAGE_INFO, S_IP) + VALUES(#{userId}, #{pageInfo}, #{clientIp}) + + diff --git a/src/main/resources/mybatis/mapper/NlpMapper.xml b/src/main/resources/mybatis/mapper/NlpMapper.xml new file mode 100644 index 0000000..f7adf18 --- /dev/null +++ b/src/main/resources/mybatis/mapper/NlpMapper.xml @@ -0,0 +1,24 @@ + + + + + + diff --git a/src/main/resources/mybatis/mapper/ProgressMapper.xml b/src/main/resources/mybatis/mapper/ProgressMapper.xml new file mode 100644 index 0000000..6cb763b --- /dev/null +++ b/src/main/resources/mybatis/mapper/ProgressMapper.xml @@ -0,0 +1,119 @@ + + + + + + = #{startDate} + AND CONVERT(DATE, dbo.FN_LAST_TIME(survey_date)) <= #{endDate} + ]]> + + + + + + + + + diff --git a/src/main/resources/mybatis/mapper/ProjectMapper.xml b/src/main/resources/mybatis/mapper/ProjectMapper.xml new file mode 100644 index 0000000..5916b09 --- /dev/null +++ b/src/main/resources/mybatis/mapper/ProjectMapper.xml @@ -0,0 +1,117 @@ + + + + + + AND MKEY NOT IN + #{owner} + + + + + + + AND PKEY IN + #{key} + + AND 1 = 0 + + + + + + 'M101']]> + + AND GKEY = #{authenticatedUserTeam} + + + + + + + + AND GKEY = #{authenticatedUserTeam} + 'M101']]> + + + + + + + + + + diff --git a/src/main/resources/mybatis/mapper/QuestionMapper.xml b/src/main/resources/mybatis/mapper/QuestionMapper.xml new file mode 100644 index 0000000..f4303cf --- /dev/null +++ b/src/main/resources/mybatis/mapper/QuestionMapper.xml @@ -0,0 +1,63 @@ + + + + + diff --git a/src/main/resources/mybatis/mapper/QuotaMapper.xml b/src/main/resources/mybatis/mapper/QuotaMapper.xml new file mode 100644 index 0000000..c6b055a --- /dev/null +++ b/src/main/resources/mybatis/mapper/QuotaMapper.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/src/main/resources/mybatis/mapper/ShareLinkMapper.xml b/src/main/resources/mybatis/mapper/ShareLinkMapper.xml new file mode 100644 index 0000000..51f344a --- /dev/null +++ b/src/main/resources/mybatis/mapper/ShareLinkMapper.xml @@ -0,0 +1,32 @@ + + + + ID, URL_KEY, REAL_URL, IS_PAGE_ONLY, SKEY, PKEY, PROJECT_TYPE, PROJECT_TITLE, URL_OWNER + + + + + INSERT INTO dbo.REPORT_URL(URL_KEY, REAL_URL, IS_PAGE_ONLY, SKEY, PKEY, PROJECT_TYPE, PROJECT_TITLE, URL_OWNER, LANDING_CNT) + VALUES(#{urlKey}, #{realUrl}, #{isPageOnly}, #{skey}, #{pkey}, #{projectType}, #{projectTitle}, #{urlOwner}, 0) + + + UPDATE dbo.REPORT_URL SET LANDING_CNT = ISNULL(LANDING_CNT, 0) + 1 + WHERE ID = #{id} AND URL_KEY COLLATE Korean_Wansung_CS_AS = #{urlKey} + + + diff --git a/src/main/resources/mybatis/mapper/StatisticsMapper.xml b/src/main/resources/mybatis/mapper/StatisticsMapper.xml new file mode 100644 index 0000000..df74730 --- /dev/null +++ b/src/main/resources/mybatis/mapper/StatisticsMapper.xml @@ -0,0 +1,74 @@ + + + + + diff --git a/src/main/resources/mybatis/mapper/UserMapper.xml b/src/main/resources/mybatis/mapper/UserMapper.xml new file mode 100644 index 0000000..f2b5c39 --- /dev/null +++ b/src/main/resources/mybatis/mapper/UserMapper.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/src/test/java/com/kri/kart/server/PackageStructureTest.java b/src/test/java/com/kri/kart/server/PackageStructureTest.java deleted file mode 100644 index 4f15402..0000000 --- a/src/test/java/com/kri/kart/server/PackageStructureTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.kri.kart.server; - -import static org.junit.jupiter.api.Assertions.assertTrue; - -import org.junit.jupiter.api.Test; - -class PackageStructureTest { - - @Test - void templateIsGenerated() { - assertTrue(true); - } -}