Merge branch 'dev'

Author: yeongbin1999

backend/src/test/java/com/deliveranything/domain/user/profile/service/ProfileServiceTest.java

@@ -75,7 +75,6 @@ class CreateProfileTest {
     void createProfile_first_customer_success() {
       User mockUser = mock(User.class);
       when(mockUser.getId()).thenReturn(1L);
-      when(mockUser.hasActiveProfile()).thenReturn(false);
 
       when(profileRepository.existsByUserIdAndType(1L, ProfileType.CUSTOMER)).thenReturn(false);
 
@@ -104,7 +103,6 @@ void createProfile_first_customer_success() {
     void createProfile_additional_seller_success() {
       User mockUser = mock(User.class);
       when(mockUser.getId()).thenReturn(1L);
-      when(mockUser.hasActiveProfile()).thenReturn(true);
 
       when(profileRepository.existsByUserIdAndType(1L, ProfileType.SELLER)).thenReturn(false);
       when(sellerProfileRepository.existsByBusinessCertificateNumber(anyString()))
@@ -127,16 +125,15 @@ void createProfile_additional_seller_success() {
       assertNotNull(result);
       verify(profileRepository, times(1)).save(any(Profile.class));
       verify(sellerProfileRepository, times(1)).save(any(SellerProfile.class));
-      verify(mockUser, never()).setCurrentActiveProfile(any());
-      verify(userRepository, never()).save(any());
+      verify(mockUser, times(1)).setCurrentActiveProfile(any(Profile.class));
+      verify(userRepository, times(1)).save(mockUser);
     }
 
     @Test
     @DisplayName("성공 - 라이더 프로필 생성")
     void createProfile_rider_success() {
       User mockUser = mock(User.class);
       when(mockUser.getId()).thenReturn(1L);
-      when(mockUser.hasActiveProfile()).thenReturn(false);
 
       when(profileRepository.existsByUserIdAndType(1L, ProfileType.RIDER)).thenReturn(false);
 
@@ -156,6 +153,10 @@ void createProfile_rider_success() {
       assertNotNull(result);
       verify(profileRepository, times(1)).save(any(Profile.class));
       verify(riderProfileRepository, times(1)).save(any(RiderProfile.class));
+      verify(mockUser, times(1)).setCurrentActiveProfile(any(Profile.class));
+      verify(userRepository, times(1)).save(mockUser);
+      verify(mockUser, times(1)).setCurrentActiveProfile(any(Profile.class));
+      verify(userRepository, times(1)).save(mockUser);
     }
 
     @Test

backend/src/test/java/com/deliveranything/domain/user/user/controller/UserControllerTest.java

@@ -3,6 +3,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -35,6 +37,8 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
@@ -140,6 +144,7 @@ void changePassword_success() {
   @DisplayName("프로필 생성 테스트")
   class CreateProfileTest {
 
+    @MockitoSettings(strictness = Strictness.LENIENT)
     @Test
     @DisplayName("성공 - 프로필 생성")
     void createProfile_success() {
@@ -150,16 +155,31 @@ void createProfile_success() {
       Profile mockProfile = mock(Profile.class);
       when(mockProfile.getId()).thenReturn(10L);
       when(mockProfile.isActive()).thenReturn(true);
+      when(mockProfile.getType()).thenReturn(ProfileType.CUSTOMER);
+      when(mockProfile.getUser()).thenReturn(mockUser);
+      when(mockProfile.getType()).thenReturn(ProfileType.CUSTOMER);
 
       CustomerProfileCreateData profileData = new CustomerProfileCreateData(
           "닉네임", null, "01012345678"
       );
 
       CreateProfileRequest request = new CreateProfileRequest(ProfileType.CUSTOMER, profileData);
 
-      when(profileService.createProfile(mockUser, ProfileType.CUSTOMER, profileData))
+      when(profileService.createProfile(eq(mockUser), eq(ProfileType.CUSTOMER), any()))
           .thenReturn(mockProfile);
 
+      when(rq.getDeviceId()).thenReturn("device123");
+      when(rq.getAccessTokenFromHeader()).thenReturn("oldAccessToken");
+
+      SwitchProfileResult switchResult = new SwitchProfileResult(
+          SwitchProfileResponse.builder().build(),
+          "newAccessToken"
+      );
+
+      when(authService.switchProfileWithTokenReissue(
+          any(Long.class), any(ProfileType.class), any(String.class), any(String.class)
+      )).thenReturn(switchResult);
+
       ResponseEntity<ApiResponse<CreateProfileResponse>> response = userController.createProfile(
           request);