[ref] API models and UI models

app/src/main/java/tj/rsdevteam/inmuslim/data/api/Api.kt

@@ -3,13 +3,13 @@ package tj.rsdevteam.inmuslim.data.api
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
-import tj.rsdevteam.inmuslim.data.models.network.GetRegionsResponse
-import tj.rsdevteam.inmuslim.data.models.network.GetTimingBody
-import tj.rsdevteam.inmuslim.data.models.network.GetTimingResponse
-import tj.rsdevteam.inmuslim.data.models.network.RegisterUserBody
-import tj.rsdevteam.inmuslim.data.models.network.RegisterUserResponse
-import tj.rsdevteam.inmuslim.data.models.network.UpdateMessagingIdBody
-import tj.rsdevteam.inmuslim.data.models.network.UpdateMessagingIdResponse
+import tj.rsdevteam.inmuslim.data.models.api.GetRegionsDTO
+import tj.rsdevteam.inmuslim.data.models.api.GetTimingBodyDTO
+import tj.rsdevteam.inmuslim.data.models.api.GetTimingDTO
+import tj.rsdevteam.inmuslim.data.models.api.RegisterUserBodyDTO
+import tj.rsdevteam.inmuslim.data.models.api.RegisterUserDTO
+import tj.rsdevteam.inmuslim.data.models.api.UpdateMessagingIdBodyDTO
+import tj.rsdevteam.inmuslim.data.models.api.UpdateMessagingIdDTO
 
 /**
  * Created by Rustam Safarov on 8/13/23.
@@ -19,14 +19,14 @@ import tj.rsdevteam.inmuslim.data.models.network.UpdateMessagingIdResponse
 interface Api {
 
     @GET("GetRegions")
-    suspend fun getRegions(): Result<GetRegionsResponse>
+    suspend fun getRegions(): Result<GetRegionsDTO>
 
     @POST("GetTiming")
-    suspend fun getTiming(@Body body: GetTimingBody): Result<GetTimingResponse>
+    suspend fun getTiming(@Body body: GetTimingBodyDTO): Result<GetTimingDTO>
 
     @POST("RegisterUser")
-    suspend fun registerUser(@Body body: RegisterUserBody): Result<RegisterUserResponse>
+    suspend fun registerUser(@Body body: RegisterUserBodyDTO): Result<RegisterUserDTO>
 
     @POST("UpdateMessagingId")
-    suspend fun updateMessagingId(@Body body: UpdateMessagingIdBody): Result<UpdateMessagingIdResponse>
+    suspend fun updateMessagingId(@Body body: UpdateMessagingIdBodyDTO): Result<UpdateMessagingIdDTO>
 }

app/src/main/java/tj/rsdevteam/inmuslim/data/models/Message.kt

@@ -0,0 +1,10 @@
+package tj.rsdevteam.inmuslim.data.models
+
+/**
+ * Created by Rustam Safarov on 6/25/24.
+ * github.com/rustamsafarovrs
+ */
+
+data class Message(
+    val message: String
+)

app/src/main/java/tj/rsdevteam/inmuslim/data/models/Region.kt

@@ -1,14 +1,12 @@
 package tj.rsdevteam.inmuslim.data.models
 
 import androidx.compose.runtime.mutableStateOf
-import com.squareup.moshi.JsonClass
 
 /**
- * Created by Rustam Safarov on 14/08/23.
+ * Created by Rustam Safarov on 6/25/24.
  * github.com/rustamsafarovrs
  */
 
