Merge pull request #328 from Team-Sopetit/refactor/#320-erd-architect…

…ure-conversation [REFACTOR] conversation api
Team-Sopetit · Aug 20, 2024 · 7cea0fd · 7cea0fd
2 parents 1dd4813 + 8685b71
commit 7cea0fd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 36 deletions.
diff --git a/src/main/java/com/soptie/server/domain/conversation/Conversation.java b/src/main/java/com/soptie/server/domain/conversation/Conversation.java
@@ -2,8 +2,10 @@
 
 import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
+import lombok.Getter;
 
 @Builder
+@Getter
 public class Conversation {
 	private Long id;
 	@NotNull

diff --git a/src/main/java/com/soptie/server/domain/member/MemberService.java b/src/main/java/com/soptie/server/domain/member/MemberService.java
@@ -5,11 +5,13 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.soptie.server.domain.conversation.Conversation;
 import com.soptie.server.domain.doll.DollType;
-import com.soptie.server.persistence.adapter.ConversationFinder;
+import com.soptie.server.persistence.adapter.ConversationAdapter;
 import com.soptie.server.persistence.adapter.DollFinder;
 import com.soptie.server.persistence.adapter.MemberAdapter;
 import com.soptie.server.persistence.adapter.MemberDollSaver;
+import com.soptie.server.persistence.adapter.MemberRoutineAdapter;
 import com.soptie.server.persistence.adapter.RoutineAdapter;
 
 import lombok.RequiredArgsConstructor;
@@ -20,12 +22,11 @@
 @Transactional(readOnly = true)
 public class MemberService {
 	private final MemberAdapter memberAdapter;
-
-	private final ConversationFinder conversationFinder;
+	private final ConversationAdapter conversationAdapter;
 	private final DollFinder dollFinder;
 	private final RoutineAdapter routineAdapter;
 	private final MemberDollSaver memberDollSaver;
-	private final MemberRoutineSaver memberRoutineSaver;
+	private final MemberRoutineAdapter memberRoutineAdapter;
 
 	@Transactional
 	public void createMemberProfile(MemberProfileCreateServiceRequest request) {
@@ -48,14 +49,14 @@ public MemberHomeInfoGetServiceResponse getMemberHomeInfo(MemberHomeInfoGetServi
 		val member = memberAdapter.findById(request.memberId());
 		//TODO: check on MemberDoll
 		member.checkMemberDollExist();
-		val conversations = getConversations();
+		val conversations = conversationAdapter.findAll().stream().map(Conversation::getContent).toList();
 		return MemberHomeInfoGetServiceResponse.of(member, conversations);
 	}
 
 	private void createDailyRoutines(Member member, List<Long> routineIds) {
 		routineIds.forEach(id -> {
 			val routine = routineAdapter.findById(id);
-			memberRoutineSaver.checkHasDeletedAndSave(member, routine);
+			memberRoutineAdapter.checkHasDeletedAndSave(member, routine);
 		});
 	}
 
@@ -64,8 +65,4 @@ private void createMemberDoll(Member member, DollType dollType, String name) {
 		val memberDoll = new MemberDoll(member, doll, name);
 		memberDollSaver.save(memberDoll);
 	}
-
-	private List<String> getConversations() {
-		return conversationFinder.findAll().stream().map(Conversation::getContent).toList();
-	}
 }
diff --git a/...rsistence/adapter/ConversationFinder.java → ...sistence/adapter/ConversationAdapter.java b/...rsistence/adapter/ConversationFinder.java → ...sistence/adapter/ConversationAdapter.java
@@ -11,7 +11,7 @@
 
 @RepositoryAdapter
 @RequiredArgsConstructor
-public class ConversationFinder {
+public class ConversationAdapter {
 	private final ConversationRepository conversationRepository;
 
 	public List<Conversation> findAll() {

diff --git a/src/test/java/com/soptie/server/domain/member/MemberServiceTest.java b/src/test/java/com/soptie/server/domain/member/MemberServiceTest.java
@@ -1,37 +1,14 @@
 package com.soptie.server.domain.member;
 
-import static com.soptie.server.common.message.MemberErrorCode.*;
-import static com.soptie.server.domain.doll.DollType.*;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import java.util.List;
-
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
-import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import com.soptie.server.domain.doll.DollType;
-import com.soptie.server.persistence.adapter.ConversationFinder;
-import com.soptie.server.support.fixture.ConversationFixture;
-import com.soptie.server.support.fixture.DollFixture;
-import com.soptie.server.support.fixture.MemberDollFixture;
-import com.soptie.server.support.fixture.MemberFixture;
-
 @ExtendWith(MockitoExtension.class)
 class MemberServiceTest {
 
 	@InjectMocks
 	private MemberService memberService;
-
-	@Mock
-	private MemberFinder memberFinder;
-
-	@Mock
-	private ConversationFinder conversationFinder;
 /*
     @Test
     @DisplayName("멤버 프로필 생성 시, 멤버 데일리 루틴 생성과 멤버 인형 생성 메소드를 호출한다.")
@@ -52,7 +29,7 @@ class MemberServiceTest {
         // then
         verify(memberService).createDailyRoutines(member, routines);
         verify(memberService).createMemberDoll(member, dollType, name);
-    }*/
+    }
 
 	@Test
 	@DisplayName("솜뭉치 개수가 양수일 때 솜뭉치를 줄 수 있다.")
@@ -147,7 +124,8 @@ private List<Conversation> conversations(List<Long> conversationIds) {
 				.content("conversation" + conversationId)
 				.build()
 			).toList();
-		doReturn(conversations).when(conversationFinder).findAll();
+		doReturn(conversations).when(conversationAdapter).findAll();
 		return conversations;
 	}
+	*/
 }