feat : Add Social User Signup API(#61)

src/docs/asciidoc/user-api.adoc

@@ -94,4 +94,28 @@ include::{snippetsDir}/generalUserSignUp/1/response-fields.adoc[]
 실패1.
 include::{snippetsDir}/generalUserSignUp/2/http-response.adoc[]
 실패 2
-include::{snippetsDir}/generalUserSignUp/3/http-response.adoc[]
+include::{snippetsDir}/generalUserSignUp/3/http-response.adoc[]
+
+
+=== **6. 소셜 회원가입 api**
+
+소셜 회원가입 api입니다.
+
+==== Request
+**소셜 로그인 후 발급된 session id를  cookie에 전달**
+include::{snippetsDir}/socialUserSignUp/1/http-request.adoc[]
+
+==== Request Body Fields
+include::{snippetsDir}/socialUserSignUp/1/request-fields.adoc[]
+
+==== 성공 Response
+include::{snippetsDir}/socialUserSignUp/1/http-response.adoc[]
+
+==== Response Body Fields
+include::{snippetsDir}/socialUserSignUp/1/response-fields.adoc[]
+
+==== 실패 Response
+실패1.
+include::{snippetsDir}/socialUserSignUp/2/http-response.adoc[]
+실패 2
+include::{snippetsDir}/socialUserSignUp/3/http-response.adoc[]

src/main/java/com/ftm/server/application/dto/command/GeneralUserCreationCommand.java

@@ -2,6 +2,7 @@
 
 import com.ftm.server.domain.enums.AgeGroup;
 import com.ftm.server.domain.enums.HashTag;
+import java.util.List;
 import lombok.Data;
 
 @Data
@@ -10,10 +11,14 @@ public class GeneralUserCreationCommand {
     private final String password;
     private final String nickName;
     private final AgeGroup ageGroup;
-    private final HashTag[] hashTags;
+    private final List<HashTag> hashtags;
 
     public static GeneralUserCreationCommand of(
-            String email, String password, String nickName, AgeGroup ageGroup, HashTag[] hashTag) {
-        return new GeneralUserCreationCommand(email, password, nickName, ageGroup, hashTag);
+            String email,
+            String password,
+            String nickName,
+            AgeGroup ageGroup,
+            List<HashTag> hashtag) {
+        return new GeneralUserCreationCommand(email, password, nickName, ageGroup, hashtag);
     }
 }

src/main/java/com/ftm/server/application/dto/command/SocialUserCreationCommand.java

@@ -0,0 +1,25 @@
+package com.ftm.server.application.dto.command;
+
+import com.ftm.server.domain.enums.AgeGroup;
+import com.ftm.server.domain.enums.HashTag;
+import com.ftm.server.domain.enums.SocialProvider;
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class SocialUserCreationCommand {
+    private final SocialProvider provider;
+    private final String socialId;
+    private final String nickname;
+    private final AgeGroup age;
+    private final List<HashTag> hashtags;
+
+    public static SocialUserCreationCommand of(
+            SocialProvider provider,
+            String socialId,
+            String nickname,
+            AgeGroup age,
+            List<HashTag> hashTags) {
+        return new SocialUserCreationCommand(provider, socialId, nickname, age, hashTags);
+    }
+}

src/main/java/com/ftm/server/application/dto/command/SocialUserSignupCommand.java

@@ -0,0 +1,23 @@
+package com.ftm.server.application.dto.command;
+
+import com.ftm.server.domain.enums.AgeGroup;
+import com.ftm.server.domain.enums.HashTag;
+import com.ftm.server.domain.enums.SocialProvider;
+import com.ftm.server.domain.vo.PendingSocialUserVo;
+import com.ftm.server.web.dto.request.SocialUserSignupRequest;
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class SocialUserSignupCommand {
+    private final SocialProvider socialProvider;
+    private final String socialId;
+    private final AgeGroup age;
+    private final List<HashTag> hashtags;
+
+    public static SocialUserSignupCommand from(
+            SocialUserSignupRequest request, PendingSocialUserVo vo) {
+        return new SocialUserSignupCommand(
+                vo.getSocialProvider(), vo.getSocialId(), request.getAge(), request.getHashtags());
+    }
+}

src/main/java/com/ftm/server/application/dto/query/FindBySocialValueQuery.java

@@ -0,0 +1,15 @@
+package com.ftm.server.application.dto.query;
+
+import com.ftm.server.domain.enums.SocialProvider;
+import lombok.Data;
+
+@Data
+public class FindBySocialValueQuery {
+
+    private final SocialProvider socialProvider;
+    private final String socialId;
+
+    public static FindBySocialValueQuery of(SocialProvider socialProvider, String socialId) {
+        return new FindBySocialValueQuery(socialProvider, socialId);
+    }
+}

src/main/java/com/ftm/server/application/port/repository/UserRepository.java

@@ -12,4 +12,6 @@ public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByEmail(String email);
 
     Optional<User> findBySocialProviderAndSocialId(SocialProvider socialProvider, String socialId);
+
+    Boolean existsBySocialIdAndSocialProvider(String socialId, SocialProvider socialProvider);
 }

