feat: 회원가입 시 프로필 이미지 업로드 및 S3 url 변수 분리 및 회원가입 로직 수정

feat: 회원가입 시 프로필 이미지 업로드 및 S3 url 변수 분리 및 회원가입 로직 수정

Author: tjdtn0219

src/main/java/swm/betterlife/antifragile/common/util/S3ImageComponent.java

@@ -10,12 +10,14 @@
 import java.util.Objects;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 import swm.betterlife.antifragile.common.exception.S3DeleteFailException;
 import swm.betterlife.antifragile.common.exception.S3UploadFailException;
 
+@Slf4j
 @Component
 @RequiredArgsConstructor
 public class S3ImageComponent {
@@ -45,7 +47,7 @@ public String uploadImage(S3ImageCategory category, MultipartFile multipartFile)
             throw new S3UploadFailException();
         }
 
-        return amazonS3.getUrl(bucket, fileName).toString();
+        return fileName;
     }
 
     private String createFileName(S3ImageCategory category, String originalFileName) {
@@ -57,12 +59,18 @@ private String createFileName(S3ImageCategory category, String originalFileName)
         return category + "/" + fileName + "_" + random + fileExtension;
     }
 
-    public void deleteImage(String imageUrl) {
-        String[] deleteUrl = imageUrl.split("/", 4);
+    public void deleteImage(String filename) {
         try {
-            amazonS3.deleteObject(new DeleteObjectRequest(bucket, deleteUrl[3]));
+            amazonS3.deleteObject(new DeleteObjectRequest(bucket, filename));
         } catch (AmazonS3Exception e) {
             throw new S3DeleteFailException();
         }
     }
+
+    public String getUrl(String filename) {
+        if (filename != null) {
+            return amazonS3.getUrl(bucket, filename).toString();
+        }
+        return null;
+    }
 }

src/main/java/swm/betterlife/antifragile/domain/auth/controller/AuthController.java

@@ -7,7 +7,9 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 import swm.betterlife.antifragile.common.response.ResponseBody;
 import swm.betterlife.antifragile.common.security.PrincipalDetails;
 import swm.betterlife.antifragile.domain.auth.dto.request.AuthLoginRequest;
