261021_01_ENH: 2차 마이그레이션 완료

This commit is contained in:
2026-10-21 15:28:07 +09:00
parent 26088f6fd0
commit b892070b6b
72 changed files with 934 additions and 481 deletions

View File

@@ -1,6 +1,7 @@
package com.kri.kart.server.persistence;
import com.kri.kart.server.common.enums.ProjectType;
import com.kri.kart.server.dto.project.ProjectRefDto;
import java.util.Objects;
import org.mybatis.spring.SqlSessionTemplate;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -20,6 +21,14 @@ public class SurveySessionProvider {
this.konkiwiSqlSessionTemplate = konkiwiSqlSessionTemplate;
}
public <T> T mapper(ProjectRefDto project, Class<T> mapperType) {
return mapper(project.getProjectType(), mapperType);
}
public <T> T mapper(ProjectType type, Class<T> mapperType) {
return forProject(type).getMapper(mapperType);
}
public SqlSessionTemplate forProject(ProjectType type) {
return switch (Objects.requireNonNull(type, "Project type is required")) {
case KON -> konSqlSessionTemplate;

View File

@@ -0,0 +1,38 @@
package com.kri.kart.server.persistence.mapper;
import com.kri.kart.server.dto.bookmark.BookmarkDto;
import com.kri.kart.server.dto.bookmark.BookmarkSaveRequestDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface BookmarkMapper {
List<BookmarkDto> list(
@Param("pkey") String pkey,
@Param("page") String page,
@Param("userId") String userId);
BookmarkDto find(@Param("pkey") String pkey, @Param("bookmarkId") String bookmarkId);
int create(
@Param("pkey") String pkey,
@Param("bookmarkId") String bookmarkId,
@Param("request") BookmarkSaveRequestDto request,
@Param("userTeam") String userTeam,
@Param("userId") String userId);
int update(
@Param("pkey") String pkey,
@Param("bookmarkId") String bookmarkId,
@Param("request") BookmarkSaveRequestDto request,
@Param("userId") String userId);
int shiftOrderAfterDelete(
@Param("pkey") String pkey,
@Param("bookmarkId") String bookmarkId,
@Param("userId") String userId);
int delete(
@Param("pkey") String pkey,
@Param("bookmarkId") String bookmarkId,
@Param("userId") String userId);
}

View File

@@ -0,0 +1,67 @@
package com.kri.kart.server.persistence.mapper;
import com.kri.kart.server.dto.derived.DerivedDataDto;
import com.kri.kart.server.dto.derived.DerivedDefinitionDto;
import com.kri.kart.server.dto.question.QuestionDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface DerivedMapper {
List<QuestionDto> list(
@Param("pkey") String pkey,
@Param("userRole") Integer userRole,
@Param("userTeam") String userTeam);
String lockProject(@Param("pkey") String pkey);
List<DerivedDefinitionDto> definitions(@Param("pkey") String pkey);
DerivedDefinitionDto find(@Param("pkey") String pkey, @Param("qid") String qid);
Integer duplicate(
@Param("pkey") String pkey,
@Param("qid") String qid,
@Param("originId") String originId);
int create(
@Param("pkey") String pkey,
@Param("qid") String qid,
@Param("questionJson") String questionJson,
@Param("derivedJson") String derivedJson,
@Param("userTeam") String userTeam,
@Param("userId") String userId);
int update(
@Param("pkey") String pkey,
@Param("qid") String qid,
@Param("questionJson") String questionJson,
@Param("derivedJson") String derivedJson,
@Param("originId") String originId,
@Param("userTeam") String userTeam,
@Param("userId") String userId);
int shiftOrder(@Param("pkey") String pkey, @Param("qid") String qid);
int delete(@Param("pkey") String pkey, @Param("qid") String qid);
int clearData(@Param("pkey") String pkey, @Param("jsonPath") String jsonPath);
List<DerivedDataDto> responses(@Param("pkey") String pkey);
int saveData(
@Param("pkey") String pkey,
@Param("jsonPath") String jsonPath,
@Param("idkey") String idkey,
@Param("groupJson") String groupJson);
int ensureRespondent(@Param("pkey") String pkey, @Param("idkey") String idkey);
int clearRespondentData(
@Param("pkey") String pkey,
@Param("jsonPath") String jsonPath,
@Param("idkey") String idkey);
List<DerivedDataDto> respondentResponses(
@Param("pkey") String pkey,
@Param("idkey") String idkey);
}

View File

@@ -0,0 +1,28 @@
package com.kri.kart.server.persistence.mapper;
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 java.time.LocalDate;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface ExportMapper {
String additionalColumns(@Param("pkey") String pkey);
List<ExportDerivedHeaderDto> derivedHeaders(@Param("pkey") String pkey);
List<ExportHeaderDto> questionHeaders(@Param("pkey") String pkey);
List<ExportTitleDto> titles(@Param("pkey") String pkey);
String surveyType(@Param("pkey") String pkey);
List<ExportDataDto> data(
@Param("pkey") String pkey,
@Param("type") String type,
@Param("startDate") LocalDate startDate,
@Param("endDate") LocalDate endDate,
@Param("includeInterviewer") Boolean includeInterviewer);
}

View File

@@ -0,0 +1,36 @@
package com.kri.kart.server.persistence.mapper;
import com.kri.kart.server.dto.upload.ImportQuestionDto;
import com.kri.kart.server.dto.upload.ImportResponseDto;
import org.apache.ibatis.annotations.Param;
public interface ImportMapper {
String lockProject(@Param("pkey") String pkey);
int resetTitles(@Param("pkey") String pkey);
int title(@Param("pkey") String pkey, @Param("qid") String qid, @Param("explain") String explain);
int deleteQuestions(@Param("pkey") String pkey);
int deleteOptions(@Param("pkey") String pkey);
int deleteQuotaSets(@Param("pkey") String pkey);
int deleteQuotas(@Param("pkey") String pkey);
int resetStructure(@Param("pkey") String pkey);
int question(@Param("pkey") String pkey, @Param("question") ImportQuestionDto question);
int structure(
@Param("pkey") String pkey,
@Param("question") ImportQuestionDto question,
@Param("jsonPath") String jsonPath);
int deleteUploaded(@Param("pkey") String pkey);
int archiveCompleted(@Param("pkey") String pkey);
int response(@Param("pkey") String pkey, @Param("response") ImportResponseDto response);
}

View File

@@ -0,0 +1,18 @@
package com.kri.kart.server.persistence.mapper;
import org.apache.ibatis.annotations.Param;
public interface LogMapper {
int loginLog(@Param("userId") String userId, @Param("clientIp") String clientIp);
int visitLog(
@Param("userId") String userId,
@Param("pkey") String pkey,
@Param("pageInfo") String pageInfo,
@Param("clientIp") String clientIp);
int siteLog(
@Param("userId") String userId,
@Param("pageInfo") String pageInfo,
@Param("clientIp") String clientIp);
}

View File

@@ -0,0 +1,11 @@
package com.kri.kart.server.persistence.mapper;
import com.kri.kart.server.dto.statistics.NlpDictionaryWordDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface NlpMapper {
List<String> tags(@Param("pkey") String pkey, @Param("qid") String qid);
List<NlpDictionaryWordDto> words(@Param("pkey") String pkey, @Param("qid") String qid);
}

View File

@@ -0,0 +1,33 @@
package com.kri.kart.server.persistence.mapper;
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.ProgressTypeDto;
import java.time.LocalDate;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface ProgressMapper {
List<ProgressDayDto> daily(@Param("pkey") String pkey);
List<ProgressTypeDto> type(
@Param("pkey") String pkey,
@Param("startDate") LocalDate startDate,
@Param("endDate") LocalDate endDate);
List<LoiDto> loi(
@Param("pkey") String pkey,
@Param("startDate") LocalDate startDate,
@Param("endDate") LocalDate endDate);
List<ProgressScreenDto> screen(
@Param("pkey") String pkey,
@Param("startDate") LocalDate startDate,
@Param("endDate") LocalDate endDate);
List<CustomProgressDto> reportUrls(@Param("pkey") String pkey);
List<CustomProgressDto> appendFiles(@Param("pkey") String pkey);
}

View File

@@ -0,0 +1,34 @@
package com.kri.kart.server.persistence.mapper;
import com.kri.kart.server.dto.project.ProjectListDto;
import com.kri.kart.server.dto.project.ProjectSummaryDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface ProjectMapper {
List<ProjectListDto> list(
@Param("userRole") Integer userRole,
@Param("authenticatedUserTeam") String authenticatedUserTeam,
@Param("assignedPkeys") List<String> assignedPkeys,
@Param("projectType") Integer projectType,
@Param("excludedOwnerIds") List<String> excludedOwnerIds,
@Param("mustViewPkeys") List<String> mustViewPkeys);
List<ProjectSummaryDto> summary(
@Param("userRole") Integer userRole,
@Param("authenticatedUserTeam") String authenticatedUserTeam,
@Param("assignedPkeys") List<String> assignedPkeys,
@Param("excludedOwnerIds") List<String> excludedOwnerIds);
List<String> mustViewPkeys(@Param("projectType") Integer projectType);
List<String> assignedPkeys(@Param("userId") String userId);
List<ProjectListDto> linkedList(
@Param("userRole") Integer userRole,
@Param("authenticatedUserTeam") String authenticatedUserTeam,
@Param("assignedPkeys") List<String> assignedPkeys,
@Param("intranetCode") String intranetCode,
@Param("userTeam") String userTeam,
@Param("keyword") String keyword);
}

View File

@@ -0,0 +1,11 @@
package com.kri.kart.server.persistence.mapper;
import com.kri.kart.server.dto.question.QuestionDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface QuestionMapper {
List<QuestionDto> list(
@Param("pkey") String pkey,
@Param("includeProfiles") Boolean includeProfiles);
}

View File

@@ -0,0 +1,16 @@
package com.kri.kart.server.persistence.mapper;
import com.kri.kart.server.dto.quota.QuotaEntryDto;
import com.kri.kart.server.dto.quota.QuotaSetDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface QuotaMapper {
List<QuotaSetDto> quotaSets(@Param("pkey") String pkey);
QuotaSetDto quotaSet(@Param("pkey") String pkey, @Param("quotaOrder") Integer quotaOrder);
List<QuotaEntryDto> quotaEntries(
@Param("pkey") String pkey,
@Param("quotaOrder") Integer quotaOrder);
}

View File

@@ -0,0 +1,18 @@
package com.kri.kart.server.persistence.mapper;
import com.kri.kart.server.dto.share.ShareLinkRecordDto;
import org.apache.ibatis.annotations.Param;
public interface ShareLinkMapper {
ShareLinkRecordDto find(@Param("urlKey") String urlKey);
ShareLinkRecordDto reusable(ShareLinkRecordDto link);
Integer keyExists(@Param("urlKey") String urlKey);
int create(ShareLinkRecordDto link);
int incrementLanding(@Param("id") Long id, @Param("urlKey") String urlKey);
String projectTitle(@Param("pkey") String pkey);
}

View File

@@ -0,0 +1,17 @@
package com.kri.kart.server.persistence.mapper;
import com.kri.kart.server.dto.statistics.StatisticsDataDto;
import java.time.LocalDate;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface StatisticsMapper {
List<StatisticsDataDto> data(
@Param("pkey") String pkey,
@Param("dataScope") String dataScope,
@Param("startDate") LocalDate startDate,
@Param("endDate") LocalDate endDate,
@Param("includeProfiles") Boolean includeProfiles,
@Param("selectedRoots") List<String> selectedRoots,
@Param("hasFilter") Boolean hasFilter);
}

View File

@@ -0,0 +1,9 @@
package com.kri.kart.server.persistence.mapper;
import com.kri.kart.server.dto.auth.LoginRequestDto;
import com.kri.kart.server.dto.auth.ReportMemberDto;
import java.util.List;
public interface UserMapper {
List<ReportMemberDto> findMember(LoginRequestDto request);
}

View File

@@ -3,9 +3,8 @@ 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 com.kri.kart.server.persistence.mapper.BookmarkMapper;
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;
@@ -22,15 +21,13 @@ public class BookmarkRepository {
}
public List<BookmarkDto> list(ProjectRefDto project, String page, String userId) {
Map<String, Object> params = new HashMap<>();
params.put("pkey", project.getPkey());
params.put("page", page);
params.put("userId", userId);
return kartSqlSessionTemplate.selectList("kart.Bookmark.list", params);
return kartSqlSessionTemplate.getMapper(BookmarkMapper.class)
.list(project.getPkey(), page, userId);
}
public BookmarkDto find(ProjectRefDto project, String bookmarkId) {
return kartSqlSessionTemplate.selectOne("kart.Bookmark.find", keys(project, bookmarkId));
return kartSqlSessionTemplate.getMapper(BookmarkMapper.class)
.find(project.getPkey(), bookmarkId);
}
public int create(
@@ -39,32 +36,23 @@ public class BookmarkRepository {
BookmarkSaveRequestDto request,
String userTeam,
String userId) {
Map<String, Object> params = keys(project, bookmarkId);
params.put("request", request);
params.put("userTeam", userTeam);
params.put("userId", userId);
return kartSqlSessionTemplate.insert("kart.Bookmark.create", params);
return kartSqlSessionTemplate.getMapper(BookmarkMapper.class)
.create(project.getPkey(), bookmarkId, request, userTeam, userId);
}
public int update(ProjectRefDto project, String bookmarkId, BookmarkSaveRequestDto request) {
Map<String, Object> params = keys(project, bookmarkId);
params.put("request", request);
return kartSqlSessionTemplate.update("kart.Bookmark.update", params);
public int update(
ProjectRefDto project, String bookmarkId, BookmarkSaveRequestDto request, String userId) {
return kartSqlSessionTemplate.getMapper(BookmarkMapper.class)
.update(project.getPkey(), bookmarkId, request, userId);
}
public int shiftOrderAfterDelete(ProjectRefDto project, String bookmarkId) {
return kartSqlSessionTemplate.update(
"kart.Bookmark.shiftOrderAfterDelete", keys(project, bookmarkId));
public int shiftOrderAfterDelete(ProjectRefDto project, String bookmarkId, String userId) {
return kartSqlSessionTemplate.getMapper(BookmarkMapper.class)
.shiftOrderAfterDelete(project.getPkey(), bookmarkId, userId);
}
public int delete(ProjectRefDto project, String bookmarkId) {
return kartSqlSessionTemplate.delete("kart.Bookmark.delete", keys(project, bookmarkId));
}
private Map<String, Object> keys(ProjectRefDto project, String bookmarkId) {
Map<String, Object> params = new HashMap<>();
params.put("pkey", project.getPkey());
params.put("bookmarkId", bookmarkId);
return params;
public int delete(ProjectRefDto project, String bookmarkId, String userId) {
return kartSqlSessionTemplate.getMapper(BookmarkMapper.class)
.delete(project.getPkey(), bookmarkId, userId);
}
}

View File

@@ -5,9 +5,8 @@ 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 com.kri.kart.server.persistence.mapper.DerivedMapper;
import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Repository;
@@ -19,39 +18,28 @@ public class DerivedRepository {
private final SurveySessionProvider surveySessionProvider;
public List<QuestionDto> list(ProjectRefDto project, Integer userRole, String userTeam) {
Map<String, Object> 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);
return surveySessionProvider.mapper(project, DerivedMapper.class)
.list(project.getPkey(), userRole, userTeam);
}
public String lockProject(ProjectRefDto project) {
return surveySessionProvider
.forProject(project.getProjectType())
.selectOne("kart.Derived.lockProject", Map.of("pkey", project.getPkey()));
return surveySessionProvider.mapper(project, DerivedMapper.class)
.lockProject(project.getPkey());
}
public List<DerivedDefinitionDto> definitions(ProjectRefDto project) {
return surveySessionProvider
.forProject(project.getProjectType())
.selectList("kart.Derived.definitions", Map.of("pkey", project.getPkey()));
return surveySessionProvider.mapper(project, DerivedMapper.class)
.definitions(project.getPkey());
}
public DerivedDefinitionDto find(ProjectRefDto project, String qid) {
return surveySessionProvider
.forProject(project.getProjectType())
.selectOne("kart.Derived.find", keys(project, qid));
return surveySessionProvider.mapper(project, DerivedMapper.class)
.find(project.getPkey(), 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())
.<Integer>selectOne("kart.Derived.duplicate", params)
return surveySessionProvider.mapper(project, DerivedMapper.class)
.duplicate(project.getPkey(), qid, originId == null ? "" : originId)
> 0;
}
@@ -61,77 +49,62 @@ public class DerivedRepository {
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());
var derivedMapper = surveySessionProvider.mapper(project, DerivedMapper.class);
return originId == null
? session.insert("kart.Derived.create", params)
: session.update("kart.Derived.update", params);
? derivedMapper.create(
project.getPkey(),
definition.getQid(),
definition.getQuestionJson(),
definition.getDerivedJson(),
userTeam,
userId)
: derivedMapper.update(
project.getPkey(),
definition.getQid(),
definition.getQuestionJson(),
definition.getDerivedJson(),
originId,
userTeam,
userId);
}
public void shiftOrder(ProjectRefDto project, String qid) {
surveySessionProvider
.forProject(project.getProjectType())
.update("kart.Derived.shiftOrder", keys(project, qid));
surveySessionProvider.mapper(project, DerivedMapper.class)
.shiftOrder(project.getPkey(), qid);
}
public int delete(ProjectRefDto project, String qid) {
return surveySessionProvider
.forProject(project.getProjectType())
.delete("kart.Derived.delete", keys(project, qid));
return surveySessionProvider.mapper(project, DerivedMapper.class)
.delete(project.getPkey(), qid);
}
public void clearData(ProjectRefDto project, String qid) {
surveySessionProvider
.forProject(project.getProjectType())
.update("kart.Derived.clearData", keys(project, qid));
surveySessionProvider.mapper(project, DerivedMapper.class)
.clearData(project.getPkey(), "$.\"" + qid + "\"");
}
public List<DerivedDataDto> responses(ProjectRefDto project) {
return surveySessionProvider
.forProject(project.getProjectType())
.selectList("kart.Derived.responses", Map.of("pkey", project.getPkey()));
return surveySessionProvider.mapper(project, DerivedMapper.class)
.responses(project.getPkey());
}
public void ensureRespondent(ProjectRefDto project, String idkey) {
surveySessionProvider
.forProject(project.getProjectType())
.update("kart.Derived.ensureRespondent", Map.of("pkey", project.getPkey(), "idkey", idkey));
surveySessionProvider.mapper(project, DerivedMapper.class)
.ensureRespondent(project.getPkey(), 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);
surveySessionProvider.mapper(project, DerivedMapper.class)
.clearRespondentData(project.getPkey(), "$.\"" + qid + "\"", idkey);
}
public List<DerivedDataDto> respondentResponses(ProjectRefDto project, String idkey) {
return surveySessionProvider
.forProject(project.getProjectType())
.selectList(
"kart.Derived.respondentResponses", Map.of("pkey", project.getPkey(), "idkey", idkey));
return surveySessionProvider.mapper(project, DerivedMapper.class)
.respondentResponses(project.getPkey(), 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<String, Object> keys(ProjectRefDto project, String qid) {
var params = new HashMap<String, Object>();
params.put("pkey", project.getPkey());
params.put("qid", qid);
params.put("jsonPath", "$.\"" + qid + "\"");
return params;
surveySessionProvider.mapper(project, DerivedMapper.class)
.saveData(project.getPkey(), "$.\"" + qid + "\"", idkey, groupJson);
}
}

View File

@@ -7,11 +7,9 @@ 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 com.kri.kart.server.persistence.mapper.ExportMapper;
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;
@@ -22,41 +20,36 @@ public class ExportRepository {
private final SurveySessionProvider surveySessionProvider;
public String additionalColumns(ProjectRefDto project) {
return session(project)
.selectOne("kart.Export.additionalColumns", Map.of("pkey", project.getPkey()));
return surveySessionProvider.mapper(project, ExportMapper.class)
.additionalColumns(project.getPkey());
}
public List<ExportDerivedHeaderDto> derivedHeaders(ProjectRefDto project) {
return session(project)
.selectList("kart.Export.derivedHeaders", Map.of("pkey", project.getPkey()));
return surveySessionProvider.mapper(project, ExportMapper.class)
.derivedHeaders(project.getPkey());
}
public List<ExportHeaderDto> questionHeaders(ProjectRefDto project) {
return session(project)
.selectList("kart.Export.questionHeaders", Map.of("pkey", project.getPkey()));
return surveySessionProvider.mapper(project, ExportMapper.class)
.questionHeaders(project.getPkey());
}
public List<ExportTitleDto> titles(ProjectRefDto project) {
return session(project).selectList("kart.Export.titles", Map.of("pkey", project.getPkey()));
return surveySessionProvider.mapper(project, ExportMapper.class).titles(project.getPkey());
}
public String surveyType(ProjectRefDto project) {
return session(project).selectOne("kart.Export.surveyType", Map.of("pkey", project.getPkey()));
return surveySessionProvider.mapper(project, ExportMapper.class).surveyType(project.getPkey());
}
public List<ExportDataDto> data(
ProjectRefDto project, RawDataExportRequestDto request, boolean includeInterviewer) {
Map<String, Object> 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());
return surveySessionProvider.mapper(project, ExportMapper.class)
.data(
project.getPkey(),
request.getType(),
request.getStartDate(),
request.getEndDate() == null ? request.getStartDate() : request.getEndDate(),
includeInterviewer);
}
}

View File

@@ -4,9 +4,8 @@ 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 com.kri.kart.server.persistence.mapper.ImportMapper;
import lombok.RequiredArgsConstructor;
import org.mybatis.spring.SqlSessionTemplate;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Repository;
@@ -17,43 +16,65 @@ public class ImportRepository {
private final SurveySessionProvider surveySessionProvider;
public String lockProject(ProjectRefDto project) {
return session(project).selectOne("kart.Import.lockProject", Map.of("pkey", project.getPkey()));
return surveySessionProvider.mapper(project, ImportMapper.class).lockProject(project.getPkey());
}
public int command(ProjectRefDto project, String statement) {
return session(project).update("kart.Import." + statement, Map.of("pkey", project.getPkey()));
public int resetTitles(ProjectRefDto project) {
return surveySessionProvider.mapper(project, ImportMapper.class).resetTitles(project.getPkey());
}
public int deleteQuestions(ProjectRefDto project) {
return surveySessionProvider.mapper(project, ImportMapper.class)
.deleteQuestions(project.getPkey());
}
public int deleteOptions(ProjectRefDto project) {
return surveySessionProvider.mapper(project, ImportMapper.class)
.deleteOptions(project.getPkey());
}
public int deleteQuotaSets(ProjectRefDto project) {
return surveySessionProvider.mapper(project, ImportMapper.class)
.deleteQuotaSets(project.getPkey());
}
public int deleteQuotas(ProjectRefDto project) {
return surveySessionProvider.mapper(project, ImportMapper.class)
.deleteQuotas(project.getPkey());
}
public int resetStructure(ProjectRefDto project) {
return surveySessionProvider.mapper(project, ImportMapper.class)
.resetStructure(project.getPkey());
}
public int deleteUploaded(ProjectRefDto project) {
return surveySessionProvider.mapper(project, ImportMapper.class)
.deleteUploaded(project.getPkey());
}
public int archiveCompleted(ProjectRefDto project) {
return surveySessionProvider.mapper(project, ImportMapper.class)
.archiveCompleted(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));
return surveySessionProvider.mapper(project, ImportMapper.class)
.title(project.getPkey(), qid, explain);
}
public int question(ProjectRefDto project, ImportQuestionDto question) {
return session(project)
.insert("kart.Import.question", Map.of("pkey", project.getPkey(), "question", question));
return surveySessionProvider.mapper(project, ImportMapper.class)
.question(project.getPkey(), 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()));
return surveySessionProvider.mapper(project, ImportMapper.class)
.structure(project.getPkey(), question, "$." + 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());
return surveySessionProvider.mapper(project, ImportMapper.class)
.response(project.getPkey(), response);
}
}

View File

@@ -1,6 +1,6 @@
package com.kri.kart.server.persistence.repository;
import java.util.Map;
import com.kri.kart.server.persistence.mapper.LogMapper;
import org.mybatis.spring.SqlSessionTemplate;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -20,33 +20,21 @@ public class LogRepository {
@Transactional(transactionManager = "kartTransactionManager")
public void writeLoginLog(String userId, String clientIp) {
kartSqlSessionTemplate.insert(
"kart.Log.loginLog",
Map.of("userId", userId, "clientIp", clientIp == null ? "" : clientIp));
kartSqlSessionTemplate.getMapper(LogMapper.class)
.loginLog(userId, 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));
kartSqlSessionTemplate.getMapper(LogMapper.class)
.visitLog(userId, pkey, pageInfo, 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));
kartSqlSessionTemplate.getMapper(LogMapper.class)
.siteLog(userId, pageInfo, clientIp == null ? "" : clientIp);
}
}

View File

@@ -1,8 +1,8 @@
package com.kri.kart.server.persistence.repository;
import com.kri.kart.server.dto.statistics.NlpDictionaryWordDto;
import com.kri.kart.server.persistence.mapper.NlpMapper;
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;
@@ -19,10 +19,10 @@ public class NlpRepository {
}
public List<String> tags(String pkey, String qid) {
return kartSqlSessionTemplate.selectList("kart.Nlp.tags", Map.of("pkey", pkey, "qid", qid));
return kartSqlSessionTemplate.getMapper(NlpMapper.class).tags(pkey, qid);
}
public List<NlpDictionaryWordDto> words(String pkey, String qid) {
return kartSqlSessionTemplate.selectList("kart.Nlp.words", Map.of("pkey", pkey, "qid", qid));
return kartSqlSessionTemplate.getMapper(NlpMapper.class).words(pkey, qid);
}
}

