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("필드워커 배정 현황을 계산할 수 없습니다."); }