Merge branch 'feat/issue-13' into develop

Author: yhj0214

api/src/main/java/com/mbtips/domain/fastfriend/controller/dto/request/FastFriendRequest.java

@@ -1,12 +1,15 @@
 package com.mbtips.domain.fastfriend.controller.dto.request;
 
 import com.mbtips.fastfriend.entity.FastFriend;
+import jakarta.validation.constraints.Pattern;
 
 public record FastFriendRequest(
-        String EorI,
-        String NorS,
-        String TorF,
-        String JorP,
+
+        @Pattern(
+                regexp = "^(INTJ|INTP|ENTJ|ENTP|INFJ|INFP|ENFJ|ENFP|ISTJ|ISFJ|ESTJ|ESFJ|ISTP|ISFP|ESTP|ESFP)$",
+                message = "유효하지 않은 mbti입니다. 16가지중 하나를 입력해주세요."
+        )
+        String mbti,
         String fastFriendName,
         int fastFriendAge,
         String fastFriendSex,
@@ -15,10 +18,7 @@ public record FastFriendRequest(
 
     public FastFriend toEntity(FastFriendRequest request) {
         return FastFriend.builder()
-                .EorI(request.EorI)
-                .NorS(request.NorS)
-                .TorF(request.TorF)
-                .JorP(request.JorP)
+                .mbti(request.mbti)
                 .fastFriendName(request.fastFriendName)
                 .fastFriendAge(request.fastFriendAge)
                 .fastFriendSex(request.fastFriendSex)

api/src/main/java/com/mbtips/domain/fastfriend/controller/dto/response/FastFriendResponse.java

@@ -4,10 +4,7 @@
 
 public record FastFriendResponse (
         Long fastFriendId,
-        String EorI,
-        String NorS,
-        String TorF,
-        String JorP,
+        String mbti,
         String fastFriendName,
         int fastFriendAge,
         String fastFriendSex,
@@ -17,10 +14,7 @@ public record FastFriendResponse (
     public static FastFriendResponse from(FastFriend saveFriend) {
         return new FastFriendResponse(
                 saveFriend.getFastFriendId(),
-                saveFriend.getEorI(),
-                saveFriend.getNorS(),
-                saveFriend.getTorF(),
-                saveFriend.getJorP(),
+                saveFriend.getMbti(),
                 saveFriend.getFastFriendName(),
                 saveFriend.getFastFriendAge(),
                 saveFriend.getFastFriendSex(),

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

@@ -39,13 +39,11 @@ public ApiResponse<List<VirtualFriendResponse>> getVirtualFriends(@LoginUser Use
     @Operation(summary = "가상친구 생성", description = "가상친구 생성을 요청하며, 채팅방이 생성됩니다.")
     public ApiResponse<VirtualFriendResponse> createVirtualFriend(@Valid @RequestBody VirtualFriendRequest virtualFriendRequest,
                                                                   @LoginUser User user){
+        log.debug("virtualFriendReuqest : {}", virtualFriendRequest);
         VirtualFriendResponse result = virtualFriendService.createVirtualFriend(virtualFriendRequest, user.getUserId());
         return ApiResponse.success(result);
     }
 
-    /**
-     *
-     */
     @DeleteMapping("/{friendId}")
     @Operation(summary = "가상친구 삭제", description = "가상친구가 삭제되며, 채팅방이 삭제됩니다.")
     public ApiResponse<Void> deleteVirtualFriend(@PathVariable Long friendId, @LoginUser User user){

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

@@ -8,11 +8,15 @@
 import com.mbtips.domain.virtualfriend.response.VirtualFriendResponse;
 import com.mbtips.user.application.service.UserService;
 import com.mbtips.user.entity.UserEntity;
+import com.mbtips.virtualfriend.InterestRepository;
 import com.mbtips.virtualfriend.VirtualFriendRepository;
+import com.mbtips.virtualfriend.entity.Interest;
+import com.mbtips.virtualfriend.entity.InterestId;
 import com.mbtips.virtualfriend.entity.VirtualFriend;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -23,6 +27,7 @@ public class VirtualFriendService {
     private final VirtualFriendRepository virtualFriendRepository;
     private final ConversationService conversationService;
     private final UserService userService;
+    private final InterestRepository interestRepository;
 
     public List<VirtualFriendResponse> getVirtualFriendsByUserId(String userId) {
         List<Object[]> friends = virtualFriendRepository.findvirtualFriendAndConversation(userId);
@@ -45,6 +50,15 @@ public VirtualFriendResponse createVirtualFriend(VirtualFriendRequest req, Strin
         VirtualFriend friend = VirtualFriendRequest.toEntity(req, userEntity);
         VirtualFriend saveFriend = virtualFriendRepository.save(friend);
 
+        List<Interest> interests = new ArrayList<>();
+        for(String topic : req.interests()){
+            interests.add(Interest.builder()
+                    .virtualFriend(saveFriend)
+                    .interestId(new InterestId(saveFriend.getVirtualFriendId(), topic))
+                    .build());
+        }
+        interestRepository.saveAll(interests);
+
         Conversation conversation = conversationService.createConversation(friend, userEntity);
 
         VirtualFriendResponse result = VirtualFriendResponse.from(saveFriend, conversation.getConversationId());

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

@@ -1,16 +1,19 @@
 package com.mbtips.domain.virtualfriend.request;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.mbtips.user.entity.UserEntity;
 import com.mbtips.virtualfriend.entity.VirtualFriend;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Pattern;
 
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public record VirtualFriendRequest(
-        Long userId,
 
-        String userName,
+        String friendName,
 
         @Min(value = 1, message = "나이는 1 이상이어야 합니다.")
         @Max(value = 100, message = "나이는 100 이하이어야 합니다.")
@@ -22,30 +25,22 @@ public record VirtualFriendRequest(
         @Pattern(regexp = "M|F", message = "성별은 M 또는 F만 가능합니다.")
         String sex,
 
-        @Pattern(regexp = "E|I", message = "E 또는 I중 하나이어야 합니다.")
-        String EorI,
-
-        @Pattern(regexp = "N|S", message = "N 또는 S중 하나이어야 합니다.")
-        String NorS,
-
-        @Pattern(regexp = "T|F", message = "T 또는 F중 하나이어야 합니다.")
-        String TorF,
-
-        @Pattern(regexp = "J|P", message = "J 또는 P중 하나이어야 합니다.")
-        String JorP
+        @Pattern(
+                regexp = "^(INTJ|INTP|ENTJ|ENTP|INFJ|INFP|ENFJ|ENFP|ISTJ|ISFJ|ESTJ|ESFJ|ISTP|ISFP|ESTP|ESFP)$",
+                message = "유효하지 않은 mbti입니다. 16가지중 하나를 입력해주세요."
+        )
+        String mbti,
 
+        List<String> interests
         ){
         public static VirtualFriend toEntity(VirtualFriendRequest req, UserEntity userEntity) {
                 return VirtualFriend.builder()
                         .user(userEntity)
-                        .virtualFriendName(req.userName)
+                        .virtualFriendName(req.friendName)
                         .virtualFriendAge(req.age)
                         .virtualFriendRelationship(req.relationship)
                         .virtualFriendSex(req.sex)
-                        .EorI(req.EorI)
-                        .JorP(req.JorP)
-                        .NorS(req.NorS)
-                        .TorF(req.TorF)
+                        .mbti(req.mbti)
                         .build();
 
         }

api/src/main/java/com/mbtips/domain/virtualfriend/response/VirtualFriendResponse.java

@@ -5,10 +5,7 @@
 public record VirtualFriendResponse (
         Long virtualFriendId,
         Long conversationId,
-        String EorI,
-        String NorS,
-        String TorF,
-        String JorP,
+        String mbti,
         String virtualFriendName,
         int virtualFriendAge,
         String virtualFriendSex,
@@ -21,14 +18,12 @@ public static VirtualFriendResponse from(VirtualFriend friend ,Long conversation
         return new VirtualFriendResponse(
                 friend.getVirtualFriendId(),
                 conversationId,
-                friend.getEorI(),
-                friend.getNorS(),
-                friend.getTorF(),
-                friend.getJorP(),
+                friend.getMbti(),
                 friend.getVirtualFriendName(),
                 friend.getVirtualFriendAge(),
                 friend.getVirtualFriendSex(),
                 friend.getVirtualFriendRelationship()
         );
     }
+
 }

external/src/main/java/com/mbtips/kakao/dto/GetKakaoUserInfoResponseDto.java

@@ -1,6 +1,7 @@
 package com.mbtips.kakao.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.ToString;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record GetKakaoUserInfoResponseDto(

repository/src/main/java/com/mbtips/fastfriend/entity/FastFriend.java

@@ -15,17 +15,8 @@ public class FastFriend {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long fastFriendId;
 
-    @Column(nullable = false)
-    private String EorI;
-
-    @Column(nullable = false)
-    private String NorS;
-
-    @Column(nullable = false)
-    private String TorF;
-
-    @Column(nullable = false)
-    private String JorP;
+    @Column
+    private String mbti;
 
     @Column(length = 20)
     private String fastFriendName;

repository/src/main/java/com/mbtips/virtualfriend/InterestRepository.java

@@ -0,0 +1,8 @@
+package com.mbtips.virtualfriend;
+
+import com.mbtips.virtualfriend.entity.Interest;
+import com.mbtips.virtualfriend.entity.InterestId;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InterestRepository extends JpaRepository<Interest, InterestId> {
+}

repository/src/main/java/com/mbtips/virtualfriend/VirtualFriendRepository.java

@@ -22,5 +22,5 @@ public interface VirtualFriendRepository extends JpaRepository<VirtualFriend, Lo
 
 
     @Query("select v from VirtualFriend v where v.virtualFriendId = :friendId and v.user = :user")
-    Optional<VirtualFriend> findByFriendId(Long friendId, UserEntity userEntity);
+    Optional<VirtualFriend> findByFriendId(Long friendId, UserEntity user);
 }