-@JsonClass(generateAdapter = true)
 data class Region(
     val id: Long,
     val name: String

app/src/main/java/tj/rsdevteam/inmuslim/data/models/network/Resource.kt → app/src/main/java/tj/rsdevteam/inmuslim/data/models/Resource.kt

@@ -1,4 +1,4 @@
-package tj.rsdevteam.inmuslim.data.models.network
+package tj.rsdevteam.inmuslim.data.models
 
 /**
  * Created by Rustam Safarov on 8/13/23.

app/src/main/java/tj/rsdevteam/inmuslim/data/models/Timing.kt

@@ -1,13 +1,10 @@
 package tj.rsdevteam.inmuslim.data.models
 
-import com.squareup.moshi.JsonClass
-
 /**
- * Created by Rustam Safarov on 8/13/23.
+ * Created by Rustam Safarov on 6/25/24.
  * github.com/rustamsafarovrs
  */
 
-@JsonClass(generateAdapter = true)
 data class Timing(
     val fajr: String,
     val sunrise: String,

app/src/main/java/tj/rsdevteam/inmuslim/data/models/User.kt

@@ -0,0 +1,10 @@
+package tj.rsdevteam.inmuslim.data.models
+
+/**
+ * Created by Rustam Safarov on 6/25/24.
+ * github.com/rustamsafarovrs
+ */
+
+data class User(
+    val id: Long
+)

app/src/main/java/tj/rsdevteam/inmuslim/data/models/network/GetRegionsResponse.kt → app/src/main/java/tj/rsdevteam/inmuslim/data/models/api/GetRegionsDTO.kt

@@ -1,16 +1,15 @@
-package tj.rsdevteam.inmuslim.data.models.network
+package tj.rsdevteam.inmuslim.data.models.api
 
 import com.squareup.moshi.JsonClass
-import tj.rsdevteam.inmuslim.data.models.Region
 
 /**
  * Created by Rustam Safarov on 14/08/23.
  * github.com/rustamsafarovrs
  */
 
 @JsonClass(generateAdapter = true)
-data class GetRegionsResponse(
+data class GetRegionsDTO(
     val result: Int,
     val msg: String,
-    val regions: List<Region>
+    val regions: List<RegionDTO>
 )

app/src/main/java/tj/rsdevteam/inmuslim/data/models/network/GetTimingBody.kt → app/src/main/java/tj/rsdevteam/inmuslim/data/models/api/GetTimingBodyDTO.kt

@@ -1,4 +1,4 @@
-package tj.rsdevteam.inmuslim.data.models.network
+package tj.rsdevteam.inmuslim.data.models.api
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
@@ -9,7 +9,7 @@ import com.squareup.moshi.JsonClass
  */
 
 @JsonClass(generateAdapter = true)
-data class GetTimingBody(
+data class GetTimingBodyDTO(
     @Json(name = "region_id")
     val regionId: Long
 )

app/src/main/java/tj/rsdevteam/inmuslim/data/models/network/GetTimingResponse.kt → app/src/main/java/tj/rsdevteam/inmuslim/data/models/api/GetTimingDTO.kt

@@ -1,20 +1,19 @@
-package tj.rsdevteam.inmuslim.data.models.network
+package tj.rsdevteam.inmuslim.data.models.api
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import tj.rsdevteam.inmuslim.data.models.Timing
 
 /**
  * Created by Rustam Safarov on 8/13/23.
  * github.com/rustamsafarovrs
  */
 
 @JsonClass(generateAdapter = true)
-data class GetTimingResponse(
+data class GetTimingDTO(
     val result: Int,
     val msg: String,
     val region: String,
     @Json(name = "begin_date")
     val beginDate: String,
-    val timing: Timing
+    val timing: TimingDTO
 )

app/src/main/java/tj/rsdevteam/inmuslim/data/models/network/MessageResponse.kt → app/src/main/java/tj/rsdevteam/inmuslim/data/models/api/MessageDTO.kt

@@ -1,4 +1,4 @@
-package tj.rsdevteam.inmuslim.data.models.network
+package tj.rsdevteam.inmuslim.data.models.api
 
 import com.squareup.moshi.JsonClass
 
@@ -8,7 +8,7 @@ import com.squareup.moshi.JsonClass
  */
 
 @JsonClass(generateAdapter = true)
-data class MessageResponse(
+data class MessageDTO(
     val result: Int,
     val msg: String
 )

app/src/main/java/tj/rsdevteam/inmuslim/data/models/api/RegionDTO.kt

@@ -0,0 +1,14 @@
+package tj.rsdevteam.inmuslim.data.models.api
+
+import com.squareup.moshi.JsonClass
+
+/**
+ * Created by Rustam Safarov on 14/08/23.
+ * github.com/rustamsafarovrs
+ */
+
+@JsonClass(generateAdapter = true)
+data class RegionDTO(
+    val id: Long,
+    val name: String
+)

app/src/main/java/tj/rsdevteam/inmuslim/data/models/network/RegisterUserBody.kt → app/src/main/java/tj/rsdevteam/inmuslim/data/models/api/RegisterUserBodyDTO.kt

@@ -1,4 +1,4 @@
-package tj.rsdevteam.inmuslim.data.models.network
+package tj.rsdevteam.inmuslim.data.models.api
 
 import com.squareup.moshi.JsonClass
 
@@ -8,6 +8,6 @@ import com.squareup.moshi.JsonClass
  */
 
 @JsonClass(generateAdapter = true)
-data class RegisterUserBody(
+data class RegisterUserBodyDTO(
     val name: String
 )

app/src/main/java/tj/rsdevteam/inmuslim/data/models/network/RegisterUserResponse.kt → app/src/main/java/tj/rsdevteam/inmuslim/data/models/api/RegisterUserDTO.kt

@@ -1,4 +1,4 @@
-package tj.rsdevteam.inmuslim.data.models.network
+package tj.rsdevteam.inmuslim.data.models.api
 
 import com.squareup.moshi.JsonClass
 
@@ -8,7 +8,7 @@ import com.squareup.moshi.JsonClass
  */
 
 @JsonClass(generateAdapter = true)
-data class RegisterUserResponse(
+data class RegisterUserDTO(
     val result: Int,
     val msg: String,
     val id: Long

app/src/main/java/tj/rsdevteam/inmuslim/data/models/api/TimingDTO.kt

@@ -0,0 +1,19 @@
+package tj.rsdevteam.inmuslim.data.models.api
+
+import com.squareup.moshi.JsonClass
+
+/**
+ * Created by Rustam Safarov on 8/13/23.
+ * github.com/rustamsafarovrs
+ */
+
+@JsonClass(generateAdapter = true)
+data class TimingDTO(
+    val fajr: String,
+    val sunrise: String,
+    val zuhr: String,
+    val asr: String,
+    val sunset: String,
+    val maghrib: String,
+    val isha: String
+)

app/src/main/java/tj/rsdevteam/inmuslim/data/models/network/UpdateMessagingIdBody.kt → app/src/main/java/tj/rsdevteam/inmuslim/data/models/api/UpdateMessagingIdBodyDTO.kt

@@ -1,4 +1,4 @@
-package tj.rsdevteam.inmuslim.data.models.network
+package tj.rsdevteam.inmuslim.data.models.api
 
 import com.squareup.moshi.JsonClass
 
@@ -8,7 +8,7 @@ import com.squareup.moshi.JsonClass
  */
 
 @JsonClass(generateAdapter = true)
-data class UpdateMessagingIdBody(
+data class UpdateMessagingIdBodyDTO(
     val id: Long,
     val msgid: String
 )

app/src/main/java/tj/rsdevteam/inmuslim/data/models/network/UpdateMessagingIdResponse.kt → app/src/main/java/tj/rsdevteam/inmuslim/data/models/api/UpdateMessagingIdDTO.kt

@@ -1,4 +1,4 @@
-package tj.rsdevteam.inmuslim.data.models.network
+package tj.rsdevteam.inmuslim.data.models.api
 
 import com.squareup.moshi.JsonClass
 
@@ -8,7 +8,7 @@ import com.squareup.moshi.JsonClass
  */
 
 @JsonClass(generateAdapter = true)
-data class UpdateMessagingIdResponse(
+data class UpdateMessagingIdDTO(
     val result: Int,
     val msg: String
 )

app/src/main/java/tj/rsdevteam/inmuslim/data/repositories/ErrorHandler.kt

@@ -4,8 +4,8 @@ import retrofit2.HttpException
 import tj.rsdevteam.inmuslim.data.exceptions.ApiException
 import tj.rsdevteam.inmuslim.data.exceptions.ConnectionTimeoutException
 import tj.rsdevteam.inmuslim.data.exceptions.UnknownException
-import tj.rsdevteam.inmuslim.data.models.network.MessageResponse
-import tj.rsdevteam.inmuslim.data.models.network.Resource
+import tj.rsdevteam.inmuslim.data.models.Resource
+import tj.rsdevteam.inmuslim.data.models.api.MessageDTO
 import java.io.IOException
 import java.net.UnknownHostException
 
@@ -17,8 +17,8 @@ import java.net.UnknownHostException
 class ErrorHandler {
 
     fun <T : Any> getError(result: Result<*>): Resource<T> {
-        return if (result.getOrNull() is MessageResponse) {
-            Resource.Error(error = ApiException((result.getOrThrow() as MessageResponse).msg))
+        return if (result.getOrNull() is MessageDTO) {
+            Resource.Error(error = ApiException((result.getOrThrow() as MessageDTO).msg))
         } else if (result.exceptionOrNull() is UnknownHostException) {
             Resource.Error(error = ConnectionTimeoutException())
         } else if (result.exceptionOrNull() is HttpException) {

app/src/main/java/tj/rsdevteam/inmuslim/data/repositories/Mappers.kt

@@ -0,0 +1,53 @@
+package tj.rsdevteam.inmuslim.data.repositories
+
+import tj.rsdevteam.inmuslim.data.models.Message
+import tj.rsdevteam.inmuslim.data.models.Region
+import tj.rsdevteam.inmuslim.data.models.Timing
+import tj.rsdevteam.inmuslim.data.models.User
+import tj.rsdevteam.inmuslim.data.models.api.MessageDTO
+import tj.rsdevteam.inmuslim.data.models.api.RegionDTO
+import tj.rsdevteam.inmuslim.data.models.api.RegisterUserDTO
+import tj.rsdevteam.inmuslim.data.models.api.TimingDTO
+import tj.rsdevteam.inmuslim.data.models.api.UpdateMessagingIdDTO
+
+/**
+ * Created by Rustam Safarov on 6/25/24.
+ * github.com/rustamsafarovrs
+ */
+
+fun RegionDTO.toRegion(): Region {
+    return Region(
+        id = this.id,
+        name = this.name
+    )
+}
+
+fun TimingDTO.toTiming(): Timing {
+    return Timing(
+        fajr = this.fajr,
+        sunrise = this.sunrise,
+        zuhr = this.zuhr,
+        asr = this.asr,
+        sunset = this.sunset,
+        maghrib = this.maghrib,
+        isha = this.isha
+    )
+}
+
+fun MessageDTO.toMessage(): Message {
+    return Message(
+        message = this.msg
+    )
+}
+
+fun RegisterUserDTO.toUser(): User {
+    return User(
+        id = this.id
+    )
+}
+
+fun UpdateMessagingIdDTO.toMessage(): Message {
+    return Message(
+        message = this.msg
+    )
+}

app/src/main/java/tj/rsdevteam/inmuslim/data/repositories/RegionRepository.kt

@@ -6,7 +6,7 @@ import kotlinx.coroutines.flow.flow
 import tj.rsdevteam.inmuslim.data.api.Api
 import tj.rsdevteam.inmuslim.data.constants.Constants
 import tj.rsdevteam.inmuslim.data.models.Region
-import tj.rsdevteam.inmuslim.data.models.network.Resource
+import tj.rsdevteam.inmuslim.data.models.Resource
 import tj.rsdevteam.inmuslim.data.preferences.Preferences
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -34,7 +34,7 @@ class RegionRepository
         val result = api.getRegions()
         delay(Constants.MIDDLE_DELAY)
         if (result.isSuccess && result.getOrNull()?.result == 0) {
-            emit(Resource.Success(result.getOrThrow().regions))
+            emit(Resource.Success(result.getOrThrow().regions.map { it.toRegion() }))
         } else {
             emit(errorHandler.getError(result))
         }