src/main/java/com/ftm/server/application/service/UserImageService.java

@@ -21,8 +21,9 @@ public UserImage queryUserImageByUserId(FindByUserIdQuery query) {
                 .orElseThrow(() -> new CustomException(ErrorResponseCode.USER_IMAGE_NOT_FOUND));
     }
 
-    public void saveUserDefaultImage(User user) {
+    public UserImage saveUserDefaultImage(User user) {
         UserImage userImage = UserImage.createUserImage(user);
         userImageRepository.save(userImage);
+        return userImage;
     }
 }

src/main/java/com/ftm/server/application/service/UserService.java

@@ -1,8 +1,10 @@
 package com.ftm.server.application.service;
 
 import com.ftm.server.application.dto.command.GeneralUserCreationCommand;
+import com.ftm.server.application.dto.command.SocialUserCreationCommand;
 import com.ftm.server.application.dto.query.FindByEmailQuery;
 import com.ftm.server.application.dto.query.FindByIdQuery;
+import com.ftm.server.application.dto.query.FindBySocialValueQuery;
 import com.ftm.server.application.dto.query.FindSocialUserQuery;
 import com.ftm.server.application.port.repository.UserRepository;
 import com.ftm.server.common.exception.CustomException;
@@ -41,6 +43,17 @@ public User createGeneralUser(GeneralUserCreationCommand command) {
         return user;
     }
 
+    public User createSocialUser(SocialUserCreationCommand command) {
+        User user = User.createSocailUser(command);
+        userRepository.save(user);
+        return user;
+    }
+
+    public Boolean userCheckBySocialValue(FindBySocialValueQuery query) {
+        return userRepository.existsBySocialIdAndSocialProvider(
+                query.getSocialId(), query.getSocialProvider());
+    }
+
     public Boolean userCheckByEmail(FindByEmailQuery query) {
         return userRepository.existsByEmail(query.getEmail());
     }

src/main/java/com/ftm/server/application/usecase/user/EmailAuthenticationUseCase.java

@@ -14,9 +14,11 @@
 import java.time.LocalDateTime;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 @UseCase
 @RequiredArgsConstructor
+@Slf4j
 public class EmailAuthenticationUseCase {
 
     private final MailSenderPort mailSenderPort;

src/main/java/com/ftm/server/application/usecase/user/GeneralUserSignupUseCase.java

@@ -14,7 +14,6 @@
 import com.ftm.server.common.utils.RandomNickNameCreator;
 import com.ftm.server.domain.entity.EmailVerificationLogs;
 import com.ftm.server.domain.entity.User;
-import com.ftm.server.domain.enums.HashTag;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 
@@ -45,15 +44,14 @@ public void execute(GeneralUserSignupCommand command) {
         }
 
         String nickname = RandomNickNameCreator.generateNickname(); // random 닉네임 생성
-        int size = command.getHashtags().size();
 
         GeneralUserCreationCommand convertedCommand =
                 GeneralUserCreationCommand.of(
                         command.getEmail(),
                         authenticationPort.passwordEncode(command.getPassword()),
                         nickname,
                         command.getAge(),
-                        command.getHashtags().toArray(new HashTag[size]));
+                        command.getHashtags());
 
         User user = userService.createGeneralUser(convertedCommand);
         userImageService.saveUserDefaultImage(user);

