diff --git a/.gitignore b/.gitignore
index 6cfef3db..3de52aa2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ build/
 src/main/resources/application.yml
 src/main/resources/application.properties
 .env
+*.env
 deploy-*
 *TestController*
 *TestService*
diff --git a/Dockerfile b/Dockerfile
index 5953fd07..45839c9c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,48 +1,48 @@
-######### intellij 자체 빌드 후 데이터 추가 ###############
-# 1. 공식 Tomcat 이미지 기반 (버전은 필요에 맞게 조정)
+########## intellij 자체 빌드 후 데이터 추가 ###############
+## 1. 공식 Tomcat 이미지 기반 (버전은 필요에 맞게 조정)
+#FROM tomcat:9.0-jdk17
+#
+## 2. 시간대 설정 (한국 시간)
+#ENV TZ=Asia/Seoul
+#RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+#
+## 3. 기존 webapps 디렉토리 제거 (불필요한 기본 앱 제거)
+#RUN rm -rf /usr/local/tomcat/webapps/*
+#
+#COPY build/libs/plan-it-1.0-SNAPSHOT.war /usr/local/tomcat/webapps/ROOT.war
+#
+#EXPOSE 8080
+
+
+######## container 자체 빌드 ###############
+# 1) Builder 단계: Gradle + JDK17로 WAR 빌드
+FROM gradle:7.6-jdk17 AS builder
+WORKDIR /home/gradle/project
+
+# 프로젝트 파일 전체를 복사 (캐시 효율보다 단순 호환성 우선)
+COPY --chown=gradle:gradle . .
+
+# 테스트 제외하고 WAR 생성
+RUN gradle clean build -x test --no-daemon
+
+# 2) Run 단계: Tomcat에 WAR 배포
 FROM tomcat:9.0-jdk17
 
-# 2. 시간대 설정 (한국 시간)
+# 한국 시간대 설정
 ENV TZ=Asia/Seoul
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \
+ && echo $TZ > /etc/timezone
 
