v0.1.4

depromeet · Aug 29, 2024 · caf7728 · caf7728
2 parents ad45244 + dc957c9
commit caf7728
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/src/main/java/com/depromeet/stonebed/domain/auth/application/AuthService.java b/src/main/java/com/depromeet/stonebed/domain/auth/application/AuthService.java
@@ -15,10 +15,13 @@
 import com.depromeet.stonebed.domain.member.domain.MemberStatus;
 import com.depromeet.stonebed.domain.member.domain.Profile;
 import com.depromeet.stonebed.domain.member.dto.request.CreateMemberRequest;
+import com.depromeet.stonebed.domain.missionRecord.dao.MissionRecordBoostRepository;
 import com.depromeet.stonebed.domain.missionRecord.dao.MissionRecordRepository;
+import com.depromeet.stonebed.domain.missionRecord.domain.MissionRecord;
 import com.depromeet.stonebed.global.error.ErrorCode;
 import com.depromeet.stonebed.global.error.exception.CustomException;
 import com.depromeet.stonebed.global.util.MemberUtil;
+import java.util.List;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -33,6 +36,7 @@ public class AuthService {
     private final FcmNotificationRepository fcmNotificationRepository;
     private final MemberRepository memberRepository;
     private final MissionRecordRepository missionRecordRepository;
+    private final MissionRecordBoostRepository missionRecordBoostRepository;
 
     private final AppleClient appleClient;
     private final KakaoClient kakaoClient;
@@ -131,11 +135,14 @@ public void withdraw() {
          * appleClient.withdraw(member.getOauthInfo().getOauthId()); }
          */
         validateMemberStatusDelete(member.getStatus());
+
+        List<MissionRecord> missionRecords = missionRecordRepository.findAllByMember(member);
         member.updateMemberRole(MemberRole.TEMPORARY);
         member.updateProfile(Profile.createProfile("", ""));
         member.updateOauthId("");
         memberRepository.flush();
-        withdrawMemberRelationByMemberId(member.getId());
+        withdrawMemberRelationByMemberId(
+                missionRecords.stream().map(MissionRecord::getId).toList(), member.getId());
 
         jwtTokenService.deleteRefreshToken(member.getId());
 
@@ -164,7 +171,8 @@ private void updateMemberNormalStatus(Member member) {
         }
     }
 
-    private void withdrawMemberRelationByMemberId(Long memberId) {
+    private void withdrawMemberRelationByMemberId(List<Long> recordIds, Long memberId) {
+        missionRecordBoostRepository.deleteAllByMember(recordIds);
         missionRecordRepository.deleteAllByMember(memberId);
         fcmNotificationRepository.deleteAllByMember(memberId);
     }

diff --git a/...in/java/com/depromeet/stonebed/domain/missionRecord/dao/MissionRecordBoostRepository.java b/...in/java/com/depromeet/stonebed/domain/missionRecord/dao/MissionRecordBoostRepository.java
@@ -1,12 +1,19 @@
 package com.depromeet.stonebed.domain.missionRecord.dao;
 
 import com.depromeet.stonebed.domain.missionRecord.domain.MissionRecordBoost;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
 public interface MissionRecordBoostRepository extends JpaRepository<MissionRecordBoost, Long> {
     @Query(
             "SELECT SUM(mrb.count) FROM MissionRecordBoost mrb WHERE mrb.missionRecord.id = :missionRecordId")
     Long sumBoostCountByMissionRecord(@Param("missionRecordId") Long missionRecordId);
+
+    // Delete
+    @Modifying
+    @Query("DELETE FROM MissionRecordBoost mrb WHERE mrb.missionRecord.id in (:missionRecordIds)")
+    void deleteAllByMember(@Param("missionRecordIds") List<Long> missionRecordIds);
 }
diff --git a/src/main/java/com/depromeet/stonebed/domain/missionRecord/dao/MissionRecordRepository.java b/src/main/java/com/depromeet/stonebed/domain/missionRecord/dao/MissionRecordRepository.java
@@ -35,4 +35,6 @@ boolean existsByMemberAndMissionHistoryAndStatusAndCreatedAtBetween(
     @Modifying
     @Query("DELETE FROM MissionRecord mr WHERE mr.member.id = :memberId")
     void deleteAllByMember(@Param("memberId") Long memberId);
+
+    List<MissionRecord> findAllByMember(Member member);
 }
diff --git a/src/test/java/com/depromeet/stonebed/domain/auth/application/AuthServiceTest.java b/src/test/java/com/depromeet/stonebed/domain/auth/application/AuthServiceTest.java
@@ -12,6 +12,7 @@
 import com.depromeet.stonebed.domain.member.domain.Member;
 import com.depromeet.stonebed.domain.member.domain.MemberRole;
 import com.depromeet.stonebed.domain.member.domain.MemberStatus;
+import com.depromeet.stonebed.domain.missionRecord.dao.MissionRecordBoostRepository;
 import com.depromeet.stonebed.domain.missionRecord.dao.MissionRecordRepository;
 import com.depromeet.stonebed.global.util.MemberUtil;
 import java.util.Optional;
@@ -35,6 +36,7 @@ class AuthServiceTest extends FixtureMonkeySetUp {
 
     @Mock private FcmNotificationRepository fcmNotificationRepository;
     @Mock private MissionRecordRepository missionRecordRepository;
+    @Mock private MissionRecordBoostRepository missionRecordBoostRepository;
 
     @Mock private MemberUtil memberUtil;