feat : 빠른친구 대화 로그 기록하도록 코드 변경

yhj0214 · yhj0214 · commit af1543e9babc · 2025-05-10T00:37:55.000+09:00
diff --git a/api/src/main/java/com/mbtips/domain/fastfriend/controller/FastFriendController.java b/api/src/main/java/com/mbtips/domain/fastfriend/controller/FastFriendController.java
@@ -4,6 +4,12 @@
 import com.mbtips.domain.fastfriend.controller.dto.request.FastFriendMessageRequest;
 import com.mbtips.domain.fastfriend.controller.dto.request.FastFriendRequest;
 import com.mbtips.domain.fastfriend.service.FastFriendService;
+import com.mbtips.domain.message.dto.request.CreateMessageRequestDto;
+import com.mbtips.domain.user.User;
+import com.mbtips.domain.virtualfriend.VirtualFriendService;
+import com.mbtips.domain.virtualfriend.request.VirtualFriendRequest;
+import com.mbtips.domain.virtualfriend.response.VirtualFriendResponse;
+import com.mbtips.message.application.manager.MessageManager;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirements;
 import jakarta.validation.Valid;
@@ -17,19 +23,26 @@
 public class FastFriendController {
 
     private final FastFriendService fastFriendService;
+    private final VirtualFriendService virtualFriendService;
+    private final MessageManager manager;
 
     @PostMapping
     @Operation(summary = "빠른대화 생성", description = "빠른 대화 생성을 요청한 후 가상친구Id를 반환받습니다.")
     public ApiResponse<Long> createFastFriendRequest(@Valid @RequestBody FastFriendRequest fastFriendRequest){
-        Long fastFriendId = fastFriendService.createFastFriend(fastFriendRequest);
+        VirtualFriendRequest request = VirtualFriendRequest.from(fastFriendRequest);
+        User user = new User("admin");
+        VirtualFriendResponse result = virtualFriendService.createVirtualFriend(request, user, "fast");
+        Long fastFriendId = result.virtualFriendId();
         return ApiResponse.success(fastFriendId);
     }
 
     @PostMapping("/message")
     @Operation(summary = "빠른대화 메시지 요청", description = "빠른 대화 친구에게 메시지를 보내고 응답을 받습니다.")
     public ApiResponse<String> fastFriendMessageRequest(@RequestBody FastFriendMessageRequest request) {
+        User user = new User("admin");
 
-        String result = fastFriendService.messageRequest(request);
+        CreateMessageRequestDto dto = virtualFriendService.createMessageRequestDto(request);
+        String result = manager.sendMessage(user, dto);
         return ApiResponse.success(result);
     }
 }
