[Feat/#14] 유저 프로필 업로드 API 수정

SemtleApp · Aug 17, 2023 · 4534e77 · 4534e77
2 parents 872f56d + 0237b8b
commit 4534e77
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/src/main/java/com/semtleapp/semtleapp/semtleuser/controller/SemtleUserController.java b/src/main/java/com/semtleapp/semtleapp/semtleuser/controller/SemtleUserController.java
@@ -34,15 +34,16 @@ public class SemtleUserController {
     @ApiOperation(value = "회원가입", notes = "회원가입")
     @PostMapping("/signup")
     public ApiResponse<SemtleUserRes.UserDetail> signup(@RequestPart(value = "signupDto") SemtleUserReq.SignupDto signupDto,
-                                                        @RequestPart(value = "file", required = false) MultipartFile file) {
+                                                        @RequestPart(value = "file", required = false) MultipartFile file
+                                                        ) {
 
         SemtleUserRes.UserDetail result = semtleUserService.signup(signupDto, file);
         return new ApiResponse<>(result);
     }
 
     @ApiOperation(value = "로그인", notes = "로그인")
     @PostMapping("/login")
-    public ApiResponse<Token> login(HttpServletRequest request, @RequestBody SemtleUserReq.LoginDto loginDto,
+    public ApiResponse<Token> login(@RequestBody SemtleUserReq.LoginDto loginDto,
                                     @RequestHeader(value = "User-Agent", required = false) String userAgent) {
 
         return new ApiResponse<>(semtleUserService.login(loginDto, userAgent));

diff --git a/src/main/java/com/semtleapp/semtleapp/semtleuser/service/SemtleUserService.java b/src/main/java/com/semtleapp/semtleapp/semtleuser/service/SemtleUserService.java
@@ -6,8 +6,10 @@
 import com.semtleapp.semtleapp.semtleuser.dto.Token;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 public interface SemtleUserService {
-    SemtleUserRes.UserDetail signup(SemtleUserReq.SignupDto signupDto, MultipartFile file);
+    SemtleUserRes.UserDetail signup(SemtleUserReq.SignupDto signupDto, MultipartFile file );
 
     SemtleUserRes.UserDetail nowUser(String email);
 

diff --git a/src/main/java/com/semtleapp/semtleapp/semtleuser/service/SemtleUserServiceImpl.java b/src/main/java/com/semtleapp/semtleapp/semtleuser/service/SemtleUserServiceImpl.java
@@ -42,20 +42,20 @@ public class SemtleUserServiceImpl implements SemtleUserService {
 
     private final FileUserService fileUserService;
 
-    private void uploadPhoto(List<MultipartFile> files, SemtleStudyPost saveSemtleStudyPost) {
-        if(files != null) {
-            try {
-                fileUserService.saveFiles(files, PhotoType.STUDY, saveSemtleStudyPost.getPostId());
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
+//    private void uploadPhoto(List<MultipartFile> files, Long userId) {
+//        if(files != null) {
+//            try {
+//                fileUserService.saveFiles(files, PhotoType.USER, userId);
+//            } catch (IOException e) {
+//                e.printStackTrace();
+//            }
+//        }
+//    }
 
     @SneakyThrows
     @Transactional
     @Override
-    public SemtleUserRes.UserDetail signup(SemtleUserReq.SignupDto signupDto, MultipartFile file) {
+    public SemtleUserRes.UserDetail signup(SemtleUserReq.SignupDto signupDto, MultipartFile file ) {
         semtleUserRepository.findByEmail(signupDto.getEmail()).ifPresent(e -> {
             throw new CustomException(ErrorCode.REGISTERED_EMAIL);
         });
@@ -66,7 +66,7 @@ public SemtleUserRes.UserDetail signup(SemtleUserReq.SignupDto signupDto, Multip
                 .role("ROLE_USER")
                 .social("")
                 .build();
-        semtleUserRepository.save(user);
+        Long userId = semtleUserRepository.save(user).getUserId();
 
         SemtleUserInfo userInfo = SemtleUserInfo.builder()
                 .semtleUser(user)
@@ -81,8 +81,7 @@ public SemtleUserRes.UserDetail signup(SemtleUserReq.SignupDto signupDto, Multip
 
 
         //프로필 사진 업로드하기
-        fileUserService.saveFile(file, PhotoType.USER, user.getUserId());
-
+        fileUserService.saveFile(file, PhotoType.USER, userId);
 
 
         return SemtleUserRes.UserDetail.toDto(user, userInfo);