Merge pull request #253 from Team-Sopetit/develop

[HOTFIX] 행복 루틴 이슈 대응
Team-Sopetit · May 2, 2024 · 36960b9 · 36960b9
2 parents 9b84184 + 76564a9
commit 36960b9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/com/soptie/server/memberRoutine/service/MemberRoutineService.java b/src/main/java/com/soptie/server/memberRoutine/service/MemberRoutineService.java
@@ -1,5 +1,6 @@
 package com.soptie.server.memberRoutine.service;
 
+import static com.soptie.server.routine.entity.RoutineType.*;
 import static com.soptie.server.routine.message.RoutineErrorCode.*;
 
 import java.util.List;
@@ -74,6 +75,7 @@ public MemberRoutineAchieveServiceResponse achieveMemberRoutine(MemberRoutineAch
 		memberRoutine.checkMemberHas(member);
 		memberRoutine.achieve();
 		member.addCottonCount(memberRoutine.getType());
+		deleteMemberRoutineIfTypeIsOneTime(memberRoutine);
 		return MemberRoutineAchieveServiceResponse.of(memberRoutine);
 	}
 
@@ -134,4 +136,10 @@ public void checkMemberHasChallengeAlready(Member member) {
 			throw new RoutineException(CANNOT_ADD_MEMBER_ROUTINE);
 		}
 	}
+
+	private void deleteMemberRoutineIfTypeIsOneTime(MemberRoutine memberRoutine) {
+		if (memberRoutine.getType().equals(CHALLENGE)) {
+			memberRoutineDeleter.softDelete(memberRoutine);
+		}
+	}
 }
diff --git a/src/test/java/com/soptie/server/memberRoutine/service/MemberRoutineServiceTest.java b/src/test/java/com/soptie/server/memberRoutine/service/MemberRoutineServiceTest.java
@@ -17,6 +17,7 @@
 
 import com.soptie.server.member.adapter.MemberFinder;
 import com.soptie.server.member.entity.Member;
+import com.soptie.server.memberRoutine.adapter.MemberRoutineDeleter;
 import com.soptie.server.memberRoutine.adapter.MemberRoutineFinder;
 import com.soptie.server.memberRoutine.entity.MemberRoutine;
 import com.soptie.server.memberRoutine.service.dto.request.MemberRoutineAchieveServiceRequest;
@@ -36,6 +37,9 @@ class MemberRoutineServiceTest {
 	@Mock
 	private MemberRoutineFinder memberRoutineFinder;
 
+	@Mock
+	private MemberRoutineDeleter memberRoutineDeleter;
+
 	@Test
 	@DisplayName("[성공] 데일리 루틴을 달성하면 달성 횟수와 데일리 솜 뭉치 개수가 1만큼 증가한다.")
 	void shouldUpdateAchieveCountAndCottonCountWhenAchieveDailyRoutine() {
@@ -87,6 +91,7 @@ void shouldUpdateAchieveCountAndCottonCountWhenAchieveHappinessRoutine() {
 
 		doReturn(member).when(memberFinder).findById(member.getId());
 		doReturn(memberRoutine).when(memberRoutineFinder).findById(memberRoutine.getId());
+		doNothing().when(memberRoutineDeleter).softDelete(memberRoutine);
 
 		MemberRoutineAchieveServiceRequest request = MemberRoutineAchieveServiceRequest.of(
 				member.getId(),