src/main/java/com/ftm/server/application/usecase/user/SocialUserSignupUseCase.java

@@ -0,0 +1,48 @@
+package com.ftm.server.application.usecase.user;
+
+import com.ftm.server.application.dto.command.SocialUserCreationCommand;
+import com.ftm.server.application.dto.command.SocialUserSignupCommand;
+import com.ftm.server.application.dto.query.FindBySocialValueQuery;
+import com.ftm.server.application.service.UserImageService;
+import com.ftm.server.application.service.UserService;
+import com.ftm.server.common.annotation.UseCase;
+import com.ftm.server.common.exception.CustomException;
+import com.ftm.server.common.response.enums.ErrorResponseCode;
+import com.ftm.server.common.utils.RandomNickNameCreator;
+import com.ftm.server.domain.entity.User;
+import com.ftm.server.domain.entity.UserImage;
+import com.ftm.server.domain.vo.SocialUserSignupSummaryVo;
+import lombok.RequiredArgsConstructor;
+
+@UseCase
+@RequiredArgsConstructor
+public class SocialUserSignupUseCase {
+
+    private final UserService userService;
+    private final UserImageService userImageService;
+
+    public SocialUserSignupSummaryVo execute(SocialUserSignupCommand command) {
+
+        // 이미 가입된 회원인지 한번 더 확인
+        if (userService.userCheckBySocialValue(
+                FindBySocialValueQuery.of(command.getSocialProvider(), command.getSocialId()))) {
+            throw new CustomException(ErrorResponseCode.USER_ALREADY_EXISTS);
+        }
+
+        String nickname = RandomNickNameCreator.generateNickname();
+
+        SocialUserCreationCommand command1 =
+                SocialUserCreationCommand.of(
+                        command.getSocialProvider(),
+                        command.getSocialId(),
+                        nickname,
+                        command.getAge(),
+                        command.getHashtags());
+
+        User user = userService.createSocialUser(command1);
+
+        UserImage userImage = userImageService.saveUserDefaultImage(user);
+
+        return SocialUserSignupSummaryVo.of(user, userImage.getObjectKey());
+    }
+}

src/main/java/com/ftm/server/common/consts/PropertiesHolder.java

@@ -0,0 +1,19 @@
+package com.ftm.server.common.consts;
+
+import jakarta.annotation.PostConstruct;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class PropertiesHolder {
+
+    @Value("${cdn.path.root}")
+    private String cdnPathValue;
+
+    public static String CDN_PATH;
+
+    @PostConstruct
+    public void init() {
+        CDN_PATH = cdnPathValue;
+    }
+}

src/main/java/com/ftm/server/common/response/enums/ErrorResponseCode.java

