develop #2
@@ -9,8 +9,8 @@ public final class GwcfConstant {
|
||||
public static final String SYSTEM_USER_NAME = "SYSTEM";
|
||||
public static final Integer WRITTEN_USER_ROLE = 2021;
|
||||
public static final Integer MONITORING_USER_ROLE = 9003;
|
||||
public static final Short REJECT_ASSIGN_ORDER = 9999;
|
||||
|
||||
public static final List<Integer> REVIEW_TYPE = List.of(1, 3);
|
||||
|
||||
public static final List<Integer> REVIEW_CLASSIFICATION = List.of(1, 5, 99);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.kri.gwcf.review.back.common.enums;
|
||||
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Getter
|
||||
@RequiredArgsConstructor
|
||||
@Schema(description = "배정 승인 상태")
|
||||
public enum AssignConfirmStatus implements CodeEnum<Short> {
|
||||
REQUESTED((short) 0), // 요청
|
||||
CONFIRMED((short) 1), // 승인
|
||||
REJECTED((short) 9); // 거절
|
||||
|
||||
private final Short code;
|
||||
}
|
||||
@@ -25,9 +25,10 @@ public enum SystemEventType implements CodeEnum<Short> {
|
||||
|
||||
ASSIGN_PERFORMANCE_REQUEST((short) 1031), //공연 배정 요청
|
||||
ASSIGN_PERFORMANCE_CONFIRM((short) 1032), //공연 배정 승인
|
||||
ASSIGN_PERFORMANCE_REJECT((short) 1033), //공연 배정 거절
|
||||
ASSIGN_PERFORMANCE_CANCEL((short) 1033), //공연 배정 거절
|
||||
ASSIGN_PERFORMANCE_FORCE((short) 1034), //강제 공연 배정
|
||||
UPLOAD_WRITTEN_ASSIGN((short) 1036),
|
||||
ASSIGN_PERFORMANCE_REJECT((short) 1039), //공연 배정 거절
|
||||
|
||||
VISIT_START((short) 2011), //모니터링 출발
|
||||
VISIT_END((short) 2012), //모니터링 도착
|
||||
|
||||
@@ -68,11 +68,24 @@ public class AssignController {
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
||||
String result = assignService.confirmMonitoringAssignByUser(performanceId, userId);
|
||||
String result = assignService.confirmMonitoringAssignByUser(performanceId, userId, true);
|
||||
systemEventLogService.writeAssignConfirmLog(userId, now, ctx.getClientIp(), String.valueOf(performanceId));
|
||||
return result;
|
||||
}
|
||||
|
||||
@Operation(summary = "참여 거절")
|
||||
@PostMapping("/reject/{performanceId}/{userId}")
|
||||
public String assignReject(
|
||||
@PathVariable Integer performanceId,
|
||||
@PathVariable String userId,
|
||||
RequestUserContext ctx
|
||||
) {
|
||||
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
||||
String result = assignService.confirmMonitoringAssignByUser(performanceId, userId, false);
|
||||
systemEventLogService.writeAssignRejectLog(userId, now, ctx.getClientIp(), String.valueOf(performanceId));
|
||||
return result;
|
||||
}
|
||||
|
||||
@Operation(summary = "모니터링 배정 저장")
|
||||
@PostMapping("/monitoring")
|
||||
public List<PerformanceAssignDto> saveMonitoringAssign(
|
||||
|
||||
@@ -32,7 +32,7 @@ public class PerformanceAssignDto {
|
||||
private String assignUser;
|
||||
|
||||
@Schema(description = "사용자 컨펌 여부")
|
||||
private Boolean assignConfirm;
|
||||
private Short assignStatus;
|
||||
|
||||
public static PerformanceAssignDto from(TPerformanceAssignEntity entity) {
|
||||
if (entity == null) {
|
||||
@@ -45,7 +45,7 @@ public class PerformanceAssignDto {
|
||||
.assignType(entity.getAssignType())
|
||||
.assignOrder(entity.getAssignOrder())
|
||||
.assignUser(entity.getAssignUser())
|
||||
.assignConfirm(entity.getAssignConfirm())
|
||||
.assignStatus(entity.getAssignStatus())
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,8 +43,8 @@ public class TPerformanceAssignEntity {
|
||||
private String assignUser;
|
||||
|
||||
@NotNull
|
||||
@Column(name = "is_assign_confirm", nullable = false)
|
||||
private Boolean assignConfirm;
|
||||
@Column(name = "assign_status", nullable = false)
|
||||
private Short assignStatus;
|
||||
|
||||
@Size(max = 32)
|
||||
@NotNull
|
||||
@@ -67,7 +67,7 @@ public class TPerformanceAssignEntity {
|
||||
entity.setAssignType(dto.getAssignType());
|
||||
entity.setAssignOrder(dto.getAssignOrder());
|
||||
entity.setAssignUser(dto.getAssignUser());
|
||||
entity.setAssignConfirm(dto.getAssignConfirm());
|
||||
entity.setAssignStatus(dto.getAssignStatus());
|
||||
|
||||
return entity;
|
||||
}
|
||||
|
||||
@@ -20,10 +20,10 @@ public interface PerformanceAssignRepository extends JpaRepository<TPerformanceA
|
||||
|
||||
long countByPerformanceIdAndAssignType(Integer performanceId, Integer assignType);
|
||||
|
||||
long countByPerformanceIdAndAssignTypeAndAssignConfirm(
|
||||
long countByPerformanceIdAndAssignTypeAndAssignStatus(
|
||||
Integer performanceId,
|
||||
Integer assignType,
|
||||
Boolean assignConfirm
|
||||
Short assignStatus
|
||||
);
|
||||
|
||||
List<TPerformanceAssignEntity> findByPerformanceIdAndAssignUser(
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
package com.kri.gwcf.review.back.service;
|
||||
|
||||
import static com.kri.gwcf.review.back.common.consts.GwcfConstant.REJECT_ASSIGN_ORDER;
|
||||
|
||||
import com.kri.common.feature.excel.ExcelMapper;
|
||||
import com.kri.common.feature.util.NumericUtil;
|
||||
import com.kri.common.feature.util.StringUtil;
|
||||
import com.kri.gwcf.review.back.common.util.ExcelUploadResultUtil;
|
||||
import com.kri.gwcf.review.back.common.enums.AssignConfirmStatus;
|
||||
import com.kri.gwcf.review.back.dto.assign.AssignUserCountDto;
|
||||
import com.kri.gwcf.review.back.dto.excel.ExcelErrorDto;
|
||||
import com.kri.gwcf.review.back.dto.excel.ExcelUploadResultDto;
|
||||
@@ -145,7 +148,7 @@ public class AssignService {
|
||||
entity.setAssignType(1);
|
||||
entity.setAssignOrder((short) (currentCount + 1));
|
||||
entity.setAssignUser(assignUser);
|
||||
entity.setAssignConfirm(false);
|
||||
entity.setAssignStatus(AssignConfirmStatus.REQUESTED.getCode());
|
||||
entity.setRegUser(regUser);
|
||||
entity.setRegDt(regDt);
|
||||
|
||||
@@ -182,7 +185,11 @@ public class AssignService {
|
||||
performanceAssignRepository.findByPerformanceIdAndAssignType(performanceId, 1);
|
||||
Set<String> requestedUserSet = Set.copyOf(normalizedAssignUsers);
|
||||
List<TPerformanceAssignEntity> deleteTargets = currentAssigns.stream()
|
||||
.filter(assign -> !requestedUserSet.contains(assign.getAssignUser()))
|
||||
.filter(assign -> {
|
||||
boolean requested = requestedUserSet.contains(assign.getAssignUser());
|
||||
boolean rejected = AssignConfirmStatus.REJECTED.getCode().equals(assign.getAssignStatus());
|
||||
return (requested && rejected) || (!requested && !rejected);
|
||||
})
|
||||
.toList();
|
||||
|
||||
for (TPerformanceAssignEntity deleteTarget : deleteTargets) {
|
||||
@@ -192,32 +199,29 @@ public class AssignService {
|
||||
|
||||
Set<String> currentUserSet = currentAssigns.stream()
|
||||
.filter(assign -> requestedUserSet.contains(assign.getAssignUser()))
|
||||
.filter(assign -> !AssignConfirmStatus.REJECTED.getCode().equals(assign.getAssignStatus()))
|
||||
.map(TPerformanceAssignEntity::getAssignUser)
|
||||
.collect(Collectors.toSet());
|
||||
Map<String, TPerformanceAssignEntity> currentAssignMap = currentAssigns.stream()
|
||||
Set<Short> usedAssignOrders = currentAssigns.stream()
|
||||
.filter(assign -> requestedUserSet.contains(assign.getAssignUser()))
|
||||
.collect(Collectors.toMap(
|
||||
TPerformanceAssignEntity::getAssignUser,
|
||||
Function.identity(),
|
||||
(first, second) -> first
|
||||
));
|
||||
.filter(assign -> !AssignConfirmStatus.REJECTED.getCode().equals(assign.getAssignStatus()))
|
||||
.map(TPerformanceAssignEntity::getAssignOrder)
|
||||
.collect(Collectors.toSet());
|
||||
|
||||
short assignOrder = 1;
|
||||
for (String assignUser : normalizedAssignUsers) {
|
||||
if (!currentUserSet.contains(assignUser)) {
|
||||
short assignOrder = findAvailableAssignOrder(usedAssignOrders);
|
||||
TPerformanceAssignEntity entity = new TPerformanceAssignEntity();
|
||||
entity.setPerformanceId(performanceId);
|
||||
entity.setAssignType(1);
|
||||
entity.setAssignOrder(assignOrder);
|
||||
entity.setAssignUser(assignUser);
|
||||
entity.setAssignConfirm(false);
|
||||
entity.setAssignStatus(AssignConfirmStatus.REQUESTED.getCode());
|
||||
entity.setRegUser(regUser);
|
||||
entity.setRegDt(regDt);
|
||||
performanceAssignRepository.save(entity);
|
||||
} else {
|
||||
currentAssignMap.get(assignUser).setAssignOrder(assignOrder);
|
||||
usedAssignOrders.add(assignOrder);
|
||||
}
|
||||
assignOrder++;
|
||||
}
|
||||
|
||||
return performanceAssignRepository.findByPerformanceIdAndAssignType(performanceId, 1).stream()
|
||||
@@ -328,7 +332,7 @@ public class AssignService {
|
||||
entity.setAssignType(2);
|
||||
entity.setAssignOrder((short) 1);
|
||||
entity.setAssignUser(row.getUserId());
|
||||
entity.setAssignConfirm(true);
|
||||
entity.setAssignStatus(AssignConfirmStatus.CONFIRMED.getCode());
|
||||
entity.setRegUser(regUser);
|
||||
entity.setRegDt(regDt);
|
||||
performanceAssignRepository.save(entity);
|
||||
@@ -388,6 +392,14 @@ public class AssignService {
|
||||
.toList();
|
||||
}
|
||||
|
||||
private short findAvailableAssignOrder(Set<Short> usedAssignOrders) {
|
||||
short assignOrder = 1;
|
||||
while (usedAssignOrders.contains(assignOrder)) {
|
||||
assignOrder++;
|
||||
}
|
||||
return assignOrder;
|
||||
}
|
||||
|
||||
private void validateAssignableUser(Integer performanceId, String userId) {
|
||||
if (StringUtil.isNullOrBlank(userId)) {
|
||||
throw BusinessException.badRequest("EMPTY_USER_ID", "사용자 ID가 없습니다.");
|
||||
@@ -424,7 +436,10 @@ public class AssignService {
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public String confirmMonitoringAssignByUser(Integer performanceId, String assignUser) {
|
||||
public String confirmMonitoringAssignByUser(Integer performanceId, String assignUser, boolean confirm) {
|
||||
String assignText = confirm ? "승인" : "거절";
|
||||
AssignConfirmStatus assignStatus = confirm ? AssignConfirmStatus.CONFIRMED : AssignConfirmStatus.REJECTED;
|
||||
|
||||
List<TPerformanceAssignEntity> assigns =
|
||||
performanceAssignRepository.findByPerformanceIdAndAssignUserAndAssignType(
|
||||
performanceId,
|
||||
@@ -432,27 +447,34 @@ public class AssignService {
|
||||
1
|
||||
);
|
||||
|
||||
if (assigns.isEmpty()) {
|
||||
return "승인 가능한 내용이 없습니다.";
|
||||
boolean hasRequested = assigns.stream()
|
||||
.anyMatch(assign -> AssignConfirmStatus.REQUESTED.getCode().equals(assign.getAssignStatus()));
|
||||
if (!hasRequested) {
|
||||
return assignText + " 가능한 내용이 없습니다.";
|
||||
}
|
||||
|
||||
boolean alreadyConfirmed = assigns.stream()
|
||||
.anyMatch(assign -> Boolean.TRUE.equals(assign.getAssignConfirm()));
|
||||
if (alreadyConfirmed) {
|
||||
return "이미 승인된 내용입니다.";
|
||||
}
|
||||
|
||||
long confirmedCount = performanceAssignRepository
|
||||
.countByPerformanceIdAndAssignTypeAndAssignConfirm(performanceId, 1, true);
|
||||
if (confirmedCount >= 2) {
|
||||
return "이미 배정이 종료된 공연입니다.";
|
||||
if(confirm){
|
||||
long confirmedCount = performanceAssignRepository
|
||||
.countByPerformanceIdAndAssignTypeAndAssignStatus(
|
||||
performanceId,
|
||||
1,
|
||||
AssignConfirmStatus.CONFIRMED.getCode()
|
||||
);
|
||||
if (confirmedCount >= 2) {
|
||||
return "이미 배정이 종료된 공연입니다.";
|
||||
}
|
||||
}
|
||||
|
||||
assigns.stream()
|
||||
.filter(assign -> Boolean.FALSE.equals(assign.getAssignConfirm()))
|
||||
.forEach(assign -> assign.setAssignConfirm(true));
|
||||
.filter(assign -> AssignConfirmStatus.REQUESTED.getCode().equals(assign.getAssignStatus()))
|
||||
.forEach(assign -> {
|
||||
assign.setAssignStatus(assignStatus.getCode());
|
||||
if(!confirm) {
|
||||
assign.setAssignOrder(REJECT_ASSIGN_ORDER);
|
||||
}
|
||||
});
|
||||
|
||||
return "승인 처리 됐습니다.";
|
||||
return assignText + " 처리 됐습니다.";
|
||||
}
|
||||
|
||||
@Transactional
|
||||
@@ -472,15 +494,21 @@ public class AssignService {
|
||||
.with("assignType", assign.getAssignType())
|
||||
.with("assignUser", assignUser);
|
||||
}
|
||||
if (confirm && Boolean.FALSE.equals(assign.getAssignConfirm())) {
|
||||
if (confirm && !AssignConfirmStatus.CONFIRMED.getCode().equals(assign.getAssignStatus())) {
|
||||
long confirmedCount = performanceAssignRepository
|
||||
.countByPerformanceIdAndAssignTypeAndAssignConfirm(performanceId, assign.getAssignType(), true);
|
||||
.countByPerformanceIdAndAssignTypeAndAssignStatus(
|
||||
performanceId,
|
||||
assign.getAssignType(),
|
||||
AssignConfirmStatus.CONFIRMED.getCode()
|
||||
);
|
||||
if (assign.getAssignType() == 1 && confirmedCount >= 2) {
|
||||
throw BusinessException.conflict("MONITORING_ASSIGN_CONFIRM_LIMIT", "확정된 모니터링 요원은 최대 2명입니다.")
|
||||
.with("performanceId", performanceId);
|
||||
}
|
||||
}
|
||||
assign.setAssignConfirm(confirm);
|
||||
assign.setAssignStatus(confirm
|
||||
? AssignConfirmStatus.CONFIRMED.getCode()
|
||||
: AssignConfirmStatus.REQUESTED.getCode());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -131,6 +131,18 @@ public class SystemEventLogService {
|
||||
);
|
||||
}
|
||||
|
||||
public void writeAssignRejectLog(String userId, LocalDateTime regDt, String clientIp, String performanceId) {
|
||||
writeSystemLog(
|
||||
SystemEventType.ASSIGN_PERFORMANCE_REJECT,
|
||||
"Assign Reject",
|
||||
userId,
|
||||
regDt,
|
||||
clientIp,
|
||||
"performanceId",
|
||||
performanceId
|
||||
);
|
||||
}
|
||||
|
||||
public void writeVisitStartLog(String regId, LocalDateTime regDt, String clientIp, Integer performanceId) {
|
||||
writeSystemLog(
|
||||
SystemEventType.VISIT_START,
|
||||
@@ -287,7 +299,7 @@ public class SystemEventLogService {
|
||||
String assignUser
|
||||
) {
|
||||
saveLog(
|
||||
SystemEventType.ASSIGN_PERFORMANCE_REJECT,
|
||||
SystemEventType.ASSIGN_PERFORMANCE_CANCEL,
|
||||
"Assign Cancel",
|
||||
regId,
|
||||
regDt,
|
||||
|
||||
@@ -53,6 +53,7 @@ kri:
|
||||
- /api/v1/auth/login
|
||||
- /api/v1/admin-cache/**
|
||||
- /api/v1/assign/confirm/*/*
|
||||
- /api/v1/assign/reject/*/*
|
||||
- /api/v1/performance/list/compact
|
||||
- /api/v1/review/start/**
|
||||
- /api/v1/review/end/**
|
||||
|
||||
Reference in New Issue
Block a user