Merge pull request #312 from Team-Sopetit/fix/#274-daily-routine-achi…

…eved

[ADD] 데일리 루틴 달성 취소 로직 추가

src/main/java/com/soptie/server/memberroutine/controller/v1/MemberDailyRoutineController.java

@@ -77,7 +77,7 @@ public ResponseEntity<SuccessResponse<MemberDailyRoutineAchieveResponse>> achiev
 	) {
 		val memberId = Long.parseLong(principal.getName());
 		val response = MemberDailyRoutineAchieveResponse
-			.of(memberRoutineUpdateService.achieveMemberRoutine(
+			.of(memberRoutineUpdateService.updateAchievementStatus(
 				MemberRoutineAchieveServiceRequest.of(memberId, routineId)));
 		return ResponseEntity.ok(success(SUCCESS_ACHIEVE_ROUTINE.getMessage(), response));
 	}

src/main/java/com/soptie/server/memberroutine/controller/v1/MemberHappinessRoutineController.java

@@ -81,7 +81,7 @@ public ResponseEntity<BaseResponse> achieveMemberHappinessRoutine(
 		@PathVariable Long routineId
 	) {
 		val memberId = Long.parseLong(principal.getName());
-		memberRoutineUpdateService.achieveMemberRoutine(MemberRoutineAchieveServiceRequest.of(memberId, routineId));
+		memberRoutineUpdateService.updateAchievementStatus(MemberRoutineAchieveServiceRequest.of(memberId, routineId));
 		return ResponseEntity.ok(success(SUCCESS_ACHIEVE_ROUTINE.getMessage()));
 	}
 }

src/main/java/com/soptie/server/memberroutine/controller/v1/dto/response/MemberDailyRoutineAchieveResponse.java

@@ -10,14 +10,16 @@
 public record MemberDailyRoutineAchieveResponse(
 	long routineId,
 	boolean isAchieve,
-	int achieveCount
+	int achieveCount,
+	boolean hasCotton
 ) {
 
 	public static MemberDailyRoutineAchieveResponse of(MemberRoutineAchieveServiceResponse response) {
 		return MemberDailyRoutineAchieveResponse.builder()
 			.routineId(response.routineId())
 			.isAchieve(response.isAchieve())
 			.achieveCount(response.achieveCount())
+			.hasCotton(response.hasCotton())
 			.build();
 	}
 }

src/main/java/com/soptie/server/memberroutine/entity/MemberRoutine.java

@@ -36,6 +36,8 @@ public class MemberRoutine {
 
 	private boolean isAchieve;
 
+	private boolean isAchieveToday;
+
 	private int achieveCount;
 
 	@Enumerated(value = STRING)
@@ -49,6 +51,7 @@ public class MemberRoutine {
 
 	public MemberRoutine(Member member, Routine routine) {
 		this.isAchieve = false;
+		this.isAchieveToday = false;
 		this.achieveCount = 0;
 		this.type = routine.getType();
 		this.routineId = routine.getId();
@@ -57,6 +60,7 @@ public MemberRoutine(Member member, Routine routine) {
 
 	public MemberRoutine(Member member, Challenge challenge) {
 		this.isAchieve = false;
+		this.isAchieveToday = false;
 		this.achieveCount = 0;
 		this.type = CHALLENGE;
 		this.routineId = challenge.getId();
@@ -65,6 +69,7 @@ public MemberRoutine(Member member, Challenge challenge) {
 
 	public MemberRoutine(DeletedMemberRoutine deletedMemberRoutine) {
 		this.isAchieve = isAchievedToday(deletedMemberRoutine);
+		this.isAchieveToday = isAchievedToday(deletedMemberRoutine);
 		this.achieveCount = deletedMemberRoutine.getAchieveCount();
 		this.type = deletedMemberRoutine.getType();
 		this.routineId = deletedMemberRoutine.getRoutineId();
@@ -77,6 +82,7 @@ public MemberRoutine(
 	) {
 		this.id = id;
 		this.isAchieve = isAchieve;
+		this.isAchieveToday = isAchieve;
 		this.achieveCount = achieveCount;
 		this.type = type;
 		this.routineId = routineId;
@@ -85,11 +91,18 @@ public MemberRoutine(
 
 	public void achieve() {
 		this.isAchieve = true;
+		this.isAchieveToday = true;
 		this.achieveCount++;
 	}
 
 	public void initAchieve() {
 		this.isAchieve = false;
+		this.isAchieveToday = false;
+	}
+
+	public void cancelAchievement() {
+		this.isAchieve = false;
+		this.achieveCount--;
 	}
 
 	public void checkMemberHas(Member member) {

src/main/java/com/soptie/server/memberroutine/service/MemberRoutineUpdateService.java

@@ -24,14 +24,24 @@ public class MemberRoutineUpdateService {
 	private final MemberRoutineDeleter memberRoutineDeleter;
 	private final MemberFinder memberFinder;
 
-	public MemberRoutineAchieveServiceResponse achieveMemberRoutine(MemberRoutineAchieveServiceRequest request) {
+	public MemberRoutineAchieveServiceResponse updateAchievementStatus(MemberRoutineAchieveServiceRequest request) {
 		val member = memberFinder.findById(request.memberId());
 		val memberRoutine = memberRoutineFinder.findById(request.memberRoutineId());
+		val isAchievedToday = memberRoutine.isAchieveToday();
+
 		memberRoutine.checkMemberHas(member);
-		memberRoutine.achieve();
-		member.addCottonCount(memberRoutine.getType());
-		deleteMemberRoutineIfTypeIsOneTime(memberRoutine);
-		return MemberRoutineAchieveServiceResponse.of(memberRoutine);
+
+		if (memberRoutine.isAchieve()) {
+			memberRoutine.cancelAchievement();
+		} else {
+			if (!isAchievedToday) {
+				member.addCottonCount(memberRoutine.getType());
+			}
+			memberRoutine.achieve();
+			deleteMemberRoutineIfTypeIsOneTime(memberRoutine);
+		}
+
+		return MemberRoutineAchieveServiceResponse.of(memberRoutine, !isAchievedToday);
 	}
 
 	public void initDailyRoutines() {

src/main/java/com/soptie/server/memberroutine/service/dto/response/MemberRoutineAchieveServiceResponse.java

@@ -10,14 +10,16 @@
 public record MemberRoutineAchieveServiceResponse(
 	long routineId,
 	boolean isAchieve,
-	int achieveCount
+	int achieveCount,
+	boolean hasCotton
 ) {
 
-	public static MemberRoutineAchieveServiceResponse of(MemberRoutine routine) {
+	public static MemberRoutineAchieveServiceResponse of(MemberRoutine routine, boolean hasCotton) {
 		return MemberRoutineAchieveServiceResponse.builder()
 			.routineId(routine.getId())
 			.isAchieve(routine.isAchieve())
 			.achieveCount(routine.getAchieveCount())
+			.hasCotton(hasCotton)
 			.build();
 	}
 }

src/test/java/com/soptie/server/memberroutine/service/MemberRoutineServiceTest.java

@@ -63,7 +63,7 @@ void shouldUpdateAchieveCountAndCottonCountWhenAchieveDailyRoutine() {
 			memberRoutine.getId());
 
 		// when
-		memberRoutineUpdateService.achieveMemberRoutine(request);
+		memberRoutineUpdateService.updateAchievementStatus(request);
 
 		// then
 		assertThat(memberRoutine.isAchieve()).isTrue();
@@ -95,7 +95,7 @@ void shouldUpdateAchieveCountAndCottonCountWhenAchieveHappinessRoutine() {
 			memberRoutine.getId());
 
 		// when
-		memberRoutineUpdateService.achieveMemberRoutine(request);
+		memberRoutineUpdateService.updateAchievementStatus(request);
 
 		// then
 		assertThat(memberRoutine.isAchieve()).isTrue();