Skip to content

fix: derive entryByRecipeId fixing favorites button #400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonsch318 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: derive entryByRecipeId fixing favorites button #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions shared/src/commonMain/kotlin/de/kitshn/api/tandoor/model/TandoorRecipeBook.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package de.kitshn.api.tandoor.model

import androidx.compose.runtime.Composable
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.mutableStateMapOf
import coil3.request.ImageRequest
Expand Down Expand Up @@ -39,8 +41,9 @@ class TandoorRecipeBook(
@Transient
val filterEntries = mutableStateListOf<TandoorRecipeOverview>()

@Transient
val entryByRecipeId = mutableStateMapOf<Int, TandoorRecipeBookEntry>()
val entryByRecipeId: Map<Int, TandoorRecipeBookEntry> by derivedStateOf {
entries.associateBy { it.recipe }
}

@Composable
fun loadThumbnail(): ImageRequest? {
Expand Down Expand Up @@ -142,21 +145,26 @@ class TandoorRecipeBookEntry(

suspend fun delete(): String {
// remove from entry lists
client?.container?.recipeBook?.get(book)?.let {
it.entries.removeIf { it.id == id }
it.entryByRecipeId.remove(recipe)
client?.container?.recipeBook?.get(book)?.let { book ->
book.entries.removeIf { it.id == id }
}

return client?.delete("/recipe-book-entry/${id}/")?.status?.value?.toString() ?: "unknown"
}

fun populate(book: TandoorRecipeBook?, client: TandoorClient?) {
val entry = this
this.client = client

client?.container?.recipeOverview?.get(recipe)?.let { recipe_content = it }
client?.container?.recipeBookEntry?.put(id, this)

book?.apply { book_content = this }
book?.apply {
book_content = this
if(entries.none { it.id == entry.id}) {
entries.add(entry)
}
}

recipe_content.client = client
}
Expand Down
2 changes: 0 additions & 2 deletions shared/src/commonMain/kotlin/de/kitshn/api/tandoor/route/TandoorRecipeBookRoute.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,9 @@ class TandoorRecipeBookRoute(client: TandoorClient) : TandoorBaseRoute(client) {

client.container.recipeBook[bookId]?.let { book ->
book.entries.clear()
book.entryByRecipeId.clear()

entries.forEach {
book.entries.add(it)
book.entryByRecipeId[it.recipe] = it
}
}

Expand Down