-# 3. 기존 webapps 디렉토리 제거 (불필요한 기본 앱 제거)
+# 기본 웹앱 제거
 RUN rm -rf /usr/local/tomcat/webapps/*
 
-COPY build/libs/plan-it-1.0-SNAPSHOT.war /usr/local/tomcat/webapps/ROOT.war
+# Builder 단계에서 생성된 WAR를 ROOT.war로 복사
+# 빌드 결과물 위치가 build/libs/*.war 라는 점에 유의
+COPY --from=builder /home/gradle/project/build/libs/*.war \
+     /usr/local/tomcat/webapps/ROOT.war
 
+# 컨테이너 노출 포트
 EXPOSE 8080
 
-
-######### container 자체 빌드 ###############
-## 1) Builder 단계: Gradle + JDK17로 WAR 빌드
-#FROM gradle:7.6-jdk17 AS builder
-#WORKDIR /home/gradle/project
-#
-## 프로젝트 파일 전체를 복사 (캐시 효율보다 단순 호환성 우선)
-#COPY --chown=gradle:gradle . .
-#
-## 테스트 제외하고 WAR 생성
-#RUN gradle clean build -x test --no-daemon
-#
-## 2) Run 단계: Tomcat에 WAR 배포
-#FROM tomcat:9.0-jdk17
-#
-## 한국 시간대 설정
-#ENV TZ=Asia/Seoul
-#RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \
-# && echo $TZ > /etc/timezone
-#
-## 기본 웹앱 제거
-#RUN rm -rf /usr/local/tomcat/webapps/*
-#
-## Builder 단계에서 생성된 WAR를 ROOT.war로 복사
-## 빌드 결과물 위치가 build/libs/*.war 라는 점에 유의
-#COPY --from=builder /home/gradle/project/build/libs/*.war \
-#     /usr/local/tomcat/webapps/ROOT.war
-#
-## 컨테이너 노출 포트
-#EXPOSE 8080
-#
-## Tomcat 기동
-#CMD ["catalina.sh", "run"]
+# Tomcat 기동
+CMD ["catalina.sh", "run"]
diff --git a/build.gradle b/build.gradle
index f1394d13..b6a2f8c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -69,8 +69,8 @@ dependencies {
     implementation "org.springframework:spring-tx:${springVersion}"
     implementation "org.springframework:spring-jdbc:${springVersion}"
 
-    implementation 'org.mybatis:mybatis:3.4.6'
-    implementation 'org.mybatis:mybatis-spring:1.3.2'
+    implementation 'org.mybatis:mybatis:3.5.14'
+    implementation 'org.mybatis:mybatis-spring:2.1.2'
 
     implementation 'org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:1.16'
     implementation 'org.apache.logging.log4j:log4j-api:2.0.1'
@@ -139,6 +139,8 @@ dependencies {
     implementation "io.micrometer:micrometer-core:1.13.1"
     implementation "io.micrometer:micrometer-registry-prometheus:1.13.1"
     implementation "io.micrometer:micrometer-jakarta9:1.13.1"
+    implementation 'io.micrometer:micrometer-core:1.7.6'
+
 
 }
 
diff --git a/src/main/java/woojooin/planit/domain/goal/action/domain/Action.java b/src/main/java/woojooin/planit/domain/goal/action/domain/Action.java
index 95e6f783..ae652218 100644
--- a/src/main/java/woojooin/planit/domain/goal/action/domain/Action.java
+++ b/src/main/java/woojooin/planit/domain/goal/action/domain/Action.java
@@ -5,6 +5,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import woojooin.planit.domain.member.domain.MemberProduct;
 
 @Data
 @AllArgsConstructor
@@ -20,6 +21,7 @@ public class Action {
 	private String accountNumber;
 
 	private Long memberProductId;
+	private MemberProduct memberProduct;
 
 	private Integer allocatedRate;
 
diff --git a/src/main/java/woojooin/planit/domain/goal/action/mapper/ActionMapper.java b/src/main/java/woojooin/planit/domain/goal/action/mapper/ActionMapper.java
index 97234b36..d9803d0a 100644
--- a/src/main/java/woojooin/planit/domain/goal/action/mapper/ActionMapper.java
+++ b/src/main/java/woojooin/planit/domain/goal/action/mapper/ActionMapper.java
@@ -11,4 +11,6 @@ public interface ActionMapper {
 	List<Action> findActionsByGoalId(Long goalId);
 
 	int saveAll(List<Action> action);
+
+	Action findByMemberProductId(Long memberProductId);
 }
diff --git a/src/main/java/woojooin/planit/domain/goal/isa/dto/req/IsaAccountProductEditReq.java b/src/main/java/woojooin/planit/domain/goal/isa/dto/req/IsaAccountProductEditReq.java
index 624bd5a7..6ca6f2d1 100644
--- a/src/main/java/woojooin/planit/domain/goal/isa/dto/req/IsaAccountProductEditReq.java
+++ b/src/main/java/woojooin/planit/domain/goal/isa/dto/req/IsaAccountProductEditReq.java
@@ -3,21 +3,17 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.NonNull;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 public class IsaAccountProductEditReq {
 
-	@NonNull
 	private Long goalId;
 
-	@NonNull
 	private Long memberProductId;
 
 	private String accountType = "ISA";
 
-	@NonNull
 	private boolean checked;
 }
\ No newline at end of file
diff --git a/src/main/java/woojooin/planit/domain/goal/mapper/GoalMapper.java b/src/main/java/woojooin/planit/domain/goal/mapper/GoalMapper.java
index 1999b23c..881616d6 100644
--- a/src/main/java/woojooin/planit/domain/goal/mapper/GoalMapper.java
+++ b/src/main/java/woojooin/planit/domain/goal/mapper/GoalMapper.java
@@ -1,49 +1,48 @@
 package woojooin.planit.domain.goal.mapper;
 
-import org.apache.ibatis.annotations.MapKey;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import woojooin.planit.domain.goal.domain.Goal; // 변경된 Goal VO 임포트
+import woojooin.planit.domain.goal.domain.Goal;
 import woojooin.planit.domain.goal.domain.GoalProgress;
-
 import woojooin.planit.domain.goal.dto.DepositAccountDto;
 import woojooin.planit.domain.goal.dto.IsaProductDto;
 import woojooin.planit.domain.goal.dto.res.GoalDepositResponse;
 import woojooin.planit.domain.goal.isa.dto.res.IsaAccountProductRes;
-import woojooin.planit.domain.goal.deposit.dto.res.DepositAccountRes;
-
-import java.util.List;
-import java.util.Map;
 
 @Mapper
 public interface GoalMapper {
 
-    int insertGoal(Goal goal);
+	Goal findById(@Param("id") long id);
+
+	int insertGoal(Goal goal);
 
-    Goal selectGoalById(@Param("memberId") Long memberId,@Param("goalId") Long goalId);
+	Goal selectGoalById(@Param("memberId") Long memberId, @Param("goalId") Long goalId);
 
-    List<Goal> selectAllGoals(Long memberId);
+	List<Goal> selectAllGoals(Long memberId);
 
-    int updateGoal(Goal goal);
+	int updateGoal(Goal goal);
 
-    int deleteGoal(@Param("goalId") Long goalId, @Param("memberId") Long memberId);
+	int deleteGoal(@Param("goalId") Long goalId, @Param("memberId") Long memberId);
 
-    int softDeleteActionsByGoalId(@Param("goalId") Long goalId, @Param("memberId") Long memberId);
+	int softDeleteActionsByGoalId(@Param("goalId") Long goalId, @Param("memberId") Long memberId);
 
-    List<IsaAccountProductRes> findAllocatedIsaByGoal(@Param("memberId") Long memberId, @Param("goalId") Long goalId);
+	List<IsaAccountProductRes> findAllocatedIsaByGoal(@Param("memberId") Long memberId, @Param("goalId") Long goalId);
 
-    List<GoalDepositResponse> findAllocatedDepositByGoal(@Param("memberId") Long memberId, @Param("goalId") Long goalId);
+	List<GoalDepositResponse> findAllocatedDepositByGoal(@Param("memberId") Long memberId,
+		@Param("goalId") Long goalId);
 
-    List<DepositAccountDto> selectDepositAccountsByGoalId(Long goalId);
+	List<DepositAccountDto> selectDepositAccountsByGoalId(Long goalId);
 
-    List<IsaProductDto> selectIsaProductsByGoalId(Long goalId);
+	List<IsaProductDto> selectIsaProductsByGoalId(Long goalId);
 
-    // 목표 금액 조회
-    Long selectGoalTargetAmount(Long goalId);
+	// 목표 금액 조회
+	Long selectGoalTargetAmount(Long goalId);
 
-	  List<GoalProgress> selectGoalProgressByGoalId(@Param("goalId") Long goalId);
+	List<GoalProgress> selectGoalProgressByGoalId(@Param("goalId") Long goalId);
 
-	  List<GoalProgress> selectDailyGoalProgressLast6Months(@Param("goalId") Long goalId);
+	List<GoalProgress> selectDailyGoalProgressLast6Months(@Param("goalId") Long goalId);
 
 }
diff --git a/src/main/java/woojooin/planit/domain/member/domain/Member.java b/src/main/java/woojooin/planit/domain/member/domain/Member.java
index cdbb3b2b..a50e1ff4 100644
--- a/src/main/java/woojooin/planit/domain/member/domain/Member.java
+++ b/src/main/java/woojooin/planit/domain/member/domain/Member.java
@@ -30,4 +30,5 @@ public class Member {
 	private Double liquid;
 	private Double growth;
 	private Double diversified;
+	private String fcmToken;
 }
diff --git a/src/main/java/woojooin/planit/domain/member/domain/MemberProduct.java b/src/main/java/woojooin/planit/domain/member/domain/MemberProduct.java
index 8ced397d..5216dbdb 100644
--- a/src/main/java/woojooin/planit/domain/member/domain/MemberProduct.java
+++ b/src/main/java/woojooin/planit/domain/member/domain/MemberProduct.java
@@ -2,11 +2,13 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import woojooin.planit.domain.goal.action.domain.Action;
 import woojooin.planit.domain.product.domain.ProductTypeCode;
 
 @Data
@@ -14,10 +16,11 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class MemberProduct {
-
 	private Long memberProductId;
 	private Long memberId;
 	private Long accountId;
+	private List<Action> actionList;
+	private Member member;
 
 	// ==== 상품 정보 ====
 	private ProductTypeCode productTypeCode;            // 상품유형코드
diff --git a/src/main/java/woojooin/planit/domain/member/mapper/MemberMapper.java b/src/main/java/woojooin/planit/domain/member/mapper/MemberMapper.java
index ec894231..9466f02c 100644
--- a/src/main/java/woojooin/planit/domain/member/mapper/MemberMapper.java
+++ b/src/main/java/woojooin/planit/domain/member/mapper/MemberMapper.java
@@ -1,21 +1,27 @@
 package woojooin.planit.domain.member.mapper;
 
 import org.apache.ibatis.annotations.Param;
+
 import woojooin.planit.domain.member.domain.Member;
 
 public interface MemberMapper {
-    Member findById(Long memberId);
-    Member findByEmail(String email);
-    void insert(Member member);
-    void update(Member member);
-    void delete(Long memberId);
-
-    void updateInvestType(@Param("memberId") Long memberId, @Param("type") String type);
-
-    String findByConnectedIdString(@Param("memberId") Long memberId);
-    
-    void updateConnectedId(@Param("memberId") Long memberId, @Param("connectedId") String connectedId);
-    String findInvestTypeById(@Param("memberId") Long memberId);
-    
-    void updateIsaType(@Param("memberId") Long memberId, @Param("isaType") String isaType);
+	Member findById(Long memberId);
+
+	Member findByEmail(String email);
+
+	void insert(Member member);
+
+	void update(Member member);
+
+	void delete(Long memberId);
+
+	void updateInvestType(@Param("memberId") Long memberId, @Param("type") String type);
+
+	String findByConnectedIdString(@Param("memberId") Long memberId);
+
+	void updateConnectedId(@Param("memberId") Long memberId, @Param("connectedId") String connectedId);
+
+	String findInvestTypeById(@Param("memberId") Long memberId);
+
+	void updateIsaType(@Param("memberId") Long memberId, @Param("isaType") String isaType);
 }
\ No newline at end of file
diff --git a/src/main/java/woojooin/planit/domain/member/mapper/MemberProductMapper.java b/src/main/java/woojooin/planit/domain/member/mapper/MemberProductMapper.java
index 26d723c8..f9f16d85 100644
--- a/src/main/java/woojooin/planit/domain/member/mapper/MemberProductMapper.java
+++ b/src/main/java/woojooin/planit/domain/member/mapper/MemberProductMapper.java
@@ -7,11 +7,14 @@
 import woojooin.planit.domain.member.domain.MemberProduct;
 
 public interface MemberProductMapper {
+
+	MemberProduct findById(@Param("id") Long memberProductId);
+
 	void insert(MemberProduct memberProduct);
 
 	void insertBatch(List<MemberProduct> memberProducts);
 
-	MemberProduct findByMemberId(@Param("memberProductId") Long memberProductId);
+	MemberProduct findByMemberProductId(@Param("memberProductId") Long memberProductId);
 
 	List<MemberProduct> select(Long memberId);
 }
diff --git a/src/main/java/woojooin/planit/domain/product/mapper/ProductMapper.java b/src/main/java/woojooin/planit/domain/product/mapper/ProductMapper.java
index b781ab13..6bc00a71 100644
--- a/src/main/java/woojooin/planit/domain/product/mapper/ProductMapper.java
+++ b/src/main/java/woojooin/planit/domain/product/mapper/ProductMapper.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import woojooin.planit.domain.product.domain.Product;
 
 public interface ProductMapper {
@@ -10,5 +12,8 @@ public interface ProductMapper {
 	Product selectBySrtnCd(String srtncd);
 
 	Product findByProductId(Long productId);
+
+	Product findByShortenCode(@Param("shortenCode") String shortenCode);
+
 	Long selectProductIdByItemName(String itemName);
 }
diff --git a/src/main/java/woojooin/planit/domain/rebalance/mapper/RebalanceMapper.java b/src/main/java/woojooin/planit/domain/rebalance/mapper/RebalanceMapper.java
index 284b2951..a5548f2c 100644
--- a/src/main/java/woojooin/planit/domain/rebalance/mapper/RebalanceMapper.java
+++ b/src/main/java/woojooin/planit/domain/rebalance/mapper/RebalanceMapper.java
@@ -11,6 +11,8 @@
 @Mapper
 public interface RebalanceMapper {
 
+	Rebalance findById(@Param("id") long id);
+
 	/** 단일 리밸런싱 내역 저장 */
 	int insert(Rebalance rebalance);
 