View File

@@ -8,9 +8,8 @@ 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 com.kri.kart.server.persistence.mapper.ProgressMapper;
import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Repository;
@@ -22,46 +21,32 @@ public class ProgressRepository {
private final SurveySessionProvider surveySessionProvider;
public List<ProgressDayDto> daily(ProjectRefDto project) {
return surveySessionProvider
.forProject(project.getProjectType())
.selectList("kart.Progress.daily", Map.of("pkey", project.getPkey()));
return surveySessionProvider.mapper(project, ProgressMapper.class)
.daily(project.getPkey());
}
public List<ProgressTypeDto> type(ProjectRefDto project, ProgressSearchDto search) {
return surveySessionProvider
.forProject(project.getProjectType())
.selectList("kart.Progress.type", params(project, search));
return surveySessionProvider.mapper(project, ProgressMapper.class)
.type(project.getPkey(), search.getStartDate(), search.getEndDate());
}
public List<LoiDto> loi(ProjectRefDto project, ProgressSearchDto search) {
return surveySessionProvider
.forProject(project.getProjectType())
.selectList("kart.Progress.loi", params(project, search));
return surveySessionProvider.mapper(project, ProgressMapper.class)
.loi(project.getPkey(), search.getStartDate(), search.getEndDate());
}
public List<ProgressScreenDto> screen(ProjectRefDto project, ProgressSearchDto search) {
return surveySessionProvider
.forProject(project.getProjectType())
.selectList("kart.Progress.screen", params(project, search));
return surveySessionProvider.mapper(project, ProgressMapper.class)
.screen(project.getPkey(), search.getStartDate(), search.getEndDate());
}
public List<CustomProgressDto> reportUrls(ProjectRefDto project) {
return surveySessionProvider
.forProject(project.getProjectType())
.selectList("kart.Progress.reportUrls", Map.of("pkey", project.getPkey()));
return surveySessionProvider.mapper(project, ProgressMapper.class)
.reportUrls(project.getPkey());
}
public List<CustomProgressDto> appendFiles(ProjectRefDto project) {
return surveySessionProvider
.forProject(project.getProjectType())
.selectList("kart.Progress.appendFiles", Map.of("pkey", project.getPkey()));
}
private Map<String, Object> params(ProjectRefDto project, ProgressSearchDto search) {
Map<String, Object> result = new HashMap<>();
result.put("pkey", project.getPkey());
result.put("startDate", search.getStartDate());
result.put("endDate", search.getEndDate());
return result;
return surveySessionProvider.mapper(project, ProgressMapper.class)
.appendFiles(project.getPkey());
}
}