@@ -34,9 +36,10 @@ public ResponseBody<AuthLoginResponse> login(
 
     @PostMapping("/sign-up")
     public ResponseBody<AuthSignUpResponse> signUp(
-        @RequestBody AuthSignUpRequest authSignUpRequest
+        @RequestPart(required = false) MultipartFile profileImgFile,
+        @RequestPart AuthSignUpRequest authSignUpRequest
     ) {
-        return ResponseBody.ok(authService.signUp(authSignUpRequest));
+        return ResponseBody.ok(authService.signUp(authSignUpRequest, profileImgFile));
     }
 
     @PostMapping("/logout")

src/main/java/swm/betterlife/antifragile/domain/auth/dto/request/AuthSignUpRequest.java

@@ -1,10 +1,15 @@
 package swm.betterlife.antifragile.domain.auth.dto.request;
 
+import swm.betterlife.antifragile.domain.member.entity.Gender;
 import swm.betterlife.antifragile.domain.member.entity.LoginType;
 
 public record AuthSignUpRequest(
     String email,
-    LoginType loginType //todo: 암호화된 password로 받는 거 고민
+    LoginType loginType,
+    String nickname,
+    Integer age,
+    Gender gender,
+    String job
 ) {
 
 }

src/main/java/swm/betterlife/antifragile/domain/auth/dto/response/AuthLoginResponse.java

@@ -1,7 +1,6 @@
 package swm.betterlife.antifragile.domain.auth.dto.response;
 
 import lombok.Builder;
-import swm.betterlife.antifragile.domain.member.dto.response.MemberDetailResponse;
 import swm.betterlife.antifragile.domain.member.entity.LoginType;
 import swm.betterlife.antifragile.domain.member.entity.Member;
 import swm.betterlife.antifragile.domain.token.dto.response.TokenIssueResponse;
@@ -12,7 +11,6 @@ public record AuthLoginResponse(
     String email,
     String nickname,
     LoginType loginType,
-    MemberDetailResponse memberDetail,
     TokenIssueResponse tokenIssue
 ) {
     public static AuthLoginResponse from(

src/main/java/swm/betterlife/antifragile/domain/auth/dto/response/AuthSignUpResponse.java

@@ -3,20 +3,25 @@
 import lombok.Builder;
 import swm.betterlife.antifragile.domain.member.entity.LoginType;
 import swm.betterlife.antifragile.domain.member.entity.Member;
+import swm.betterlife.antifragile.domain.token.dto.response.TokenIssueResponse;
 
 @Builder
 public record AuthSignUpResponse(
     String id,
     String email,
     String nickname,
-    LoginType loginType
+    LoginType loginType,
+    TokenIssueResponse tokenIssue
 ) {
-    public static AuthSignUpResponse from(Member member) {
+    public static AuthSignUpResponse from(
+        Member member, TokenIssueResponse tokenIssue
+    ) {
         return AuthSignUpResponse.builder()
             .id(member.getId())
             .email(member.getEmail())
             .nickname(member.getNickname())
             .loginType(member.getLoginType())
+            .tokenIssue(tokenIssue)
             .build();
     }
 }

src/main/java/swm/betterlife/antifragile/domain/auth/service/AuthService.java

@@ -1,9 +1,11 @@
 package swm.betterlife.antifragile.domain.auth.service;
 
+import static swm.betterlife.antifragile.common.util.S3ImageCategory.PROFILE;
 import static swm.betterlife.antifragile.domain.member.entity.RoleType.ROLE_USER;
 
 import com.mongodb.client.result.UpdateResult;
 import java.time.LocalDateTime;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -17,8 +19,10 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 import swm.betterlife.antifragile.common.exception.MemberNotFoundException;
 import swm.betterlife.antifragile.common.jwt.util.JwtProvider;
+import swm.betterlife.antifragile.common.util.S3ImageComponent;
 import swm.betterlife.antifragile.domain.auth.dto.request.AuthLoginRequest;
 import swm.betterlife.antifragile.domain.auth.dto.request.AuthLogoutRequest;
 import swm.betterlife.antifragile.domain.auth.dto.request.AuthSignUpRequest;
@@ -48,25 +52,26 @@ public class AuthService {
     private final PasswordEncoder passwordEncoder;
     private final TokenService tokenService;
     private final MongoTemplate mongoTemplate;
+    private final S3ImageComponent s3ImageComponent;
 
     @Transactional
     public AuthLoginResponse login(AuthLoginRequest authLoginRequest) {
-        String username
-            = authLoginRequest.loginType().name() + ":" + authLoginRequest.email(); //todo: common분리
         String password = authLoginRequest.password();
 
-        Authentication authentication = getAuthenticate(username, password);
+        Authentication authentication
+            = getAuthenticate(authLoginRequest.email(), password, authLoginRequest.loginType());
 
         Member member = memberRepository.getMember(
             authLoginRequest.email(), authLoginRequest.loginType()
         );
-        TokenIssueResponse tokenIssueResponse
-                = jwtProvider.issueToken(authentication);
-        return AuthLoginResponse.from(member, tokenIssueResponse);
+        TokenIssueResponse tokenIssue = jwtProvider.issueToken(authentication);
+        return AuthLoginResponse.from(member, tokenIssue);
     }
 
     @Transactional
-    public AuthSignUpResponse signUp(AuthSignUpRequest authSignUpRequest) {
+    public AuthSignUpResponse signUp(
+        AuthSignUpRequest authSignUpRequest, MultipartFile profileImgFile
+    ) {
         if (memberRepository.existsByEmailAndLoginType(
             authSignUpRequest.email(), authSignUpRequest.loginType())
         ) {
@@ -77,14 +82,27 @@ public AuthSignUpResponse signUp(AuthSignUpRequest authSignUpRequest) {
         String encodedPassword = passwordEncoder.encode(password);
 
         Member member = Member.builder()
-                .email(authSignUpRequest.email())
-                .password(encodedPassword)
-                .loginType(authSignUpRequest.loginType())
-                .roleType(ROLE_USER)
-                .build();
-
-        return AuthSignUpResponse.from(memberRepository.save(member));
-
+            .email(authSignUpRequest.email())
+            .password(encodedPassword)
+            .loginType(authSignUpRequest.loginType())
+            .age(authSignUpRequest.age())
+            .gender(authSignUpRequest.gender())
+            .job(authSignUpRequest.job())
+            .profileImgFilename(
+                Optional.ofNullable(profileImgFile)
+                .map(file -> s3ImageComponent.uploadImage(PROFILE, file))
+                .orElse(null)
+            )
+            .roleType(ROLE_USER)
+            .build();
+
+        Member savedMember = memberRepository.save(member);
+
+        Authentication authentication =
+            getAuthenticate(authSignUpRequest.email(), password, authSignUpRequest.loginType());
+        TokenIssueResponse tokenIssue = jwtProvider.issueToken(authentication);
+
+        return AuthSignUpResponse.from(savedMember, tokenIssue);
     }
 
     @Transactional
@@ -105,7 +123,11 @@ public void delete(String memberId) {
         }
     }
 
-    private Authentication getAuthenticate(String username, String password) {
+    private Authentication getAuthenticate(
+        String email, String password,
+        LoginType loginType
+    ) {
+        String username = loginType.name() + ":" + email;
         UsernamePasswordAuthenticationToken authenticationToken
             = new UsernamePasswordAuthenticationToken(username, password);
         return authenticationManagerBuilder.getObject().authenticate(authenticationToken);

src/main/java/swm/betterlife/antifragile/domain/contentreview/entity/ReviewMember.java

@@ -15,5 +15,5 @@ public class ReviewMember {
 
     private String nickname;
 
-    private String profileImgUrl;
+    private String profileImgFilename;
 }

src/main/java/swm/betterlife/antifragile/domain/member/dto/response/MemberDetailResponse.java

@@ -15,13 +15,14 @@ public record MemberDetailResponse(
         LoginType loginType //todo: 연속 작성일 수 추가
 ) {
     public static MemberDetailResponse from(
-        Member member, Integer point, Integer diaryTotalNum
+        Member member, Integer point,
+        Integer diaryTotalNum, String profileImgUrl
     ) {
         return MemberDetailResponse.builder()
             .id(member.getId())
             .email(member.getEmail())
             .nickname(member.getNickname())
-            .profileImgUrl(member.getProfileImgUrl())
+            .profileImgUrl(profileImgUrl)
             .point(point)
             .diaryTotalNum(diaryTotalNum)
             .loginType(member.getLoginType())

src/main/java/swm/betterlife/antifragile/domain/member/entity/Member.java

@@ -35,7 +35,7 @@ public class Member extends BaseTimeEntity {
 
     private String job;
 
-    private String profileImgUrl;
+    private String profileImgFilename;
 
     private List<String> emoticonThemeIds = new ArrayList<>();
 

src/main/java/swm/betterlife/antifragile/domain/member/service/MemberService.java

@@ -41,8 +41,11 @@ public class MemberService {
     public MemberDetailResponse findMemberByEmail(String id) {
         Integer point = memberPointService.getPointByMemberId(id);
         Integer diaryTotalNum = memberDiaryService.getDiaryTotalNumByMemberId(id);
-        return MemberDetailResponse
-            .from(memberRepository.getMember(id), point, diaryTotalNum);
+        Member member = memberRepository.getMember(id);
+        return MemberDetailResponse.from(
+            member, point, diaryTotalNum,
+            s3ImageComponent.getUrl(member.getProfileImgFilename())
+        );
     }
 
     public Member getMemberById(String id) {
@@ -79,21 +82,21 @@ public MemberProfileModifyResponse modifyProfile(
 
     private String modifyProfileImg(MultipartFile profileImgFile, String id) {
         Member member = memberRepository.getMember(id);
-        String originProfileImgUrl = member.getProfileImgUrl();
-        if (originProfileImgUrl != null) {
-            s3ImageComponent.deleteImage(originProfileImgUrl);
+        String originFilename = member.getProfileImgFilename();
+        if (originFilename != null) {
+            s3ImageComponent.deleteImage(originFilename);
         }
 
-        String newProfileImgUrl = s3ImageComponent.uploadImage(PROFILE, profileImgFile);
+        String newFilename = s3ImageComponent.uploadImage(PROFILE, profileImgFile);
         Query query = new Query(Criteria.where("id").is(id));
-        Update update = new Update().set("profileImgUrl", newProfileImgUrl);
+        Update update = new Update().set("profileImgFilename", newFilename);
 
         UpdateResult result = mongoTemplate.upsert(query, update, Member.class);
 
         if (result.getMatchedCount() == 0) {
             throw new MemberNotFoundException();
         }
-        return newProfileImgUrl;
+        return s3ImageComponent.getUrl(newFilename);
     }
 
     @Transactional(readOnly = true)