diff --git a/src/main/java/woojooin/planit/domain/rebalance/vo/Rebalance.java b/src/main/java/woojooin/planit/domain/rebalance/vo/Rebalance.java
index 5f729712..b5e7add5 100644
--- a/src/main/java/woojooin/planit/domain/rebalance/vo/Rebalance.java
+++ b/src/main/java/woojooin/planit/domain/rebalance/vo/Rebalance.java
@@ -6,6 +6,9 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import woojooin.planit.domain.goal.domain.Goal;
+import woojooin.planit.domain.member.domain.MemberProduct;
+import woojooin.planit.domain.product.domain.Product;
 import woojooin.planit.domain.rebalance.enums.InvestType;
 
 @Data
@@ -13,6 +16,11 @@
 @AllArgsConstructor
 @NoArgsConstructor
 public class Rebalance {
+
+	private Goal goal;
+	private Product product;
+	private MemberProduct memberProduct;
+
 	private Long rebalanceId;
 	private String productCode;
 	private Long memberProductId;
diff --git a/src/main/java/woojooin/planit/global/util/rabbitMQ/GoalMsg.java b/src/main/java/woojooin/planit/global/util/rabbitMQ/GoalMsg.java
index 43c0d877..e201104f 100644
--- a/src/main/java/woojooin/planit/global/util/rabbitMQ/GoalMsg.java
+++ b/src/main/java/woojooin/planit/global/util/rabbitMQ/GoalMsg.java
@@ -10,7 +10,7 @@
 public class GoalMsg {
 
 	private Long memberId;
-	private Long goalId;
 	private String goalName;
 	private Integer achievementRate;
+	private Integer tryCount;
 }
diff --git a/src/main/resources/mapper/ActionMapper.xml b/src/main/resources/mapper/ActionMapper.xml
index 2283d18f..91b9c1e2 100644
--- a/src/main/resources/mapper/ActionMapper.xml
+++ b/src/main/resources/mapper/ActionMapper.xml
@@ -18,6 +18,12 @@
         <result property="updatedAt" column="updated_at"/>
     </resultMap>
 
+    <select id="findByMemberProductId" parameterType="long" resultMap="ActionResultMap">
+        SELECT *
+        FROM action
+        WHERE member_product_id = #{memberProductId}
+    </select>
+
     <select id="findActionsByGoalId" parameterType="long" resultMap="ActionResultMap">
         SELECT *
         FROM action
diff --git a/src/main/resources/mapper/MemberMapper.xml b/src/main/resources/mapper/MemberMapper.xml
index 515f99e3..48a7816d 100644
--- a/src/main/resources/mapper/MemberMapper.xml
+++ b/src/main/resources/mapper/MemberMapper.xml
@@ -21,45 +21,50 @@
     </resultMap>
 
     <select id="findById" resultMap="MemberResultMap" parameterType="long">
-        SELECT * FROM member WHERE member_id = #{memberId}
+        SELECT *
+        FROM member
+        WHERE member_id = #{memberId}
     </select>
 
 
-    <insert id="insert" parameterType="woojooin.planit.domain.member.domain.Member" useGeneratedKeys="true" keyProperty="memberId">
-        INSERT INTO member (
-            role, connected_id, reward_cnt, social_id, auth_vender,
-            invest_type, last_visit, email, password, benefit, nickname
-        ) VALUES (
-                     #{role}, #{connectedId}, #{rewardCnt}, #{socialId}, #{authVender},
-                     #{investType}, #{lastVisit}, #{email}, #{password}, #{benefit}, #{nickname}
-                 )
+    <insert id="insert" parameterType="woojooin.planit.domain.member.domain.Member" keyProperty="memberId">
+        INSERT INTO member (member_id, role, connected_id, reward_cnt, social_id, auth_vender,
+                            invest_type, last_visit, email, password, benefit, nickname)
+        VALUES (${memberId}, #{role}, #{connectedId}, #{rewardCnt}, #{socialId}, #{authVender},
+                #{investType}, #{lastVisit}, #{email}, #{password}, #{benefit}, #{nickname})
     </insert>
 
     <update id="update" parameterType="woojooin.planit.domain.member.domain.Member">
         UPDATE member
-        SET role = #{role},
+        SET role         = #{role},
             connected_id = #{connectedId},
-            reward_cnt = #{rewardCnt},
-            social_id = #{socialId},
-            auth_vender = #{authVender},
-            invest_type = #{investType},
-            last_visit = #{lastVisit},
-            email = #{email},
-            password = #{password},
-            benefit = #{benefit},
-            nickname = #{nickname}
+            reward_cnt   = #{rewardCnt},
+            social_id    = #{socialId},
+            auth_vender  = #{authVender},
+            invest_type  = #{investType},
+            last_visit   = #{lastVisit},
+            email        = #{email},
+            password     = #{password},
+            benefit      = #{benefit},
+            nickname     = #{nickname}
         WHERE member_id = #{memberId}
     </update>
 
     <delete id="delete" parameterType="long">
-        DELETE FROM member WHERE member_id = #{memberId}
+        DELETE
+        FROM member
+        WHERE member_id = #{memberId}
     </delete>
 
     <select id="findByEmail" resultMap="MemberResultMap" parameterType="String">
-        SELECT * FROM member WHERE email = #{email}
+        SELECT *
+        FROM member
+        WHERE email = #{email}
     </select>
     <select id="findByConnectedIdString" resultType="java.lang.String">
-        select connected_id from member where member_id = #{memberId}
+        select connected_id
+        from member
+        where member_id = #{memberId}
     </select>
 
     <update id="updateInvestType">
@@ -67,7 +72,7 @@
         SET invest_type = #{type}
         WHERE member_id = #{memberId}
     </update>
-    
+
     <update id="updateConnectedId">
         UPDATE member
         SET connected_id = #{connectedId}
@@ -75,10 +80,11 @@
     </update>
 
     <select id="findInvestTypeById" parameterType="long" resultType="string">
-        select invest_type from member
-        where member_id=#{memberId}
+        select invest_type
+        from member
+        where member_id = #{memberId}
     </select>
-    
+
     <update id="updateIsaType">
         UPDATE member
         SET isa_type = #{isaType}
diff --git a/src/main/resources/mapper/MemberProductMapper.xml b/src/main/resources/mapper/MemberProductMapper.xml
index 53e27de5..244dbb65 100644
--- a/src/main/resources/mapper/MemberProductMapper.xml
+++ b/src/main/resources/mapper/MemberProductMapper.xml
@@ -3,6 +3,50 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="woojooin.planit.domain.member.mapper.MemberProductMapper">
+
+    <resultMap id="MemberProductResultMap" type="woojooin.planit.domain.member.domain.MemberProduct">
+        <id property="memberProductId" column="member_product_id"/>
+
+        <result property="accountId" column="account_id"/>
+        <result property="itemName" column="item_name"/>
+        <result property="itemCode" column="item_code"/>
+        <result property="productId" column="product_id"/>
+        <result property="accountNumber" column="account_number"/>
+        <result property="accountExtends" column="account_extends"/>
+        <result property="balanceType" column="balance_type"/>
+        <result property="accountCurrency" column="account_currency"/>
+        <result property="avgPresentAmount" column="avg_present_amount"/>
+        <result property="presentAmount" column="present_amount"/>
+        <result property="valuationPl" column="valuation_pl"/>
+        <result property="valuationAmount" column="valuation_amount"/>
+        <result property="purchaseAmount" column="purchase_amount"/>
+        <result property="earningsRate" column="earnings_rate"/>
+        <result property="depositReceived" column="deposit_received"/>
+        <result property="quantity" column="quantity"/>
+        <result property="settleQuantity" column="settle_quantity"/>
+        <result property="isIntegrated" column="is_integrated"/>
+        <result property="createdAt" column="created_at"/>
+        <result property="updatedAt" column="updated_at"/>
+
+        <!-- Lazy로 나중에 실행 -->
+        <association property="member"
+                     javaType="woojooin.planit.domain.member.domain.Member"
+                     column="member_id"
+                     select="woojooin.planit.domain.member.mapper.MemberMapper.findById"/>
+
+        <collection property="actionList"
+                    ofType="woojooin.planit.domain.goal.action.domain.Action"
+                    column="member_product_id"
+                    select="woojooin.planit.domain.goal.action.mapper.ActionMapper.findByMemberProductId"/>
+    </resultMap>
+
+    <select id="findByMemberProductId" parameterType="java.lang.Long"
+            resultMap="MemberProductResultMap">
+        SELECT *
+        FROM member_product
+        WHERE member_product_id = #{memberProductId}
+    </select>
+
     <insert id="insert" parameterType="woojooin.planit.domain.member.domain.MemberProduct"
             useGeneratedKeys="true"
             keyProperty="memberProductId"
@@ -155,23 +199,22 @@
         WHERE member_id = #{memberId}
     </select>
 
-    <select id="findByMemberId" parameterType="java.lang.Long"
+    <select id="findById" parameterType="java.lang.Long"
             resultType="woojooin.planit.domain.member.domain.MemberProduct">
         SELECT *
         FROM member_product
-        WHERE member_product_id = #{memberProductId}
+        WHERE member_product_id = #{id}
     </select>
 
     <select id="selectProductIdByItemName" resultType="java.lang.Long">
         SELECT CAST(shorten_code AS UNSIGNED) as productId
         FROM product
         WHERE item_name = #{itemName}
-          AND base_date = (
-            SELECT MAX(base_date)
-            FROM product
-            WHERE item_name = #{itemName}
-        )
+          AND base_date = (SELECT MAX(base_date)
+                           FROM product
+                           WHERE item_name = #{itemName})
             LIMIT 1
     </select>
 
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/ProductMapper.xml b/src/main/resources/mapper/ProductMapper.xml
index b04b1cfe..ddef5700 100644
--- a/src/main/resources/mapper/ProductMapper.xml
+++ b/src/main/resources/mapper/ProductMapper.xml
@@ -30,15 +30,20 @@
         WHERE product_id = #{productId}
     </select>
 
+    <select id="findByShortenCode" parameterType="java.lang.String"
+            resultType="woojooin.planit.domain.product.domain.Product">
+        SELECT *
+        FROM product
+        WHERE shorten_code = #{shortenCode}
+    </select>
+
     <select id="selectProductIdByItemName" resultType="java.lang.Long">
         SELECT CAST(shorten_code AS UNSIGNED) as productId
         FROM product
         WHERE item_name = #{itemName}
-          AND base_date = (
-            SELECT MAX(base_date)
-            FROM product
-            WHERE item_name = #{itemName}
-        )
+          AND base_date = (SELECT MAX(base_date)
+                           FROM product
+                           WHERE item_name = #{itemName})
             LIMIT 1
     </select>
 
diff --git a/src/main/resources/mapper/RebalanceMapper.xml b/src/main/resources/mapper/RebalanceMapper.xml
index 54e68bac..3ea5399d 100644
--- a/src/main/resources/mapper/RebalanceMapper.xml
+++ b/src/main/resources/mapper/RebalanceMapper.xml
@@ -4,6 +4,53 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="woojooin.planit.domain.rebalance.mapper.RebalanceMapper">
 
+    <resultMap id="RebalanceResultMap" type="woojooin.planit.domain.rebalance.vo.Rebalance">
+        <!-- 단일 컬럼 매핑 -->
+        <id property="rebalanceId" column="rebalance_id"/>
+        <result property="productCode" column="product_code"/>
+        <result property="memberProductId" column="member_product_id"/>
+        <result property="goalId" column="goal_id"/>
+        <result property="comment" column="comment"/>
+        <result property="expectedReturnRate" column="expected_return_rate"/>
+        <result property="previousProductName" column="previous_product_name"/>
+        <result property="nextProductName" column="next_product_name"/>
+        <result property="investType" column="invest_type"/>
+
+        <association property="goal"
+                     javaType="woojooin.planit.domain.goal.domain.Goal"
+                     column="goal_id"
+                     select="woojooin.planit.domain.goal.mapper.GoalMapper.findById"/>
+
+        <association property="goal"
+                     javaType="woojooin.planit.domain.goal.domain.Goal"
+                     column="goal_id"
+                     select="woojooin.planit.domain.goal.mapper.GoalMapper.findById"/>
+
+        <association property="goal"
+                     javaType="woojooin.planit.domain.goal.domain.Goal"
+                     column="goal_id"
+                     select="woojooin.planit.domain.goal.mapper.GoalMapper.findById"/>
+
+        <association property="product"
+                     javaType="woojooin.planit.domain.product.domain.Product"
+                     column="product_code"
+                     select="woojooin.planit.domain.product.mapper.ProductMapper.findByShortenCode"/>
+
+
+        <association property="memberProduct"
+                     javaType="woojooin.planit.domain.member.domain.MemberProduct"
+                     column="member_product_id"
+                     select="woojooin.planit.domain.member.mapper.MemberProductMapper.findById"/>
+
+
+    </resultMap>
+
+    <select id="findById" parameterType="java.lang.Long" resultMap="RebalanceResultMap">
+        SELECT *
+        FROM rebalancing
+        WHERE rebalance_id = ${id}
+    </select>
+
     <!-- 단일 insert -->
     <insert id="insert"
             parameterType="woojooin.planit.domain.rebalance.vo.Rebalance"
@@ -92,7 +139,8 @@
         ORDER BY created_at LIMIT 3
     </select>
 
-    <select id="findRebalanceInvestInfoByMemberId" parameterType="long" resultType="woojooin.planit.domain.rebalance.dto.res.RebalanceInvestInfoRes">
+    <select id="findRebalanceInvestInfoByMemberId" parameterType="long"
+            resultType="woojooin.planit.domain.rebalance.dto.res.RebalanceInvestInfoRes">
         select item_name,
                quantity,
                valuation_amount,
diff --git a/src/main/resources/mapper/goal/GoalMapper.xml b/src/main/resources/mapper/goal/GoalMapper.xml
index 638807c5..e6c9310f 100644
--- a/src/main/resources/mapper/goal/GoalMapper.xml
+++ b/src/main/resources/mapper/goal/GoalMapper.xml
@@ -17,113 +17,127 @@
         <result property="goalRate" column="goal_rate"/>
     </resultMap>
 
-    <insert id="insertGoal" parameterType="woojooin.planit.domain.goal.domain.Goal" useGeneratedKeys="true" keyProperty="goalId">
-    insert  into `goal` (member_id, goal_name, target_amount, start_date, end_date,
-            deposit_rate, isa_rate, start_amount, goal_rate
-        )
-    VALUES (
-        #{memberId}, #{goalName}, #{targetAmount}, #{startDate}, #{endDate},
-        #{depositRate}, #{isaRate}, #{startAmount}, #{goalRate}
-        )
+
+    <select id="findById" parameterType="java.lang.Long" resultMap="GoalResultMap">
+        SELECT *
+        FROM goal
+        WHERE goal_id = #{id}
+    </select>
+
+    <insert id="insertGoal" parameterType="woojooin.planit.domain.goal.domain.Goal" useGeneratedKeys="true"
+            keyProperty="goalId">
+        insert into `goal` (member_id, goal_name, target_amount, start_date, end_date,
+                            deposit_rate, isa_rate, start_amount, goal_rate)
+        VALUES (#{memberId}, #{goalName}, #{targetAmount}, #{startDate}, #{endDate},
+                #{depositRate}, #{isaRate}, #{startAmount}, #{goalRate})
     </insert>
 
 
     <update id="updateGoal" parameterType="woojooin.planit.domain.goal.domain.Goal">
         UPDATE `goal`
-        SET
-            goal_name = #{goalName},
+        SET goal_name     = #{goalName},
             target_amount = #{targetAmount},
-            start_date = #{startDate},
-            end_date = #{endDate},
-            isa_rate = #{isaRate},
-            deposit_rate = #{depositRate},
-            start_amount = #{startAmount},
-            goal_rate = #{goalRate}
-        WHERE goal_id = #{goalId} AND member_id = #{memberId}
+            start_date    = #{startDate},
+            end_date      = #{endDate},
+            isa_rate      = #{isaRate},
+            deposit_rate  = #{depositRate},
+            start_amount  = #{startAmount},
+            goal_rate     = #{goalRate}
+        WHERE goal_id = #{goalId}
+          AND member_id = #{memberId}
         /*goal.getGoaldID*/
     </update>
 
-    <select id="selectGoalById" resultMap="GoalResultMap" >
-        SELECT
-            goal_id, member_id, goal_name, target_amount,
-            start_date, end_date, deposit_rate, isa_rate,
-            start_amount, goal_rate
+    <select id="selectGoalById" resultMap="GoalResultMap">
+        SELECT goal_id,
+               member_id,
+               goal_name,
+               target_amount,
+               start_date,
+               end_date,
+               deposit_rate,
+               isa_rate,
+               start_amount,
+               goal_rate
         FROM `goal`
-        WHERE goal_id = #{goalId} AND member_id = #{memberId}
+        WHERE goal_id = #{goalId}
+          AND member_id = #{memberId}
     </select>
 
 
     <select id="selectAllGoals" resultMap="GoalResultMap" parameterType="Long">
-        SELECT
-            goal_id, member_id, goal_name, target_amount,
-            start_date, end_date, deposit_rate, isa_rate,
-            start_amount, goal_rate
+        SELECT goal_id,
+               member_id,
+               goal_name,
+               target_amount,
+               start_date,
+               end_date,
+               deposit_rate,
+               isa_rate,
+               start_amount,
+               goal_rate
         FROM `goal`
         WHERE member_id = #{memberId}
         ORDER BY goal_id DESC
     </select>
 
     <select id="findAllocatedIsaByGoal" resultType="woojooin.planit.domain.goal.isa.dto.res.IsaAccountProductRes">
-        SELECT
-            mp.member_product_id,
-            mp.present_amount,
-            mp.quantity,
-            mp.item_name,
-            1 AS checked
+        SELECT mp.member_product_id,
+               mp.present_amount,
+               mp.quantity,
+               mp.item_name,
+               1 AS checked
         FROM member_product mp
         WHERE mp.member_id = #{memberId}
           AND mp.is_deleted = 0
-          AND EXISTS (
-            SELECT 1
-            FROM action a
-            WHERE a.is_deleted = 0
-              AND a.account_type = 'ISA'
-              AND a.goal_id = #{goalId}
-              AND a.member_product_id = mp.member_product_id
-        )
+          AND EXISTS (SELECT 1
+                      FROM action a
+                      WHERE a.is_deleted = 0
+                        AND a.account_type = 'ISA'
+                        AND a.goal_id = #{goalId}
+                        AND a.member_product_id = mp.member_product_id)
         ORDER BY mp.member_product_id DESC
     </select>
     <select id="findAllocatedDepositByGoal" resultType="woojooin.planit.domain.goal.dto.res.GoalDepositResponse">
-        select
-            acc.account_id as member_product_id,
-            acc.account_number,
-            acc.account_name,
-            acc.account_balance as present_amount,
-            1 as checked,
-            COALESCE(allocated_sum.total_allocated, 0) as allocated_amount,
-            (acc.account_balance - COALESCE(allocated_sum.total_allocated, 0)) as remaining_amount,
-            a.amount AS myAmount
+        select acc.account_id                                                     as member_product_id,
+               acc.account_number,
+               acc.account_name,
+               acc.account_balance                                                as present_amount,
+               1                                                                  as checked,
+               COALESCE(allocated_sum.total_allocated, 0)                         as allocated_amount,
+               (acc.account_balance - COALESCE(allocated_sum.total_allocated, 0)) as remaining_amount,
+               a.amount                                                           AS myAmount
         FROM account acc
                  -- 각 계좌별로 현재 할당된 총액을 계산하는 서브쿼리
-                 LEFT JOIN (
-            SELECT
-                a.account_id,
-                SUM(a.amount) as total_allocated
-            FROM action a
-            WHERE a.is_deleted = false
-              AND a.account_type = 'DEPOSIT'
-            GROUP BY a.account_id
-        ) allocated_sum ON acc.account_id = allocated_sum.account_id
+                 LEFT JOIN (SELECT a.account_id,
+                                   SUM(a.amount) as total_allocated
+                            FROM action a
+                            WHERE a.is_deleted = false
+                              AND a.account_type = 'DEPOSIT'
+                            GROUP BY a.account_id) allocated_sum ON acc.account_id = allocated_sum.account_id
                  INNER JOIN action a ON acc.account_id = a.account_id
         WHERE acc.member_id = #{memberId}
-        AND acc.is_deleted = false
-        AND acc.account_type = 'DEPOSIT'  -- 예적금 계좌만 필터링
-        AND a.goal_id = #{goalId}
-        AND a.is_deleted = false
-        AND a.account_type = 'DEPOSIT'  -- action 테이블에서도 예적금만 필터링
+          AND acc.is_deleted = false
+          AND acc.account_type = 'DEPOSIT' -- 예적금 계좌만 필터링
+          AND a.goal_id = #{goalId}
+          AND a.is_deleted = false
+          AND a.account_type = 'DEPOSIT'   -- action 테이블에서도 예적금만 필터링
         ORDER BY acc.account_id DESC
     </select>
 
 
-    <delete id="deleteGoal" >
-        delete from `goal`
-        where goal_id = #{goalId} AND member_id = #{memberId}
+    <delete id="deleteGoal">
+        delete
+        from `goal`
+        where goal_id = #{goalId}
+          AND member_id = #{memberId}
     </delete>
 
-    <update id="softDeleteActionsByGoalId" >
+    <update id="softDeleteActionsByGoalId">
         UPDATE `action`
         SET is_deleted = 1
-        WHERE goal_id = #{goalId}  AND member_id = #{memberId}
+        WHERE goal_id = #{goalId}
+          AND member_id = #{memberId}
     </update>
 
 
@@ -135,24 +149,22 @@
     </select>
 
 
-
     <select id="selectDailyGoalProgressLast6Months" resultType="woojooin.planit.domain.goal.domain.GoalProgress">
-        SELECT
-            daily_goal_progress_id,
-            goal_id,
-            isa_progress,
-            deposit_progress,
-            progress_date,
-            created_at,
-            updated_at
+        SELECT daily_goal_progress_id,
+               goal_id,
+               isa_progress,
+               deposit_progress,
+               progress_date,
+               created_at,
+               updated_at
         FROM daily_goal_progress
         WHERE goal_id = #{goalId}
           AND created_at >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
         ORDER BY created_at DESC
     </select>
     <select id="selectDepositAccountsByGoalId" resultType="woojooin.planit.domain.goal.dto.DepositAccountDto">
-        SELECT a.bank_code AS bankCode,
-               a.account_balance AS accountBalance,
+        SELECT a.bank_code                AS bankCode,
+               a.account_balance          AS accountBalance,
                act.account_allocated_rate AS allocatedRate
         FROM action act
                  JOIN account a ON act.account_id = a.account_id
@@ -164,7 +176,7 @@
 
     <select id="selectIsaProductsByGoalId" resultType="woojooin.planit.domain.goal.dto.IsaProductDto">
         SELECT mp.present_amount AS presentAmount,
-               mp.quantity AS quantity
+               mp.quantity       AS quantity
         FROM member_product mp
                  JOIN action act ON mp.member_product_id = act.member_product_id
                  JOIN account a ON act.account_id = a.account_id
diff --git a/src/main/resources/mybatis-config.xml b/src/main/resources/mybatis-config.xml
index 78b7e779..7b7b8387 100644
--- a/src/main/resources/mybatis-config.xml
+++ b/src/main/resources/mybatis-config.xml
@@ -6,6 +6,8 @@
 <configuration>
     <settings>
         <setting name="mapUnderscoreToCamelCase" value="true"/>
+        <setting name="lazyLoadingEnabled" value="true"/>
+        <setting name="aggressiveLazyLoading" value="false"/>
     </settings>
 
     <typeAliases>