prod :전반적인 도메인 로직 내에서 validation 체크 및 NPE 안정성 보강

src/main/java/life/mosu/mosuserver/application/admin/AdminDashboardService.java

@@ -1,7 +1,8 @@
 package life.mosu.mosuserver.application.admin;
 
 import life.mosu.mosuserver.domain.examapplication.repository.ExamApplicationJpaRepository;
-import life.mosu.mosuserver.domain.refund.repository.RefundJpaRepository;
+import life.mosu.mosuserver.domain.refund.repository.RefundFailureLogJpaRepository;
+import life.mosu.mosuserver.domain.user.entity.UserRole;
 import life.mosu.mosuserver.domain.user.repository.UserJpaRepository;
 import life.mosu.mosuserver.presentation.admin.dto.DashBoardResponse;
 import lombok.RequiredArgsConstructor;
@@ -13,15 +14,19 @@ public class AdminDashboardService {
 
     private final ExamApplicationJpaRepository examApplicationJpaRepository;
     private final UserJpaRepository userJpaRepository;
-    private final RefundJpaRepository refundJpaRepository;
+    private final RefundFailureLogJpaRepository refundFailureLogJpaRepository;
 
     // 대시보드 정보 조회
     public DashBoardResponse getAll() {
-        Long applicationCounts = examApplicationJpaRepository.count();
-        Long refundCounts = refundJpaRepository.count();
-        Long userCounts = userJpaRepository.count();
-        return new DashBoardResponse(applicationCounts, refundCounts, userCounts);
-    }
 
+        Long applicationCounts = examApplicationJpaRepository.countAll();
+        Long refundAbortedCounts = refundFailureLogJpaRepository.count();
+        Long userCounts = userJpaRepository.countByUserRoleNot(UserRole.ROLE_ADMIN);
 
+        return DashBoardResponse.of(
+                applicationCounts,
+                refundAbortedCounts,
+                userCounts
+        );
+    }
 }

src/main/java/life/mosu/mosuserver/application/application/ApplicationService.java

@@ -46,6 +46,9 @@ public CreateApplicationResponse apply(Long userId, ApplicationRequest request)
         List<Long> examIds = request.examApplication().stream()
                 .map(ExamApplicationRequest::examId)
                 .toList();
