code rev tomi

app/src/main/java/com/rocketinsights/android/di/hilt/HiltNetworkModule.kt

@@ -2,7 +2,7 @@ package com.rocketinsights.android.di.hilt
 
 import com.google.gson.GsonBuilder
 import com.rocketinsights.android.network.RecipeService
-import com.rocketinsights.android.network.models.recipe_hilt.RecipeDtoMapper
+import com.rocketinsights.android.models.recipe_hilt.RecipeDtoMapper
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

app/src/main/java/com/rocketinsights/android/di/hilt/RepositoryModule.kt

@@ -1,7 +1,7 @@
 package com.rocketinsights.android.di.hilt
 
 import com.rocketinsights.android.network.RecipeService
-import com.rocketinsights.android.network.models.recipe_hilt.RecipeDtoMapper
+import com.rocketinsights.android.models.recipe_hilt.RecipeDtoMapper
 import com.rocketinsights.android.repos.RecipeRepository
 import com.rocketinsights.android.repos.RecipeRepositoryImplementation
 import dagger.Module

app/src/main/java/com/rocketinsights/android/models/recipe_hilt/Recipe.kt

@@ -0,0 +1,13 @@
+package com.rocketinsights.android.models.recipe_hilt
+
+data class Recipe(
+    val id: Int,
+    val title: String,
+    val publisher: String,
+    val featuredImage: String,
+    val rating: Int = 0,
+    val sourceUrl: String,
+    val ingredients: List<String> = listOf(),
+    val dateAdded: String,
+    val dateUpdated: String
+)

app/src/main/java/com/rocketinsights/android/models/recipe_hilt/RecipeDto.kt

@@ -0,0 +1,19 @@
+package com.rocketinsights.android.models.recipe_hilt
+
+import com.google.gson.annotations.SerializedName
+
+data class RecipeDto(
+    var pk: Int,
+    var title: String,
+    var publisher: String,
+    @SerializedName("featured_image")
+    var featuredImage: String,
+    var rating: Int = 0,
+    @SerializedName("source_url")
+    var sourceUrl: String,
+    var ingredients: List<String> = emptyList(),
+    @SerializedName("date_added")
+    var dateAdded: String,
+    @SerializedName("date_updated")
+    var dateUpdated: String,
+)

app/src/main/java/com/rocketinsights/android/models/recipe_hilt/RecipeDtoMapper.kt

@@ -0,0 +1,36 @@
+package com.rocketinsights.android.models.recipe_hilt
+
+class RecipeDtoMapper {
+    fun mapToDomainModel(model: RecipeDto): Recipe {
+        return Recipe(
+            id = model.pk,
+            title = model.title,
+            featuredImage = model.featuredImage,
+            rating = model.rating,
+            publisher = model.publisher,
+            sourceUrl = model.sourceUrl,
+            ingredients = model.ingredients,
+            dateAdded = model.dateAdded,
+            dateUpdated = model.dateUpdated,
+        )
+    }
+
+    private fun mapFromDomainModel(domainModel: Recipe): RecipeDto {
+        return RecipeDto(
+            pk = domainModel.id,
+            title = domainModel.title,
+            featuredImage = domainModel.featuredImage,
+            rating = domainModel.rating,
+            publisher = domainModel.publisher,
+            sourceUrl = domainModel.sourceUrl,
+            ingredients = domainModel.ingredients,
+            dateAdded = domainModel.dateAdded,
+            dateUpdated = domainModel.dateUpdated,
+        )
+    }
+
+    fun toDomainList(initial: List<RecipeDto>): List<Recipe> = initial.map { mapToDomainModel(it) }
+
+    fun fromDomainList(initial: List<Recipe>): List<RecipeDto> =
+        initial.map { mapFromDomainModel(it) }
+}

app/src/main/java/com/rocketinsights/android/network/hiltexample/RecipeSearchResponse.kt

@@ -1,6 +1,6 @@
 package com.rocketinsights.android.network.hiltexample
 
-import com.rocketinsights.android.network.models.recipe_hilt.RecipeDto
+import com.rocketinsights.android.models.recipe_hilt.RecipeDto
 
 data class RecipeSearchResponse(
     var count: Int,

app/src/main/java/com/rocketinsights/android/network/hiltexample/RecipeService.kt

@@ -1,7 +1,7 @@
 package com.rocketinsights.android.network
 
 import com.rocketinsights.android.network.hiltexample.RecipeSearchResponse
-import com.rocketinsights.android.network.models.recipe_hilt.RecipeDto
+import com.rocketinsights.android.models.recipe_hilt.RecipeDto
 import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.Query

app/src/main/java/com/rocketinsights/android/repos/RecipeRepository.kt

@@ -1,6 +1,6 @@
 package com.rocketinsights.android.repos
 
-import com.rocketinsights.android.network.models.recipe_hilt.Recipe
+import com.rocketinsights.android.models.recipe_hilt.Recipe
 
 interface RecipeRepository {
     suspend fun search(token: String, page: Int, query: String): List<Recipe>?

app/src/main/java/com/rocketinsights/android/repos/RecipeRepositoryImplementation.kt

@@ -1,8 +1,8 @@
 package com.rocketinsights.android.repos
 
 import com.rocketinsights.android.network.RecipeService
-import com.rocketinsights.android.network.models.recipe_hilt.Recipe
-import com.rocketinsights.android.network.models.recipe_hilt.RecipeDtoMapper
+import com.rocketinsights.android.models.recipe_hilt.Recipe
+import com.rocketinsights.android.models.recipe_hilt.RecipeDtoMapper
 
 class RecipeRepositoryImplementation(
     private val recipeService: RecipeService,

app/src/main/java/com/rocketinsights/android/viewmodels/HiltListViewModel.kt

@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.rocketinsights.android.network.models.recipe_hilt.Recipe
+import com.rocketinsights.android.models.recipe_hilt.Recipe
 import com.rocketinsights.android.repos.RecipeRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch