From d975f8ad1f1c75c90ba907db5e18da989784055c Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 12 Aug 2026 16:02:09 +0900 Subject: [PATCH 1/3] =?UTF-8?q?260812=5F02=5FENH:=20=EC=98=88=EC=95=BD=20?= =?UTF-8?q?=EB=82=B4=EC=97=AD=20=EC=A1=B0=ED=9A=8C=EC=9D=98=20=EC=B4=88=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kri/contact/server/service/ReserveService.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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) ); From daa83ff4c9b6f32351437584fc5053799cdd89f8 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 12 Aug 2026 16:38:57 +0900 Subject: [PATCH 2/3] =?UTF-8?q?260812=5F02=5FENH:=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EB=B0=B0=EC=A0=95=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EA=B1=B4=EC=88=98=20=EC=A7=91=EA=B3=84=20?= =?UTF-8?q?=EB=B2=BC=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../query/AssignSummaryQuerySupport.java | 70 ++++++++----------- .../contact/server/service/AssignService.java | 7 +- 2 files changed, 30 insertions(+), 47 deletions(-) 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/service/AssignService.java b/src/main/java/com/kri/contact/server/service/AssignService.java index e7b1103..044ac97 100644 --- a/src/main/java/com/kri/contact/server/service/AssignService.java +++ b/src/main/java/com/kri/contact/server/service/AssignService.java @@ -110,7 +110,6 @@ public class AssignService { ScopeCountRow scopeCounts = assignSummaryQuerySupport.findFieldworkScopeCounts( prjctIdx, validatedAssignType, - allowedUserRoles, companyIds, externalUser ); @@ -131,10 +130,8 @@ public class AssignService { .build()) .toList(); - long responseAssignedCount = assignees.stream() - .mapToLong(FieldworkAssignSummaryItemDto::getAssignedCount) - .sum(); - if (scopeCounts.totalCount() != scopeCounts.unassignedCount() + responseAssignedCount) { + if (scopeCounts.unassignedCount() < 0 + || scopeCounts.unassignedCount() > scopeCounts.totalCount()) { throw BusinessException.internalError("필드워커 배정 현황을 계산할 수 없습니다."); } From 18f42133d9d559f2c669d674196c392885d9bcb7 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Thu, 20 Aug 2026 10:37:06 +0900 Subject: [PATCH 3/3] =?UTF-8?q?260820=5F01=5FENH:=20=EC=84=A4=EB=AC=B8=20?= =?UTF-8?q?=EC=8B=9C=EC=9E=91=EC=9D=B4=20=EB=8B=A4=EB=A5=B8=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=EA=B0=92=EC=9D=84=20=EB=8D=AE=EC=96=B4=20=EC=93=B0?= =?UTF-8?q?=EB=8A=94=20=EA=B2=BD=EC=9A=B0=EB=A5=BC=20=EB=A7=89=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/dto/list/ListEventHistSurveyMetaDto.java | 4 ++-- .../repository/ListEventHistRepository.java | 8 ++++++++ .../contact/server/service/ListUpdateService.java | 12 ++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) 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/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