Merge pull request #366 from mosu-dev/develop

prod :  가상 계좌 부분 삭제 및 휴대폰 번호 UID 변경

Author: polyglot-k

.github/workflows/docker-pr-build.yaml

@@ -5,7 +5,7 @@ on:
     branches: [ develop ]
 
 jobs:
-  build-and-deploy:
+  build-and-test:
     runs-on: ubuntu-latest
 
     steps:
@@ -34,5 +34,14 @@ jobs:
           git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/mosu-dev/mosu-kmc-jar.git temp-jar
           cp temp-jar/*.jar libs/
 
-      - name: Build with Gradle
+      - name: Build without tests
         run: ./gradlew build -x test
+
+      - name: Run tests
+        run: ./gradlew test
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-artifacts
+          path: build/libs/*.jar

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

@@ -7,7 +7,6 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import life.mosu.mosuserver.domain.application.entity.ApplicationJpaEntity;
 import life.mosu.mosuserver.domain.exam.entity.ExamJpaEntity;
 import life.mosu.mosuserver.domain.examapplication.entity.ExamApplicationJpaEntity;
@@ -34,6 +33,13 @@ public ApplicationContext(
         this(applications, examApplications, Map.of(), Map.of(), Map.of(), Map.of());
     }
 
+    public static ApplicationContext of(
+            List<ApplicationJpaEntity> applications,
+            List<ExamApplicationWithStatus> examApplications
+    ) {
+        return new ApplicationContext(applications, examApplications);
+    }
+
     public ApplicationContext fetchExams(Function<List<Long>, List<ExamJpaEntity>> fetcher) {
         Map<Long, ExamJpaEntity> newExamMap = fetcher.apply(
                 examApplications.stream()
@@ -42,37 +48,44 @@ public ApplicationContext fetchExams(Function<List<Long>, List<ExamJpaEntity>> f
                         .toList()
         ).stream().collect(Collectors.toMap(ExamJpaEntity::getId, Function.identity()));
 
-        return new ApplicationContext(applications, examApplications, newExamMap, subjectMap, paymentMap, refundMap);
+        return new ApplicationContext(applications, examApplications, newExamMap, subjectMap,
+                paymentMap, refundMap);
     }
 
-    public ApplicationContext fetchSubjects(Function<List<Long>, List<ExamSubjectJpaEntity>> fetcher) {
+    public ApplicationContext fetchSubjects(
+            Function<List<Long>, List<ExamSubjectJpaEntity>> fetcher) {
         Map<Long, List<ExamSubjectJpaEntity>> newSubjectMap = fetcher.apply(
                 examApplications.stream()
                         .map(e -> e.examApplication().getId())
                         .toList()
         ).stream().collect(Collectors.groupingBy(ExamSubjectJpaEntity::getExamApplicationId));
 
-        return new ApplicationContext(applications, examApplications, examMap, newSubjectMap, paymentMap, refundMap);
+        return new ApplicationContext(applications, examApplications, examMap, newSubjectMap,
+                paymentMap, refundMap);
     }
 
     public ApplicationContext fetchPayments(Function<List<Long>, List<PaymentJpaEntity>> fetcher) {
         Map<Long, PaymentJpaEntity> newPaymentMap = fetcher.apply(
                 examApplications.stream()
                         .map(e -> e.examApplication().getId())
                         .toList()
-        ).stream().collect(Collectors.toMap(PaymentJpaEntity::getExamApplicationId, Function.identity()));
+        ).stream().collect(
+                Collectors.toMap(PaymentJpaEntity::getExamApplicationId, Function.identity()));
 
-        return new ApplicationContext(applications, examApplications, examMap, subjectMap, newPaymentMap, refundMap);
+        return new ApplicationContext(applications, examApplications, examMap, subjectMap,
+                newPaymentMap, refundMap);
     }
 
     public ApplicationContext fetchRefunds(Function<List<Long>, List<RefundJpaEntity>> fetcher) {
         Map<Long, RefundJpaEntity> newRefundMap = fetcher.apply(
                 examApplications.stream()
                         .map(e -> e.examApplication().getId())
                         .toList()
-        ).stream().collect(Collectors.toMap(RefundJpaEntity::getExamApplicationId, Function.identity()));
+        ).stream().collect(
+                Collectors.toMap(RefundJpaEntity::getExamApplicationId, Function.identity()));
 
-        return new ApplicationContext(applications, examApplications, examMap, subjectMap, paymentMap, newRefundMap);
+        return new ApplicationContext(applications, examApplications, examMap, subjectMap,
+                paymentMap, newRefundMap);
     }
 
     public List<ApplicationResponse> assemble() {
@@ -88,10 +101,13 @@ public List<ApplicationResponse> assemble() {
                 .toList();
     }
 
-    private Map.Entry<Long, ExamApplicationResponse> createExamApplicationResponse(ExamApplicationWithStatus item) {
+    private Map.Entry<Long, ExamApplicationResponse> createExamApplicationResponse(
+            ExamApplicationWithStatus item) {
         ExamApplicationJpaEntity examApp = item.examApplication();
         ExamJpaEntity exam = examMap.get(examApp.getExamId());
-        if (exam == null) return null;
+        if (exam == null) {
+            return null;
+        }
 
         Set<String> subjects = subjectMap.getOrDefault(examApp.getId(), List.of()).stream()
                 .map(s -> s.getSubject().getSubjectName()).collect(Collectors.toSet());

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

@@ -6,7 +6,7 @@
 import life.mosu.mosuserver.application.application.processor.GetApplicationsStepProcessor;
 import life.mosu.mosuserver.application.application.processor.RegisterApplicationStepProcessor;
 import life.mosu.mosuserver.application.application.processor.SaveExamTicketStepProcessor;
-import life.mosu.mosuserver.application.application.vaildator.ApplicationValidator;
+import life.mosu.mosuserver.application.application.validator.ApplicationValidator;
 import life.mosu.mosuserver.application.exam.cache.ExamQuotaCacheManager;
 import life.mosu.mosuserver.application.user.UserService;
 import life.mosu.mosuserver.domain.application.entity.ApplicationJpaEntity;

…tion/vaildator/ApplicationValidator.java …tion/validator/ApplicationValidator.javasrc/main/java/life/mosu/mosuserver/application/application/vaildator/ApplicationValidator.java renamed to src/main/java/life/mosu/mosuserver/application/application/validator/ApplicationValidator.java src/main/java/life/mosu/mosuserver/application/application/vaildator/ApplicationValidator.java renamed to src/main/java/life/mosu/mosuserver/application/application/validator/ApplicationValidator.java

@@ -1,4 +1,4 @@
-package life.mosu.mosuserver.application.application.vaildator;
+package life.mosu.mosuserver.application.application.validator;
 
 import java.time.LocalDateTime;
 import java.util.HashSet;

src/main/java/life/mosu/mosuserver/application/event/EventAttachmentService.java

@@ -2,6 +2,7 @@
 
 import static life.mosu.mosuserver.global.util.EncodeUtil.passwordEncode;
 
+import life.mosu.mosuserver.domain.user.entity.AuthProvider;
 import life.mosu.mosuserver.domain.user.entity.UserJpaEntity;
 import life.mosu.mosuserver.domain.user.repository.UserJpaRepository;
 import life.mosu.mosuserver.global.exception.CustomRuntimeException;
@@ -42,11 +43,13 @@ public ChangePasswordResponse changePassword(ChangePasswordRequest request,
     @Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
     public FindLoginIdResponse findLoginId(FindLoginIdRequest request) {
         UserJpaEntity user = userJpaRepository.findByNameAndPhoneNumber(request.name(),
-                        request.phoneNumber())
+                        PhoneNumberUtil.formatPhoneNumber(request.phoneNumber()))
                 .orElseThrow(() -> new CustomRuntimeException(ErrorCode.NOT_FOUND_LOGIN_ID));
 
+        if (user.getProvider() == AuthProvider.KAKAO) {
+            throw new CustomRuntimeException(ErrorCode.KAKAO_ACCOUNT_DUPLICATED);
+        }
         return FindLoginIdResponse.from(user.getLoginId());
-
     }
 
     @Transactional(readOnly = true, propagation = Propagation.SUPPORTS)

src/main/java/life/mosu/mosuserver/application/user/MyUserService.java

@@ -2,6 +2,8 @@
 
 
 import life.mosu.mosuserver.application.virtualaccount.VirtualAccountLogService;
+import life.mosu.mosuserver.domain.application.entity.ApplicationStatus;
+import life.mosu.mosuserver.domain.application.repository.ApplicationJpaRepository;
 import life.mosu.mosuserver.domain.examapplication.repository.ExamApplicationJpaRepository;
 import life.mosu.mosuserver.domain.virtualaccount.DepositStatus;
 import life.mosu.mosuserver.domain.virtualaccount.VirtualAccountLogJpaEntity;
@@ -25,7 +27,7 @@ public class DepositSuccessEventHandler implements DepositEventHandler<DepositSu
     private final MailNotifier<DepositSuccessMailRequest> mailer;
     private final NotifyEventPublisher notifier;
     private final ExamApplicationJpaRepository examApplicationJpaRepository;
-
+    private final ApplicationJpaRepository applicationJpaRepository;
     @Override
     @Transactional
     public void handle(DepositSuccessEvent event) {
@@ -38,6 +40,12 @@ public void handle(DepositSuccessEvent event) {
                 .orElseThrow(
                         () -> new CustomRuntimeException(ErrorCode.EXAM_APPLICATION_NOT_FOUND));
 
+        var application = applicationJpaRepository.findById(log.getApplicationId())
+                .orElseThrow(
+                        () -> new CustomRuntimeException(ErrorCode.APPLICATION_LIST_NOT_FOUND));
+        if (application.getStatus() == ApplicationStatus.PENDING) {
+            application.changeStatus(ApplicationStatus.APPROVED);
+        }
         LunaNotificationEvent lunaNotificationEvent = LunaNotificationEvent.create(
                 LunaNotificationStatus.APPLICATION_GUEST_SUCCESS,
                 exam.getUserId(), exam.getId());

src/main/java/life/mosu/mosuserver/application/virtualaccount/event/DepositSuccessEventHandler.java

@@ -168,6 +168,7 @@ public enum ErrorCode {
 
     // ID 찾기 관련
     NOT_FOUND_LOGIN_ID(HttpStatus.NOT_FOUND, "해당 아이디를 찾을 수 없습니다.", CriticalLevel.LOW),
+    KAKAO_ACCOUNT_DUPLICATED(HttpStatus.CONFLICT, "카카오로 가입한 사용자입니다", CriticalLevel.LOW),
 
     //결제 API 실패
     PAYMENT_API_ERROR(HttpStatus.BAD_REQUEST, "결제 API 호출에 실패하였습니다.", CriticalLevel.CRITICAL),

src/main/java/life/mosu/mosuserver/global/exception/ErrorCode.java

@@ -21,7 +21,7 @@ public InquiryAnswerJpaEntity toEntity(Long postId, UserJpaEntity user) {
                 .title(title)
                 .content(content)
                 .userId(user.getId())
-                .author(user.getName())
+                .author("관리자")
                 .build();
     }
 }