[REFACTOR] 종합 이슈 처리

src/main/java/com/soptie/server/auth/controller/AuthController.java

@@ -10,7 +10,7 @@
 
 import java.security.Principal;
 
-import static com.soptie.server.auth.message.ResponseMessage.*;
+import static com.soptie.server.auth.message.SuccessMessage.*;
 import static com.soptie.server.common.dto.Response.success;
 
 @RestController
@@ -30,7 +30,7 @@ public ResponseEntity<Response> signIn(@RequestHeader("Authorization") String so
     public ResponseEntity<Response> signOut(Principal principal) {
         val memberId = Long.parseLong(principal.getName());
         authService.signOut(memberId);
-        return ResponseEntity.ok(success(SUCCESS_SIGN_OUT.getMessage(), null));
+        return ResponseEntity.ok(success(SUCCESS_SIGN_OUT.getMessage()));
     }
 
     @DeleteMapping

src/main/java/com/soptie/server/auth/message/ResponseMessage.java → src/main/java/com/soptie/server/auth/message/SuccessMessage.java

@@ -5,7 +5,7 @@
 
 @RequiredArgsConstructor
 @Getter
-public enum ResponseMessage {
+public enum SuccessMessage {
 
     SUCCESS_SIGN_IN("소셜로그인 성공"),
     SUCCESS_SIGN_OUT("로그아웃 성공"),

src/main/java/com/soptie/server/auth/service/AuthServiceImpl.java

@@ -11,6 +11,8 @@
 import com.soptie.server.member.repository.MemberRepository;
 import com.soptie.server.memberDoll.entity.MemberDoll;
 import com.soptie.server.memberDoll.service.MemberDollService;
+import com.soptie.server.memberRoutine.entity.daily.MemberDailyRoutine;
+import com.soptie.server.memberRoutine.entity.happiness.MemberHappinessRoutine;
 import com.soptie.server.memberRoutine.service.CompletedMemberDailyRoutineService;
 import com.soptie.server.memberRoutine.service.MemberDailyRoutineService;
 import com.soptie.server.memberRoutine.service.MemberHappinessRoutineService;
@@ -21,6 +23,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 import java.util.Objects;
 
 import static com.soptie.server.auth.message.ErrorMessage.INVALID_TOKEN;
@@ -58,8 +61,8 @@ public void signOut(Long memberId) {
     public void withdraw(Long memberId) {
         val member = findMember(memberId);
         deleteMemberDoll(member.getMemberDoll());
-        deleteMemberDailyRoutines(member);
-        deleteMemberHappinessRoutine(member);
+        deleteMemberDailyRoutines(member.getDailyRoutines());
+        deleteMemberHappinessRoutine(member.getHappinessRoutine());
         deleteCompletedMemberDailyRoutines(member);
         deleteMember(member);
     }
@@ -105,7 +108,7 @@ private Token generateToken(Authentication authentication) {
 
     private Member findMember(Long id) {
         return memberRepository.findById(id)
-                .orElseThrow(() -> new EntityNotFoundException(INVALID_MEMBER.getMeesage()));
+                .orElseThrow(() -> new EntityNotFoundException(INVALID_MEMBER.getMessage()));
     }
 
     private void deleteMemberDoll(MemberDoll memberDoll) {
@@ -114,14 +117,14 @@ private void deleteMemberDoll(MemberDoll memberDoll) {
         }
     }
 
-    private void deleteMemberDailyRoutines(Member member) {
-        member.getDailyRoutines()
+    private void deleteMemberDailyRoutines(List<MemberDailyRoutine> memberDailyRoutines) {
+        memberDailyRoutines
                 .forEach(memberDailyRoutineService::deleteMemberDailyRoutine);
     }
 
-    private void deleteMemberHappinessRoutine(Member member) {
-        if (Objects.nonNull(member.getHappinessRoutine())) {
-            memberHappinessRoutineService.deleteMemberHappinessRoutine(member.getHappinessRoutine());
+    private void deleteMemberHappinessRoutine(MemberHappinessRoutine memberHappinessRoutine) {
+        if (Objects.nonNull(memberHappinessRoutine)) {
+            memberHappinessRoutineService.deleteMemberHappinessRoutine(memberHappinessRoutine);
         }
     }
 

src/main/java/com/soptie/server/doll/controller/DollController.java

@@ -1,7 +1,7 @@
 package com.soptie.server.doll.controller;
 
 import static com.soptie.server.common.dto.Response.*;
-import static com.soptie.server.doll.message.ResponseMessage.*;
+import static com.soptie.server.doll.message.SuccessMessage.*;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/soptie/server/doll/message/ResponseMessage.java → src/main/java/com/soptie/server/doll/message/SuccessMessage.java

@@ -5,7 +5,7 @@
 
 @RequiredArgsConstructor
 @Getter
-public enum ResponseMessage {
+public enum SuccessMessage {
 	SUCCESS_GET_IMAGE("인형 이미지 조회 성공"),
 	;
 

src/main/java/com/soptie/server/member/controller/MemberController.java

@@ -15,9 +15,9 @@
 import java.security.Principal;
 
 import static com.soptie.server.common.dto.Response.success;
-import static com.soptie.server.member.message.ResponseMessage.SUCCESS_CREATE_PROFILE;
-import static com.soptie.server.member.message.ResponseMessage.SUCCESS_GIVE_COTTON;
-import static com.soptie.server.member.message.ResponseMessage.*;
+import static com.soptie.server.member.message.SuccessMessage.SUCCESS_CREATE_PROFILE;
+import static com.soptie.server.member.message.SuccessMessage.SUCCESS_GIVE_COTTON;
+import static com.soptie.server.member.message.SuccessMessage.*;
 
 @RestController
 @RequiredArgsConstructor
@@ -31,7 +31,7 @@ public ResponseEntity<Response> createMemberProfile(Principal principal, @Reques
         val memberId = Long.parseLong(principal.getName());
         memberService.createMemberProfile(memberId, request);
         return ResponseEntity.created(getURI())
-                .body(success(SUCCESS_CREATE_PROFILE.getMessage(), null));
+                .body(success(SUCCESS_CREATE_PROFILE.getMessage()));
     }
 
     private URI getURI() {

src/main/java/com/soptie/server/member/entity/Member.java

@@ -53,7 +53,7 @@ public void setMemberDoll(MemberDoll memberDoll) {
 		this.memberDoll = memberDoll;
 	}
 
-	public void initHappinessRoutine() {
+	public void resetHappinessRoutine() {
 		this.happinessRoutine = null;
 	}
 
@@ -84,8 +84,4 @@ public int subtractDailyCotton() {
 	public int subtractHappinessCotton() {
 		return this.cottonInfo.subtractHappinessCotton();
 	}
-
-	public void deleteHappinessRoutine() {
-		this.happinessRoutine = null;
-	}
 }

src/main/java/com/soptie/server/member/message/ErrorMessage.java

@@ -15,5 +15,5 @@ public enum ErrorMessage {
 	NOT_ENOUGH_COTTON("솜뭉치가 부족합니다.")
 	;
 
-	private final String meesage;
+	private final String message;
 }

src/main/java/com/soptie/server/member/message/ResponseMessage.java → src/main/java/com/soptie/server/member/message/SuccessMessage.java

@@ -5,7 +5,7 @@
 
 @RequiredArgsConstructor
 @Getter
-public enum ResponseMessage {
+public enum SuccessMessage {
 
     SUCCESS_CREATE_PROFILE("프로필 생성 성공"),
     SUCCESS_GIVE_COTTON("솜뭉치 주기 성공"),

src/main/java/com/soptie/server/member/service/MemberServiceImpl.java

@@ -73,18 +73,18 @@ public MemberHomeInfoResponse getMemberHomeInfo(Long memberId) {
 
     private Member findMember(Long id) {
         return memberRepository.findById(id)
-                .orElseThrow(() -> new EntityNotFoundException(INVALID_MEMBER.getMeesage()));
+                .orElseThrow(() -> new EntityNotFoundException(INVALID_MEMBER.getMessage()));
     }
 
     private void checkMemberProfileExist(Member member) {
         if (Objects.nonNull(member)) {
-            throw new IllegalStateException(EXIST_PROFILE.getMeesage());
+            throw new IllegalStateException(EXIST_PROFILE.getMessage());
         }
     }
 
     private void checkMemberCottonCount(int cottonCount) {
         if (cottonCount <= 0) {
-            throw new IllegalStateException(NOT_ENOUGH_COTTON.getMeesage());
+            throw new IllegalStateException(NOT_ENOUGH_COTTON.getMessage());
         }
     }
 

src/main/java/com/soptie/server/memberRoutine/controller/MemberDailyRoutineController.java

@@ -1,7 +1,7 @@
 package com.soptie.server.memberRoutine.controller;
 
 import static com.soptie.server.common.dto.Response.*;
-import static com.soptie.server.memberRoutine.message.ResponseMessage.*;
+import static com.soptie.server.memberRoutine.message.SuccessMessage.*;
 
 import java.net.URI;
 import java.security.Principal;

src/main/java/com/soptie/server/memberRoutine/controller/MemberHappinessRoutineController.java

@@ -13,7 +13,7 @@
 import java.security.Principal;
 
 import static com.soptie.server.common.dto.Response.success;
-import static com.soptie.server.memberRoutine.message.ResponseMessage.*;
+import static com.soptie.server.memberRoutine.message.SuccessMessage.*;
 
 @RestController
 @RequiredArgsConstructor

src/main/java/com/soptie/server/memberRoutine/entity/happiness/MemberHappinessRoutine.java

@@ -41,7 +41,7 @@ public MemberHappinessRoutine(Member member, HappinessSubRoutine routine) {
 
 	private void setMember(Member member) {
 		if (Objects.nonNull(this.member)) {
-			this.member.initHappinessRoutine();
+			this.member.resetHappinessRoutine();
 		}
 		this.member = member;
 		member.addHappinessRoutine(this);

src/main/java/com/soptie/server/memberRoutine/message/ResponseMessage.java → src/main/java/com/soptie/server/memberRoutine/message/SuccessMessage.java

@@ -5,7 +5,7 @@
 
 @RequiredArgsConstructor
 @Getter
-public enum ResponseMessage {
+public enum SuccessMessage {
 	SUCCESS_CREATE_ROUTINE("루틴 추가 성공"),
 	SUCCESS_DELETE_ROUTINE("루틴 삭제 성공"),
 	SUCCESS_ACHIEVE_ROUTINE("루틴 달성 성공"),

src/main/java/com/soptie/server/memberRoutine/service/MemberDailyRoutineServiceImpl.java

@@ -126,7 +126,7 @@ private MemberDailyRoutine findMemberRoutine(Long id) {
 
 	private void checkRoutineForMember(Member member, MemberDailyRoutine routine) {
 		if (!member.getDailyRoutines().contains(routine)) {
-			throw new IllegalStateException(INACCESSIBLE_ROUTINE.getMeesage());
+			throw new IllegalStateException(INACCESSIBLE_ROUTINE.getMessage());
 		}
 	}
 
@@ -139,7 +139,7 @@ public MemberDailyRoutinesResponse getMemberDailyRoutines(long memberId) {
 
 	private Member findMember(Long id) {
 		return memberRepository.findById(id)
-			.orElseThrow(() -> new EntityNotFoundException(INVALID_MEMBER.getMeesage()));
+			.orElseThrow(() -> new EntityNotFoundException(INVALID_MEMBER.getMessage()));
 	}
 
 	@Override

src/main/java/com/soptie/server/memberRoutine/service/MemberHappinessRoutineServiceImpl.java

@@ -71,11 +71,11 @@ public void deleteMemberHappinessRoutine(Long memberId, Long routineId) {
 
     private Member findMember(Long id) {
         return memberRepository.findById(id)
-                .orElseThrow(() -> new EntityNotFoundException(INVALID_MEMBER.getMeesage()));
+                .orElseThrow(() -> new EntityNotFoundException(INVALID_MEMBER.getMessage()));
     }
 
     private void deleteMemberRoutine(MemberHappinessRoutine routine) {
-        routine.getMember().deleteHappinessRoutine();
+        routine.getMember().resetHappinessRoutine();
         memberHappinessRoutineRepository.delete(routine);
     }
 
@@ -96,7 +96,7 @@ private MemberHappinessRoutine findMemberRoutine(Long id) {
 
     private void checkRoutineForMember(Member member, MemberHappinessRoutine routine) {
         if (!member.getHappinessRoutine().equals(routine)) {
-            throw new IllegalStateException(INACCESSIBLE_ROUTINE.getMeesage());
+            throw new IllegalStateException(INACCESSIBLE_ROUTINE.getMessage());
         }
     }
 

src/main/java/com/soptie/server/routine/controller/DailyRoutineController.java

@@ -1,7 +1,7 @@
 package com.soptie.server.routine.controller;
 
 import static com.soptie.server.common.dto.Response.*;
-import static com.soptie.server.routine.message.ResponseMessage.*;
+import static com.soptie.server.routine.message.SuccessMessage.*;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/soptie/server/routine/controller/HappinessRoutineController.java

@@ -1,18 +1,14 @@
 package com.soptie.server.routine.controller;
 
 import com.soptie.server.common.dto.Response;
-import com.soptie.server.routine.dto.HappinessSubRoutinesResponse;
 import com.soptie.server.routine.service.HappinessRoutineService;
-import com.soptie.server.routine.service.HappinessSubRoutineService;
 import lombok.RequiredArgsConstructor;
 import lombok.val;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.security.Principal;
-
 import static com.soptie.server.common.dto.Response.success;
-import static com.soptie.server.routine.message.ResponseMessage.*;
+import static com.soptie.server.routine.message.SuccessMessage.*;
 
 @RestController
 @RequiredArgsConstructor

src/main/java/com/soptie/server/routine/message/ResponseMessage.java → src/main/java/com/soptie/server/routine/message/SuccessMessage.java

@@ -5,7 +5,7 @@
 
 @RequiredArgsConstructor
 @Getter
-public enum ResponseMessage {
+public enum SuccessMessage {
 	SUCCESS_GET_THEME("데일리 루틴 테마 조회 성공"),
 	SUCCESS_GET_ROUTINE("데일리 루틴 조회 성공"),
 	SUCCESS_GET_HAPPINESS_THEME("행복 루틴 테마 조회 성공"),

src/test/java/com/soptie/server/auth/controller/AuthControllerTest.java

@@ -13,13 +13,11 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation;
-import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders;
 
 import java.security.Principal;
 
 import static com.epages.restdocs.apispec.ResourceDocumentation.resource;
-import static com.soptie.server.auth.message.ResponseMessage.*;
+import static com.soptie.server.auth.message.SuccessMessage.*;
 import static org.mockito.Mockito.when;
 import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.*;

src/test/java/com/soptie/server/member/controller/MemberControllerTest.java

@@ -5,14 +5,9 @@
 import com.soptie.server.common.dto.Response;
 import com.soptie.server.member.dto.CottonCountResponse;
 import com.soptie.server.member.dto.MemberProfileRequest;
-import com.soptie.server.member.entity.CottonType;
-import com.soptie.server.routine.dto.DailyRoutinesResponse;
-import com.soptie.server.routine.fixture.DailyRoutineFixture;
 import com.soptie.server.doll.entity.Doll;
 import com.soptie.server.doll.entity.DollImage;
 import com.soptie.server.member.dto.MemberHomeInfoResponse;
-import com.soptie.server.member.dto.MemberProfileRequest;
-import com.soptie.server.member.entity.Cotton;
 import com.soptie.server.member.entity.Member;
 import com.soptie.server.member.entity.SocialType;
 import com.soptie.server.memberDoll.entity.MemberDoll;
@@ -32,9 +27,9 @@
 import static com.soptie.server.common.dto.Response.success;
 import static com.soptie.server.doll.entity.DollType.BROWN;
 import static com.soptie.server.member.entity.CottonType.DAILY;
-import static com.soptie.server.member.message.ResponseMessage.SUCCESS_CREATE_PROFILE;
-import static com.soptie.server.member.message.ResponseMessage.SUCCESS_GIVE_COTTON;
-import static com.soptie.server.member.message.ResponseMessage.*;
+import static com.soptie.server.member.message.SuccessMessage.SUCCESS_CREATE_PROFILE;
+import static com.soptie.server.member.message.SuccessMessage.SUCCESS_GIVE_COTTON;
+import static com.soptie.server.member.message.SuccessMessage.*;
 import static org.mockito.Mockito.when;
 import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.*;

src/test/java/com/soptie/server/routine/controller/HappinessRoutineControllerTest.java

@@ -3,15 +3,13 @@
 import com.epages.restdocs.apispec.ResourceSnippetParameters;
 import com.soptie.server.base.BaseControllerTest;
 import com.soptie.server.common.dto.Response;
-import com.soptie.server.routine.dto.DailyRoutinesResponse;
 import com.soptie.server.routine.dto.HappinessRoutinesResponse;
 import com.soptie.server.routine.dto.HappinessSubRoutinesResponse;
 import com.soptie.server.routine.dto.HappinessThemesResponse;
 import com.soptie.server.routine.entity.happiness.HappinessRoutine;
 import com.soptie.server.routine.entity.happiness.HappinessSubRoutine;
 import com.soptie.server.routine.entity.happiness.HappinessTheme;
 import com.soptie.server.routine.entity.happiness.RoutineImage;
-import com.soptie.server.routine.fixture.DailyRoutineFixture;
 import com.soptie.server.routine.fixture.HappinessRoutineFixture;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -24,11 +22,10 @@
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import static com.epages.restdocs.apispec.ResourceDocumentation.resource;
-import static com.soptie.server.routine.message.ResponseMessage.SUCCESS_GET_HAPPINESS_SUB_ROUTINES;
+import static com.soptie.server.routine.message.SuccessMessage.SUCCESS_GET_HAPPINESS_SUB_ROUTINES;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.when;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.*;