@@ -9,6 +9,8 @@ public enum ErrorResponseCode {
     // 400번
     INVALID_REQUEST_ARGUMENT(
             HttpStatus.BAD_REQUEST, "E400_001", "클라이언트 요청값의 일부가 잘못된 형식이거나, 필수 데이터가 누락되었습니다."),
+    INVALID_SEESION_FOR_SOCIAL_USER_SIGNUP(
+            HttpStatus.BAD_REQUEST, "E400_002", "소셜 회원가입을 위한 session 값이 잘못됨"),
 
     // 401번
     NOT_AUTHENTICATED(HttpStatus.UNAUTHORIZED, "E401_001", "인증되지 않은 사용자입니다."),

src/main/java/com/ftm/server/domain/entity/User.java

@@ -1,6 +1,7 @@
 package com.ftm.server.domain.entity;
 
 import com.ftm.server.application.dto.command.GeneralUserCreationCommand;
+import com.ftm.server.application.dto.command.SocialUserCreationCommand;
 import com.ftm.server.domain.enums.AgeGroup;
 import com.ftm.server.domain.enums.HashTag;
 import com.ftm.server.domain.enums.SocialProvider;
@@ -107,12 +108,38 @@ private User(
     }
 
     public static User createGeneralUser(GeneralUserCreationCommand command) {
+
+        HashTag[] hashTags = null;
+
+        if (command.getHashtags() != null && command.getHashtags().isEmpty()) {
+            hashTags = command.getHashtags().toArray(new HashTag[0]);
+        }
         return User.builder()
                 .email(command.getEmail())
                 .password(command.getPassword())
                 .nickname(command.getNickName())
                 .ageGroup(command.getAgeGroup())
-                .favoriteHashtags(command.getHashTags())
+                .favoriteHashtags(hashTags)
+                .groomingScore(0)
+                .isDeleted(false)
+                .role(UserRole.USER)
+                .build();
+    }
+
+    public static User createSocailUser(SocialUserCreationCommand command) {
+
+        HashTag[] hashTags = null;
+
+        if (command.getHashtags() != null && command.getHashtags().isEmpty()) {
+            hashTags = command.getHashtags().toArray(new HashTag[0]);
+        }
+
+        return User.builder()
+                .socialProvider(command.getProvider())
+                .socialId(command.getSocialId())
+                .nickname(command.getNickname())
+                .ageGroup(command.getAge())
+                .favoriteHashtags(hashTags)
                 .groomingScore(0)
                 .isDeleted(false)
                 .role(UserRole.USER)

src/main/java/com/ftm/server/domain/vo/SocialUserSignupSummaryVo.java

@@ -0,0 +1,34 @@
+package com.ftm.server.domain.vo;
+
+import com.ftm.server.common.consts.PropertiesHolder;
+import com.ftm.server.domain.entity.User;
+import com.ftm.server.domain.enums.SocialProvider;
+import lombok.Data;
+
+@Data
+public class SocialUserSignupSummaryVo {
+    private final User user;
+    private final Long id;
+    private final String nickname;
+    private final SocialProvider socialProvider;
+    private final String profileImageUrl;
+    private final String mildLevelName;
+    private final String spicyLevelName;
+
+    public static SocialUserSignupSummaryVo of(User user, String userImage) {
+        String mildLevelName = null;
+        String spicyLevelName = null;
+        if (user.getGroomingLevel() != null) {
+            mildLevelName = user.getGroomingLevel().getMildLevelName();
+            spicyLevelName = user.getGroomingLevel().getMildLevelName();
+        }
+        return new SocialUserSignupSummaryVo(
+                user,
+                user.getId(),
+                user.getNickname(),
+                user.getSocialProvider(),
+                PropertiesHolder.CDN_PATH + "/" + userImage,
+                mildLevelName,
+                spicyLevelName);
+    }
+}

src/main/java/com/ftm/server/domain/vo/UserSummaryVo.java

@@ -1,5 +1,6 @@
 package com.ftm.server.domain.vo;
 
+import com.ftm.server.common.consts.PropertiesHolder;
 import com.ftm.server.domain.entity.GroomingLevel;
 import com.ftm.server.domain.entity.User;
 import com.ftm.server.domain.entity.UserImage;
@@ -17,7 +18,11 @@ public class UserSummaryVo {
     private UserSummaryVo(User user, UserImage userImage, GroomingLevel groomingLevel) {
         this.id = user.getId();
         this.nickname = user.getNickname();
-        this.profileImageUrl = userImage.getObjectKey(); // TODO: 추후 CDN 주소 + getObjectKey() 로 변경해야함
+        this.profileImageUrl =
+                PropertiesHolder.CDN_PATH
+                        + "/"
+                        + userImage
+                                .getObjectKey(); // TODO: 추후 CDN 주소 + getObjectKey() 로 변경해야함 -> 변경완료
         this.mildLevelName = groomingLevel != null ? groomingLevel.getMildLevelName() : null;
         this.spicyLevelName = groomingLevel != null ? groomingLevel.getSpicyLevelName() : null;
     }

src/main/java/com/ftm/server/infrastructure/security/SecurityConfig.java

@@ -55,7 +55,8 @@ public class SecurityConfig {
         "/api/users/email/authentication",
         "/api/users/email/authentication/code",
         "/api/auth/login/**",
-        "/api/users"
+        "/api/users",
+        "/api/users/social"
     };
 
     private static final String[] ANONYMOUS_MATCHERS = {"/docs/**"};