Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] 프로필수정 멀티파트파일 nullable 수정 - #161 #221

Merged
merged 6 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dateroad-api/src/main/java/org/dateroad/user/api/UserApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ public interface UserApi {
@ApiResponse(responseCode = "500", description = "서버 오류")
})
ResponseEntity<UserJwtInfoRes> signUp(
@RequestHeader(name = "Authorization", required = true) @Parameter(description = "Bearer 토큰") final String token,
@RequestHeader(name = "Authorization", required = true) @Parameter(description = "플랫폼 토큰") final String token,
@RequestPart(name = "userSignUpReq", required = true) @Parameter(description = "회원가입 요청 데이터") final UserSignUpReq userSignUpReq,
@RequestPart(name = "image", required = true) @Parameter(description = "프로필 이미지") MultipartFile image,
@RequestPart(name = "image", required = false) @Parameter(description = "프로필 이미지") MultipartFile image,
@RequestPart(name = "tag", required = true) @Parameter(description = "사용자 태그") List<DateTagType> tag
) throws IOException, ExecutionException, InterruptedException;

Expand All @@ -54,7 +54,7 @@ ResponseEntity<UserJwtInfoRes> signUp(
@ApiResponse(responseCode = "500", description = "서버 오류")
})
ResponseEntity<UserJwtInfoRes> signIn(
@RequestHeader(name = "Authorization", required = true) @Parameter(description = "Bearer 토큰") final String token,
@RequestHeader(name = "Authorization", required = true) @Parameter(description = "플랫폼폼 토큰") final String token,
@RequestBody(description = "로그인 요청 데이터", required = true) final UserSignInReq userSignInReq
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public ResponseEntity<UserInfoGetMyPageRes> getUserInfoMyPage(@UserId final Long
public ResponseEntity<Void> patchUserProfile(@UserId final Long userId,
@RequestPart("name") final String name,
@RequestPart("tags") final List<DateTagType> tags,
@Nullable @RequestPart("image") final MultipartFile image ) throws IOException, ExecutionException, InterruptedException {
@Nullable @RequestPart(name = "image", required = false) final MultipartFile image ) throws IOException, ExecutionException, InterruptedException {
userService.editUserProfile(userId, name, tags, image);
return ResponseEntity
.ok()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package org.dateroad.user.service;

import org.assertj.core.api.Assertions;
import org.dateroad.code.FailureCode;
import org.dateroad.common.ValidatorUtil;
import org.dateroad.exception.ConflictException;
import org.dateroad.exception.InvalidValueException;
import org.dateroad.tag.domain.DateTagType;
import org.dateroad.user.domain.Platform;
import org.dateroad.user.domain.User;
import org.dateroad.user.dto.request.UserSignUpReq;
import org.dateroad.user.repository.UserRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.util.Assert;

import java.util.Collections;
import java.util.List;

import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;

@ExtendWith(MockitoExtension.class)
class AuthServiceTest {
@InjectMocks
AuthService authService;

@Mock
UserRepository userRepository;

@Test
@DisplayName("유저가 회원가입을 한다.")
void testDuplicatedNickName() {

//given
User user = User.create("성준", "dfsjalsadf", Platform.KAKAO, "null");

//when
userRepository.save(user);

//then
Assertions.assertThatThrownBy(
() -> authService.checkNickname("성준")
).isInstanceOf(ConflictException.class);
}
}
Loading