From b59dc0cecbc62a552391a493f53ba0b76c8532f0 Mon Sep 17 00:00:00 2001
From: beom84 <cjja00@konkuk.ac.kr>
Date: Tue, 21 Jan 2025 05:23:38 +0900
Subject: [PATCH] =?UTF-8?q?[feat]=20#46=20deadline=20parsing=20=EC=99=84?=
 =?UTF-8?q?=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bbangzip/data/dto/response/ResponseTodayOrdersDto.kt     | 5 ++++-
 .../android/bbangzip/data/dto/response/ResponseTodoDto.kt    | 5 ++++-
 app/src/main/res/values/strings.xml                          | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/android/bbangzip/data/dto/response/ResponseTodayOrdersDto.kt b/app/src/main/java/org/android/bbangzip/data/dto/response/ResponseTodayOrdersDto.kt
index c80fe6b3..cef24314 100644
--- a/app/src/main/java/org/android/bbangzip/data/dto/response/ResponseTodayOrdersDto.kt
+++ b/app/src/main/java/org/android/bbangzip/data/dto/response/ResponseTodayOrdersDto.kt
@@ -57,7 +57,10 @@ data class TodoInfo(
             studyContents = studyContents,
             startPage = startPage,
             finishPage = finishPage,
-            deadline = deadline,
+            deadline =
+                deadline.split("-").let { parts ->
+                    "${parts[0]}년 ${parts[1].toInt()}월 ${parts[2].toInt()}일"
+                },
             remainingDays = remainingDays,
             isFinished = isFinished,
         )
diff --git a/app/src/main/java/org/android/bbangzip/data/dto/response/ResponseTodoDto.kt b/app/src/main/java/org/android/bbangzip/data/dto/response/ResponseTodoDto.kt
index abaedb5a..3312db27 100644
--- a/app/src/main/java/org/android/bbangzip/data/dto/response/ResponseTodoDto.kt
+++ b/app/src/main/java/org/android/bbangzip/data/dto/response/ResponseTodoDto.kt
@@ -48,7 +48,10 @@ data class TodoCardInfo(
             studyContents = studyContents,
             startPage = startPage,
             finishPage = finishPage,
-            deadline = deadline,
+            deadline =
+                deadline.split("-").let { parts ->
+                    "${parts[0]}년 ${parts[1].toInt()}월 ${parts[2].toInt()}일"
+                },
             remainingDays = remainingDays,
         )
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cdbcca76..25b170c5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,7 +17,7 @@
     <string name="card_friend_kebab_button_description">더보기 버튼입니다.</string>
     <string name="card_friend_boss_text">사장님</string>
     <string name="card_d_minus_day_text">D-%s</string>
-    <string name="card_deadline_text">%s까지</string>
+    <string name="card_deadline_text">%s 까지</string>
     <string name="card_start_end_day_text">%sp - %sp</string>
     <string name="card_subject_exam_name_text">%s / %s</string>
     <string name="card_d_minus">D+</string>