Modularize domain layer including usecase, repository and domain model

app/build.gradle

@@ -75,6 +75,7 @@ android {
 }
 
 dependencies {
+    implementation project(':models')
 
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation libs.bundles.androidx

app/src/main/java/com/hieuwu/groceriesstore/data/database/entities/Category.kt

@@ -4,9 +4,8 @@ import androidx.annotation.NonNull
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.hieuwu.groceriesstore.domain.models.CategoryModel
+import com.hieuwu.groceriesstore.models.CategoryModel
 import com.hieuwu.groceriesstore.utilities.CATEGORY_TABLE
-
 @Entity(tableName = CATEGORY_TABLE)
 data class Category(
     @PrimaryKey

app/src/main/java/com/hieuwu/groceriesstore/data/database/entities/OrderWithLineItems.kt

@@ -2,7 +2,7 @@ package com.hieuwu.groceriesstore.data.database.entities
 
 import androidx.room.Embedded
 import androidx.room.Relation
-import com.hieuwu.groceriesstore.domain.models.OrderModel
+import com.hieuwu.groceriesstore.models.OrderModel
 
 data class OrderWithLineItems(
     @Embedded var order: Order,

app/src/main/java/com/hieuwu/groceriesstore/data/database/entities/Product.kt

@@ -4,7 +4,7 @@ import androidx.annotation.NonNull
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.hieuwu.groceriesstore.domain.models.ProductModel
+import com.hieuwu.groceriesstore.models.ProductModel
 import com.hieuwu.groceriesstore.utilities.PRODUCT_TABLE
 
 @Entity(tableName = PRODUCT_TABLE)

app/src/main/java/com/hieuwu/groceriesstore/data/database/entities/ProductAndLineItem.kt

@@ -2,7 +2,7 @@ package com.hieuwu.groceriesstore.data.database.entities
 
 import androidx.room.Embedded
 import androidx.room.Relation
-import com.hieuwu.groceriesstore.domain.models.LineItemModel
+import com.hieuwu.groceriesstore.models.LineItemModel
 
 data class ProductAndLineItem(
     @Embedded val lineItem: LineItem?,

app/src/main/java/com/hieuwu/groceriesstore/data/database/entities/Recipe.kt

@@ -3,7 +3,7 @@ package com.hieuwu.groceriesstore.data.database.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.hieuwu.groceriesstore.domain.models.RecipeModel
+import com.hieuwu.groceriesstore.models.RecipeModel
 import com.hieuwu.groceriesstore.utilities.RECIPE_TABLE
 
 @Entity(tableName = RECIPE_TABLE)

app/src/main/java/com/hieuwu/groceriesstore/data/database/entities/User.kt

@@ -3,7 +3,7 @@ package com.hieuwu.groceriesstore.data.database.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.hieuwu.groceriesstore.domain.models.UserModel
+import com.hieuwu.groceriesstore.models.UserModel
 import com.hieuwu.groceriesstore.utilities.USER_TABLE
 
 @Entity(tableName = USER_TABLE)

app/src/main/java/com/hieuwu/groceriesstore/data/repository/impl/CategoryRepositoryImpl.kt → app/src/main/java/com/hieuwu/groceriesstore/data/repository/CategoryRepositoryImpl.kt

@@ -1,40 +1,40 @@
-package com.hieuwu.groceriesstore.data.repository.impl
-
-import com.hieuwu.groceriesstore.data.database.dao.CategoryDao
-import com.hieuwu.groceriesstore.data.database.entities.Category
-import com.hieuwu.groceriesstore.data.database.entities.asDomainModel
-import com.hieuwu.groceriesstore.data.network.RemoteTable
-import com.hieuwu.groceriesstore.data.network.dto.CategoriesDto
-import com.hieuwu.groceriesstore.data.repository.CategoryRepository
-import io.github.jan.supabase.postgrest.Postgrest
-import kotlinx.coroutines.flow.map
-import timber.log.Timber
-import javax.inject.Inject
-
-class CategoryRepositoryImpl @Inject constructor(
-    private val categoryDao: CategoryDao,
-    private val supabasePostgrest: Postgrest
-) :
-    CategoryRepository {
-
-    override suspend fun refreshDatabase() {
-        try {
-            val result = supabasePostgrest[RemoteTable.Categories.tableName]
-                .select()
-            val res = result.decodeList<CategoriesDto>()
-            val categories = res.map { it.asEntity() }
-            categoryDao.insertAll(categories)
-        } catch (e: Exception) {
-            Timber.e(e.message)
-        }
-    }
-
-    override fun getFromLocal() = categoryDao.getAll().map { it.asDomainModel() }
-
-    private fun CategoriesDto.asEntity(): Category = Category(
-        id = id,
-        name = name,
-        image = image,
-    )
-
-}
+package com.hieuwu.groceriesstore.data.repository
+
+import com.hieuwu.groceriesstore.data.database.dao.CategoryDao
+import com.hieuwu.groceriesstore.data.database.entities.Category
+import com.hieuwu.groceriesstore.data.database.entities.asDomainModel
+import com.hieuwu.groceriesstore.data.network.RemoteTable
+import com.hieuwu.groceriesstore.data.network.dto.CategoriesDto
+import com.hieuwu.groceriesstore.repository.CategoryRepository
+import io.github.jan.supabase.postgrest.Postgrest
+import kotlinx.coroutines.flow.map
+import timber.log.Timber
+import javax.inject.Inject
+
+class CategoryRepositoryImpl @Inject constructor(
+    private val categoryDao: CategoryDao,
+    private val supabasePostgrest: Postgrest
+) :
+    CategoryRepository {
+
+    override suspend fun refreshDatabase() {
+        try {
+            val result = supabasePostgrest[RemoteTable.Categories.tableName]
+                .select()
+            val res = result.decodeList<CategoriesDto>()
+            val categories = res.map { it.asEntity() }
+            categoryDao.insertAll(categories)
+        } catch (e: Exception) {
+            Timber.e(e.message)
+        }
+    }
+
+    override fun getFromLocal() = categoryDao.getAll().map { it.asDomainModel() }
+
+    private fun CategoriesDto.asEntity(): Category = Category(
+        id = id,
+        name = name,
+        image = image,
+    )
+
+}

app/src/main/java/com/hieuwu/groceriesstore/data/repository/impl/MealPlanRepositoryImpl.kt → app/src/main/java/com/hieuwu/groceriesstore/data/repository/MealPlanRepositoryImpl.kt

@@ -1,9 +1,9 @@
-package com.hieuwu.groceriesstore.data.repository.impl
+package com.hieuwu.groceriesstore.data.repository
 
 import com.hieuwu.groceriesstore.data.network.dto.Meal
-import com.hieuwu.groceriesstore.data.repository.MealPlanRepository
-import com.hieuwu.groceriesstore.data.repository.UserRepository
-import com.hieuwu.groceriesstore.domain.models.MealModel
+import com.hieuwu.groceriesstore.repository.MealPlanRepository
+import com.hieuwu.groceriesstore.repository.UserRepository
+import com.hieuwu.groceriesstore.models.MealModel
 import com.hieuwu.groceriesstore.utilities.SupabaseHelper
 import io.github.jan.supabase.postgrest.Postgrest
 import io.github.jan.supabase.storage.Storage