diff --git a/src/main/java/com/kri/contact/server/dto/list/ListEventHistSurveyMetaDto.java b/src/main/java/com/kri/contact/server/dto/list/ListEventHistSurveyMetaDto.java index 7834263..2da122e 100644 --- a/src/main/java/com/kri/contact/server/dto/list/ListEventHistSurveyMetaDto.java +++ b/src/main/java/com/kri/contact/server/dto/list/ListEventHistSurveyMetaDto.java @@ -24,8 +24,8 @@ public class ListEventHistSurveyMetaDto { @Schema(description = "입력 action 코드") private ListEventHistorySurveyType action; - @Schema(description = "프로젝트 고유번호") - private String pid; + @Schema(description = "프로젝트 설문 고유번호") + private String psidx; @Schema(description = "리스트 고유번호") private String sid; diff --git a/src/main/java/com/kri/contact/server/persistence/query/AssignSummaryQuerySupport.java b/src/main/java/com/kri/contact/server/persistence/query/AssignSummaryQuerySupport.java index a9dc977..eeddc4f 100644 --- a/src/main/java/com/kri/contact/server/persistence/query/AssignSummaryQuerySupport.java +++ b/src/main/java/com/kri/contact/server/persistence/query/AssignSummaryQuerySupport.java @@ -9,7 +9,6 @@ import com.kri.contact.server.persistence.entity.QTPrjctAssignUserEntity; import com.kri.contact.server.persistence.entity.QTUserEntity; import com.querydsl.core.BooleanBuilder; import com.querydsl.core.Tuple; -import com.querydsl.core.types.dsl.CaseBuilder; import com.querydsl.core.types.dsl.NumberExpression; import com.querydsl.jpa.impl.JPAQuery; import com.querydsl.jpa.impl.JPAQueryFactory; @@ -78,66 +77,53 @@ public class AssignSummaryQuerySupport { public ScopeCountRow findFieldworkScopeCounts( Long prjctIdx, Short assignType, - Collection allowedUserRoles, Collection companyIds, boolean externalUser ) { QTListEntity list = QTListEntity.tListEntity; QTListAssignUserEntity listAssign = new QTListAssignUserEntity("summaryScopeUserAssign"); - QTUserEntity assignedUser = new QTUserEntity("summaryScopeAssignedUser"); QTListAssignCmpnEntity companyAssign = new QTListAssignCmpnEntity("summaryScopeCompanyAssign"); - boolean companyScoped = companyIds != null && !companyIds.isEmpty(); - NumberExpression totalCount = list.id.sid.count(); - NumberExpression unassignedCount = new CaseBuilder() - .when(assignedUser.userId.isNull()) - .then(1L) - .otherwise(0L) - .sumLong(); - - JPAQuery query = jpaQueryFactory - .select(totalCount, unassignedCount) + var totalQuery = jpaQueryFactory + .select(list.id.sid.count()) .from(list); - if (externalUser) { - query.join(companyAssign).on( + totalQuery.join(companyAssign).on( companyAssign.prjctIdx.eq(list.id.prjctIdx), companyAssign.sid.eq(list.id.sid), companyAssign.cmpnId.in(companyIds) ); } + long totalCount = safeLong(totalQuery + .where(list.id.prjctIdx.eq(prjctIdx)) + .fetchOne()); - query.leftJoin(listAssign).on( - listAssign.prjctIdx.eq(list.id.prjctIdx), - listAssign.sid.eq(list.id.sid), - listAssign.assignRole.eq(assignType) - ); - - BooleanBuilder userJoin = new BooleanBuilder() - .and(assignedUser.userId.eq(listAssign.userId)) - .and(assignedUser.del.isFalse()) - .and(assignedUser.userRole.in(allowedUserRoles)); + QTListEntity unassignedList = new QTListEntity("summaryUnassignedList"); + QTListAssignCmpnEntity unassignedCompany = + new QTListAssignCmpnEntity("summaryUnassignedCompany"); + var unassignedQuery = jpaQueryFactory + .select(unassignedList.id.sid.count()) + .from(unassignedList); if (externalUser) { - userJoin.and(assignedUser.userCmpn.in(companyIds)); - } - query.leftJoin(assignedUser).on(userJoin); - - BooleanBuilder predicate = new BooleanBuilder(list.id.prjctIdx.eq(prjctIdx)); - if (!externalUser && companyScoped) { - predicate.and( - assignedUser.userId.isNull() - .or(assignedUser.userCmpn.in(companyIds)) + unassignedQuery.join(unassignedCompany).on( + unassignedCompany.prjctIdx.eq(unassignedList.id.prjctIdx), + unassignedCompany.sid.eq(unassignedList.id.sid), + unassignedCompany.cmpnId.in(companyIds) ); } - - Tuple row = query.where(predicate).fetchOne(); - if (row == null) { - return new ScopeCountRow(0L, 0L); - } - return new ScopeCountRow( - safeLong(row.get(totalCount)), - safeLong(row.get(unassignedCount)) + unassignedQuery.leftJoin(listAssign).on( + listAssign.prjctIdx.eq(unassignedList.id.prjctIdx), + listAssign.sid.eq(unassignedList.id.sid), + listAssign.assignRole.eq(assignType) ); + long unassignedCount = safeLong(unassignedQuery + .where( + unassignedList.id.prjctIdx.eq(prjctIdx), + listAssign.listAssignIdx.isNull() + ) + .fetchOne()); + + return new ScopeCountRow(totalCount, unassignedCount); } public List findFieldworkAssignees( diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java index eaedf2d..206c750 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java @@ -14,6 +14,14 @@ public interface ListEventHistRepository extends JpaRepository scopeCounts.totalCount()) { throw BusinessException.internalError("필드워커 배정 현황을 계산할 수 없습니다."); } diff --git a/src/main/java/com/kri/contact/server/service/ListUpdateService.java b/src/main/java/com/kri/contact/server/service/ListUpdateService.java index fbe79da..be8857d 100644 --- a/src/main/java/com/kri/contact/server/service/ListUpdateService.java +++ b/src/main/java/com/kri/contact/server/service/ListUpdateService.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.kri.common.feature.util.CollectionUtil; import com.kri.common.feature.web.BusinessException; import com.kri.contact.server.common.consts.ContactConstant; +import com.kri.contact.server.common.enums.ListEventHistorySurveyType; import com.kri.contact.server.common.enums.ListHeaderGrade; import com.kri.contact.server.common.enums.ListHeaderType; import com.kri.contact.server.common.enums.ListIsUse; @@ -200,6 +201,17 @@ public class ListUpdateService { validateEventHistoryTarget(survey.getPrjctIdx(), request.getSid()); applySurveySnapshot(request, survey); + if (request.getAction() == ListEventHistorySurveyType.START + && listEventHistRepository.existsByPrjctIdxAndPrjctSurveyIdxAndSidAndEventTyAndResultCdNot( + survey.getPrjctIdx(), + request.getPrjctSurveyIdx(), + request.getSid(), + ResultCodeType.SURVEY.getCode(), + ListEventHistorySurveyType.START.getCode().intValue() + )) { + return; + } + listEventHistRepository.save(TListEventHistEntity.fromSurveyHistory( request, survey.getPrjctIdx(), diff --git a/src/main/java/com/kri/contact/server/service/ReserveService.java b/src/main/java/com/kri/contact/server/service/ReserveService.java index 09b5279..d4508a2 100644 --- a/src/main/java/com/kri/contact/server/service/ReserveService.java +++ b/src/main/java/com/kri/contact/server/service/ReserveService.java @@ -69,8 +69,14 @@ public class ReserveService { boolean requestPast, LocalDateTime now ) { - LocalDateTime startDt = requestPast ? now.minusMinutes(NOTIFICATION_RANGE_MINUTES) : now; - LocalDateTime endDt = now.plusMinutes(NOTIFICATION_RANGE_MINUTES); + LocalDateTime currentMinute = now.withSecond(0).withNano(0); + LocalDateTime startDt = requestPast + ? currentMinute.minusMinutes(NOTIFICATION_RANGE_MINUTES) + : currentMinute; + LocalDateTime endDt = currentMinute + .plusMinutes(NOTIFICATION_RANGE_MINUTES) + .withSecond(59) + .withNano(999_999_999); return toDtosWithProjectNames( listReserveRepository.findNotifications(userId, startDt, endDt) );