Merge pull request #294 from team-winey/feature/hotfix-mypage-getUser

team-winey · May 15, 2024 · 54633f1 · 54633f1
2 parents 5b6751a + f366afe
commit 54633f1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt
@@ -15,6 +15,8 @@ data class ResponseGetUserDto(
         val userId: Int,
         @SerialName("nickname")
         val nickname: String,
+        @SerialName("createdDday")
+        val createdDday: Int,
         @SerialName("userLevel")
         val userLevel: String,
         @SerialName("fcmIsAllowed")
@@ -23,8 +25,6 @@ data class ResponseGetUserDto(
         val accumulatedAmount: Int,
         @SerialName("accumulatedCount")
         val accumulatedCount: Int,
-        @SerialName("amountSavedHundredDays")
-        val amountSavedHundredDays: Int,
         @SerialName("amountSavedTwoWeeks")
         val amountSavedTwoWeeks: Int,
         @SerialName("amountSpentTwoWeeks")
@@ -42,7 +42,7 @@ data class ResponseGetUserDto(
             fcmIsAllowed = userData.fcmIsAllowed,
             accumulatedAmount = userData.accumulatedAmount,
             accumulatedCount = userData.accumulatedCount,
-            amountSavedHundredDays = userData.amountSavedHundredDays,
+            createdDday = userData.createdDday,
             amountSavedTwoWeeks = userData.amountSavedTwoWeeks,
             amountSpentTwoWeeks = userData.amountSpentTwoWeeks,
             remainingAmount = userData.remainingAmount,

diff --git a/app/src/main/java/org/go/sopt/winey/data/repository/DataStoreRepositoryImpl.kt b/app/src/main/java/org/go/sopt/winey/data/repository/DataStoreRepositoryImpl.kt
@@ -119,7 +119,7 @@ class DataStoreRepositoryImpl @Inject constructor(
                         fcmIsAllowed = true,
                         accumulatedAmount = 0,
                         accumulatedCount = 0,
-                        amountSavedHundredDays = 0,
+                        createdDday = 0,
                         amountSavedTwoWeeks = 0,
                         amountSpentTwoWeeks = 0,
                         remainingCount = 0,

diff --git a/app/src/main/java/org/go/sopt/winey/domain/entity/UserV2.kt b/app/src/main/java/org/go/sopt/winey/domain/entity/UserV2.kt
@@ -6,7 +6,7 @@ data class UserV2(
     val fcmIsAllowed: Boolean,
     val accumulatedAmount: Int,
     val accumulatedCount: Int,
-    val amountSavedHundredDays: Int,
+    val createdDday: Int,
     val amountSavedTwoWeeks: Int,
     val amountSpentTwoWeeks: Int,
     val remainingAmount: Int,

diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml
@@ -339,9 +339,9 @@
 
                     <TextView
                         android:id="@+id/tv_mypage_item_save"
-                        setAmount="@{data.amountSavedHundredDays}"
-                        setPrefix="@{@string/mypage_save_for_100days_prefix}"
-                        setSuffix="@{@string/mypage_save_for_100days_suffix}"
+                        setAmount="@{data.accumulatedAmount}"
+                        setPrefix="@{data.createdDday + @string/mypage_saved_after_joined_prefix}"
+                        setSuffix="@{@string/mypage_saved_after_joined_suffix}"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginHorizontal="16dp"
@@ -371,7 +371,7 @@
                             app:layout_constraintEnd_toStartOf="@+id/l_mypage_item_chicken"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent"
-                            app:savedAmount="@{data.amountSavedHundredDays}" />
+                            app:savedAmount="@{data.accumulatedAmount}" />
 
                         <include
                             android:id="@+id/l_mypage_item_chicken"
@@ -384,7 +384,7 @@
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toEndOf="@id/l_mypage_item_coffee"
                             app:layout_constraintTop_toTopOf="parent"
-                            app:savedAmount="@{data.amountSavedHundredDays}" />
+                            app:savedAmount="@{data.accumulatedAmount}" />
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -408,7 +408,7 @@
                             app:layout_constraintEnd_toStartOf="@+id/l_mypage_item_airpod"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent"
-                            app:savedAmount="@{data.amountSavedHundredDays}" />
+                            app:savedAmount="@{data.accumulatedAmount}" />
 
                         <include
                             android:id="@+id/l_mypage_item_airpod"
@@ -420,7 +420,7 @@
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toEndOf="@id/l_mypage_item_sneakers"
                             app:layout_constraintTop_toTopOf="parent"
-                            app:savedAmount="@{data.amountSavedHundredDays}" />
+                            app:savedAmount="@{data.accumulatedAmount}" />
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -125,8 +125,8 @@
     <string name="mypage_2weeks_title">최근 2주간</string>
     <string name="mypage_description_eat">%s 이만큼\n먹을 수 있어요</string>
     <string name="mypage_description_buy">%s 이만큼\n살 수 있어요</string>
-    <string name="mypage_save_for_100days_prefix">100일간 총&#160;</string>
-    <string name="mypage_save_for_100days_suffix">원을 아꼈네요.</string>
+    <string name="mypage_saved_after_joined_prefix">일간 총&#160;</string>
+    <string name="mypage_saved_after_joined_suffix">원을 아꼈네요.</string>
     <string name="mypage_reamining_amount">%s원만 더!</string>
     <string name="mypage_lv4">절약을 통해 황제를 계속 유지해 보세요!</string>
     <string name="mypage_current_amount">%s원 절약중</string>