Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,10 @@ import com.example.testkmp.domain.models.Categories
import com.example.testkmp.domain.models.Task

class FakeDatabase {
val list = listOf(
Task("dddd", "", "", ""),
Task("gtgddd", "", "", ""),
Task("dddsd", "", "", ""),
Task("ddytyfdd", "", "", ""),
Task("dddds", "", "", ""),
Task("dddd", "", "", ""),
Task("dddd", "", "", ""),
Task("dddd", "", "", ""),
Task("dddsd", "", "", ""),
Task("ddytyfdd", "", "", ""),
Task("dddds", "", "", ""),
Task("dddd", "", "", ""),
Task("dddd", "", "", ""),
Task("dddd", "", "", ""),
Task("dddsd", "", "", ""),
Task("ddytyfdd", "", "", ""),
Task("dddds", "", "", ""),
Task("dddd", "", "", ""),
Task("dddd", "", "", ""),
Task("dddd", "", "", ""),
)

val categories = listOf(
Categories(0, name = "Домашние дела", description = "Описание", userId = ""),
Categories(1, name ="В колледже", description ="Описание", userId = ""),
Categories(0, name ="На тренировке", description = "Описание", userId = ""),
)

val listTaskInCat = listOf(
Task("ddytyfdd", "ddytyfdd", "", ""),
Task("dddds", "dddds", "", ""),
Task("dddd", "dddd", "", ""),
Task("dddd", "влылвыллвы", "", ""),
Task("dddd", "dddd", "", ""),
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ import kotlinx.coroutines.withContext

class FakeRepositoryImpl : DatabaseRepository {

val db = FakeDatabase()
//val db = FakeDatabase()

override fun getTasksList(): List<Task> {
return db.list
return emptyList()
//return db.list
}

override suspend fun getCategoriesList(userId: String): List<Categories> {
Expand All @@ -29,8 +30,17 @@ class FakeRepositoryImpl : DatabaseRepository {
}
}

override fun getTasksInCategory(category: Categories): List<Task> {
return db.listTaskInCat
override suspend fun getTasksInCategory(category: Categories): List<Task> {
return withContext(Dispatchers.IO) {
supabase
.from("tasks")
.select {
filter {
Task::category_id eq category.id
}
}
.decodeList<Task>()
}
}

override suspend fun addCategory(category: Categories) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
package com.example.testkmp.domain.models

import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable

@Serializable
data class Task(
val id: String,
val id: Long? = null,
@SerialName("created_at")
val createdAt: String? = null,
val name: String,
val description: String,
val catId: String
val description: String? = null,
@SerialName("category_id")
val category_id: Long
)
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ interface DatabaseRepository {

suspend fun getCategoriesList(userId: String) : List<Categories>

fun getTasksInCategory(category: Categories) : List<Task>
suspend fun getTasksInCategory(category: Categories) : List<Task>

}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class GetTasksInCategoryUseCase(
private val repository: DatabaseRepository
) {

operator fun invoke(category: Categories) : List<Task> {
suspend operator fun invoke(category: Categories) : List<Task> {
return repository.getTasksInCategory(category)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import com.example.testkmp.domain.usecases.GetAllCategoriesUseCase
import com.example.testkmp.domain.usecases.GetAllTasksUseCase
import com.example.testkmp.domain.usecases.GetTasksInCategoryUseCase
import io.github.jan.supabase.auth.auth
import kotlinx.coroutines.async
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -47,7 +48,11 @@ class HomeViewModel(
}

fun loadTasksInCategory(category: Categories) : List<Task> {
return getTasksInCategoryUseCase(category)
var result = listOf<Task>()
viewModelScope.launch {
result = getTasksInCategoryUseCase(category)
}
return result
}


Expand Down
Loading