+
+        validator.agreedToTerms(request);
+        validator.requestNoDuplicateExams(examIds);
         return handleApplication(
                 userId,
                 examIds,
@@ -78,7 +81,6 @@ private CreateApplicationResponse handleApplication(
             List<ExamApplicationRequest> examApplications,
             FileRequest admissionTicket
     ) {
-        validator.requestNoDuplicateExams(examIds);
         List<ExamJpaEntity> exams = examJpaRepository.findAllById(examIds);
         validator.examDateNotPassed(exams);
         validator.examNotFull(exams);

src/main/java/life/mosu/mosuserver/application/application/processor/GetApplicationsStepProcessor.java

@@ -13,10 +13,8 @@
 import life.mosu.mosuserver.presentation.application.dto.ApplicationResponse;
 import life.mosu.mosuserver.presentation.examapplication.dto.ExamApplicationWithStatus;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-@Slf4j
 @Component
 @RequiredArgsConstructor
 public class GetApplicationsStepProcessor implements
@@ -33,7 +31,6 @@ public class GetApplicationsStepProcessor implements
     public List<ApplicationResponse> process(Long userId) {
 
         List<ApplicationJpaEntity> applications = applicationJpaRepository.findAllByUserId(userId);
-        log.info("applications info: {}", applications.size());
         if (applications.isEmpty()) {
             return List.of();
         }

src/main/java/life/mosu/mosuserver/application/application/vaildator/ApplicationValidator.java

@@ -6,29 +6,41 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import life.mosu.mosuserver.application.exam.cache.ExamQuotaCacheManager;
-import life.mosu.mosuserver.domain.application.repository.ApplicationJpaRepository;
 import life.mosu.mosuserver.domain.exam.entity.ExamJpaEntity;
 import life.mosu.mosuserver.domain.exam.entity.ExamJpaRepository;
 import life.mosu.mosuserver.domain.exam.entity.ExamStatus;
+import life.mosu.mosuserver.domain.examapplication.repository.ExamApplicationJpaRepository;
 import life.mosu.mosuserver.global.exception.CustomRuntimeException;
 import life.mosu.mosuserver.global.exception.ErrorCode;
+import life.mosu.mosuserver.presentation.application.dto.ApplicationRequest;
 import life.mosu.mosuserver.presentation.application.dto.ExamApplicationRequest;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+@Slf4j
 @Component
 @RequiredArgsConstructor
 public class ApplicationValidator {
 
     private final ExamJpaRepository examJpaRepository;
-    private final ApplicationJpaRepository applicationJpaRepository;
+    private final ExamApplicationJpaRepository examApplicationJpaRepository;
     private final ExamQuotaCacheManager examQuotaCacheManager;
 
+    public void agreedToTerms(ApplicationRequest request) {
+        if (!request.agreement().validateAgreement()) {
+            throw new CustomRuntimeException(ErrorCode.NOT_AGREED_TO_TERMS);
+        }
+    }
+
     public void requestNoDuplicateExams(List<Long> examIds) {
         Set<Long> examIdSet = new HashSet<>(examIds);
         if (examIds.size() != examIdSet.size()) {
             throw new CustomRuntimeException(ErrorCode.EXAM_DUPLICATED);
         }
+        if (examIdSet.isEmpty()) {
+            throw new CustomRuntimeException(ErrorCode.EXAM_NOT_APPLIED);
+        }
     }
 
     public void examIdsAndLunchSelection(List<ExamApplicationRequest> requests) {
@@ -39,12 +51,9 @@ public void examIdsAndLunchSelection(List<ExamApplicationRequest> requests) {
         List<Long> requestedExamIds = requests.stream()
                 .map(ExamApplicationRequest::examId)
                 .toList();
+        Set<Long> examIdSet = new HashSet<>(requestedExamIds);
 
-        List<ExamJpaEntity> existingExams = examJpaRepository.findAllById(requestedExamIds);
-
-        if (existingExams.size() != requestedExamIds.size()) {
-            throw new CustomRuntimeException(ErrorCode.EXAM_NOT_FOUND);
-        }
+        List<ExamJpaEntity> existingExams = examJpaRepository.findAllById(examIdSet);
 
         lunchSelection(requests, existingExams);
     }
@@ -56,16 +65,18 @@ private void lunchSelection(List<ExamApplicationRequest> requests,
                 .map(ExamJpaEntity::getId)
                 .collect(Collectors.toSet());
 
-        boolean hasInvalidLunchRequest = requests.stream()
-                .anyMatch(req -> examsWithoutLunch.contains(req.examId()) && req.isLunchChecked());
+        requests.stream()
+                .filter(req -> req.isLunchChecked() && examsWithoutLunch.contains(req.examId()))
+                .findFirst()
+                .ifPresent(req -> {
+                    throw new CustomRuntimeException(ErrorCode.LUNCH_SELECTION_INVALID);
+                });
 
-        if (hasInvalidLunchRequest) {
-            throw new CustomRuntimeException(ErrorCode.LUNCH_SELECTION_INVALID);
-        }
     }
 
     public void noDuplicateApplication(Long userId, List<Long> examIds) {
-        boolean alreadyApplied = applicationJpaRepository.existsByUserIdAndExamIds(userId, examIds);
+        boolean alreadyApplied = examApplicationJpaRepository.existsByUserIdAndExamIds(userId,
+                examIds);
         if (alreadyApplied) {
             throw new CustomRuntimeException(ErrorCode.APPLICATION_SCHOOL_DUPLICATED);
         }

src/main/java/life/mosu/mosuserver/application/auth/processor/SignUpAccountStepProcessor.java

@@ -18,8 +18,9 @@ public class SignUpAccountStepProcessor implements StepProcessor<UserJpaEntity,
     @Transactional
     @Override
     public UserJpaEntity process(UserJpaEntity user) {
-        if (userRepository.existsByPhoneNumber(user.getPhoneNumber())
-                || userRepository.existsByLoginId(user.getLoginId())) {
+        if (userRepository.existsByPhoneNumber(user.getPhoneNumber())) {
+            throw new CustomRuntimeException(ErrorCode.USER_ALREADY_EXISTS);
+        } else if (userRepository.existsByLoginId(user.getLoginId())) {
             throw new CustomRuntimeException(ErrorCode.USER_ALREADY_EXISTS);
         }
         return userRepository.save(user);

src/main/java/life/mosu/mosuserver/application/exam/ExamService.java

@@ -23,7 +23,9 @@ public class ExamService {
 
     @Transactional
     public void register(ExamRequest request) {
+        validateExamDate(request);
         ExamJpaEntity exam = request.toEntity();
+
         examJpaRepository.save(exam);
     }
 
@@ -71,4 +73,10 @@ public void close(Long examId) {
                 .orElseThrow(() -> new CustomRuntimeException(ErrorCode.EXAM_NOT_FOUND));
         exam.close();
     }
+
+    private void validateExamDate(ExamRequest request) {
+        if (!request.deadlineTime().isBefore(request.examDate().atStartOfDay())) {
+            throw new CustomRuntimeException(ErrorCode.EXAM_DATE_AFTER_DEADLINE);
+        }
+    }
 }

src/main/java/life/mosu/mosuserver/application/examapplication/ExamApplicationService.java

@@ -41,7 +41,6 @@ public class ExamApplicationService {
     private final S3Service s3Service;
     private final FixedQuantityDiscountCalculator calculator;
 
-
     @Transactional
     public List<ExamApplicationJpaEntity> register(RegisterExamApplicationEvent event) {
         List<ExamApplicationJpaEntity> examApplicationEntities = event.toEntity();
@@ -57,7 +56,6 @@ public void updateSubjects(Long userId, Long examApplicationId,
         examSubjectJpaRepository.deleteExamSubjectsWithDonePayment(examApplicationId);
         List<ExamSubjectJpaEntity> examSubjects = request.toEntityList(examApplicationId);
         examSubjectJpaRepository.saveAll(examSubjects);
-
     }
 
     @Transactional(propagation = Propagation.REQUIRES_NEW)
@@ -97,27 +95,17 @@ public ExamTicketResponse getExamTicket(Long userId, Long examApplicationId) {
                 .map(Subject::getSubjectName)
                 .toList();
 
-        String s3Key = examTicketInfo.s3Key();
-        String examTicketImgUrl = null;
-
-        if (s3Key != null) {
-            examTicketImgUrl = s3Service.getPreSignedUrl(s3Key);
-        }
+        String examTicketImgUrl = getExamTicketImgUrl(examTicketInfo);
 
         return ExamTicketResponse.of(examTicketImgUrl, examTicketInfo.userName(),
                 examTicketInfo.birth(),
                 examTicketInfo.examNumber(), subjects, examTicketInfo.schoolName());
-
     }
 
 
     public ExamApplicationInfoResponse getApplication(Long userId, Long examApplicationId,
             Long applicationId) {
-        validateUser(userId, examApplicationId);
 
-        //상세 조회는 done 만 가능
-//        Integer examApplicationCount = paymentJpaRepository.countByExamApplicationId(
-//                examApplicationId);
         List<ExamApplicationJpaEntity> examApplicationEntities = examApplicationJpaRepository.findByApplicationId(
                 applicationId);
         int lunchCount = (int) examApplicationEntities.stream()
@@ -135,6 +123,7 @@ public ExamApplicationInfoResponse getApplication(Long userId, Long examApplicat
         Set<String> subjects = examSubjects.stream()
                 .map(ExamSubjectJpaEntity::getSubjectName)
                 .collect(Collectors.toSet());
+
         //totalAmount 는 Lunch 가격이 포함되었을 수도 있음
         //totalAmount - Lunch 가격으로 getAppliedDiscountAmount() 메소드에 넣어야함.
 
@@ -187,4 +176,15 @@ private void validateExamTicketOpenDate(LocalDate examDate, String examNumber) {
             throw new CustomRuntimeException(ErrorCode.EXAM_TICKET_NOT_OPEN);
         }
     }
+
+    private String getExamTicketImgUrl(ExamTicketInfoProjection examTicketInfo) {
+        String s3Key = examTicketInfo.s3Key();
+        String examTicketImgUrl = null;
+
+        if (s3Key != null) {
+            examTicketImgUrl = s3Service.getPreSignedUrl(s3Key);
+        }
+        return examTicketImgUrl;
+    }
+
 }

src/main/java/life/mosu/mosuserver/domain/admin/projection/RecommendationDetailsProjection.java

@@ -10,8 +10,8 @@ public record RecommendationDetailsProjection(
         LocalDate birth,
         String recommendeeName,
         String recommendeePhoneNumber,
-        String recommendeeBank,
-        String recommendeeAccountNumber
+        String recommenderBank,
+        String recommenderAccountNumber
 ) {
 
 }

src/main/java/life/mosu/mosuserver/domain/application/repository/ApplicationJpaRepository.java

@@ -29,21 +29,6 @@ AND a.status IN ('PENDING', 'ABORT')
             """)
     List<ApplicationJpaEntity> findAllByUserId(@Param("userId") Long userId);
 
-    @Query(
-            """
-                    SELECT CASE WHEN COUNT(a) > 0 THEN true ELSE false END
-                    FROM ApplicationJpaEntity a
-                    JOIN ExamApplicationJpaEntity ea ON a.id = ea.applicationId
-                    JOIN ExamJpaEntity e ON ea.examId = e.id
-                    JOIN PaymentJpaEntity p ON ea.id = p.examApplicationId
-                    WHERE a.userId = :userId
-                    AND p.paymentStatus = 'DONE'
-                    AND e.id IN :examIds
-                    """
-    )
-    boolean existsByUserIdAndExamIds(@Param("userId") Long userId,
-            @Param("examIds") List<Long> examIds);
-
     @Modifying
     @Query(value = """
             UPDATE application a

src/main/java/life/mosu/mosuserver/domain/exam/entity/ExamJpaEntity.java

@@ -80,7 +80,7 @@ public ExamJpaEntity(
     }
 
     public boolean hasNotLunch() {
-        return lunchName == null;
+        return this.lunchName == null || this.lunchPrice == null;
     }
 
     public void close() {

src/main/java/life/mosu/mosuserver/domain/examapplication/repository/ExamApplicationJpaRepository.java

@@ -44,9 +44,12 @@ public interface ExamApplicationJpaRepository extends
             JOIN PaymentJpaEntity p on p.examApplicationId = ea.id
             WHERE ea.id = :examApplicationId
             AND p.paymentStatus = 'DONE'
+            AND ea.userId = :userId
+            AND p.deleted = false
             """)
-    Optional<ExamApplicationInfoProjection> findExamApplicationInfoById(Long userId,
-            Long examApplicationId);
+    Optional<ExamApplicationInfoProjection> findExamApplicationInfoById(
+            @Param("userId") Long userId,
+            @Param("examApplicationId") Long examApplicationId);
 
 
     @Query("""
@@ -67,6 +70,7 @@ Optional<ExamApplicationInfoProjection> findExamApplicationInfoById(Long userId,
             WHERE ea.id = :examApplicationId
             AND u.id = :userId
             AND p.paymentStatus = 'DONE'
+            AND p.deleted = false
             """)
     Optional<ExamTicketInfoProjection> findExamTicketInfoProjectionById(
             @Param("userId") Long userId,
@@ -105,6 +109,7 @@ Optional<ExamTicketInfoProjection> findExamTicketInfoProjectionById(
             JOIN PaymentJpaEntity p on p.examApplicationId = ea.id
             WHERE ea.id = :targetId
             AND p.paymentStatus = 'DONE'
+            AND p.deleted = false
             """)
     Optional<ExamApplicationNotifyProjection> findExamAndPaymentByExamApplicationId(
             @Param("targetId") Long targetId);
@@ -121,6 +126,7 @@ Optional<ExamApplicationNotifyProjection> findExamAndPaymentByExamApplicationId(
                 JOIN PaymentJpaEntity p ON p.examApplicationId = ea.id
                 WHERE ea.id = :examApplicationId
                 AND p.paymentStatus = 'DONE'
+                AND p.deleted = false
             """)
     Optional<ExamInfoProjection> findExamInfo(@Param("examApplicationId") Long examApplicationId);
 
@@ -137,6 +143,7 @@ Optional<ExamApplicationNotifyProjection> findExamAndPaymentByExamApplicationId(
                 JOIN PaymentJpaEntity p ON p.examApplicationId = ea.id
                 WHERE ea.id = :examApplicationId
                 AND p.paymentStatus = 'DONE'
+                AND p.deleted = false
             """)
     Optional<ExamInfoWithExamNumberProjection> findExamInfoWithExamNumber(
             @Param("examApplicationId") Long examApplicationId);
@@ -148,6 +155,7 @@ SELECT case when COUNT(ea) > 0 then true else false end
             WHERE ea.id = :examApplicationId
             AND ea.userId = :userId
             AND p.paymentStatus = 'DONE'
+            AND p.deleted = false
             """)
     boolean existByUserIdAndExamApplicationId(@Param("userId") Long userId,
             @Param("examApplicationId") Long examApplicationId);
@@ -161,4 +169,29 @@ boolean existByUserIdAndExamApplicationId(@Param("userId") Long userId,
             AND e.deleted = false
             """)
     Optional<ExamApplicationJpaEntity> findByOrderId(String orderId);
+
+    @Query(
+            """
+                    SELECT CASE WHEN COUNT(ea) > 0 THEN true ELSE false END
+                    FROM ExamApplicationJpaEntity ea
+                    JOIN PaymentJpaEntity p ON ea.id = p.examApplicationId
+                    WHERE ea.userId = :userId
+                    AND p.paymentStatus = 'DONE'
+                    AND p.deleted = false
+                    AND ea.examId IN :examIds
+                    """
+    )
+    boolean existsByUserIdAndExamIds(
+            @Param("userId") Long userId,
+            @Param("examIds") List<Long> examIds);
+
+
+    @Query("""
+            SELECT COUNT(ea)
+            FROM ExamApplicationJpaEntity ea
+            JOIN PaymentJpaEntity p ON ea.id = p.examApplicationId
+            WHERE p.paymentStatus = 'DONE'
+            AND p.deleted = false
+            """)
+    long countAll();
 }

src/main/java/life/mosu/mosuserver/domain/examapplication/repository/ExamSubjectJpaRepository.java

@@ -29,6 +29,7 @@ public interface ExamSubjectJpaRepository extends JpaRepository<ExamSubjectJpaEn
             FROM exam_subject es
             JOIN payment p ON es.exam_application_id = p.exam_application_id
             WHERE p.status = 'DONE'
+            AND p.deleted = false
             AND p.exam_application_id = :examApplicationId
             """, nativeQuery = true)
     void deleteExamSubjectsWithDonePayment(@Param("examApplicationId") Long examApplicationId);