Merge pull request #74 from 2rabs/rt/refactor-schedule

♻️ Schedule 関連のリファクタリング
nitoclub · Nov 26, 2023 · 10ec0f2 · 10ec0f2
2 parents 0004c54 + 7a83218
commit 10ec0f2
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 10 deletions.
diff --git a/core/data/src/commonMain/kotlin/club/nito/core/data/OfflineFirstScheduleRepository.kt b/core/data/src/commonMain/kotlin/club/nito/core/data/OfflineFirstScheduleRepository.kt
@@ -1,7 +1,7 @@
 package club.nito.core.data
 
 import club.nito.core.model.Order
-import club.nito.core.model.Schedule
+import club.nito.core.model.schedule.Schedule
 import club.nito.core.network.schedule.ScheduleRemoteDataSource
 import co.touchlab.kermit.Logger
 import kotlinx.coroutines.flow.Flow

diff --git a/core/data/src/commonMain/kotlin/club/nito/core/data/ScheduleRepository.kt b/core/data/src/commonMain/kotlin/club/nito/core/data/ScheduleRepository.kt
@@ -1,7 +1,7 @@
 package club.nito.core.data
 
 import club.nito.core.model.Order
-import club.nito.core.model.Schedule
+import club.nito.core.model.schedule.Schedule
 import kotlinx.coroutines.flow.Flow
 import kotlinx.datetime.Instant
 

diff --git a/core/domain/src/commonMain/kotlin/club/nito/core/domain/GetParticipantScheduleListUseCase.kt b/core/domain/src/commonMain/kotlin/club/nito/core/domain/GetParticipantScheduleListUseCase.kt
@@ -5,7 +5,7 @@ import club.nito.core.data.ScheduleRepository
 import club.nito.core.data.UserRepository
 import club.nito.core.domain.model.ParticipantSchedule
 import club.nito.core.model.FetchMultipleContentResult
-import club.nito.core.model.Schedule
+import club.nito.core.model.schedule.Schedule
 import club.nito.core.model.UserProfile
 import club.nito.core.model.participant.Participant
 import club.nito.core.model.toNitoError

diff --git a/core/domain/src/commonMain/kotlin/club/nito/core/domain/GetRecentScheduleUseCase.kt b/core/domain/src/commonMain/kotlin/club/nito/core/domain/GetRecentScheduleUseCase.kt
@@ -6,7 +6,7 @@ import club.nito.core.data.UserRepository
 import club.nito.core.domain.model.ParticipantSchedule
 import club.nito.core.model.FetchSingleContentResult
 import club.nito.core.model.Order
-import club.nito.core.model.Schedule
+import club.nito.core.model.schedule.Schedule
 import club.nito.core.model.UserProfile
 import club.nito.core.model.toNitoError
 import co.touchlab.kermit.Logger

diff --git a/...n/kotlin/club/nito/core/model/Schedule.kt → ...club/nito/core/model/schedule/Schedule.kt b/...n/kotlin/club/nito/core/model/Schedule.kt → ...club/nito/core/model/schedule/Schedule.kt
@@ -1,7 +1,12 @@
-package club.nito.core.model
+package club.nito.core.model.schedule
 
 import kotlinx.datetime.Instant
 
+/**
+ * スケジュールID
+ */
+public typealias ScheduleId = String
+
 /**
  * スケジュール
  * @param id ID
@@ -12,7 +17,7 @@ import kotlinx.datetime.Instant
  * @param description 説明文
  */
 public data class Schedule(
-    val id: String,
+    val id: ScheduleId,
     val scheduledAt: Instant,
     val metAt: Instant,
     val venueId: String,

diff --git a/...ork/src/commonMain/kotlin/club/nito/core/network/schedule/FakeScheduleRemoteDataSource.kt b/...ork/src/commonMain/kotlin/club/nito/core/network/schedule/FakeScheduleRemoteDataSource.kt
@@ -1,7 +1,7 @@
 package club.nito.core.network.schedule
 
 import club.nito.core.model.Order
-import club.nito.core.model.Schedule
+import club.nito.core.model.schedule.Schedule
 import club.nito.core.network.schedule.model.NetworkSchedule
 import club.nito.core.network.schedule.model.createFakeNetworkSchedule
 import kotlinx.datetime.Clock

diff --git a/...network/src/commonMain/kotlin/club/nito/core/network/schedule/ScheduleRemoteDataSource.kt b/...network/src/commonMain/kotlin/club/nito/core/network/schedule/ScheduleRemoteDataSource.kt
@@ -1,7 +1,7 @@
 package club.nito.core.network.schedule
 
 import club.nito.core.model.Order
-import club.nito.core.model.Schedule
+import club.nito.core.model.schedule.Schedule
 import kotlinx.datetime.Instant
 
 public sealed interface ScheduleRemoteDataSource {

diff --git a/...src/commonMain/kotlin/club/nito/core/network/schedule/SupabaseScheduleRemoteDataSource.kt b/...src/commonMain/kotlin/club/nito/core/network/schedule/SupabaseScheduleRemoteDataSource.kt
@@ -1,7 +1,7 @@
 package club.nito.core.network.schedule
 
 import club.nito.core.model.Order
-import club.nito.core.model.Schedule
+import club.nito.core.model.schedule.Schedule
 import club.nito.core.network.schedule.model.NetworkSchedule
 import club.nito.core.network.toSupabaseOrder
 import co.touchlab.kermit.Logger

diff --git a/core/network/src/commonMain/kotlin/club/nito/core/network/schedule/model/NetworkSchedule.kt b/core/network/src/commonMain/kotlin/club/nito/core/network/schedule/model/NetworkSchedule.kt
@@ -1,6 +1,6 @@
 package club.nito.core.network.schedule.model
 
-import club.nito.core.model.Schedule
+import club.nito.core.model.schedule.Schedule
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import kotlinx.serialization.Serializable