Merge pull request #93 from WE-ARE-RACCOONS/RAC-254

RAC-254 test: 통합테스트
WE-ARE-RACCOONS · Jan 21, 2024 · 48f1165 · 48f1165
2 parents cafdabb + 5a5017f
commit 48f1165
Show file tree

Hide file tree

Showing 16 changed files with 1,134 additions and 28 deletions.
diff --git a/src/main/java/com/postgraduate/domain/available/application/util/AvailableUtil.java b/src/main/java/com/postgraduate/domain/available/application/util/AvailableUtil.java
@@ -2,8 +2,11 @@
 
 import com.postgraduate.domain.available.application.dto.req.AvailableCreateRequest;
 import com.postgraduate.domain.available.domain.entity.Available;
+import com.postgraduate.domain.available.exception.DayAvailableException;
 import com.postgraduate.domain.senior.domain.entity.Senior;
+import lombok.AllArgsConstructor;
 
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 
@@ -16,21 +19,7 @@ public static List<Available> sortAvailable(List<AvailableCreateRequest> availab
                         Comparator.comparing(
                                 (AvailableCreateRequest availableCreateRequest) -> {
                                     String day = availableCreateRequest.day();
-                                    if (day.equals("월"))
-                                        return 0;
-                                    if (day.equals("화"))
-                                        return 1;
-                                    if (day.equals("수"))
-                                        return 2;
-                                    if (day.equals("목"))
-                                        return 3;
-                                    if (day.equals("금"))
-                                        return 4;
-                                    if (day.equals("토"))
-                                        return 5;
-                                    if (day.equals("일"))
-                                        return 6;
-                                    throw new IllegalArgumentException();
+                                    return Day.sortDay(day);
                                 }
                         ).thenComparingInt(
                                 availableCreateRequest -> {
@@ -46,4 +35,17 @@ public static List<Available> sortAvailable(List<AvailableCreateRequest> availab
         return sortedAvailable;
     }
 
+    @AllArgsConstructor
+    private enum Day {
+        월(0), 화(1), 수(2), 목(3), 금(4), 토(5), 일(6);
+        private final int day;
+
+        private static int sortDay(String inputDay) {
+            return Arrays.stream(Day.values())
+                    .filter(day -> day.name().equals(inputDay))
+                    .findFirst()
+                    .orElseThrow(DayAvailableException::new)
+                    .day;
+        }
+    }
 }
diff --git a/src/main/java/com/postgraduate/domain/available/exception/DayAvailableException.java b/src/main/java/com/postgraduate/domain/available/exception/DayAvailableException.java
@@ -0,0 +1,10 @@
+package com.postgraduate.domain.available.exception;
+
+import com.postgraduate.domain.senior.presentation.constant.SeniorResponseCode;
+import com.postgraduate.domain.senior.presentation.constant.SeniorResponseMessage;
+
+public class DayAvailableException extends AvailableException {
+    public DayAvailableException() {
+        super(SeniorResponseMessage.INVALID_DAY.getMessage(), SeniorResponseCode.INVALID_DAY.getCode());
+    }
+}
diff --git a/...in/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseCase.java b/...in/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseCase.java
@@ -9,6 +9,10 @@
 import com.postgraduate.domain.mentoring.domain.service.MentoringUpdateService;
 import com.postgraduate.domain.mentoring.exception.MentoringNotExpectedException;
 import com.postgraduate.domain.mentoring.exception.MentoringNotWaitingException;
+import com.postgraduate.domain.payment.domain.entity.Payment;
+import com.postgraduate.domain.payment.domain.entity.constant.Status;
+import com.postgraduate.domain.payment.domain.service.PaymentGetService;
+import com.postgraduate.domain.payment.domain.service.PaymentUpdateService;
 import com.postgraduate.domain.refuse.application.dto.req.MentoringRefuseRequest;
 import com.postgraduate.domain.refuse.application.mapper.RefuseMapper;
 import com.postgraduate.domain.refuse.domain.entity.Refuse;
@@ -43,12 +47,17 @@ public class MentoringManageUseCase {
     private final SeniorGetService seniorGetService;
     private final SalaryGetService salaryGetService;
     private final SalaryUpdateService salaryUpdateService;
+    private final PaymentGetService paymentGetService;
+    private final PaymentUpdateService paymentUpdateService;
 
     public void updateCancel(User user, Long mentoringId) {
         Mentoring mentoring = checkIsMyMentoringUseCase.byUser(user, mentoringId);
         if (mentoring.getStatus() != WAITING)
             throw new MentoringNotWaitingException();
         mentoringUpdateService.updateStatus(mentoring, CANCEL);
+        Payment payment = paymentGetService.byMentoring(mentoring);
+        paymentUpdateService.updateStatus(payment, Status.CANCEL);
+        // todo 환불 구현 후 수정
     }
 
     public void updateDone(User user, Long mentoringId) {

diff --git a/...main/java/com/postgraduate/domain/payment/domain/repository/PaymentDslRepositoryImpl.java b/...main/java/com/postgraduate/domain/payment/domain/repository/PaymentDslRepositoryImpl.java
@@ -1,6 +1,7 @@
 package com.postgraduate.domain.payment.domain.repository;
 
 import com.postgraduate.domain.payment.domain.entity.Payment;
+import com.postgraduate.domain.payment.domain.entity.constant.Status;
 import com.postgraduate.domain.senior.domain.entity.Senior;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -29,6 +30,7 @@ public List<Payment> findAllBySeniorAndStatus(Senior senior, Boolean status) {
         return queryFactory.selectFrom(payment)
                 .where(
                         payment.mentoring.senior.eq(senior),
+                        payment.status.eq(Status.DONE),
                         payment.salary.status.eq(status)
                 )
                 .join(payment.salary, salary)

diff --git a/...n/java/com/postgraduate/domain/senior/application/dto/req/SeniorMyPageProfileRequest.java b/...n/java/com/postgraduate/domain/senior/application/dto/req/SeniorMyPageProfileRequest.java
@@ -1,6 +1,7 @@
 package com.postgraduate.domain.senior.application.dto.req;
 
 import com.postgraduate.domain.available.application.dto.req.AvailableCreateRequest;
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 
@@ -22,5 +23,7 @@ public record SeniorMyPageProfileRequest(
         @NotBlank
         String oneLiner,
         @NotEmpty
+        @Valid
         List<AvailableCreateRequest> times
-) {}
+) {
+}
diff --git a/src/main/java/com/postgraduate/domain/senior/application/usecase/SeniorManageUseCase.java b/src/main/java/com/postgraduate/domain/senior/application/usecase/SeniorManageUseCase.java
@@ -6,8 +6,8 @@
 import com.postgraduate.domain.account.domain.service.AccountUpdateService;
 import com.postgraduate.domain.available.application.dto.req.AvailableCreateRequest;
 import com.postgraduate.domain.available.domain.entity.Available;
-import com.postgraduate.domain.available.domain.service.AvailableSaveService;
 import com.postgraduate.domain.available.domain.service.AvailableDeleteService;
+import com.postgraduate.domain.available.domain.service.AvailableSaveService;
 import com.postgraduate.domain.salary.domain.entity.Salary;
 import com.postgraduate.domain.salary.domain.service.SalaryGetService;
 import com.postgraduate.domain.salary.domain.service.SalaryUpdateService;
@@ -90,29 +90,27 @@ public void updateSeniorMyPageUserAccount(User user, SeniorMyPageUserAccountRequ
         userUtils.checkPhoneNumber(myPageUserAccountRequest.phoneNumber());
         Senior senior = seniorGetService.byUser(user);
         user = userGetService.getUser(user.getUserId());
+        userUpdateService.updateSeniorUserAccount(user, myPageUserAccountRequest);
+
         Optional<Account> optionalAccount = accountGetService.bySenior(senior);
         if (optionalAccount.isEmpty()) {
-            updateSeniorMyPageUserAccountNoneAccount(senior, user, myPageUserAccountRequest);
+            updateSeniorMyPageUserAccountNoneAccount(senior, myPageUserAccountRequest);
             return;
         }
         if (myPageUserAccountRequest.accountNumber().isEmpty() || myPageUserAccountRequest.accountHolder().isEmpty() || myPageUserAccountRequest.bank().isEmpty())
             throw new NoneAccountException();
         Account account = optionalAccount.get();
         String accountNumber = encryptorUtils.encryptData(myPageUserAccountRequest.accountNumber());
-        userUpdateService.updateSeniorUserAccount(user, myPageUserAccountRequest);
         accountUpdateService.updateAccount(account, myPageUserAccountRequest, accountNumber);
         updateSalaryAccount(senior, myPageUserAccountRequest.bank(), accountNumber, myPageUserAccountRequest.accountHolder());
     }
 
-    private void updateSeniorMyPageUserAccountNoneAccount(Senior senior, User user, SeniorMyPageUserAccountRequest myPageUserAccountRequest) {
-        user = userGetService.getUser(user.getUserId());
+    private void updateSeniorMyPageUserAccountNoneAccount(Senior senior, SeniorMyPageUserAccountRequest myPageUserAccountRequest) {
         if (myPageUserAccountRequest.accountNumber().isEmpty() || myPageUserAccountRequest.accountHolder().isEmpty() || myPageUserAccountRequest.bank().isEmpty()) {
-            userUpdateService.updateSeniorUserAccount(user, myPageUserAccountRequest);
             return;
         }
         String accountNumber = encryptorUtils.encryptData(myPageUserAccountRequest.accountNumber());
         Account account = mapToAccount(senior, myPageUserAccountRequest, accountNumber);
-        userUpdateService.updateSeniorUserAccount(user, myPageUserAccountRequest);
         accountSaveService.saveAccount(account);
         updateSalaryAccount(senior, myPageUserAccountRequest.bank(), accountNumber, myPageUserAccountRequest.accountHolder());
     }

diff --git a/src/main/java/com/postgraduate/domain/senior/application/usecase/SeniorMyPageUseCase.java b/src/main/java/com/postgraduate/domain/senior/application/usecase/SeniorMyPageUseCase.java
@@ -14,6 +14,7 @@
 import com.postgraduate.domain.senior.domain.entity.Senior;
 import com.postgraduate.domain.senior.domain.entity.constant.Status;
 import com.postgraduate.domain.senior.domain.service.SeniorGetService;
+import com.postgraduate.domain.senior.exception.NoneProfileException;
 import com.postgraduate.domain.user.domain.entity.User;
 import com.postgraduate.domain.wish.domain.entity.Wish;
 import com.postgraduate.domain.wish.domain.service.WishGetService;
@@ -49,6 +50,9 @@ public SeniorMyPageResponse getSeniorInfo(User user) {
 
     public SeniorMyPageProfileResponse getSeniorMyPageProfile(User user) {
         Senior senior = seniorGetService.byUser(user);
+        if (senior.getProfile() == null) {
+            throw new NoneProfileException();
+        }
         List<Available> availables = availableGetService.bySenior(senior);
         List<AvailableTimeResponse> times = availables.stream()
                 .map(AvailableMapper::mapToAvailableTimes)

diff --git a/src/main/java/com/postgraduate/domain/senior/exception/NoneProfileException.java b/src/main/java/com/postgraduate/domain/senior/exception/NoneProfileException.java
@@ -0,0 +1,11 @@
+package com.postgraduate.domain.senior.exception;
+
+import com.postgraduate.domain.senior.presentation.constant.SeniorResponseCode;
+import com.postgraduate.domain.senior.presentation.constant.SeniorResponseMessage;
+import com.postgraduate.global.exception.ApplicationException;
+
+public class NoneProfileException extends ApplicationException {
+    public NoneProfileException() {
+        super(SeniorResponseMessage.NONE_PROFILE.getMessage(), SeniorResponseCode.NONE_PROFILE.getCode());
+    }
+}
diff --git a/src/main/java/com/postgraduate/domain/senior/presentation/constant/SeniorResponseCode.java b/src/main/java/com/postgraduate/domain/senior/presentation/constant/SeniorResponseCode.java
@@ -16,6 +16,8 @@ public enum SeniorResponseCode {
     NOT_WAITING_STATUS("EX402"),
     INVALID_KEYWORD("EX402"),
     EMPTY_TIME("EX403"),
+    INVALID_DAY("EX404"),
+    NONE_PROFILE("EX405"),
     ;
     private final String code;
 }
diff --git a/...main/java/com/postgraduate/domain/senior/presentation/constant/SeniorResponseMessage.java b/...main/java/com/postgraduate/domain/senior/presentation/constant/SeniorResponseMessage.java
@@ -28,6 +28,8 @@ public enum SeniorResponseMessage {
     INVALID_KEYWORD("키워드가 잘못되었습니다."),
     NOT_WAITING_STATUS("승인대기 상태의 선배가 아닙니다."),
     EMPTY_TIME("가능 시간이 비었습니다."),
+    INVALID_DAY("잘못된 요일입니다."),
+    NONE_PROFILE("등록한 프로필이 없습니다."),
     ;
 
     private final String message;

diff --git a/src/test/java/com/postgraduate/domain/auth/presentation/AuthControllerTest.java b/src/test/java/com/postgraduate/domain/auth/presentation/AuthControllerTest.java
@@ -14,13 +14,19 @@
 import com.postgraduate.domain.wish.domain.repository.WishRepository;
 import com.postgraduate.global.config.redis.RedisRepository;
 import com.postgraduate.global.config.security.jwt.util.JwtUtils;
+import com.postgraduate.global.exception.constant.ErrorCode;
+import com.postgraduate.global.exception.constant.ErrorMessage;
+import com.postgraduate.global.slack.SlackMessage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.NullAndEmptySource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 
+import java.io.IOException;
 import java.util.Optional;
 
 import static com.postgraduate.domain.auth.presentation.constant.AuthResponseCode.*;
@@ -31,8 +37,10 @@
 import static com.postgraduate.domain.user.domain.entity.constant.Role.USER;
 import static com.postgraduate.domain.user.presentation.constant.UserResponseCode.USER_NOT_FOUND;
 import static com.postgraduate.domain.user.presentation.constant.UserResponseMessage.NOT_FOUND_USER;
+import static java.lang.Boolean.FALSE;
 import static java.time.LocalDateTime.now;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
@@ -53,14 +61,17 @@ class AuthControllerTest extends IntegrationTest {
     private WishRepository wishRepository;
     @MockBean
     RedisRepository redisRepository;
+    @MockBean
+    private SlackMessage slackMessage;
     private User user;
     private final Long anonymousUserSocialId = 2L;
 
 
     @BeforeEach
-    void setUp() {
+    void setUp() throws IOException {
         user = new User(0L, 1L, "mail", "후배", "011", "profile", 0, USER, true, now(), now(), false);
         userRepository.save(user);
+        doNothing().when(slackMessage).sendSlackLog(any());
     }
 
     @Test
@@ -127,6 +138,28 @@ void signUpUser() throws Exception {
                 .andExpect(jsonPath("$.data.role").value(USER.name()));
     }
 
+    @ParameterizedTest
+    @NullAndEmptySource
+    @DisplayName("희망 대학원/학과와 연구분야를 입력하지 않아도 대학생 회원가입이 가능하다.")
+    void signUpUserWithoutWish(String empty) throws Exception {
+        authLoginByAnonymousUser();
+
+        String request = objectMapper.writeValueAsString(
+                new SignUpRequest(anonymousUserSocialId, "01012345678", "nickname",
+                        true, empty, empty, false)
+        );
+
+        mvc.perform(post("/auth/user/signup")
+                        .content(request)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(AUTH_CREATE.getCode()))
+                .andExpect(jsonPath("$.message").value(SUCCESS_AUTH.getMessage()))
+                .andExpect(jsonPath("$.data.accessToken").exists())
+                .andExpect(jsonPath("$.data.role").value(USER.name()));
+    }
+
     @Test
     @DisplayName("대학원생이 대학생으로 변경한다.")
     void changeUserToken() throws Exception {
@@ -177,6 +210,26 @@ void changeUser() throws Exception {
                 .andExpect(jsonPath("$.data.role").value(USER.name()));
     }
 
+    @ParameterizedTest
+    @NullAndEmptySource
+    @DisplayName("전공과 분야가 없어도 후배로 추가 가입할 수 있다")
+    void changeUser(String empty) throws Exception {
+        String seniorAccessToken = jwtUtil.generateAccessToken(user.getUserId(), SENIOR);
+
+        String request = objectMapper.writeValueAsString(
+                new UserChangeRequest(empty, empty, FALSE)
+        );
+
+        mvc.perform(post("/auth/user/change")
+                        .header(AUTHORIZATION, BEARER + seniorAccessToken)
+                        .content(request)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(AUTH_CREATE.getCode()))
+                .andExpect(jsonPath("$.message").value(SUCCESS_AUTH.getMessage()));
+    }
+
     @Test
     @DisplayName("선배가 회원가입한다.")
     void singUpSenior() throws Exception {
@@ -199,6 +252,26 @@ void singUpSenior() throws Exception {
                 .andExpect(jsonPath("$.data.role").value(SENIOR.name()));
     }
 
+    @ParameterizedTest
+    @NullAndEmptySource
+    @DisplayName("필수 정보를 입력하지 않으면 선배로 회원가입할 수 없다.")
+    void singUpSenior(String empty) throws Exception {
+        authLoginByAnonymousUser();
+
+        String request = objectMapper.writeValueAsString(
+                new SeniorSignUpRequest(anonymousUserSocialId, "01012345678", "nickname",
+                        true, empty, empty, empty, empty, empty, empty, empty)
+        );
+
+        mvc.perform(post("/auth/senior/signup")
+                        .content(request)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(ErrorCode.VALID_BLANK.getCode()))
+                .andExpect(jsonPath("$.message").value(ErrorMessage.VALID_BLANK.getMessage()));
+    }
+
     @Test
     @DisplayName("후배가 선배로 추가 가입합니다.")
     void changeSenior() throws Exception {
@@ -221,6 +294,26 @@ void changeSenior() throws Exception {
                 .andExpect(jsonPath("$.data.role").value(SENIOR.name()));
     }
 
+    @ParameterizedTest
+    @NullAndEmptySource
+    @DisplayName("선배 필수 정보가 없으면 선배로 추가 가입할 수 없다")
+    void changeSenior(String empty) throws Exception {
+        String userAccessToken = jwtUtil.generateAccessToken(user.getUserId(), USER);
+
+        String request = objectMapper.writeValueAsString(
+                new SeniorChangeRequest(empty, empty, empty, empty, empty, empty, empty)
+        );
+
+        mvc.perform(post("/auth/senior/change")
+                        .header(AUTHORIZATION, BEARER + userAccessToken)
+                        .content(request)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(ErrorCode.VALID_BLANK.getCode()))
+                .andExpect(jsonPath("$.message").value(ErrorMessage.VALID_BLANK.getMessage()));
+    }
+
     @Test
     @DisplayName("대학생이 대학원생으로 변경한다.")
     void changeSeniorToken() throws Exception {