update: 메서드 및 클래스 이름 변경

기존 QueryAllMember나 SearchMember와 같이 통일성 없던 메서드,클래스명을 Find를 접두사로 시작하도록 하여 통일성 및 가독성을 높였습니다
Team-Ampersand · Feb 13, 2025 · 63876a5 · 63876a5
1 parent 98d174f
commit 63876a5
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 42 deletions.
diff --git a/src/main/java/com/ampersand/groom/domain/member/application/MemberApplicationAdapter.java b/src/main/java/com/ampersand/groom/domain/member/application/MemberApplicationAdapter.java
@@ -1,8 +1,8 @@
 package com.ampersand.groom.domain.member.application;
 
 import com.ampersand.groom.domain.member.application.port.MemberApplicationPort;
-import com.ampersand.groom.domain.member.application.usecase.QueryAllMemberUseCase;
-import com.ampersand.groom.domain.member.application.usecase.SearchMemberUseCase;
+import com.ampersand.groom.domain.member.application.usecase.FindAllMembersUseCase;
+import com.ampersand.groom.domain.member.application.usecase.FindMembersByCriteriaUseCase;
 import com.ampersand.groom.domain.member.domain.constant.MemberRole;
 import com.ampersand.groom.domain.member.presentation.data.response.GetCurrentMemberResponse;
 import com.ampersand.groom.domain.member.presentation.data.response.GetMemberResponse;
