[REFACTOR] #112 : Network 모듈 DateUtil 추가

pknu-wap · Jan 27, 2024 · 3ae3254 · 3ae3254
1 parent 233a628
commit 3ae3254
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 20 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.../java/com/wap/wapp/core/network/source/attendancestatus/AttendanceStatusDataSourceImpl.kt b/.../java/com/wap/wapp/core/network/source/attendancestatus/AttendanceStatusDataSourceImpl.kt
@@ -7,8 +7,8 @@ import com.wap.wapp.core.network.constant.EVENT_COLLECTION
 import com.wap.wapp.core.network.model.attendancestatus.AttendanceStatusRequest
 import com.wap.wapp.core.network.model.attendancestatus.AttendanceStatusResponse
 import com.wap.wapp.core.network.utils.await
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
+import com.wap.wapp.core.network.utils.generateNowDateTime
+import com.wap.wapp.core.network.utils.toISOLocalDateTimeString
 import javax.inject.Inject
 
 class AttendanceStatusDataSourceImpl @Inject constructor(
@@ -42,7 +42,4 @@ class AttendanceStatusDataSourceImpl @Inject constructor(
                 .set(attendanceStatusRequest)
                 .await()
         }
-
-    private fun LocalDateTime.toISOLocalDateTimeString(): String =
-        this.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
 }
diff --git a/core/network/src/main/java/com/wap/wapp/core/network/source/event/EventDataSourceImpl.kt b/core/network/src/main/java/com/wap/wapp/core/network/source/event/EventDataSourceImpl.kt
@@ -6,10 +6,10 @@ import com.wap.wapp.core.network.constant.EVENT_COLLECTION
 import com.wap.wapp.core.network.model.event.EventRequest
 import com.wap.wapp.core.network.model.event.EventResponse
 import com.wap.wapp.core.network.utils.await
+import com.wap.wapp.core.network.utils.generateNowDateTime
+import com.wap.wapp.core.network.utils.toISOLocalDateTimeString
 import java.time.LocalDate
-import java.time.LocalDateTime
 import java.time.LocalTime
-import java.time.format.DateTimeFormatter
 import javax.inject.Inject
 
 class EventDataSourceImpl @Inject constructor(
@@ -166,6 +166,3 @@ class EventDataSourceImpl @Inject constructor(
             .await()
     }
 }
-
-private fun LocalDateTime.toISOLocalDateTimeString(): String =
-    this.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
diff --git a/core/network/src/main/java/com/wap/wapp/core/network/utils/DateUtil.kt b/core/network/src/main/java/com/wap/wapp/core/network/utils/DateUtil.kt
@@ -0,0 +1,16 @@
+package com.wap.wapp.core.network.utils
+
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+
+internal fun String.toISOLocalDateTime(): LocalDateTime = LocalDateTime.parse(
+    this,
+    DateTimeFormatter.ISO_LOCAL_DATE_TIME,
+)
+
+internal fun LocalDateTime.toISOLocalDateTimeString(): String =
+    this.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+
+internal fun generateNowDateTime(zoneId: ZoneId = ZoneId.of("Asia/Seoul")): LocalDateTime =
+    LocalDateTime.now(zoneId)
diff --git a/core/network/src/main/java/com/wap/wapp/core/network/utils/LocalDateTime.kt b/core/network/src/main/java/com/wap/wapp/core/network/utils/LocalDateTime.kt