Merge pull request #10 from MBTips/feature/issue-2

Feat : 카카오 로그인

Author: bumooo

api/build.gradle.kts

@@ -1,4 +1,3 @@
-
 extra["springCloudVersion"] = "2024.0.0"
 
 dependencies {
@@ -9,8 +8,8 @@ dependencies {
 
     // Spring
     implementation("org.springframework.boot:spring-boot-starter-web")
-    implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-validation")
+
     // Swagger
     implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.3")
 }

api/src/main/java/com/mbtips/common/configuration/SwaggerConfiguration.java

@@ -1,8 +1,11 @@
 package com.mbtips.common.configuration;
 
+import com.mbtips.common.constant.Constant;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -16,7 +19,8 @@ public class SwaggerConfiguration {
     @Bean
     public OpenAPI openAPI() {
         return new OpenAPI()
-                .components(new Components())
+                .addSecurityItem(new SecurityRequirement().addList("Bearer Authentication"))
+                .components(new Components().addSecuritySchemes("Bearer Authentication", createAPIKeyScheme()))
                 .info(apiInfo());
     }
 
@@ -27,4 +31,10 @@ public Info apiInfo() {
                 .version(API_VERSION);
     }
 
+    private SecurityScheme createAPIKeyScheme() {
+        return new SecurityScheme().type(SecurityScheme.Type.HTTP)
+                .bearerFormat("JWT")
+                .scheme("Bearer");
+    }
+
 }

api/src/main/java/com/mbtips/common/properties/KakaoProperties.java

@@ -0,0 +1,12 @@
+package com.mbtips.common.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(value = "kakao")
+public record KakaoProperties(
+        String authorizeUrl,
+        String appKey,
+        String redirectUrl
+) {
+
+}

api/src/main/java/com/mbtips/domain/conversation/ConversationService.java

@@ -2,7 +2,7 @@
 
 import com.mbtips.conversation.ConversationRepository;
 import com.mbtips.conversation.entity.Conversation;
-import com.mbtips.user.entity.User;
+import com.mbtips.user.entity.UserEntity;
 import com.mbtips.virtualfriend.entity.VirtualFriend;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -14,10 +14,10 @@
 public class ConversationService {
 
     private final ConversationRepository conversationRepository;
-    public Conversation createConversation(VirtualFriend friend, User user) {
+    public Conversation createConversation(VirtualFriend friend, UserEntity userEntity) {
         Conversation conversation = Conversation.builder()
                 .virtualFriend(friend)
-                .user(user).build();
+                .user(userEntity).build();
         Conversation saveConversation = conversationRepository.save(conversation);
         return saveConversation;
     }

api/src/main/java/com/mbtips/domain/message/MessageService.java

@@ -2,7 +2,6 @@
 
 import com.mbtips.message.response.MessageResponse;
 import com.mbtips.message.MessageRepository;
-import com.mbtips.message.entity.Message;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

api/src/main/java/com/mbtips/domain/virtualfriend/VirtualFriendController.java

@@ -1,5 +1,7 @@
 package com.mbtips.domain.virtualfriend;
 
+import com.mbtips.common.annotation.LoginUser;
+import com.mbtips.domain.user.User;
 import com.mbtips.domain.virtualfriend.request.VirtualFriendRequest;
 import com.mbtips.domain.virtualfriend.response.VirtualFriendResponse;
 import com.mbtips.common.response.ApiResponse;
@@ -12,43 +14,42 @@
 import java.util.List;
 
 @RestController
-@RequestMapping("/api/virtualfriend")
+@RequestMapping("/api/virtual-friend")
 @Slf4j
 @RequiredArgsConstructor
 public class VirtualFriendController {
 
     private final VirtualFriendService virtualFriendService;
 
     /**
-     * todo - userId 추출하여 service전달
+     * 
      */
     @GetMapping
     @Operation(summary = "가상친구, 채팅방 리스트 조회", description = "userId기준으로 채팅방+가상친구 리스트를 조회합니다.")
-    public ApiResponse<List<VirtualFriendResponse>> getVirtualFriends(@RequestParam Long userId){
+    public ApiResponse<List<VirtualFriendResponse>> getVirtualFriends(@LoginUser User user){
         log.debug(" <<< get virtualFriend List >>>");
-        List<VirtualFriendResponse> result = virtualFriendService.getVirtualFriendsByUserId(userId);
+        List<VirtualFriendResponse> result = virtualFriendService.getVirtualFriendsByUserId(user.getUserId());
         return ApiResponse.success(result);
     }
 
     /**
-     *  todo - request validation 적용, 유저추출 적용
+     *  todo - request validation 적용
      */
     @PostMapping
     @Operation(summary = "가상친구 생성", description = "가상친구 생성을 요청하며, 채팅방이 생성됩니다.")
-    public ApiResponse<VirtualFriendResponse> createVirtualFriend(@Valid @RequestBody VirtualFriendRequest virtualFriendRequest){
-        Long userId = 1L;
-        VirtualFriendResponse result = virtualFriendService.createVirtualFriend(virtualFriendRequest, userId);
+    public ApiResponse<VirtualFriendResponse> createVirtualFriend(@Valid @RequestBody VirtualFriendRequest virtualFriendRequest,
+                                                                  @LoginUser User user){
+        VirtualFriendResponse result = virtualFriendService.createVirtualFriend(virtualFriendRequest, user.getUserId());
         return ApiResponse.success(result);
     }
 
     /**
-     * todo - 유저추출 적용
+     *
      */
     @DeleteMapping("/{friendId}")
     @Operation(summary = "가상친구 삭제", description = "가상친구가 삭제되며, 채팅방이 삭제됩니다.")
-    public ApiResponse<Void> deleteVirtualFriend(@PathVariable Long friendId){
-        Long userId = 1L;
-        virtualFriendService.deleteVirtualFriend(friendId, userId);
+    public ApiResponse<Void> deleteVirtualFriend(@PathVariable Long friendId, @LoginUser User user){
+        virtualFriendService.deleteVirtualFriend(friendId, user.getUserId());
         return ApiResponse.success();
     }
 }

api/src/main/java/com/mbtips/domain/virtualfriend/VirtualFriendService.java

@@ -3,17 +3,17 @@
 import com.mbtips.common.exception.VirtualFriendNotFoundException;
 import com.mbtips.conversation.entity.Conversation;
 import com.mbtips.domain.conversation.ConversationService;
+import com.mbtips.domain.user.User;
 import com.mbtips.domain.virtualfriend.request.VirtualFriendRequest;
 import com.mbtips.domain.virtualfriend.response.VirtualFriendResponse;
-import com.mbtips.user.entity.User;
+import com.mbtips.user.application.service.UserService;
+import com.mbtips.user.entity.UserEntity;
 import com.mbtips.virtualfriend.VirtualFriendRepository;
 import com.mbtips.virtualfriend.entity.VirtualFriend;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
@@ -22,9 +22,9 @@ public class VirtualFriendService {
 
     private final VirtualFriendRepository virtualFriendRepository;
     private final ConversationService conversationService;
+    private final UserService userService;
 
-    @Transactional
-    public List<VirtualFriendResponse> getVirtualFriendsByUserId(Long userId) {
+    public List<VirtualFriendResponse> getVirtualFriendsByUserId(String userId) {
         List<Object[]> friends = virtualFriendRepository.findvirtualFriendAndConversation(userId);
 
         List<VirtualFriendResponse> result = friends.stream()
@@ -37,32 +37,28 @@ public List<VirtualFriendResponse> getVirtualFriendsByUserId(Long userId) {
     /**
      * todo user탐색 추가
      */
-    @Transactional
-    public VirtualFriendResponse createVirtualFriend(VirtualFriendRequest req, Long userId) {
+    public VirtualFriendResponse createVirtualFriend(VirtualFriendRequest req, String userId) {
 
-        User user = new User();
-        user.setUserEmail("[email protected]");
-        user.setUserId(userId);
+        User user = userService.findById(userId);
+        UserEntity userEntity = new UserEntity(user);
 
-        VirtualFriend friend = VirtualFriendRequest.toEntity(req, user);
+        VirtualFriend friend = VirtualFriendRequest.toEntity(req, userEntity);
         VirtualFriend saveFriend = virtualFriendRepository.save(friend);
 
-        Conversation conversation = conversationService.createConversation(friend, user);
+        Conversation conversation = conversationService.createConversation(friend, userEntity);
 
         VirtualFriendResponse result = VirtualFriendResponse.from(saveFriend, conversation.getConversationId());
         return result;
     }
     /**
      * todo user탐색 추가
      */
-    @Transactional
-    public void deleteVirtualFriend(Long friendId, Long userId) {
+    public void deleteVirtualFriend(Long friendId, String userId) {
 
-        User user = new User();
-        user.setUserEmail("[email protected]");
-        user.setUserId(userId);
+        User user = userService.findById(userId);
+        UserEntity userEntity = new UserEntity(user);
 
-        VirtualFriend virtualFriend = virtualFriendRepository.findByFriendId(friendId, user)
+        VirtualFriend virtualFriend = virtualFriendRepository.findByFriendId(friendId, userEntity)
                 .orElseThrow(() -> new VirtualFriendNotFoundException("가상 친구를 찾을 수 없습니다."));
         conversationService.deleteConversation(virtualFriend);
         virtualFriendRepository.delete(virtualFriend);

api/src/main/java/com/mbtips/domain/virtualfriend/request/VirtualFriendRequest.java

@@ -1,6 +1,6 @@
 package com.mbtips.domain.virtualfriend.request;
 
-import com.mbtips.user.entity.User;
+import com.mbtips.user.entity.UserEntity;
 import com.mbtips.virtualfriend.entity.VirtualFriend;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
@@ -35,9 +35,9 @@ public record VirtualFriendRequest(
         String JorP
 
         ){
-        public static VirtualFriend toEntity(VirtualFriendRequest req, User user) {
+        public static VirtualFriend toEntity(VirtualFriendRequest req, UserEntity userEntity) {
                 return VirtualFriend.builder()
-                        .user(user)
+                        .user(userEntity)
                         .virtualFriendName(req.userName)
                         .virtualFriendAge(req.age)
                         .virtualFriendRelationship(req.relationship)

api/src/main/java/com/mbtips/user/application/dto/LoginUserRequestDto.java

@@ -0,0 +1,9 @@
+package com.mbtips.user.application.dto;
+
+import com.mbtips.domain.user.enums.Platform;
+
+public record LoginUserRequestDto(
+        Platform platform,
+        long platformId
+) {
+}

api/src/main/java/com/mbtips/user/application/manager/UserManager.java

@@ -0,0 +1,36 @@
+package com.mbtips.user.application.manager;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mbtips.common.exception.CustomException;
+import com.mbtips.common.exception.enums.CommonException;
+import com.mbtips.common.provider.JwtProvider;
+import com.mbtips.domain.user.User;
+import com.mbtips.domain.user.utils.UserUtils;
+import com.mbtips.user.application.dto.LoginUserRequestDto;
+import com.mbtips.user.application.service.UserService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+public class UserManager {
+
+    private final UserService userService;
+    private final ObjectMapper objectMapper;
+    private final JwtProvider jwtProvider;
+
+    @Transactional
+    public String login(LoginUserRequestDto requestDto) {
+        String userId = UserUtils.getUserId(requestDto.platform(), requestDto.platformId());
+        User user = userService.joinAndLogin(userId);
+        try {
+            return jwtProvider.createToken(objectMapper.writeValueAsString(user));
+        } catch (JsonProcessingException e) {
+            throw new CustomException(CommonException.JSON_PROCESS_ERROR);
+        }
+    }
+}