🚚 :: Rename Expo DTO Package Name

School-of-Company · Nov 25, 2024 · 6b6efb3 · 6b6efb3
1 parent c0a4093
commit 6b6efb3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/core/network/src/main/java/com/school_of_company/network/datasource/expo/ExpoDataSource.kt b/core/network/src/main/java/com/school_of_company/network/datasource/expo/ExpoDataSource.kt
@@ -1,6 +1,6 @@
 package com.school_of_company.network.datasource.expo
 
-import com.school_of_company.network.dto.expo.request_response.ExpoRequestAndResponse
+import com.school_of_company.network.dto.expo.all.ExpoRequestAndResponse
 import com.school_of_company.network.dto.expo.response.ExpoIdResponse
 import com.school_of_company.network.dto.expo.response.ExpoListResponse
 import kotlinx.coroutines.flow.Flow

diff --git a/...network/src/main/java/com/school_of_company/network/datasource/expo/ExpoDataSourceImpl.kt b/...network/src/main/java/com/school_of_company/network/datasource/expo/ExpoDataSourceImpl.kt
@@ -1,7 +1,7 @@
 package com.school_of_company.network.datasource.expo
 
 import com.school_of_company.network.api.ExpoAPI
-import com.school_of_company.network.dto.expo.request_response.ExpoRequestAndResponse
+import com.school_of_company.network.dto.expo.all.ExpoRequestAndResponse
 import com.school_of_company.network.dto.expo.response.ExpoIdResponse
 import com.school_of_company.network.dto.expo.response.ExpoListResponse
 import com.school_of_company.network.util.performApiRequest

diff --git a/...etwork/src/main/java/com/school_of_company/network/dto/expo/all/ExpoRequestAndResponse.kt b/...etwork/src/main/java/com/school_of_company/network/dto/expo/all/ExpoRequestAndResponse.kt
@@ -0,0 +1,16 @@
+package com.school_of_company.network.dto.expo.all
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class ExpoRequestAndResponse(
+    @Json(name = "title") val title: String,
+    @Json(name = "description") val description: String,
+    @Json(name = "startedDay") val startedDay: String, // yyyy-mm-dd
+    @Json(name = "finishedDay") val finishedDay: String, // yyyy-mm-dd
+    @Json(name = "location") val location: String,
+    @Json(name = "coverImage") val coverImage: String?,
+    @Json(name = "x") val x: Float,
+    @Json(name = "y") val y: Float
+)
diff --git a/...work/src/main/java/com/school_of_company/network/mapper/expo/request/ExpoRequestMapper.kt b/...work/src/main/java/com/school_of_company/network/mapper/expo/request/ExpoRequestMapper.kt
@@ -1,7 +1,7 @@
 package com.school_of_company.network.mapper.expo.request
 
 import com.school_of_company.model.model.expo.ExpoRequestAndResponseModel
-import com.school_of_company.network.dto.expo.request_response.ExpoRequestAndResponse
+import com.school_of_company.network.dto.expo.all.ExpoRequestAndResponse
 
 fun ExpoRequestAndResponseModel.toDto(): ExpoRequestAndResponse =
     ExpoRequestAndResponse(

diff --git a/...rk/src/main/java/com/school_of_company/network/mapper/expo/response/ExpoResponseMapper.kt b/...rk/src/main/java/com/school_of_company/network/mapper/expo/response/ExpoResponseMapper.kt
@@ -1,7 +1,7 @@
 package com.school_of_company.network.mapper.expo.response
 
 import com.school_of_company.model.model.expo.ExpoRequestAndResponseModel
-import com.school_of_company.network.dto.expo.request_response.ExpoRequestAndResponse
+import com.school_of_company.network.dto.expo.all.ExpoRequestAndResponse
 
 fun ExpoRequestAndResponse.toModel(): ExpoRequestAndResponseModel =
     ExpoRequestAndResponseModel(