clean up on task and tasks categories

robertmurithi · robertmurithi · commit 0848ae8c7b22 · 2024-12-10T14:59:45.000+03:00
diff --git a/app/src/main/java/dev/robert/composetodo/navigation/MainApp.kt b/app/src/main/java/dev/robert/composetodo/navigation/MainApp.kt
@@ -87,7 +87,6 @@ fun MainApp(
     var selectedIndex by remember {
         mutableIntStateOf(0)
     }
-    Timber.d("User Object: $userObject")
 
     // TODO: FIX THIS/ OR FIND BETTER APPROACH.. it's always reseting to 0 when user navigates back
     LaunchedEffect(currentDestination) {
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
@@ -43,7 +43,7 @@ android {
 }
 
 dependencies {
-
+    implementation(project(path = ":core:design-system"))
     implementation(libs.androidx.core.ktx)
     // room
     implementation(libs.androidx.room.runtime)
diff --git a/core/database/src/main/java/dev/robert/database/ConstUtils.kt b/core/database/src/main/java/dev/robert/database/ConstUtils.kt
@@ -17,5 +17,6 @@ package dev.robert.database
 
 object ConstUtils {
     const val TODO_TABLE_NAME = "todos"
+    const val TODO_TASK_CATEGORY_TABLE_NAME = "task_categories"
     const val TODO_DATABASE = "todos_database.db"
 }
diff --git a/core/database/src/main/java/dev/robert/database/data/TodoDatabase.kt b/core/database/src/main/java/dev/robert/database/data/TodoDatabase.kt
@@ -13,21 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dev.robert.database.data.todo
+package dev.robert.database.data
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import dev.robert.database.TasksTypeConverter
+import dev.robert.database.data.categories.CategoriesDao
+import dev.robert.database.data.categories.CategoryEntity
+import dev.robert.database.data.todo.TodoDao
+import dev.robert.database.data.todo.TodoEntity
 
 @Database(
     exportSchema = false,
     entities = [
         TodoEntity::class,
+        CategoryEntity::class
     ],
     version = 4,
 )
 @TypeConverters(TasksTypeConverter::class)
 abstract class TodoDatabase : RoomDatabase() {
-    abstract val dao: TodoDao
+    abstract val tasksDao: TodoDao
+    abstract val categoryDao: CategoriesDao
 }
diff --git a/core/database/src/main/java/dev/robert/database/data/todo/TodoEntity.kt b/core/database/src/main/java/dev/robert/database/data/todo/TodoEntity.kt
@@ -37,4 +37,6 @@ data class TodoEntity(
 
 data class TaskCategoryModelEntity(
     val name: String,
+    val color: String? = null,
+    val icon: Int? = null
 )
diff --git a/core/database/src/main/java/dev/robert/database/domain/DatabaseModule.kt b/core/database/src/main/java/dev/robert/database/domain/DatabaseModule.kt
@@ -17,15 +17,22 @@ package dev.robert.database.domain
 
 import android.content.Context
 import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
 import com.google.gson.Gson
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import dev.robert.database.ConstUtils.TODO_DATABASE
+import dev.robert.design_system.R
 import dev.robert.database.TasksTypeConverter
-import dev.robert.database.data.todo.TodoDatabase
+import dev.robert.database.data.TodoDatabase
+import dev.robert.database.data.categories.CategoryEntity
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import javax.inject.Singleton
 
 @Module
@@ -41,7 +48,13 @@ object DatabaseModule {
     Provides
     Singleton
     ]
-    fun provideTodoDao(db: TodoDatabase) = db.dao
+    fun provideTodoDao(db: TodoDatabase) = db.tasksDao
+
+    @[
+        Provides
+        Singleton
+    ]
+    fun provideCategoryDao(db: TodoDatabase) = db.categoryDao
 
     @[
     Provides
@@ -63,7 +76,29 @@ object DatabaseModule {
             TODO_DATABASE,
         ).addTypeConverter(converter)
             .fallbackToDestructiveMigration()
-            .allowMainThreadQueries()
+            .addCallback(object : RoomDatabase.Callback() {
+                override fun onCreate(db: SupportSQLiteDatabase) {
+                    super.onCreate(db)
+//                    db.execSQL("INSERT INTO task_categories (name, color, icon) VALUES ('Work', '#FF5733', '')")
+//                    db.execSQL("INSERT INTO task_categories (name, color, icon) VALUES ('Personal', '#33FF57', '')")
+//                    db.execSQL("INSERT INTO task_categories (name, color, icon) VALUES ('Shopping', '#3357FF', '')")
+//                    db.execSQL("INSERT INTO task_categories (name, color, icon) VALUES ('Health', '#FF33F6', '')")
+//                    db.execSQL("INSERT INTO task_categories (name, color, icon) VALUES ('Miscellaneous', '#33FFF6', '')")
+                    CoroutineScope(Dispatchers.IO).launch {
+                        provideCategoryDao(provideTodoDatabase(context, converter))
+                            .insertAll(getInitialCategories())
+                    }
+                }
+            })
             .build()
     }
+
+
+    private fun getInitialCategories(): List<CategoryEntity> = listOf(
+        CategoryEntity(name = "Work", color = "#FF5733", icon = R.drawable.ic_work_outline),
+        CategoryEntity(name = "Personal", color = "#33FF57", icon = R.drawable.ic_personal),
+        CategoryEntity(name = "Shopping", color = "#3357FF", icon = R.drawable.ic_shopping),
+        CategoryEntity(name = "Health", color = "#FF33F6", icon = R.drawable.ic_health_safety),
+        CategoryEntity(name = "Miscellaneous", color = "#33FFF6", icon = R.drawable.ic_miscellaneous_services)
+    )
 }
diff --git a/feature/tasks/src/main/java/dev/robert/tasks/data/datasource/TaskLocalDataSource.kt b/feature/tasks/src/main/java/dev/robert/tasks/data/datasource/TaskLocalDataSource.kt
@@ -23,7 +23,7 @@ import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
-interface LocalDataSource {
+interface TaskLocalDataSource {
     val tasks: Flow<List<TodoModel>>
     fun getTaskById(id: Int): Flow<TodoModel>
     suspend fun saveTask(task: TodoModel): Result<Boolean>
@@ -34,7 +34,7 @@ interface LocalDataSource {
     suspend fun updateTask(task: TodoModel): Boolean
 }
 
-class LocalDataStoreImpl @Inject constructor(private val taskDao: TodoDao) : LocalDataSource {
+class TaskLocalDataStoreImpl @Inject constructor(private val taskDao: TodoDao) : TaskLocalDataSource {
 
     override val tasks: Flow<List<TodoModel>>
         get() = try {
diff --git a/feature/tasks/src/main/java/dev/robert/tasks/data/mappers/TaskModelMapper.kt b/feature/tasks/src/main/java/dev/robert/tasks/data/mappers/TaskModelMapper.kt
@@ -15,6 +15,7 @@
  */
 package dev.robert.tasks.data.mappers
 
+import dev.robert.database.data.categories.CategoryEntity
 import dev.robert.database.data.todo.TaskCategoryModelEntity
 import dev.robert.database.data.todo.TodoEntity
 import dev.robert.tasks.data.model.TaskCategoryModel
@@ -36,10 +37,12 @@ fun TodoEntity.toTodoModel() = TodoModel(
 
 fun TaskCategoryModelEntity.toDomain() = TaskCategoryModel(
     name = name,
+    icon = icon
 )
 
 fun TaskCategoryModel.toEntity() = TaskCategoryModelEntity(
     name = name,
+    icon = icon
 )
 
 fun TodoModel.toEntity() = TodoEntity(
@@ -80,8 +83,24 @@ fun TaskItem.toTodoModel() = TodoModel(
 
 fun TaskCategoryModel.toDomain() = TaskCategory(
     name = name,
+    color = color,
+    icon = icon,
 )
 
 fun TaskCategory.toModel() = TaskCategoryModel(
     name = name,
+    color = color ?: "",
+    icon = icon,
+)
+
+fun CategoryEntity.toDomain() = TaskCategory(
+    name = name,
+    color = color,
+    icon = icon,
+)
+
+fun TaskCategory.toEntity() = CategoryEntity(
+    name = name,
+    color = color ?: "",
+    icon =  icon ?: 0,
 )
diff --git a/feature/tasks/src/main/java/dev/robert/tasks/data/model/TodoModel.kt b/feature/tasks/src/main/java/dev/robert/tasks/data/model/TodoModel.kt
@@ -29,4 +29,6 @@ data class TodoModel(
 
 data class TaskCategoryModel(
     val name: String = "",
+    val color: String? = null,
+    val icon: Int? = null
 )
diff --git a/feature/tasks/src/main/java/dev/robert/tasks/data/repo/TasksRepositoryImpl.kt b/feature/tasks/src/main/java/dev/robert/tasks/data/repo/TasksRepositoryImpl.kt
@@ -17,7 +17,7 @@ package dev.robert.tasks.data.repo
 
 import com.google.firebase.firestore.FirebaseFirestore
 import dev.robert.datastore.data.TodoAppPreferences
-import dev.robert.tasks.data.datasource.LocalDataSource
+import dev.robert.tasks.data.datasource.TaskLocalDataSource
 import dev.robert.tasks.data.datasource.RemoteDataSource
 import dev.robert.tasks.data.mappers.toTodoItem
 import dev.robert.tasks.data.mappers.toTodoModel
@@ -36,7 +36,7 @@ import kotlinx.coroutines.tasks.await
 
 @Singleton
 class TasksRepositoryImpl @Inject constructor(
-    private val localDataSource: LocalDataSource,
+    private val taskLocalDataSource: TaskLocalDataSource,
     private val remoteDataSource: RemoteDataSource,
     private val database: FirebaseFirestore,
     private val preferences: TodoAppPreferences,
@@ -52,35 +52,50 @@ class TasksRepositoryImpl @Inject constructor(
                 }
                 if (fetchRemote) {
                     val remoteTasks = remoteDataSource.getTasks(uid).map { it.toTodoItem() }
-                    localDataSource.clear()
+                    taskLocalDataSource.clear()
                     remoteTasks.forEach { saveTask(it) }
                 }
-                emitAll(localDataSource.tasks.map { list -> list.map { it.toTodoItem() } })
+                emitAll(taskLocalDataSource.tasks.map { list -> list.map { it.toTodoItem() } })
             }
         }
 
+    fun fetchTasks(fetchRemote: Boolean): Flow<List<TaskItem>> = flow {
+        val uid = preferences.userData.firstOrNull()?.id
+        if (uid.isNullOrEmpty()) {
+            emit(emptyList())
+            return@flow
+        }
+        if (fetchRemote) {
+            val remoteTasks = remoteDataSource.getTasks(uid).map { it.toTodoItem() }
+            taskLocalDataSource.clear()
+            remoteTasks.forEach { saveTask(it) }
+        }
+        emitAll(taskLocalDataSource.tasks.map { list -> list.map { it.toTodoItem() } })
+    }
+
+
     override val task: (taskId: Int) -> Flow<TaskItem>
         get() = { taskId ->
-            localDataSource.getTaskById(taskId).map {
+            taskLocalDataSource.getTaskById(taskId).map {
                 it.toTodoItem()
             }
         }
 
     override val searchTasks: (query: String) -> Flow<List<TaskItem>>
         get() = { query ->
-            localDataSource.tasks.map { list ->
+            taskLocalDataSource.tasks.map { list ->
                 list.filter { it.name.contains(query, ignoreCase = true) }
                     .map { it.toTodoItem() }
             }
         }
 
-    override suspend fun saveTask(task: TaskItem): Result<Boolean> = localDataSource.saveTask(task.toTodoModel())
+    override suspend fun saveTask(task: TaskItem): Result<Boolean> = taskLocalDataSource.saveTask(task.toTodoModel())
 
     override suspend fun deleteTask(taskId: Int): Result<Boolean> {
         return try {
             val uid = preferences.userData.firstOrNull()?.id
                 ?: return Result.failure(Exception("User not authenticated"))
-            localDataSource.deleteTask(taskId)
+            taskLocalDataSource.deleteTask(taskId)
             remoteDataSource.deleteTask(uid, taskId)
             Result.success(true)
         } catch (e: Exception) {
@@ -95,7 +110,7 @@ class TasksRepositoryImpl @Inject constructor(
                     emit(false)
                     return@flow
                 }
-                val updated = localDataSource.updateTask(task.toTodoModel())
+                val updated = taskLocalDataSource.updateTask(task.toTodoModel())
                 emit(updated)
             }
         }
@@ -113,7 +128,7 @@ class TasksRepositoryImpl @Inject constructor(
                             .document(taskId.toString())
                             .set(this.toTodoModel())
                             .await()
-                        localDataSource.setSynced(taskId)
+                        taskLocalDataSource.setSynced(taskId)
                     }
                 }
                 Result.success(true)
@@ -124,7 +139,7 @@ class TasksRepositoryImpl @Inject constructor(
     }
 
     override suspend fun completeTask(taskId: Int, completionDate: String): Result<Boolean> = try {
-        localDataSource.completeTask(taskId = taskId, completionDate = completionDate)
+        taskLocalDataSource.completeTask(taskId = taskId, completionDate = completionDate)
         Result.success(true)
     } catch (e: Exception) {
         Result.failure(e)
diff --git a/feature/tasks/src/main/java/dev/robert/tasks/domain/di/RepositoryBindings.kt b/feature/tasks/src/main/java/dev/robert/tasks/domain/di/RepositoryBindings.kt
@@ -19,11 +19,15 @@ import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import dev.robert.tasks.data.datasource.LocalDataSource
-import dev.robert.tasks.data.datasource.LocalDataStoreImpl
+import dev.robert.tasks.data.datasource.CategoriesLocalDataSource
+import dev.robert.tasks.data.datasource.CategoriesLocalDataSourceImpl
+import dev.robert.tasks.data.datasource.TaskLocalDataSource
+import dev.robert.tasks.data.datasource.TaskLocalDataStoreImpl
 import dev.robert.tasks.data.datasource.RemoteDataSource
 import dev.robert.tasks.data.datasource.RemoteDataSourceImpl
+import dev.robert.tasks.data.repo.TaskCategoriesRepoImpl
 import dev.robert.tasks.data.repo.TasksRepositoryImpl
+import dev.robert.tasks.domain.repository.TaskCategoriesRepository
 import dev.robert.tasks.domain.repository.TasksRepository
 
 @Module
@@ -33,7 +37,13 @@ interface RepositoryBindings {
     fun bindTasksRepository(tasksRepository: TasksRepositoryImpl): TasksRepository
 
     @Binds
-    fun bindLocalDataSource(tasksRepository: LocalDataStoreImpl): LocalDataSource
+    fun bindLocalDataSource(tasksRepository: TaskLocalDataStoreImpl): TaskLocalDataSource
+
+    @Binds
+    fun bindCategoriesDataSource(tasksRepository: CategoriesLocalDataSourceImpl): CategoriesLocalDataSource
+
+    @Binds
+    fun bindTaskCategoriesRepository(repository: TaskCategoriesRepoImpl): TaskCategoriesRepository
 
     @Binds
     fun bindRemoteDataSource(tasksRepository: RemoteDataSourceImpl): RemoteDataSource
diff --git a/feature/tasks/src/main/java/dev/robert/tasks/domain/di/TasksModule.kt b/feature/tasks/src/main/java/dev/robert/tasks/domain/di/TasksModule.kt
@@ -90,8 +90,8 @@ object TasksModule {
         repository: TasksRepository
     ): SaveTaskUseCase = SaveTaskUseCase(tasksRepository = repository)
 
-    @[
-    Provides
-    ]
-    fun provideValidator(): Validator = Validator()
+//    @[
+//    Provides
+//    ]
+//    fun provideValidator(): Validator = Validator()
 }
diff --git a/feature/tasks/src/main/java/dev/robert/tasks/domain/model/TaskCategory.kt b/feature/tasks/src/main/java/dev/robert/tasks/domain/model/TaskCategory.kt
@@ -23,4 +23,6 @@ import kotlinx.serialization.Serializable
 @Parcelize
 data class TaskCategory(
     val name: String,
+    val color : String? = null,
+    val icon: Int? = null
 ) : Parcelable
diff --git a/feature/tasks/src/main/java/dev/robert/tasks/presentation/screens/tasks/TaskScreen.kt b/feature/tasks/src/main/java/dev/robert/tasks/presentation/screens/tasks/TaskScreen.kt
diff --git a/feature/tasks/src/main/java/dev/robert/tasks/presentation/screens/tasks/TasksViewModel.kt b/feature/tasks/src/main/java/dev/robert/tasks/presentation/screens/tasks/TasksViewModel.kt
diff --git a/feature/tasks/src/main/java/dev/robert/tasks/presentation/screens/tasks/add/AddTaskEvents.kt b/feature/tasks/src/main/java/dev/robert/tasks/presentation/screens/tasks/add/AddTaskEvents.kt
diff --git a/feature/tasks/src/main/java/dev/robert/tasks/presentation/screens/tasks/add/AddTaskScreen.kt b/feature/tasks/src/main/java/dev/robert/tasks/presentation/screens/tasks/add/AddTaskScreen.kt
diff --git a/feature/tasks/src/main/java/dev/robert/tasks/presentation/screens/tasks/add/AddTaskState.kt b/feature/tasks/src/main/java/dev/robert/tasks/presentation/screens/tasks/add/AddTaskState.kt
diff --git a/feature/tasks/src/main/java/dev/robert/tasks/presentation/screens/tasks/add/AddTaskViewModel.kt b/feature/tasks/src/main/java/dev/robert/tasks/presentation/screens/tasks/add/AddTaskViewModel.kt

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,6 @@ fun MainApp(`
`87`	`87`	`var selectedIndex by remember {`
`88`	`88`	`mutableIntStateOf(0)`
`89`	`89`	`}`
`90`		`- Timber.d("User Object: $userObject")`
`91`	`90`
`92`	`91`	`// TODO: FIX THIS/ OR FIND BETTER APPROACH.. it's always reseting to 0 when user navigates back`
`93`	`92`	`LaunchedEffect(currentDestination) {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ android {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`dependencies {`
`46`		`-`
	`46`	`+ implementation(project(path = ":core:design-system"))`
`47`	`47`	`implementation(libs.androidx.core.ktx)`
`48`	`48`	`// room`
`49`	`49`	`implementation(libs.androidx.room.runtime)`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,6 @@ package dev.robert.database`
`17`	`17`
`18`	`18`	`object ConstUtils {`
`19`	`19`	`const val TODO_TABLE_NAME = "todos"`
	`20`	`+ const val TODO_TASK_CATEGORY_TABLE_NAME = "task_categories"`
`20`	`21`	`const val TODO_DATABASE = "todos_database.db"`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,6 @@ data class TodoEntity(`
`37`	`37`
`38`	`38`	`data class TaskCategoryModelEntity(`
`39`	`39`	`val name: String,`
	`40`	`+ val color: String? = null,`
	`41`	`+ val icon: Int? = null`
`40`	`42`	`)`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,6 @@ data class TodoModel(`
`29`	`29`
`30`	`30`	`data class TaskCategoryModel(`
`31`	`31`	`val name: String = "",`
	`32`	`+ val color: String? = null,`
	`33`	`+ val icon: Int? = null`
`32`	`34`	`)`