Merge pull request #349 from mosu-dev/refactor/mosu-348

wlgns12370 · web-flow · commit 88d8a264e3e6 · 2025-08-21T04:05:19.000+09:00
Refactor/mosu 348 비밀번호 정규식 수정, admin application NPE 해결
diff --git a/src/main/java/life/mosu/mosuserver/application/notify/NotifyService.java b/src/main/java/life/mosu/mosuserver/application/notify/NotifyService.java
@@ -37,15 +37,10 @@ public void notify(LunaNotificationEvent event) {
         NotifySender<LunaNotificationVariable> sender = senderResolver.resolve(event.status());
 
         sender.send(phone, event, notifyVariable);
-        log.info("[NotifyService] 알림톡 전송 성공: userId={}, status={}", event.userId(), event.status());
     }
 
     @Recover
     public void recover(CustomRuntimeException exception, LunaNotificationEvent event) {
-        log.warn(
-                "[NotifyService] 알림톡 전송 실패: userId={}, status={}, reason={}",
-                event.userId(), event.status(), exception.getMessage()
-        );
         DiscordExceptionNotifyEventRequest request = DiscordExceptionNotifyEventRequest.of(
                 exception.getCause() != null ? exception.getCause().toString() : "N/A",
                 exception.getMessage(),
diff --git a/src/main/java/life/mosu/mosuserver/global/annotation/PasswordPattern.java b/src/main/java/life/mosu/mosuserver/global/annotation/PasswordPattern.java
@@ -9,7 +9,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Pattern(regexp = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[@$!%*?&])[A-Za-z\\d@$!%*?&]{8,20}$", message = "비밀번호 형식이 올바르지 않습니다.")
+@Pattern(regexp = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[!@#$%^&*_/+=])[A-Za-z\\d!@#$%^&*_/+=]{8,20}$", message = "비밀번호 형식이 올바르지 않습니다.")
 @NotBlank
 @Target({ElementType.FIELD, ElementType.PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/ApplicationQueryRepositoryImpl.java b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/ApplicationQueryRepositoryImpl.java
@@ -2,8 +2,6 @@
 
 import com.querydsl.core.Tuple;
 import com.querydsl.core.types.Predicate;
-import com.querydsl.core.types.dsl.EnumPath;
-import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.time.format.DateTimeFormatter;
@@ -18,7 +16,12 @@
 import life.mosu.mosuserver.domain.exam.entity.QExamJpaEntity;
 import life.mosu.mosuserver.domain.examapplication.entity.QExamApplicationJpaEntity;
 import life.mosu.mosuserver.domain.examapplication.entity.QExamSubjectJpaEntity;
+import life.mosu.mosuserver.domain.payment.entity.PaymentMethod;
+import life.mosu.mosuserver.domain.payment.entity.PaymentStatus;
 import life.mosu.mosuserver.domain.payment.entity.QPaymentJpaEntity;
+import life.mosu.mosuserver.domain.profile.entity.Education;
+import life.mosu.mosuserver.domain.profile.entity.Gender;
+import life.mosu.mosuserver.domain.profile.entity.Grade;
 import life.mosu.mosuserver.domain.profile.entity.QProfileJpaEntity;
 import life.mosu.mosuserver.domain.user.entity.QUserJpaEntity;
 import life.mosu.mosuserver.infra.persistence.s3.S3Service;
@@ -65,9 +68,9 @@ public Page<ApplicationListResponse> searchAllApplications(ApplicationFilter fil
 
         List<ApplicationListResponse> content = query.fetch().stream()
                 .map(tuple -> {
-                    Long appSchoolId = tuple.get(examApplication.id);
-                    Set<Subject> subjects = appSchoolId != null
-                            ? findSubjectsByExamApplicationId(appSchoolId)
+                    Long examApplicationId = tuple.get(examApplication.id);
+                    Set<Subject> subjects = examApplicationId != null
+                            ? findSubjectsByExamApplicationId(examApplicationId)
                             : new HashSet<>();
                     return mapToResponse(tuple, subjects);
                 })
@@ -81,9 +84,9 @@ public List<ApplicationExcelDto> searchAllApplicationsForExcel() {
         JPAQuery<Tuple> query = baseQuery();
         return query.fetch().stream()
                 .map(tuple -> {
-                    Long appSchoolId = tuple.get(examApplication.id);
-                    Set<Subject> subjects = appSchoolId != null
-                            ? findSubjectsByExamApplicationId(appSchoolId)
+                    Long examApplicationId = tuple.get(examApplication.id);
+                    Set<Subject> subjects = examApplicationId != null
+                            ? findSubjectsByExamApplicationId(examApplicationId)
                             : new HashSet<>();
                     return mapToExcel(tuple, subjects);
                 })
@@ -96,9 +99,9 @@ private JPAQuery<Tuple> baseQuery() {
                         examApplication.id,
                         payment.paymentKey,
                         examApplication.examNumber,
-                        profile.userName,
-                        profile.gender,
-                        profile.birth,
+                        user.name,
+                        user.gender,
+                        user.birth,
                         profile.phoneNumber,
                         application.parentPhoneNumber,
                         profile.recommenderPhoneNumber,
@@ -116,19 +119,20 @@ private JPAQuery<Tuple> baseQuery() {
                         application.createdAt
                 )
                 .from(examApplication)
-                .leftJoin(exam).on(examApplication.examId.eq(exam.id))
-                .leftJoin(application).on(examApplication.applicationId.eq(application.id))
-                .leftJoin(payment).on(payment.examApplicationId.eq(examApplication.id))
-                .leftJoin(user).on(application.userId.eq(user.id))
-                .leftJoin(profile).on(profile.userId.eq(user.id))
-                .leftJoin(examTicketImage)
-                .on(examTicketImage.applicationId.eq(application.id));
+                .join(exam).on(examApplication.examId.eq(exam.id))
+                .join(application).on(examApplication.applicationId.eq(application.id))
+                .join(payment).on(payment.examApplicationId.eq(examApplication.id))
+                .join(user).on(application.userId.eq(user.id))
+                .join(profile).on(profile.userId.eq(user.id))
+                .join(examTicketImage)
+                .on(examTicketImage.applicationId.eq(application.id))
+                .where(payment.paymentStatus.in(PaymentStatus.DONE, PaymentStatus.ABORTED));
     }
 
     private Predicate buildNameCondition(String name) {
         return (name == null || name.isBlank())
                 ? null
-                : profile.userName.contains(name);
+                : user.name.contains(name);
     }
 
     private Predicate buildPhoneCondition(String phone) {
@@ -138,7 +142,6 @@ private Predicate buildPhoneCondition(String phone) {
     }
 
     private Set<Subject> findSubjectsByExamApplicationId(Long examApplicationId) {
-        EnumPath<Subject> subject = Expressions.enumPath(Subject.class, "subject");
         return new HashSet<>(
                 queryFactory
                         .select(
@@ -160,32 +163,37 @@ private ApplicationListResponse mapToResponse(Tuple tuple, Set<Subject> subjects
 
         ExamTicketResponse examTicketResponse = ExamTicketResponse.of(
                 url,
-                tuple.get(profile.userName),
-                tuple.get(profile.birth),
+                tuple.get(user.name),
+                tuple.get(user.birth),
                 tuple.get(examApplication.examNumber),
                 subjectNames,
                 tuple.get(exam.schoolName)
         );
 
+        Gender gender = tuple.get(profile.gender);
+        Education education = tuple.get(profile.education);
+        Grade grade = tuple.get(profile.grade);
+        PaymentMethod paymentMethod = tuple.get(payment.paymentMethod);
+
         return new ApplicationListResponse(
                 tuple.get(payment.paymentKey),
                 tuple.get(examApplication.examNumber),
-                tuple.get(profile.userName),
-                tuple.get(profile.gender).getGenderName(),
-                tuple.get(profile.birth),
+                tuple.get(user.name),
+                gender != null ? gender.getGenderName() : null,
+                tuple.get(user.birth),
                 tuple.get(profile.phoneNumber),
                 tuple.get(application.parentPhoneNumber),
-                tuple.get(profile.education).getEducationName(),
+                education != null ? education.getEducationName() : null,
                 tuple.get(profile.schoolInfo.schoolName),
-                tuple.get(profile.grade).getGradeName(),
+                grade != null ? grade.getGradeName() : null,
                 tuple.get(examApplication.isLunchChecked),
                 tuple.get(exam.lunchName),
                 subjectNames,
                 tuple.get(exam.schoolName),
                 tuple.get(exam.examDate),
                 tuple.get(examTicketImage.fileName),
                 tuple.get(payment.paymentStatus),
-                tuple.get(payment.paymentMethod),
+                paymentMethod != null ? paymentMethod.getName() : null,
                 tuple.get(application.createdAt),
                 examTicketResponse
         );
@@ -196,32 +204,33 @@ private ApplicationExcelDto mapToExcel(Tuple tuple, Set<Subject> subjects) {
                 .map(Subject::getSubjectName)
                 .collect(Collectors.toSet());
 
-        String lunchName = tuple.get(exam.lunchName);
-        String genderName = tuple.get(profile.gender).getGenderName();
-        String gradeName = tuple.get(profile.grade).getGradeName();
-        String educationName = tuple.get(profile.education).getEducationName();
+        Gender gender = tuple.get(profile.gender);
+        Education education = tuple.get(profile.education);
+        Grade grade = tuple.get(profile.grade);
+        PaymentMethod paymentMethod = tuple.get(payment.paymentMethod);
+
         String appliedAt = tuple.get(application.createdAt)
                 .format(EXCEL_DT_FORMATTER);
 
         return new ApplicationExcelDto(
                 tuple.get(payment.paymentKey),
                 tuple.get(examApplication.examNumber),
-                tuple.get(profile.userName),
-                genderName,
-                tuple.get(profile.birth),
+                tuple.get(user.name),
+                gender != null ? gender.getGenderName() : null,
+                tuple.get(user.birth),
                 tuple.get(profile.phoneNumber),
                 tuple.get(application.parentPhoneNumber),
                 tuple.get(profile.recommenderPhoneNumber),
-                educationName,
+                education != null ? education.getEducationName() : null,
                 tuple.get(profile.schoolInfo.schoolName),
-                gradeName,
-                lunchName,
+                grade != null ? grade.getGradeName() : null,
+                tuple.get(exam.lunchName),
                 subjectNames,
                 tuple.get(exam.schoolName),
                 tuple.get(exam.examDate),
                 tuple.get(examTicketImage.fileName),
                 tuple.get(payment.paymentStatus),
-                tuple.get(payment.paymentMethod),
+                paymentMethod != null ? paymentMethod.getName() : null,
                 appliedAt
         );
     }
diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/RefundQueryRepositoryImpl.java b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/RefundQueryRepositoryImpl.java
@@ -55,10 +55,7 @@ public Page<RefundListResponse> searchAllRefunds(Pageable pageable) {
     public List<RefundExcelDto> searchAllRefundsForExcel() {
         JPAQuery<Tuple> query = baseQuery();
         return query.fetch().stream()
-                .map(tuple -> {
-                    log.info("tuple log : {} ", tuple);
-                    return mapToExcel(tuple);
-                })
+                .map(this::mapToExcel)
                 .toList();
     }
 
diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ApplicationExcelDto.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ApplicationExcelDto.java
@@ -3,7 +3,6 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.LocalDate;
 import java.util.Set;
-import life.mosu.mosuserver.domain.payment.entity.PaymentMethod;
 import life.mosu.mosuserver.domain.payment.entity.PaymentStatus;
 import life.mosu.mosuserver.global.annotation.ExcelColumn;
 
@@ -26,7 +25,7 @@ public record ApplicationExcelDto(
         @Schema(description = "시험 일자", example = "2025-08-10") @ExcelColumn(headerName = "시험 일자") LocalDate examDate,
         @Schema(description = "수험표 이미지 URL", example = "https://s3.amazonaws.com/bucket/admission/2025-00001.jpg") @ExcelColumn(headerName = "수험표 사진") String admissionTicketImage,
         @Schema(description = "결제 상태", example = "COMPLETED") @ExcelColumn(headerName = "결제 상태") PaymentStatus paymentStatus,
-        @Schema(description = "결제 방법", example = "CARD") @ExcelColumn(headerName = "결제 방법") PaymentMethod paymentMethod,
+        @Schema(description = "결제 방법", example = "CARD") @ExcelColumn(headerName = "결제 방법") String paymentMethod,
         @Schema(description = "신청 일시", example = "2025-07-10 15:30:00") @ExcelColumn(headerName = "신청 일시") String applicationDate) {
 
 }
diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ApplicationListResponse.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ApplicationListResponse.java
@@ -4,7 +4,6 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
-import life.mosu.mosuserver.domain.payment.entity.PaymentMethod;
 import life.mosu.mosuserver.domain.payment.entity.PaymentStatus;
 
 @Schema(description = "관리자 신청 목록 응답 DTO")
@@ -62,7 +61,7 @@ public record ApplicationListResponse(
         PaymentStatus paymentStatus,
 
         @Schema(description = "결제 방법", example = "CARD")
-        PaymentMethod paymentMethod,
+        String paymentMethod,
 
         @Schema(description = "신청 일시", example = "2025-07-10T15:30:00")
         LocalDateTime applicationDate,