View File

@@ -4,9 +4,8 @@ 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 com.kri.kart.server.persistence.mapper.ProjectMapper;
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;
@@ -26,13 +25,11 @@ public class ProjectRepository {
}
public List<String> findMustViewPkeys(ProjectType type) {
return kartSqlSessionTemplate.selectList(
"kart.Project.mustViewPkeys", Map.of("projectType", type.getCode()));
return kartSqlSessionTemplate.getMapper(ProjectMapper.class).mustViewPkeys(type.getCode());
}
public List<String> findAssignedPkeys(String userId) {
return kartSqlSessionTemplate.selectList(
"kart.Project.assignedPkeys", Map.of("userId", userId));
return kartSqlSessionTemplate.getMapper(ProjectMapper.class).assignedPkeys(userId);
}
public List<ProjectListDto> list(
@@ -42,11 +39,8 @@ public class ProjectRepository {
Integer userRole,
String userTeam,
List<String> 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);
return surveySessionProvider.mapper(type, ProjectMapper.class)
.list(userRole, userTeam, assignedPkeys, type.getCode(), excluded, mustView);
}
public List<ProjectListDto> linkedList(
@@ -57,11 +51,14 @@ public class ProjectRepository {
Integer userRole,
String authenticatedUserTeam,
List<String> 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);
return surveySessionProvider.mapper(type, ProjectMapper.class)
.linkedList(
userRole,
authenticatedUserTeam,
assignedPkeys,
intranetCode,
userTeam,
keyword);
}
public List<ProjectSummaryDto> summary(
@@ -70,17 +67,7 @@ public class ProjectRepository {
Integer userRole,
String userTeam,
List<String> assignedPkeys) {
var params = visibility(userRole, userTeam, assignedPkeys);
params.put("excludedOwnerIds", excluded);
return surveySessionProvider.forProject(type).selectList("kart.Project.summary", params);
}
private Map<String, Object> visibility(
Integer userRole, String userTeam, List<String> assignedPkeys) {
Map<String, Object> params = new HashMap<>();
params.put("userRole", userRole);
params.put("authenticatedUserTeam", userTeam);
params.put("assignedPkeys", assignedPkeys);
return params;
return surveySessionProvider.mapper(type, ProjectMapper.class)
.summary(userRole, userTeam, assignedPkeys, excluded);
}
}

