Merge pull request #313 from WE-ARE-RACCOONS/RAC-426

RAC-426 feat : Flyway 추가 + 튜토리얼 여부 응답 추가

build.gradle

@@ -87,6 +87,10 @@ dependencies {
     implementation 'org.redisson:redisson-spring-boot-starter:3.18.0'
 
     implementation 'com.github.ywj9811:querydsl-itemreader:v1.0.1'
+
+    // flyway 추가
+    implementation 'org.flywaydb:flyway-mysql'
+    implementation 'org.flywaydb:flyway-core'
 }
 
 tasks.named('test') {

src/main/java/com/postgraduate/domain/auth/application/dto/res/JwtTokenResponse.java

@@ -3,4 +3,4 @@
 import com.postgraduate.domain.user.user.domain.entity.constant.Role;
 
 public record JwtTokenResponse(String accessToken, int accessExpiration,
-                               String refreshToken, int refreshExpiration, Role role) implements AuthResponse{}
+                               String refreshToken, int refreshExpiration, Role role, boolean isTutorial) implements AuthResponse{}

src/main/java/com/postgraduate/domain/auth/application/usecase/jwt/JwtUseCase.java

@@ -78,7 +78,7 @@ private JwtTokenResponse generateToken(User user, Role role) {
         checkDelete(user);
         String accessToken = jwtUtils.generateAccessToken(user.getUserId(), role);
         String refreshToken = jwtUtils.generateRefreshToken(user.getUserId(), role);
-        return new JwtTokenResponse(accessToken, accessExpiration, refreshToken, refreshExpiration, role);
+        return new JwtTokenResponse(accessToken, accessExpiration, refreshToken, refreshExpiration, role, user.isTutorial());
     }
 
     private void checkDelete(User user) {

src/main/java/com/postgraduate/domain/user/user/application/usecase/UserManageUseCase.java

@@ -23,6 +23,11 @@ public void updateInfo(User user, UserInfoRequest userInfoRequest) {
         userUpdateService.updateInfo(user, userInfoRequest);
     }
 
+    public void tutorialFin(User user) {
+        user = userGetService.byUserId(user.getUserId());
+        userUpdateService.tutorialFin(user);
+    }
+
     @Transactional(readOnly = true)
     public Boolean duplicatedNickName(String nickName) {
         return userGetService.byNickName(nickName).isEmpty();

src/main/java/com/postgraduate/domain/user/user/application/utils/UserUtils.java

@@ -16,7 +16,7 @@ public class UserUtils {
 
     @PostConstruct
     public void init() {
-        archiveUser = new User(-100L, -100L, null, "알수없음", "탈퇴한회원", profile, 0, null, false, null, null, false);
+        archiveUser = new User(-100L, -100L, null, "알수없음", "탈퇴한회원", profile, 0, null, false, null, null, false, false);
     }
 
     public User getArchiveUser() {

src/main/java/com/postgraduate/domain/user/user/domain/entity/User.java

@@ -61,6 +61,10 @@ public class User {
     @UpdateTimestamp
     private LocalDateTime updatedAt;
 
+    @Column(nullable = false)
+    @Builder.Default
+    private boolean isTutorial = false;
+
     @Column(nullable = false)
     @Builder.Default
     private boolean isDelete = false;
@@ -91,6 +95,14 @@ public boolean isDelete() {
         return this.isDelete;
     }
 
+    public boolean isTutorial() {
+        return this.isTutorial;
+    }
+
+    public void tutorialFin() {
+        this.isTutorial = true;
+    }
+
     public boolean isDefaultProfile(List<String> defaultProfile) {
         return defaultProfile.contains(profile);
     }

src/main/java/com/postgraduate/domain/user/user/domain/service/UserUpdateService.java

@@ -42,4 +42,8 @@ public void updateSeniorUserAccount(User user, SeniorMyPageUserAccountRequest my
     public void updateRestore(User user) {
         user.restoreDelete();
     }
+
+    public void tutorialFin(User user) {
+        user.tutorialFin();
+    }
 }

src/main/java/com/postgraduate/domain/user/user/presentation/UserController.java

@@ -28,6 +28,13 @@ public class UserController {
     private final UserMyPageUseCase myPageUseCase;
     private final UserManageUseCase manageUseCase;
 
+    @PatchMapping("/me/tutorial")
+    @Operation(summary = "튜토리얼 완료시 상태 업데이트")
+    public ResponseEntity<ResponseDto<Void>> updateTutorialFin(@AuthenticationPrincipal User user) {
+        manageUseCase.tutorialFin(user);
+        return ResponseEntity.ok(create(UserResponseCode.USER_UPDATE.getCode(), UserResponseMessage.UPDATE_USER_INFO.getMessage()));
+    }
+
     @GetMapping("/me")
     @Operation(summary = "사용자 마이페이지 정보 조회 | 토큰 필요", description = "닉네임, 프로필")
     public ResponseEntity<ResponseDto<UserMyPageResponse>> getUserInfo(@AuthenticationPrincipal User user) {

src/main/java/com/postgraduate/global/bizppurio/application/usecase/BizppurioSend.java

@@ -26,12 +26,8 @@ public class BizppurioSend {
 
     @Value("${bizppurio.message}")
     private String messageUrl;
-    @Value("${bizppurio.status}")
-    private String status;
 
     protected void sendMessageWithExceptionHandling(Supplier<CommonRequest> messageSupplier) {
-        if (status.equals(DEV))
-            return;
         try {
             CommonRequest commonRequest = messageSupplier.get();
             String accessToken = bizppurioAuth.getAuth();

src/main/resources/db/migration/V1_202408230112__alter.sql

@@ -0,0 +1 @@
+ALTER TABLE user ADD COLUMN is_tutorial BIT(1) DEFAULT false;

src/test/java/com/postgraduate/domain/auth/application/usecase/jwt/JwtUseTypeTest.java

@@ -46,7 +46,7 @@ class JwtUseTypeTest {
     void setting() {
         user = new User(1L, 1L, "a",
                 "a", "123", "a",
-                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), FALSE);
+                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), FALSE, FALSE);
     }
 
     @Test
@@ -74,7 +74,7 @@ void signInWithUser() {
     void signInWithSenior() {
         user = new User(1L, 1L, "a",
                 "a", "123", "a",
-                1, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now(), FALSE);
+                1, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now(), FALSE, FALSE);
         given(jwtUtils.generateAccessToken(user.getUserId(), user.getRole()))
                 .willReturn("accessToken");
         given(jwtUtils.generateRefreshToken(user.getUserId(), user.getRole()))
@@ -104,7 +104,7 @@ void logout() {
     void signInWithUserDelete() {
         user = new User(1L, 1L, "a",
                 "a", "123", "a",
-                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now().minusDays(20), TRUE);
+                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now().minusDays(20), TRUE, TRUE);
 
         assertThatThrownBy(() -> jwtUseCase.signIn(user))
                 .isInstanceOf(UserNotFoundException.class);
@@ -115,7 +115,7 @@ void signInWithUserDelete() {
     void signInWithSeniorDelete() {
         user = new User(1L, 1L, "a",
                 "a", "123", "a",
-                1, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now().minusDays(20), TRUE);
+                1, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now().minusDays(20), TRUE, TRUE);
 
         assertThatThrownBy(() -> jwtUseCase.signIn(user))
                 .isInstanceOf(DeletedUserException.class);

src/test/java/com/postgraduate/domain/auth/application/usecase/oauth/SignUpUseTypeTest.java

@@ -89,7 +89,7 @@ void setting() {
         profile = new Profile("a", "a", "a");
         user = new User(1L, 1234L, "a",
                 "a", "123", "a",
-                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), FALSE);
+                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), FALSE, TRUE);
         wish = new Wish(1L, "major", "field", TRUE, user, Status.WAITING);
         senior = new Senior(1L, user, "a",
                 APPROVE,1, 1, info, profile,

src/test/java/com/postgraduate/domain/auth/application/usecase/oauth/kakao/KakaoSignInUseTypeTest.java

@@ -40,7 +40,7 @@ class KakaoSignInUseTypeTest {
     void setting() {
         user = new User(1L, 1L, "a",
                 "a", "123", "a",
-                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
     }
     @Test
     @DisplayName("기존 회원 테스트")

src/test/java/com/postgraduate/domain/auth/presentation/AuthControllerTest.java

@@ -17,6 +17,7 @@
 import static com.postgraduate.domain.senior.presentation.constant.SeniorResponseCode.SENIOR_CREATE;
 import static com.postgraduate.domain.senior.presentation.constant.SeniorResponseMessage.CREATE_SENIOR;
 import static com.postgraduate.domain.user.user.domain.entity.constant.Role.USER;
+import static java.lang.Boolean.TRUE;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.willDoNothing;
@@ -37,7 +38,7 @@ void authLoginByUser() throws Exception {
         CodeRequest codeRequest = new CodeRequest("code");
         String request = objectMapper.writeValueAsString(codeRequest);
         AuthUserResponse response = new AuthUserResponse(user, user.getSocialId());
-        JwtTokenResponse tokenResponse = new JwtTokenResponse("access", 10, "refresh", 10, USER);
+        JwtTokenResponse tokenResponse = new JwtTokenResponse("access", 10, "refresh", 10, USER, TRUE);
         given(selectOauth.selectSignIn(Provider.KAKAO))
                 .willReturn(kakaoSignInUseCase);
         given(kakaoSignInUseCase.getUser(codeRequest))
@@ -91,7 +92,7 @@ void signUpUser() throws Exception {
         SignUpRequest signUpRequest = new SignUpRequest(user.getSocialId(), user.getPhoneNumber(), user.getNickName(),
                 user.getMarketingReceive(), "major", "field", true);
         String request = objectMapper.writeValueAsString(signUpRequest);
-        JwtTokenResponse tokenResponse = new JwtTokenResponse("access", 10, "refresh", 10, USER);
+        JwtTokenResponse tokenResponse = new JwtTokenResponse("access", 10, "refresh", 10, USER, TRUE);
 
         given(signUpUseCase.userSignUp(signUpRequest))
                 .willReturn(user);
@@ -117,7 +118,7 @@ void signUpUser() throws Exception {
     @WithMockUser
     @DisplayName("대학원생이 대학생으로 변경한다.")
     void changeUserToken() throws Exception {
-        JwtTokenResponse tokenResponse = new JwtTokenResponse("access", 10, "refresh", 10, USER);
+        JwtTokenResponse tokenResponse = new JwtTokenResponse("access", 10, "refresh", 10, USER, TRUE);
 
         given(jwtUseCase.changeUser(any()))
                 .willReturn(tokenResponse);
@@ -142,7 +143,7 @@ void changeUser() throws Exception {
         String request = objectMapper.writeValueAsString(
                 new UserChangeRequest("major", "field", true)
         );
-        JwtTokenResponse tokenResponse = new JwtTokenResponse("access", 10, "refresh", 10, USER);
+        JwtTokenResponse tokenResponse = new JwtTokenResponse("access", 10, "refresh", 10, USER, TRUE);
 
         willDoNothing().given(signUpUseCase)
                 .changeUser(any(), any());
@@ -174,7 +175,7 @@ void singUpSenior() throws Exception {
                         true, "전공", "서울대학교", "교수", "연구실",
                         "AI", "키워드", "chatLink")
         );
-        JwtTokenResponse tokenResponse = new JwtTokenResponse("access", 10, "refresh", 10, USER);
+        JwtTokenResponse tokenResponse = new JwtTokenResponse("access", 10, "refresh", 10, USER, TRUE);
 
         given(signUpUseCase.seniorSignUp(any()))
                 .willReturn(user);
@@ -204,7 +205,7 @@ void changeSenior() throws Exception {
                 new SeniorChangeRequest("major", "field", "교수", "연구실",
                         "AI", "키워드", "chatLink")
         );
-        JwtTokenResponse tokenResponse = new JwtTokenResponse("access", 10, "refresh", 10, USER);
+        JwtTokenResponse tokenResponse = new JwtTokenResponse("access", 10, "refresh", 10, USER, TRUE);
 
         given(signUpUseCase.changeSenior(any(), any()))
                 .willReturn(user);
@@ -230,7 +231,7 @@ void changeSenior() throws Exception {
     @WithMockUser
     @DisplayName("대학생이 대학원생으로 변경한다.")
     void changeSeniorToken() throws Exception {
-        JwtTokenResponse tokenResponse = new JwtTokenResponse("access", 10, "refresh", 10, USER);
+        JwtTokenResponse tokenResponse = new JwtTokenResponse("access", 10, "refresh", 10, USER, TRUE);
 
         given(jwtUseCase.changeSenior(any()))
                 .willReturn(tokenResponse);
@@ -252,7 +253,7 @@ void changeSeniorToken() throws Exception {
     @WithMockUser
     @DisplayName("토큰을 재발급한다.")
     void refresh() throws Exception {
-        JwtTokenResponse tokenResponse = new JwtTokenResponse("access", 10, "refresh", 10, USER);
+        JwtTokenResponse tokenResponse = new JwtTokenResponse("access", 10, "refresh", 10, USER, TRUE);
 
         given(jwtUseCase.regenerateToken(any(), any()))
                 .willReturn(tokenResponse);

src/test/java/com/postgraduate/domain/image/application/usecase/ImageUploadUseTypeTest.java

@@ -46,7 +46,7 @@ void uploadCertification() {
     void uploadProfile() {
         User user = new User(-1L, -1234L, "abc.com", "abc"
                 , " 123123", "abcab", 0
-                , USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), FALSE);
+                , USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), FALSE, TRUE);
 
         MockMultipartFile mockMultipartFile = new MockMultipartFile("profile", new byte[]{});
         given(s3UploadService.saveProfileFile(mockMultipartFile))

src/test/java/com/postgraduate/domain/mentoring/application/usecase/MentoringApplyingUseTypeTest.java

@@ -81,10 +81,10 @@ void setting() {
         profile = new Profile("a", "a", "a");
         user = new User(-1L, 1234L, "a",
                 "a", "123", "a",
-                0, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                0, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
         mentoringUser = new User(-2L, 12345L, "a",
                 "a", "123", "a",
-                0, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                0, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
         senior = new Senior(-1L, user, "a",
                 APPROVE,1, 1, info, profile,
                 LocalDateTime.now(), LocalDateTime.now());

src/test/java/com/postgraduate/domain/mentoring/application/usecase/MentoringManageUseTypeTest.java

@@ -101,10 +101,10 @@ void setting() {
         profile = new Profile("a", "a", "a");
         user = new User(-1L, 1234L, "a",
                 "a", "123", "a",
-                0, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                0, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
         mentoringUser = new User(-2L, 12345L, "a",
                 "a", "123", "a",
-                0, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                0, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
         senior = new Senior(-1L, user, "a",
                 APPROVE, 1, 1, info, profile,
                 LocalDateTime.now(), LocalDateTime.now());

src/test/java/com/postgraduate/domain/mentoring/application/usecase/MentoringSeniorInfoUseTypeTest.java

@@ -67,10 +67,10 @@ void setting() {
         profile = new Profile("a", "a", "a");
         user = new User(-1L, 1234L, "a",
                 "a", "123", "a",
-                0, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                0, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
         mentoringUser = new User(-2L, 12345L, "a",
                 "a", "123", "a",
-                0, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                0, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
         senior = new Senior(-1L, user, "a",
                 APPROVE, 1, 1, info, profile,
                 LocalDateTime.now(), LocalDateTime.now());

src/test/java/com/postgraduate/domain/mentoring/application/usecase/MentoringUserInfoUseTypeTest.java

@@ -66,10 +66,10 @@ void setting() {
         profile = new Profile("a", "a", "a");
         user = new User(-1L, 1234L, "a",
                 "a", "123", "a",
-                0, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                0, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
         mentoringUser = new User(-2L, 12345L, "a",
                 "a", "123", "a",
-                0, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                0, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
         senior = new Senior(-1L, user, "a",
                 APPROVE, 1,1, info, profile,
                 LocalDateTime.now(), LocalDateTime.now());

src/test/java/com/postgraduate/domain/payment/usecase/PaymentManageUseTypeTest.java

@@ -63,10 +63,10 @@ void setting() {
         profile = new Profile("a", "a", "a");
         user = new User(-1L, 1234L, "a",
                 "a", "123", "a",
-                0, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                0, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
         mentoringUser = new User(-2L, 12345L, "a",
                 "a", "123", "a",
-                0, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                0, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
         senior = new Senior(-1L, user, "a",
                 APPROVE, 1,1, info, profile,
                 LocalDateTime.now(), LocalDateTime.now());

src/test/java/com/postgraduate/domain/senior/application/usecase/SeniorInfoUseTypeTest.java

@@ -57,10 +57,10 @@ void setting() {
         profile = new Profile("a", "a", "a");
         user = new User(1L, 1234L, "a",
                 "a", "123", "a",
-                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
         originUser = new User(2L, 12345L, "a",
                 "a", "12345", "a",
-                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
         senior = new Senior(1L, user, "a",
                 APPROVE, 1, 1, info, profile,
                 LocalDateTime.now(), LocalDateTime.now());

src/test/java/com/postgraduate/domain/senior/application/usecase/SeniorManageUseTypeTest.java

@@ -92,7 +92,7 @@ void setting() {
         profile = new Profile("a", "a", "a");
         user = new User(1L, 1234L, "a",
                 "a", "123", "a",
-                1, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                1, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
         senior = new Senior(1L, user, "a",
                 APPROVE, 1, 1, info, profile,
                 LocalDateTime.now(), LocalDateTime.now());

src/test/java/com/postgraduate/domain/senior/application/usecase/SeniorMyPageUseTypeTest.java

@@ -66,7 +66,7 @@ void setting() {
         profile = new Profile("a", "a", "a");
         user = new User(1L, 1234L, "a",
                 "a", "123", "a",
-                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
         senior = new Senior(1L, user, "a",
                 APPROVE, 1, 1, info, profile,
                 LocalDateTime.now(), LocalDateTime.now());

src/test/java/com/postgraduate/domain/senior/domain/service/SeniorUpdateServiceTest.java

@@ -29,7 +29,7 @@ class SeniorUpdateServiceTest {
     @InjectMocks
     private SeniorUpdateService seniorUpdateService;
 
-    private User user = new User(1L, 2L, "a", "b", "c", "d", 0, SENIOR, FALSE, now(), now(), TRUE);
+    private User user = new User(1L, 2L, "a", "b", "c", "d", 0, SENIOR, FALSE, now(), now(), TRUE, TRUE);
     private Senior senior;
     @BeforeEach
     void setting() {

src/test/java/com/postgraduate/domain/user/application/usecase/UserMyPageUseTypeTest.java

@@ -30,7 +30,7 @@ class UserMyPageUseTypeTest {
     void setting() {
         user = new User(1L, 1234L, "a",
                 "a", "123", "a",
-                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
     }
 
     @Test
@@ -73,7 +73,7 @@ void checkSeniorWithUser() {
     void checkSeniorWithSenior() {
         user = new User(1L, 1234L, "a",
                 "a", "123", "a",
-                1, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                1, SENIOR, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
 
         UserPossibleResponse checkSenior = userMyPageUseCase.checkSenior(user);
 

src/test/java/com/postgraduate/domain/user/domain/service/UserGetServiceTest.java

@@ -33,7 +33,7 @@ class UserGetServiceTest {
     void setting() {
         user = new User(-1l, -1l, "a",
                 "a", "123", "a",
-                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE);
+                1, USER, TRUE, LocalDateTime.now(), LocalDateTime.now(), TRUE, TRUE);
     }
 
     @Test

src/test/java/com/postgraduate/domain/user/domain/service/UserUpdateServiceTest.java

@@ -35,7 +35,7 @@ void setting() {
         user = new User(1L, 2L, "a",
                 "b", "c", "d",
                 0, USER, FALSE,
-                now(), now(), TRUE);
+                now(), now(), TRUE, TRUE);
     }
 
     @Test