refactor: QueryDSL Repository를 CommandRepository와 QueryRepository로 분리(#110)

src/main/java/com/ject/studytrip/member/application/service/MemberCommandService.java

@@ -8,7 +8,7 @@
 import com.ject.studytrip.member.domain.model.MemberCategory;
 import com.ject.studytrip.member.domain.model.SocialProvider;
 import com.ject.studytrip.member.domain.policy.MemberPolicy;
-import com.ject.studytrip.member.domain.repository.MemberQueryRepository;
+import com.ject.studytrip.member.domain.repository.MemberCommandRepository;
 import com.ject.studytrip.member.domain.repository.MemberRepository;
 import com.ject.studytrip.member.presentation.dto.request.UpdateMemberRequest;
 import lombok.RequiredArgsConstructor;
@@ -18,7 +18,7 @@
 @RequiredArgsConstructor
 public class MemberCommandService {
     private final MemberRepository memberRepository;
-    private final MemberQueryRepository memberQueryRepository;
+    private final MemberCommandRepository memberCommandRepository;
 
     public Member createMemberFromKakao(CreateMemberCommand command) {
         validateMemberIsUnique(SocialProvider.KAKAO, command.socialId());
@@ -52,7 +52,7 @@ public void deleteMember(Member member) {
     }
 
     public long hardDeleteMembers() {
-        return memberQueryRepository.deleteAllByDeletedAtIsNotNull();
+        return memberCommandRepository.deleteAllByDeletedAtIsNotNull();
     }
 
     public void hardDeleteMemberById(Long memberId) {

src/main/java/com/ject/studytrip/member/domain/repository/MemberCommandRepository.java

@@ -0,0 +1,5 @@
+package com.ject.studytrip.member.domain.repository;
+
+public interface MemberCommandRepository {
+    long deleteAllByDeletedAtIsNotNull();
+}

src/main/java/com/ject/studytrip/member/domain/repository/MemberQueryRepository.java

@@ -5,6 +5,4 @@
 
 public interface MemberQueryRepository {
     Optional<MemberRole> findMemberRoleById(Long memberId);
-
-    long deleteAllByDeletedAtIsNotNull();
 }

src/main/java/com/ject/studytrip/member/infra/querydsl/MemberCommandRepositoryAdapter.java

@@ -0,0 +1,19 @@
+package com.ject.studytrip.member.infra.querydsl;
+
+import static com.ject.studytrip.member.domain.model.QMember.member;
+
+import com.ject.studytrip.member.domain.repository.MemberCommandRepository;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class MemberCommandRepositoryAdapter implements MemberCommandRepository {
+    private final JPAQueryFactory queryFactory;
+
+    @Override
+    public long deleteAllByDeletedAtIsNotNull() {
+        return queryFactory.delete(member).where(member.deletedAt.isNotNull()).execute();
+    }
+}

src/main/java/com/ject/studytrip/member/infra/querydsl/MemberQueryRepositoryAdapter.java

@@ -25,9 +25,4 @@ public Optional<MemberRole> findMemberRoleById(Long memberId) {
 
         return Optional.ofNullable(memberRole);
     }
-
-    @Override
-    public long deleteAllByDeletedAtIsNotNull() {
-        return queryFactory.delete(member).where(member.deletedAt.isNotNull()).execute();
-    }
 }

src/main/java/com/ject/studytrip/mission/application/service/DailyMissionCommandService.java

@@ -3,7 +3,7 @@
 import com.ject.studytrip.mission.domain.factory.DailyMissionFactory;
 import com.ject.studytrip.mission.domain.model.DailyMission;
 import com.ject.studytrip.mission.domain.model.Mission;
-import com.ject.studytrip.mission.domain.repository.DailyMissionQueryRepository;
+import com.ject.studytrip.mission.domain.repository.DailyMissionCommandRepository;
 import com.ject.studytrip.mission.domain.repository.DailyMissionRepository;
 import com.ject.studytrip.trip.domain.model.DailyGoal;
 import java.util.List;
@@ -14,7 +14,7 @@
 @RequiredArgsConstructor
 public class DailyMissionCommandService {
     private final DailyMissionRepository dailyMissionRepository;
-    private final DailyMissionQueryRepository dailyMissionQueryRepository;
+    private final DailyMissionCommandRepository dailyMissionCommandRepository;
 
     public List<DailyMission> createDailyMissions(DailyGoal dailyGoal, List<Mission> missions) {
         List<DailyMission> dailyMissions =
@@ -30,18 +30,18 @@ public void deleteDailyMission(DailyMission dailyMission) {
     }
 
     public long hardDeleteDailyMissions() {
-        return dailyMissionQueryRepository.deleteAllByDeletedAtIsNotNull();
+        return dailyMissionCommandRepository.deleteAllByDeletedAtIsNotNull();
     }
 
     public long hardDeleteDailyMissionsOwnedByDeletedMission() {
-        return dailyMissionQueryRepository.deleteAllByDeletedMissionOwner();
+        return dailyMissionCommandRepository.deleteAllByDeletedMissionOwner();
     }
 
     public long hardDeleteDailyMissionsOwnedByDeletedDailyGoal() {
-        return dailyMissionQueryRepository.deleteAllByDeletedDailyGoalOwner();
+        return dailyMissionCommandRepository.deleteAllByDeletedDailyGoalOwner();
     }
 
     public long hardDeleteDailyMissionsByMember(Long memberId) {
-        return dailyMissionQueryRepository.deleteAllByMemberId(memberId);
+        return dailyMissionCommandRepository.deleteAllByMemberId(memberId);
     }
 }

src/main/java/com/ject/studytrip/mission/application/service/MissionCommandService.java

@@ -3,7 +3,7 @@
 import com.ject.studytrip.mission.domain.factory.MissionFactory;
 import com.ject.studytrip.mission.domain.model.Mission;
 import com.ject.studytrip.mission.domain.policy.MissionPolicy;
-import com.ject.studytrip.mission.domain.repository.MissionQueryRepository;
+import com.ject.studytrip.mission.domain.repository.MissionCommandRepository;
 import com.ject.studytrip.mission.domain.repository.MissionRepository;
 import com.ject.studytrip.mission.presentation.dto.request.CreateMissionRequest;
 import com.ject.studytrip.mission.presentation.dto.request.UpdateMissionRequest;
@@ -16,7 +16,7 @@
 @RequiredArgsConstructor
 public class MissionCommandService {
     private final MissionRepository missionRepository;
-    private final MissionQueryRepository missionQueryRepository;
+    private final MissionCommandRepository missionCommandRepository;
 
     public Mission createMission(Stamp stamp, CreateMissionRequest request) {
         Mission mission = MissionFactory.create(stamp, request.missionName());
@@ -47,20 +47,20 @@ public void validateMissionsBelongsToStamp(Long stampId, List<Mission> missions)
 
     public void validateAllMissionsCompletedByStampId(Long stampId) {
         boolean exists =
-                missionQueryRepository.existsByStampIdAndCompletedIsFalseAndDeletedAtIsNull(
+                missionCommandRepository.existsByStampIdAndCompletedIsFalseAndDeletedAtIsNull(
                         stampId);
         MissionPolicy.validateAllCompleted(exists);
     }
 
     public long hardDeleteMissions() {
-        return missionQueryRepository.deleteAllByDeletedAtIsNotNull();
+        return missionCommandRepository.deleteAllByDeletedAtIsNotNull();
     }
 
     public long hardDeleteMissionsOwnedByDeletedStamp() {
-        return missionQueryRepository.deleteAllByDeletedStampOwner();
+        return missionCommandRepository.deleteAllByDeletedStampOwner();
     }
 
     public long hardDeleteMissionsByMember(Long memberId) {
-        return missionQueryRepository.deleteAllByMemberId(memberId);
+        return missionCommandRepository.deleteAllByMemberId(memberId);
     }
 }

src/main/java/com/ject/studytrip/mission/domain/repository/DailyMissionCommandRepository.java

@@ -0,0 +1,11 @@
+package com.ject.studytrip.mission.domain.repository;
+
+public interface DailyMissionCommandRepository {
+    long deleteAllByDeletedAtIsNotNull();
+
+    long deleteAllByDeletedMissionOwner();
+
+    long deleteAllByDeletedDailyGoalOwner();
+
+    long deleteAllByMemberId(Long memberId);
+}

src/main/java/com/ject/studytrip/mission/domain/repository/DailyMissionQueryRepository.java

@@ -7,12 +7,4 @@ public interface DailyMissionQueryRepository {
     List<DailyMission> findAllByDailyGoalIdFetchJoinMission(Long dailyGoalId);
 
     List<DailyMission> findAllWithMissionAndStampByIds(List<Long> ids);
-
-    long deleteAllByDeletedAtIsNotNull();
-
-    long deleteAllByDeletedMissionOwner();
-
-    long deleteAllByDeletedDailyGoalOwner();
-
-    long deleteAllByMemberId(Long memberId);
 }

src/main/java/com/ject/studytrip/mission/domain/repository/MissionCommandRepository.java

@@ -0,0 +1,11 @@
+package com.ject.studytrip.mission.domain.repository;
+
+public interface MissionCommandRepository {
+    boolean existsByStampIdAndCompletedIsFalseAndDeletedAtIsNull(Long stampId);
+
+    long deleteAllByDeletedAtIsNotNull();
+
+    long deleteAllByDeletedStampOwner();
+
+    long deleteAllByMemberId(Long memberId);
+}

src/main/java/com/ject/studytrip/mission/domain/repository/MissionQueryRepository.java

@@ -5,12 +5,4 @@
 
 public interface MissionQueryRepository {
     List<Mission> findAllByIdsInFetchJoinStamp(List<Long> ids);
-
-    boolean existsByStampIdAndCompletedIsFalseAndDeletedAtIsNull(Long stampId);
-
-    long deleteAllByDeletedAtIsNotNull();
-
-    long deleteAllByDeletedStampOwner();
-
-    long deleteAllByMemberId(Long memberId);
 }

src/main/java/com/ject/studytrip/mission/infra/querydsl/DailyMissionCommandRepositoryAdapter.java

@@ -0,0 +1,69 @@
+package com.ject.studytrip.mission.infra.querydsl;
+
+import static com.ject.studytrip.mission.domain.model.QDailyMission.dailyMission;
+import static com.ject.studytrip.mission.domain.model.QMission.mission;
+import static com.ject.studytrip.stamp.domain.model.QStamp.stamp;
+import static com.ject.studytrip.trip.domain.model.QDailyGoal.dailyGoal;
+import static com.ject.studytrip.trip.domain.model.QTrip.trip;
+
+import com.ject.studytrip.mission.domain.repository.DailyMissionCommandRepository;
+import com.querydsl.jpa.JPAExpressions;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class DailyMissionCommandRepositoryAdapter implements DailyMissionCommandRepository {
+    private final JPAQueryFactory queryFactory;
+
+    @Override
+    public long deleteAllByDeletedAtIsNotNull() {
+        return queryFactory
+                .delete(dailyMission)
+                .where(dailyMission.deletedAt.isNotNull())
+                .execute();
+    }
+
+    @Override
+    public long deleteAllByDeletedMissionOwner() {
+        return queryFactory
+                .delete(dailyMission)
+                .where(
+                        dailyMission.mission.id.in(
+                                JPAExpressions.select(mission.id)
+                                        .from(mission)
+                                        .where(mission.deletedAt.isNotNull())))
+                .execute();
+    }
+
+    @Override
+    public long deleteAllByDeletedDailyGoalOwner() {
+        return queryFactory
+                .delete(dailyMission)
+                .where(
+                        dailyMission.dailyGoal.id.in(
+                                JPAExpressions.select(dailyGoal.id)
+                                        .from(dailyGoal)
+                                        .where(dailyGoal.deletedAt.isNotNull())))
+                .execute();
+    }
+
+    @Override
+    public long deleteAllByMemberId(Long memberId) {
+        List<Long> ids =
+                queryFactory
+                        .select(dailyMission.id)
+                        .from(dailyMission)
+                        .join(dailyMission.mission, mission)
+                        .join(mission.stamp, stamp)
+                        .join(stamp.trip, trip)
+                        .where(trip.member.id.eq(memberId))
+                        .fetch();
+
+        if (ids.isEmpty()) return 0;
+
+        return queryFactory.delete(dailyMission).where(dailyMission.id.in(ids)).execute();
+    }
+}

src/main/java/com/ject/studytrip/mission/infra/querydsl/DailyMissionQueryRepositoryAdapter.java

@@ -1,13 +1,11 @@
 package com.ject.studytrip.mission.infra.querydsl;
 
+import static com.ject.studytrip.mission.domain.model.QDailyMission.dailyMission;
+import static com.ject.studytrip.mission.domain.model.QMission.mission;
+import static com.ject.studytrip.stamp.domain.model.QStamp.stamp;
+
 import com.ject.studytrip.mission.domain.model.DailyMission;
-import com.ject.studytrip.mission.domain.model.QDailyMission;
-import com.ject.studytrip.mission.domain.model.QMission;
 import com.ject.studytrip.mission.domain.repository.DailyMissionQueryRepository;
-import com.ject.studytrip.stamp.domain.model.QStamp;
-import com.ject.studytrip.trip.domain.model.QDailyGoal;
-import com.ject.studytrip.trip.domain.model.QTrip;
-import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -17,11 +15,6 @@
 @RequiredArgsConstructor
 public class DailyMissionQueryRepositoryAdapter implements DailyMissionQueryRepository {
     private final JPAQueryFactory queryFactory;
-    private final QDailyMission dailyMission = QDailyMission.dailyMission;
-    private final QTrip trip = QTrip.trip;
-    private final QStamp stamp = QStamp.stamp;
-    private final QMission mission = QMission.mission;
-    private final QDailyGoal dailyGoal = QDailyGoal.dailyGoal;
 
     @Override
     public List<DailyMission> findAllByDailyGoalIdFetchJoinMission(Long dailyGoalId) {
@@ -44,53 +37,4 @@ public List<DailyMission> findAllWithMissionAndStampByIds(List<Long> ids) {
                 .where(dailyMission.id.in(ids))
                 .fetch();
     }
-
-    @Override
-    public long deleteAllByDeletedAtIsNotNull() {
-        return queryFactory
-                .delete(dailyMission)
-                .where(dailyMission.deletedAt.isNotNull())
-                .execute();
-    }
-
-    @Override
-    public long deleteAllByDeletedMissionOwner() {
-        return queryFactory
-                .delete(dailyMission)
-                .where(
-                        dailyMission.mission.id.in(
-                                JPAExpressions.select(mission.id)
-                                        .from(mission)
-                                        .where(mission.deletedAt.isNotNull())))
-                .execute();
-    }
-
-    @Override
-    public long deleteAllByDeletedDailyGoalOwner() {
-        return queryFactory
-                .delete(dailyMission)
-                .where(
-                        dailyMission.dailyGoal.id.in(
-                                JPAExpressions.select(dailyGoal.id)
-                                        .from(dailyGoal)
-                                        .where(dailyGoal.deletedAt.isNotNull())))
-                .execute();
-    }
-
-    @Override
-    public long deleteAllByMemberId(Long memberId) {
-        List<Long> ids =
-                queryFactory
-                        .select(dailyMission.id)
-                        .from(dailyMission)
-                        .join(dailyMission.mission, mission)
-                        .join(mission.stamp, stamp)
-                        .join(stamp.trip, trip)
-                        .where(trip.member.id.eq(memberId))
-                        .fetch();
-
-        if (ids.isEmpty()) return 0;
-
-        return queryFactory.delete(dailyMission).where(dailyMission.id.in(ids)).execute();
-    }
 }