View File

@@ -3,8 +3,8 @@ 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 com.kri.kart.server.persistence.mapper.QuestionMapper;
import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Repository;
@@ -16,10 +16,7 @@ public class QuestionRepository {
private final SurveySessionProvider surveySessionProvider;
public List<QuestionDto> list(ProjectRefDto project, boolean includeProfiles) {
return surveySessionProvider
.forProject(project.getProjectType())
.selectList(
"kart.Question.list",
Map.of("pkey", project.getPkey(), "includeProfiles", includeProfiles));
return surveySessionProvider.mapper(project, QuestionMapper.class)
.list(project.getPkey(), includeProfiles);
}
}

View File

@@ -4,8 +4,8 @@ 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 com.kri.kart.server.persistence.mapper.QuotaMapper;
import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Repository;
@@ -17,22 +17,17 @@ public class QuotaRepository {
private final SurveySessionProvider surveySessionProvider;
public List<QuotaSetDto> quotaSets(ProjectRefDto project) {
return surveySessionProvider
.forProject(project.getProjectType())
.selectList("kart.Quota.quotaSets", Map.of("pkey", project.getPkey()));
return surveySessionProvider.mapper(project, QuotaMapper.class)
.quotaSets(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));
return surveySessionProvider.mapper(project, QuotaMapper.class)
.quotaSet(project.getPkey(), quotaOrder);
}
public List<QuotaEntryDto> quotaEntries(ProjectRefDto project, int quotaOrder) {
return surveySessionProvider
.forProject(project.getProjectType())
.selectList(
"kart.Quota.quotaEntries", Map.of("pkey", project.getPkey(), "quotaOrder", quotaOrder));
return surveySessionProvider.mapper(project, QuotaMapper.class)
.quotaEntries(project.getPkey(), quotaOrder);
}
}

