260812_01_ENH: 배정·진행 현황 개선 및 예약/이벤트 이력 기능 추가

- 프로젝트별 외주사·필드워커 배정 현황 API 추가
- 진행 현황을 리스트 배정 기준으로 변경 및 미배정 집계 추가
- 마지막 이벤트 일자 필터·정렬 추가
- 예약 알림·기간 조회·확인 API 추가
- 이벤트 이력 단건 삭제 기능 추가
- 일반 리스트 헤더 ID를 101부터 생성
- 비밀번호 검증 규칙 완화
This commit is contained in:
2026-08-12 08:39:36 +09:00
parent d35c79217b
commit de7c09ac33
20 changed files with 1252 additions and 69 deletions

View File

@@ -7,8 +7,14 @@ import com.kri.contact.server.dto.reserve.ListReserveRequestDto;
import com.kri.contact.server.persistence.entity.TListResveEntity;
import com.kri.contact.server.persistence.repository.ListRepository;
import com.kri.contact.server.persistence.repository.ListReserveRepository;
import com.kri.contact.server.persistence.repository.ProjectRepository;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -17,8 +23,11 @@ import org.springframework.transaction.annotation.Transactional;
@RequiredArgsConstructor
public class ReserveService {
private static final long NOTIFICATION_RANGE_MINUTES = 5L;
private final ListRepository listRepository;
private final ListReserveRepository listReserveRepository;
private final ProjectRepository projectRepository;
@Transactional
public ListReserveDto reserve(ListReserveRequestDto request, String regUser, LocalDateTime regDt) {
@@ -37,22 +46,88 @@ public class ReserveService {
entity.setResveUser(request.getUserId().trim());
entity.setRegUser(regUser == null || regUser.isBlank() ? ContactConstant.SYSTEM_USER_NAME : regUser);
entity.setRegDt(regDt);
return ListReserveDto.from(listReserveRepository.save(entity));
TListResveEntity saved = listReserveRepository.save(entity);
String prjctName = projectRepository.findById(saved.getPrjctIdx())
.map(project -> project.getPrjctNm())
.orElse(null);
return ListReserveDto.from(saved, prjctName);
}
@Transactional(readOnly = true)
public List<ListReserveDto> findByUser(Long prjctIdx, String userId) {
return listReserveRepository.findByPrjctIdxAndResveUserOrderByResveDtAscListResveIdxAsc(prjctIdx, userId)
.stream()
.map(ListReserveDto::from)
.toList();
return toDtosWithProjectNames(listReserveRepository.findUnconfirmedByUser(prjctIdx, userId));
}
@Transactional(readOnly = true)
public List<ListReserveDto> findBySid(Long prjctIdx, String sid) {
return listReserveRepository.findByPrjctIdxAndSidOrderByResveDtAscListResveIdxAsc(prjctIdx, sid)
.stream()
.map(ListReserveDto::from)
return toDtosWithProjectNames(listReserveRepository.findUnconfirmedBySid(prjctIdx, sid));
}
@Transactional(readOnly = true)
public List<ListReserveDto> findNotifications(
String userId,
boolean requestPast,
LocalDateTime now
) {
LocalDateTime startDt = requestPast ? now.minusMinutes(NOTIFICATION_RANGE_MINUTES) : now;
LocalDateTime endDt = now.plusMinutes(NOTIFICATION_RANGE_MINUTES);
return toDtosWithProjectNames(
listReserveRepository.findNotifications(userId, startDt, endDt)
);
}
@Transactional(readOnly = true)
public List<ListReserveDto> findByUserAndDateRange(
String userId,
LocalDate fromDt,
LocalDate toDt
) {
if (fromDt.isAfter(toDt)) {
throw BusinessException.badRequest(
"INVALID_RESERVE_DATE_RANGE",
"예약 조회 시작일은 종료일보다 늦을 수 없습니다."
).with("fromDt", fromDt).with("toDt", toDt);
}
return toDtosWithProjectNames(listReserveRepository.findByUserAndDateRange(
userId,
fromDt.atStartOfDay(),
toDt.atTime(LocalTime.MAX)
));
}
@Transactional
public void confirm(Long listResveIdx, String userId) {
TListResveEntity entity = listReserveRepository.findById(listResveIdx)
.filter(reserve -> Objects.equals(reserve.getResveUser(), userId))
.orElseThrow(() -> BusinessException.notFound(
"RESERVE_NOT_FOUND",
"예약 정보를 찾을 수 없습니다."
).with("listResveIdx", listResveIdx));
entity.setCnfirm(true);
}
@Transactional
public int confirmByProjectSidAndUser(Long prjctIdx, String sid, String resveUser) {
return listReserveRepository.confirmByProjectSidAndUser(prjctIdx, sid, resveUser);
}
private List<ListReserveDto> toDtosWithProjectNames(List<TListResveEntity> reserves) {
List<Long> prjctIdxList = reserves.stream()
.map(TListResveEntity::getPrjctIdx)
.distinct()
.toList();
Map<Long, String> prjctNameByIdx = new HashMap<>();
projectRepository.findAllById(prjctIdxList)
.forEach(project -> prjctNameByIdx.put(project.getPrjctIdx(), project.getPrjctNm()));
return reserves.stream()
.map(reserve -> ListReserveDto.from(
reserve,
prjctNameByIdx.get(reserve.getPrjctIdx())
))
.toList();
}
}