@@ -16,17 +16,17 @@
 @RequiredArgsConstructor
 public class MemberApplicationAdapter implements MemberApplicationPort {
 
-    private final QueryAllMemberUseCase queryAllMemberUseCase;
-    private final SearchMemberUseCase searchMemberUseCase;
+    private final FindAllMembersUseCase findAllMembersUseCase;
+    private final FindMembersByCriteriaUseCase findMembersByCriteriaUseCase;
 
     @Override
     public List<GetMemberResponse> getAllMembers() {
-        return queryAllMemberUseCase.execute();
+        return findAllMembersUseCase.execute();
     }
 
     @Override
     public List<GetMemberResponse> searchMembers(Long id, String name, Integer generation, String email, Boolean isAvailable, MemberRole role) {
-        return searchMemberUseCase.execute(id, name, generation, email, isAvailable, role);
+        return findMembersByCriteriaUseCase.execute(id, name, generation, email, isAvailable, role);
     }
 
     @Override

diff --git a/src/main/java/com/ampersand/groom/domain/member/application/port/MemberPersistencePort.java b/src/main/java/com/ampersand/groom/domain/member/application/port/MemberPersistencePort.java
@@ -6,11 +6,11 @@
 import java.util.List;
 
 public interface MemberPersistencePort {
-    List<Member> queryAllMember();
+    List<Member> findAllMembers();
 
-    List<Member> searchMember(Long id, String name, Integer generation, String email, Boolean isAvailable, MemberRole role);
+    List<Member> findMembersByCriteria(Long id, String name, Integer generation, String email, Boolean isAvailable, MemberRole role);
 
-    Member queryMember(Long id);
+    Member findMemberById(Long id);
 
     void updateMemberPassword(Long id, String newPassword);
 }
diff --git a/...cation/usecase/QueryAllMemberUseCase.java → ...cation/usecase/FindAllMembersUseCase.java b/...cation/usecase/QueryAllMemberUseCase.java → ...cation/usecase/FindAllMembersUseCase.java
@@ -10,13 +10,13 @@
 
 @UseCaseWithReadOnlyTransaction
 @RequiredArgsConstructor
-public class QueryAllMemberUseCase {
+public class FindAllMembersUseCase {
 
     private final MemberPersistencePort memberPersistencePort;
     private final MemberMapper memberMapper;
 
     public List<GetMemberResponse> execute() {
-        return memberPersistencePort.queryAllMember().stream().map(
+        return memberPersistencePort.findAllMembers().stream().map(
                 memberMapper::toResponse
         ).toList();
     }

diff --git a/...lication/usecase/SearchMemberUseCase.java → ...usecase/FindMembersByCriteriaUseCase.java b/...lication/usecase/SearchMemberUseCase.java → ...usecase/FindMembersByCriteriaUseCase.java
@@ -11,13 +11,13 @@
 
 @UseCaseWithReadOnlyTransaction
 @RequiredArgsConstructor
-public class SearchMemberUseCase {
+public class FindMembersByCriteriaUseCase {
 
     private final MemberPersistencePort memberPersistencePort;
     private final MemberMapper memberMapper;
 
     public List<GetMemberResponse> execute(Long id, String name, Integer generation, String email, Boolean isAvailable, MemberRole role) {
-        return memberPersistencePort.searchMember(id, name, generation, email, isAvailable, role).stream().map(
+        return memberPersistencePort.findMembersByCriteria(id, name, generation, email, isAvailable, role).stream().map(
                 memberMapper::toResponse
         ).toList();
     }

diff --git a/src/main/java/com/ampersand/groom/domain/member/persistence/MemberPersistenceAdapter.java b/src/main/java/com/ampersand/groom/domain/member/persistence/MemberPersistenceAdapter.java
@@ -20,21 +20,21 @@ public class MemberPersistenceAdapter implements MemberPersistencePort {
     private final MemberMapper memberMapper;
 
     @Override
-    public List<Member> queryAllMember() {
+    public List<Member> findAllMembers() {
         return memberJpaRepository.findAll().stream()
                 .map(memberMapper::toDomain)
                 .toList();
     }
 
     @Override
-    public List<Member> searchMember(Long id, String name, Integer generation, String email, Boolean isAvailable, MemberRole role) {
-        return memberJpaRepository.searchMember(id, name, generation, email, isAvailable, role).stream()
+    public List<Member> findMembersByCriteria(Long id, String name, Integer generation, String email, Boolean isAvailable, MemberRole role) {
+        return memberJpaRepository.findMembersByCriteria(id, name, generation, email, isAvailable, role).stream()
                 .map(memberMapper::toDomain)
                 .toList();
     }
 
     @Override
-    public Member queryMember(Long id) {
+    public Member findMemberById(Long id) {
         return memberJpaRepository.findById(id)
                 .map(memberMapper::toDomain)
                 .orElseThrow(MemberNotFoundException::new);

diff --git a/...m/ampersand/groom/domain/member/persistence/repository/custom/MemberRepositoryCustom.java b/...m/ampersand/groom/domain/member/persistence/repository/custom/MemberRepositoryCustom.java
@@ -6,7 +6,7 @@
 import java.util.List;
 
 public interface MemberRepositoryCustom {
-    void updatePassword(Long id, String newPassword);
+    List<MemberJpaEntity> findMembersByCriteria(Long id, String name, Integer generation, String email, Boolean isAvailable, MemberRole role);
 
-    List<MemberJpaEntity> searchMember(Long id, String name, Integer generation, String email, Boolean isAvailable, MemberRole role);
+    void updatePassword(Long id, String newPassword);
 }
diff --git a/...persand/groom/domain/member/persistence/repository/custom/MemberRepositoryCustomImpl.java b/...persand/groom/domain/member/persistence/repository/custom/MemberRepositoryCustomImpl.java
@@ -29,7 +29,7 @@ public void updatePassword(Long id, String newPassword) {
     }
 
     @Override
-    public List<MemberJpaEntity> searchMember(Long id, String name, Integer generation, String email, Boolean isAvailable, MemberRole role) {
+    public List<MemberJpaEntity> findMembersByCriteria(Long id, String name, Integer generation, String email, Boolean isAvailable, MemberRole role) {
         return queryFactory
                 .selectFrom(memberJpaEntity)
                 .where(

diff --git a/...on/usecase/QueryAllMemberUseCaseTest.java → ...on/usecase/FindAllMembersUseCaseTest.java b/...on/usecase/QueryAllMemberUseCaseTest.java → ...on/usecase/FindAllMembersUseCaseTest.java
@@ -19,7 +19,7 @@
 
 @ExtendWith(MockitoExtension.class)
 @DisplayName("Member 전체 조회 UseCase 클래스의")
-class QueryAllMemberUseCaseTest {
+class FindAllMembersUseCaseTest {
 
     @Mock
     private MemberPersistencePort memberPersistencePort;
@@ -28,7 +28,7 @@ class QueryAllMemberUseCaseTest {
     private MemberMapper memberMapper;
 
     @InjectMocks
-    private QueryAllMemberUseCase queryAllMemberUseCase;
+    private FindAllMembersUseCase findAllMembersUseCase;
 
     @DisplayName("execute 메서드는")
     @Nested
@@ -69,7 +69,7 @@ void it_returns_all_members() {
                                 .build()
                 );
 
-                when(memberPersistencePort.queryAllMember()).thenReturn(members);
+                when(memberPersistencePort.findAllMembers()).thenReturn(members);
 
                 members.forEach(member -> {
                     when(memberMapper.toResponse(member)).thenReturn(
@@ -85,10 +85,10 @@ void it_returns_all_members() {
                 });
 
                 // when
-                List<GetMemberResponse> result = queryAllMemberUseCase.execute();
+                List<GetMemberResponse> result = findAllMembersUseCase.execute();
 
                 // then
-                verify(memberPersistencePort).queryAllMember();
+                verify(memberPersistencePort).findAllMembers();
                 assertEquals(members.size(), result.size());
                 for (int i = 0; i < members.size(); i++) {
                     assertMemberEquals(members.get(i), result.get(i));
@@ -104,13 +104,13 @@ class Context_with_no_members {
             @DisplayName("빈 리스트를 반환한다.")
             void it_returns_an_empty_list() {
                 // given
-                when(memberPersistencePort.queryAllMember()).thenReturn(List.of());
+                when(memberPersistencePort.findAllMembers()).thenReturn(List.of());
 
                 // when
-                List<GetMemberResponse> result = queryAllMemberUseCase.execute();
+                List<GetMemberResponse> result = findAllMembersUseCase.execute();
 
                 // then
-                verify(memberPersistencePort).queryAllMember();
+                verify(memberPersistencePort).findAllMembers();
                 assertTrue(result.isEmpty());
             }
         }

diff --git a/...tion/usecase/SearchMemberUseCaseTest.java → ...ase/FindMembersByCriteriaUseCaseTest.java b/...tion/usecase/SearchMemberUseCaseTest.java → ...ase/FindMembersByCriteriaUseCaseTest.java
@@ -22,7 +22,7 @@
 
 @ExtendWith(MockitoExtension.class)
 @DisplayName("Member 검색 UseCase 클래스의")
-public class SearchMemberUseCaseTest {
+public class FindMembersByCriteriaUseCaseTest {
 
     @Mock
     private MemberPersistencePort memberPersistencePort;
@@ -31,7 +31,7 @@ public class SearchMemberUseCaseTest {
     private MemberMapper memberMapper;
 
     @InjectMocks
-    private SearchMemberUseCase searchMemberUseCase;
+    private FindMembersByCriteriaUseCase findMembersByCriteriaUseCase;
 
     @DisplayName("execute 메서드는")
     @Nested
@@ -63,16 +63,16 @@ void it_returns_matching_members() {
                                 .build()
                 );
 
-                when(memberPersistencePort.searchMember(id, name, generation, email, isAvailable, role))
+                when(memberPersistencePort.findMembersByCriteria(id, name, generation, email, isAvailable, role))
                         .thenReturn(members);
                 when(memberMapper.toResponse(members.getFirst()))
                         .thenReturn(new GetMemberResponse(1L, "홍길동", 1, "s00001@gsm.hs.kr", true, MemberRole.ROLE_STUDENT));
 
                 // when
-                List<GetMemberResponse> result = searchMemberUseCase.execute(id, name, generation, email, isAvailable, role);
+                List<GetMemberResponse> result = findMembersByCriteriaUseCase.execute(id, name, generation, email, isAvailable, role);
 
                 // then
-                verify(memberPersistencePort).searchMember(id, name, generation, email, isAvailable, role);
+                verify(memberPersistencePort).findMembersByCriteria(id, name, generation, email, isAvailable, role);
                 assertEquals(1, result.size());
                 assertEquals("홍길동", result.getFirst().name());
                 assertEquals("s00001@gsm.hs.kr", result.getFirst().email());
@@ -101,16 +101,16 @@ void it_returns_matching_members_with_partial_conditions() {
                                 .build()
                 );
 
-                when(memberPersistencePort.searchMember(null, name, null, null, isAvailable, null))
+                when(memberPersistencePort.findMembersByCriteria(null, name, null, null, isAvailable, null))
                         .thenReturn(members);
                 when(memberMapper.toResponse(members.getFirst()))
                         .thenReturn(new GetMemberResponse(2L, "성춘향", 2, "s00002@gsm.hs.kr", true, MemberRole.ROLE_STUDENT));
 
                 // when
-                List<GetMemberResponse> result = searchMemberUseCase.execute(null, name, null, null, isAvailable, null);
+                List<GetMemberResponse> result = findMembersByCriteriaUseCase.execute(null, name, null, null, isAvailable, null);
 
                 // then
-                verify(memberPersistencePort).searchMember(null, name, null, null, isAvailable, null);
+                verify(memberPersistencePort).findMembersByCriteria(null, name, null, null, isAvailable, null);
                 assertEquals(1, result.size());
                 assertEquals("성춘향", result.getFirst().name());
                 assertEquals("s00002@gsm.hs.kr", result.getFirst().email());
@@ -127,14 +127,14 @@ void it_returns_empty_list() {
                 // given
                 String name = "놀부";
 
-                when(memberPersistencePort.searchMember(null, name, null, null, null, null))
+                when(memberPersistencePort.findMembersByCriteria(null, name, null, null, null, null))
                         .thenReturn(List.of());
 
                 // when
-                List<GetMemberResponse> result = searchMemberUseCase.execute(null, name, null, null, null, null);
+                List<GetMemberResponse> result = findMembersByCriteriaUseCase.execute(null, name, null, null, null, null);
 
                 // then
-                verify(memberPersistencePort).searchMember(null, name, null, null, null, null);
+                verify(memberPersistencePort).findMembersByCriteria(null, name, null, null, null, null);
                 assertTrue(result.isEmpty());
             }
         }
@@ -166,18 +166,18 @@ void it_returns_all_members() {
                                 .build()
                 );
 
-                when(memberPersistencePort.searchMember(null, null, null, null, null, null))
+                when(memberPersistencePort.findMembersByCriteria(null, null, null, null, null, null))
                         .thenReturn(members);
                 when(memberMapper.toResponse(members.get(0)))
                         .thenReturn(new GetMemberResponse(1L, "홍길동", 1, "s00001@gsm.hs.kr", true, MemberRole.ROLE_STUDENT));
                 when(memberMapper.toResponse(members.get(1)))
                         .thenReturn(new GetMemberResponse(2L, "성춘향", 2, "s00002@gsm.hs.kr", false, MemberRole.ROLE_ADMIN));
 
                 // when
-                List<GetMemberResponse> result = searchMemberUseCase.execute(null, null, null, null, null, null);
+                List<GetMemberResponse> result = findMembersByCriteriaUseCase.execute(null, null, null, null, null, null);
 
                 // then
-                verify(memberPersistencePort).searchMember(null, null, null, null, null, null);
+                verify(memberPersistencePort).findMembersByCriteria(null, null, null, null, null, null);
                 assertEquals(2, result.size());
                 assertEquals("홍길동", result.get(0).name());
                 assertEquals("성춘향", result.get(1).name());