View File

@@ -3,7 +3,7 @@ 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 com.kri.kart.server.persistence.mapper.ShareLinkMapper;
import org.mybatis.spring.SqlSessionTemplate;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -23,29 +23,28 @@ public class ShareLinkRepository {
}
public ShareLinkRecordDto find(String urlKey) {
return kartSqlSessionTemplate.selectOne("kart.ShareLink.find", urlKey);
return kartSqlSessionTemplate.getMapper(ShareLinkMapper.class).find(urlKey);
}
public String projectTitle(ProjectRefDto project) {
return surveySessionProvider
.forProject(project.getProjectType())
.selectOne("kart.ShareLink.projectTitle", project.getPkey());
return surveySessionProvider.mapper(project, ShareLinkMapper.class)
.projectTitle(project.getPkey());
}
public ShareLinkRecordDto reusable(ShareLinkRecordDto link) {
return kartSqlSessionTemplate.selectOne("kart.ShareLink.reusable", link);
return kartSqlSessionTemplate.getMapper(ShareLinkMapper.class).reusable(link);
}
public boolean keyExists(String urlKey) {
return kartSqlSessionTemplate.<Integer>selectOne("kart.ShareLink.keyExists", urlKey) > 0;
return kartSqlSessionTemplate.getMapper(ShareLinkMapper.class).keyExists(urlKey) > 0;
}
public int create(ShareLinkRecordDto link) {
return kartSqlSessionTemplate.insert("kart.ShareLink.create", link);
return kartSqlSessionTemplate.getMapper(ShareLinkMapper.class).create(link);
}
public int incrementLanding(ShareLinkRecordDto link) {
return kartSqlSessionTemplate.update(
"kart.ShareLink.incrementLanding", Map.of("id", link.getId(), "urlKey", link.getUrlKey()));
return kartSqlSessionTemplate.getMapper(ShareLinkMapper.class)
.incrementLanding(link.getId(), link.getUrlKey());
}
}