diff --git a/api/src/main/java/com/mbtips/domain/virtualfriend/VirtualFriendController.java b/api/src/main/java/com/mbtips/domain/virtualfriend/VirtualFriendController.java
@@ -42,7 +42,7 @@ public ApiResponse<VirtualFriendInfoResponse> getVirtualFriend(@LoginUser User u
     public ApiResponse<VirtualFriendResponse> createVirtualFriend(@Valid @RequestBody VirtualFriendRequest virtualFriendRequest,
                                                                   @LoginUser User user){
         log.debug("virtualFriendRequest : {}, {}", virtualFriendRequest, user);
-        VirtualFriendResponse result = virtualFriendService.createVirtualFriend(virtualFriendRequest, user);
+        VirtualFriendResponse result = virtualFriendService.createVirtualFriend(virtualFriendRequest, user, "virtual");
         return ApiResponse.success(result);
     }
 
diff --git a/api/src/main/java/com/mbtips/domain/virtualfriend/VirtualFriendService.java b/api/src/main/java/com/mbtips/domain/virtualfriend/VirtualFriendService.java
@@ -5,6 +5,8 @@
 import com.mbtips.conversation.interfaces.ConversationRepository;
 import com.mbtips.domain.conversation.service.ConversationService;
 import com.mbtips.domain.converstation.Conversation;
+import com.mbtips.domain.fastfriend.controller.dto.request.FastFriendMessageRequest;
+import com.mbtips.domain.message.dto.request.CreateMessageRequestDto;
 import com.mbtips.domain.user.User;
 import com.mbtips.domain.virtualfriend.request.VirtualFriendRequest;
 import com.mbtips.domain.virtualfriend.response.VirtualFriendInfoResponse;
@@ -47,7 +49,7 @@ public List<VirtualFriendResponse> getVirtualFriendsByUserId(User user) {
     }
 
     @Transactional
-    public VirtualFriendResponse createVirtualFriend(VirtualFriendRequest req, User user) {
+    public VirtualFriendResponse createVirtualFriend(VirtualFriendRequest req, User user, String type) {
 
         VirtualFriend virtualFriend = VirtualFriend.builder()
                 .user(user)
@@ -56,6 +58,7 @@ public VirtualFriendResponse createVirtualFriend(VirtualFriendRequest req, User
                 .age(req.age())
                 .gender(req.gender())
                 .relationship(req.relationship())
+                .friendType(type)
                 .build();
 
         VirtualFriend saveVirtualFriend = virtualFriendRepository.save(virtualFriend);
@@ -130,4 +133,9 @@ public VirtualFriendInfoResponse updateVirtualFriend(Long virtualFriendId, Virtu
         List<String> topics = interests.stream().map(Interest::getTopic).collect(Collectors.toList());
         return VirtualFriendInfoResponse.from(updateFriend, topics);
     }
+
+    public CreateMessageRequestDto createMessageRequestDto(FastFriendMessageRequest request) {
+        Conversation conversation = conversationRepository.findById(request.fastFriendId());
+        return new CreateMessageRequestDto(conversation.getConversationId(), request.content());
+    }
 }
diff --git a/api/src/main/java/com/mbtips/domain/virtualfriend/request/VirtualFriendRequest.java b/api/src/main/java/com/mbtips/domain/virtualfriend/request/VirtualFriendRequest.java
@@ -1,6 +1,7 @@
 package com.mbtips.domain.virtualfriend.request;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.mbtips.domain.fastfriend.controller.dto.request.FastFriendRequest;
 import com.mbtips.domain.virtualfriend.enums.Gender;
 import com.mbtips.user.entity.UserEntity;
 import com.mbtips.virtualfriend.entity.VirtualFriendEntity;
@@ -10,6 +11,7 @@
 import jakarta.validation.constraints.Pattern;
 
 import java.util.List;
+import java.util.Optional;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record VirtualFriendRequest(
@@ -30,6 +32,8 @@ public record VirtualFriendRequest(
 
         List<String> interests
         ){
+
+
         public static VirtualFriendEntity toEntity(VirtualFriendRequest req, UserEntity userEntity) {
                 return VirtualFriendEntity.builder()
                         .user(userEntity)
@@ -41,4 +45,15 @@ public static VirtualFriendEntity toEntity(VirtualFriendRequest req, UserEntity
                         .build();
 
         }
+
+        public static VirtualFriendRequest from(FastFriendRequest fastFriendRequest) {
+                return new VirtualFriendRequest(
+                        Optional.ofNullable(fastFriendRequest.fastFriendName()).orElse("빠른친구"),
+                        Optional.ofNullable(fastFriendRequest.fastFriendAge()).orElse(20),
+                        Optional.ofNullable(fastFriendRequest.fastFriendRelationship()).orElse(null),
+                        Optional.ofNullable(fastFriendRequest.gender()).orElse(null),
+                        Optional.ofNullable(fastFriendRequest.mbti()).orElse(null),
+                        Optional.ofNullable(fastFriendRequest.interests()).orElse(null)
+                        );
+        }
 }
diff --git a/core/src/main/java/com/mbtips/domain/virtualfriend/VirtualFriend.java b/core/src/main/java/com/mbtips/domain/virtualfriend/VirtualFriend.java
@@ -22,4 +22,6 @@ public class VirtualFriend {
     private Gender gender;
 
     private String relationship;
+
+    private String friendType;
 }
diff --git a/repository/src/main/java/com/mbtips/virtualfriend/entity/VirtualFriendEntity.java b/repository/src/main/java/com/mbtips/virtualfriend/entity/VirtualFriendEntity.java
@@ -42,6 +42,9 @@ public class VirtualFriendEntity {
     @Column(length = 20, nullable = false)
     private String virtualFriendRelationship;
 
+    @Column(length = 30, nullable = false)
+    private String friendType;
+
     public VirtualFriendEntity(VirtualFriend virtualFriend) {
         this.virtualFriendId = virtualFriend.getVirtualFriendId();
         this.user = new UserEntity(virtualFriend.getUser());
@@ -50,6 +53,7 @@ public VirtualFriendEntity(VirtualFriend virtualFriend) {
         this.virtualFriendAge = virtualFriend.getAge();
         this.virtualFriendSex = virtualFriend.getGender();
         this.virtualFriendRelationship = virtualFriend.getRelationship();
+        this.friendType = virtualFriend.getFriendType();
     }
 
     public VirtualFriend toDomain() {
@@ -61,6 +65,7 @@ public VirtualFriend toDomain() {
                 .age(virtualFriendAge)
                 .gender(virtualFriendSex)
                 .relationship(virtualFriendRelationship)
+                .friendType(friendType)
                 .build();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public ApiResponse<VirtualFriendInfoResponse> getVirtualFriend(@LoginUser User u`
`42`	`42`	`public ApiResponse<VirtualFriendResponse> createVirtualFriend(@Valid @RequestBody VirtualFriendRequest virtualFriendRequest,`
`43`	`43`	`@LoginUser User user){`
`44`	`44`	`log.debug("virtualFriendRequest : {}, {}", virtualFriendRequest, user);`
`45`		`- VirtualFriendResponse result = virtualFriendService.createVirtualFriend(virtualFriendRequest, user);`
	`45`	`+ VirtualFriendResponse result = virtualFriendService.createVirtualFriend(virtualFriendRequest, user, "virtual");`
`46`	`46`	`return ApiResponse.success(result);`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,6 @@ public class VirtualFriend {`
`22`	`22`	`private Gender gender;`
`23`	`23`
`24`	`24`	`private String relationship;`
	`25`	`+`
	`26`	`+ private String friendType;`
`25`	`27`	`}`