View File

@@ -4,9 +4,8 @@ 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 com.kri.kart.server.persistence.mapper.StatisticsMapper;
import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Repository;
@@ -22,17 +21,14 @@ public class StatisticsRepository {
StatisticsRequestDto request,
boolean includeProfiles,
List<String> selectedRoots) {
Map<String, Object> 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);
return surveySessionProvider.mapper(project, StatisticsMapper.class)
.data(
project.getPkey(),
request.getDataScope(),
request.getStartDate(),
request.getEndDate() == null ? request.getStartDate() : request.getEndDate(),
includeProfiles,
selectedRoots,
request.getFilter() != null);
}
}

View File

@@ -2,6 +2,7 @@ package com.kri.kart.server.persistence.repository;
import com.kri.kart.server.dto.auth.LoginRequestDto;
import com.kri.kart.server.dto.auth.ReportMemberDto;
import com.kri.kart.server.persistence.mapper.UserMapper;
import java.util.List;
import org.mybatis.spring.SqlSessionTemplate;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -20,7 +21,7 @@ public class UserRepository {
public ReportMemberDto findMember(LoginRequestDto request) {
List<ReportMemberDto> users =
kartSqlSessionTemplate.selectList("kart.User.findMember", request);
kartSqlSessionTemplate.getMapper(UserMapper.class).findMember(request);
return users.isEmpty() ? null : users.get(0);
}
}