fix: Minor bug fixes, remove ingredient

Lastaapps · Jan 20, 2025 · 05e61c8 · 05e61c8
1 parent 471356d
commit 05e61c8
Show file tree

Hide file tree

Showing 24 changed files with 118 additions and 131 deletions.
diff --git a/.idea/runConfigurations/Generate_DB_migrations.xml b/.idea/runConfigurations/Generate_DB_migrations.xml
diff --git a/...agata/src/commonMain/kotlin/cz/lastaapps/menza/api/agata/data/mapers/DtoToDomainMapper.kt b/...agata/src/commonMain/kotlin/cz/lastaapps/menza/api/agata/data/mapers/DtoToDomainMapper.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2025, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -23,7 +23,6 @@ import cz.lastaapps.api.core.domain.model.WeekDayDish
 import cz.lastaapps.api.core.domain.model.WeekDish
 import cz.lastaapps.api.core.domain.model.WeekDishCategory
 import cz.lastaapps.menza.api.agata.data.model.dto.WeekDishDto
-import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.datetime.LocalDate
 
@@ -64,5 +63,4 @@ private fun WeekDishDto.toDomain() =
         amount = amount?.trim(),
         priceNormal = null,
         priceDiscounted = null,
-        ingredients = persistentListOf(),
     )
diff --git a/...ta/src/commonMain/kotlin/cz/lastaapps/menza/api/agata/data/mapers/EntityToDomainMapper.kt b/...ta/src/commonMain/kotlin/cz/lastaapps/menza/api/agata/data/mapers/EntityToDomainMapper.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2025, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -91,14 +91,13 @@ internal fun DishEntity.toDomain(
         photoLink = dish.photoLink,
         pictogram = pictograms.map(PictogramEntity::name).toImmutableList(),
         servingPlaces =
-        servingPlaces
-            .map { entity ->
-                ServingPlace(
-                    name = entity.name,
-                    abbrev = entity.abbrev,
-                )
-            }.toImmutableList(),
-        ingredients = persistentListOf(),
+            servingPlaces
+                .map { entity ->
+                    ServingPlace(
+                        name = entity.name,
+                        abbrev = entity.abbrev,
+                    )
+                }.toImmutableList(),
         isActive = isActive,
     )
 }
@@ -161,16 +160,16 @@ internal fun InfoEntity?.toDomain(
     openingTimes = openingTimes.toDomain().toImmutableList(),
     links = links.map { it.toDomain() }.toImmutableList(),
     address =
-    address?.let {
-        Address(
-            location = address.address.let(::LocationName),
-            gps =
-            LatLong(
-                lat = address.lat.toFloat(),
-                long = address.long.toFloat(),
-            ),
-        )
-    },
+        address?.let {
+            Address(
+                location = address.address.let(::LocationName),
+                gps =
+                    LatLong(
+                        lat = address.lat.toFloat(),
+                        long = address.long.toFloat(),
+                    ),
+            )
+        },
 )
 
 private fun ContactEntity.toDomain() =
@@ -191,25 +190,25 @@ fun List<OpenTimeEntity>.toDomain() =
                 name = one.servingPlaceName,
                 abbrev = one.servingPlaceAbbrev,
                 types =
-                entities1
-                    .groupBy { it.description }
-                    .entries
-                    .map { (description, entities2) ->
-                        PlaceOpeningType(
-                            description = description,
-                            times =
-                            entities2
-                                .map {
-                                    PlaceOpeningTime(
-                                        startDay = it.dayFrom ?: DayOfWeek.MONDAY,
-                                        endDay = it.dayTo ?: it.dayFrom ?: DayOfWeek.MONDAY,
-                                        startTime = it.timeFrom,
-                                        endTime = it.timeTo,
-                                    )
-                                }.sortedBy { it.startDay }
-                                .toImmutableList(),
-                        )
-                    }.toImmutableList(),
+                    entities1
+                        .groupBy { it.description }
+                        .entries
+                        .map { (description, entities2) ->
+                            PlaceOpeningType(
+                                description = description,
+                                times =
+                                    entities2
+                                        .map {
+                                            PlaceOpeningTime(
+                                                startDay = it.dayFrom ?: DayOfWeek.MONDAY,
+                                                endDay = it.dayTo ?: it.dayFrom ?: DayOfWeek.MONDAY,
+                                                startTime = it.timeFrom,
+                                                endTime = it.timeTo,
+                                            )
+                                        }.sortedBy { it.startDay }
+                                        .toImmutableList(),
+                            )
+                        }.toImmutableList(),
             )
         }
 
@@ -230,10 +229,10 @@ internal fun List<StrahovEntity>.toDomain(language: DataLanguage) =
                 nameShort = null,
                 name = value.groupName.trim(),
                 dishList =
-                values
-                    .sortedBy { it.itemOrder }
-                    .map { it.toDomain(language) }
-                    .toImmutableList(),
+                    values
+                        .sortedBy { it.itemOrder }
+                        .map { it.toDomain(language) }
+                        .toImmutableList(),
             )
         }.toImmutableList()
 
@@ -250,6 +249,5 @@ private fun StrahovEntity.toDomain(language: DataLanguage) =
         photoLink = photoLink,
         pictogram = persistentListOf(),
         servingPlaces = persistentListOf(),
-        ingredients = persistentListOf(),
         isActive = true,
     )
diff --git a/api/buffet/src/commonMain/kotlin/cz/lastaapps/api/buffet/api/BuffetScraper.kt b/api/buffet/src/commonMain/kotlin/cz/lastaapps/api/buffet/api/BuffetScraper.kt
@@ -199,7 +199,6 @@ internal class BuffetScraperImpl : BuffetScraper {
                             type = type.removeHtml(),
                             name = name.removeHtml(),
                             price = price.toInt(),
-                            ingredients = emptyList(),
                             order = index,
                         )
                     }.mapLeft {

diff --git a/api/buffet/src/commonMain/kotlin/cz/lastaapps/api/buffet/data/BuffetDatabaseFactory.kt b/api/buffet/src/commonMain/kotlin/cz/lastaapps/api/buffet/data/BuffetDatabaseFactory.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2025, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -39,7 +39,6 @@ internal object BuffetDatabaseFactory {
                 DishEntity.Adapter(
                     buffetAdapter = BuffetAdapter,
                     dayOfWeekAdapter = DayOfWeekAdapter,
-                    ingredientsAdapter = StringListAdapter,
                 ),
         )
 }

diff --git a/api/buffet/src/commonMain/kotlin/cz/lastaapps/api/buffet/data/mappers/DtoToEntityMapper.kt b/api/buffet/src/commonMain/kotlin/cz/lastaapps/api/buffet/data/mappers/DtoToEntityMapper.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2025, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -38,7 +38,6 @@ private fun List<DishDayDto>.toEntity(buffet: BuffetType) =
                 type = dish.type,
                 name = dish.name,
                 price = dish.price.toLong(),
-                ingredients = dish.ingredients,
                 itemOrder = dish.order.toLong(),
             )
         }

diff --git a/...buffet/src/commonMain/kotlin/cz/lastaapps/api/buffet/data/mappers/EntityToDomainMapper.kt b/...buffet/src/commonMain/kotlin/cz/lastaapps/api/buffet/data/mappers/EntityToDomainMapper.kt
@@ -68,7 +68,6 @@ internal fun List<DishEntity>.toDomainDays(menzaType: MenzaType.Buffet): List<Pa
                                             photoLink = null,
                                             pictogram = persistentListOf(),
                                             servingPlaces = persistentListOf(),
-                                            ingredients = dish.ingredients.toImmutableList(),
                                             isActive = true,
                                         )
                                     }.toPersistentList(),
@@ -111,7 +110,6 @@ internal fun List<DishEntity>.toDomainWeek(
                                             amount = null,
                                             priceNormal = dish.price.toFloat(),
                                             priceDiscounted = null,
-                                            ingredients = dish.ingredients.toImmutableList(),
                                         )
                                     }.toPersistentList(),
                         )

diff --git a/api/buffet/src/commonMain/kotlin/cz/lastaapps/api/buffet/data/model/DishDto.kt b/api/buffet/src/commonMain/kotlin/cz/lastaapps/api/buffet/data/model/DishDto.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2025, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -30,6 +30,5 @@ internal data class DishDto(
     val type: String,
     val name: String,
     val price: Int,
-    val ingredients: List<String>,
     val order: Int,
 )
diff --git a/api/buffet/src/commonMain/kotlin/cz/lastaapps/api/buffet/domain/model/BuffetType.kt b/api/buffet/src/commonMain/kotlin/cz/lastaapps/api/buffet/domain/model/BuffetType.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2024, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2025, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -37,5 +37,5 @@ internal fun MenzaType.Buffet.toType(): BuffetType =
 internal fun BuffetType.toMenzaType() =
     when (this) {
         BuffetType.FS -> FS
-        BuffetType.FEL -> FS
+        BuffetType.FEL -> FEL
     }
diff --git a/api/buffet/src/commonMain/sqldelight/buffet/Dish.sq b/api/buffet/src/commonMain/sqldelight/buffet/Dish.sq
@@ -3,16 +3,15 @@ import kotlin.collections.List;
 import kotlinx.datetime.DayOfWeek;
 import kotlin.String;
 
+-- Primary key is not used as they can put really anything there and I don't want to crash because of it
+-- PRIMARY KEY (buffet, dayOfWeek, type)
 CREATE TABLE DishEntity (
     buffet TEXT AS BuffetType NOT NULL,
     dayOfWeek INTEGER AS DayOfWeek NOT NULL,
     type TEXT NOT NULL,
     name TEXT NOT NULL,
     price INTEGER NOT NULL,
-    ingredients TEXT AS List<String> NOT NULL,
     itemOrder INTEGER NOT NULL
-    -- Primary key is not used as they can put really anything there and I don't want to crash because of it
-    -- PRIMARY KEY (buffet, dayOfWeek, type)
 );
 
 getForBuffet:

diff --git a/api/buffet/src/commonMain/sqldelight/databases/2.db b/api/buffet/src/commonMain/sqldelight/databases/2.db
diff --git a/api/buffet/src/commonMain/sqldelight/migrations/1.sqm b/api/buffet/src/commonMain/sqldelight/migrations/1.sqm
@@ -0,0 +1,22 @@
+import cz.lastaapps.api.buffet.domain.model.BuffetType;
+import kotlin.collections.List;
+import kotlinx.datetime.DayOfWeek;
+import kotlin.String;
+
+-- drop ingredients
+CREATE TABLE DishEntityTmp(
+    buffet TEXT AS BuffetType NOT NULL,
+    dayOfWeek INTEGER AS DayOfWeek NOT NULL,
+    type TEXT NOT NULL,
+    name TEXT NOT NULL,
+    price INTEGER NOT NULL,
+    itemOrder INTEGER NOT NULL
+);
+INSERT INTO DishEntityTmp(
+    buffet, dayOfWeek, type, name, price, itemOrder
+)
+SELECT
+    buffet, dayOfWeek, type, name, price, itemOrder
+FROM DishEntity;
+DROP TABLE DishEntity;
+ALTER TABLE DishEntityTmp RENAME TO DishEntity;
diff --git a/api/buffet/src/jvmTest/kotlin/cz/lastaapps/api/buffet/test/BuffetScraperTest.kt b/api/buffet/src/jvmTest/kotlin/cz/lastaapps/api/buffet/test/BuffetScraperTest.kt
@@ -96,8 +96,6 @@ class BuffetScraperTest :
                     type shouldBe "Hlavní jídlo 2"
                     name shouldBe "Kuřecí steak s pikantní omáčkou, hranolky"
                     price shouldBe 139
-                    ingredients shouldBe
-                        listOf()
                 }
 
                 commonTest(fel, listOf(4, 4, 3, 3, 5))
@@ -106,8 +104,6 @@ class BuffetScraperTest :
                     type shouldBe "Hlavní jídlo 1"
                     name shouldBe "Plněný paprikový lusk, houskové knedlíky (rýže )"
                     price shouldBe 138
-                    ingredients shouldBe
-                        listOf()
                 }
             }
 
@@ -136,8 +132,6 @@ class BuffetScraperTest :
                     type shouldBe "Hlavní jídlo 2"
                     name shouldBe "Smažený květák, vařené brambory, tatarská omáčka"
                     price shouldBe 139
-                    ingredients shouldBe
-                        listOf()
                 }
 
                 commonTest(fel, listOf(4, 4, 3, 3, 5))
@@ -146,8 +140,6 @@ class BuffetScraperTest :
                     type shouldBe "Hlavní jídlo 1"
                     name shouldBe "Smažená aljašská treska, bramborová kaše"
                     price shouldBe 136
-                    ingredients shouldBe
-                        listOf()
                 }
             }
 
@@ -190,7 +182,7 @@ private fun commonTest(
     // checks if all the html parts were successfully removed
     buffet
         .map { day ->
-            day.dishList.map { listOf(it.name, it.type, it.ingredients.toString()) }
+            day.dishList.map { listOf(it.name, it.type) }
         }.flatten()
         .flatten()
         .forEach {

diff --git a/api/core/src/commonMain/kotlin/cz/lastaapps/api/core/domain/model/WeekDish.kt b/api/core/src/commonMain/kotlin/cz/lastaapps/api/core/domain/model/WeekDish.kt
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2023, Petr Laštovička as Lasta apps, All rights reserved
+ *    Copyright 2025, Petr Laštovička as Lasta apps, All rights reserved
  *
  *     This file is part of Menza.
  *
@@ -37,5 +37,4 @@ data class WeekDish(
     val amount: String?,
     val priceNormal: Float?,
     val priceDiscounted: Float?,
-    val ingredients: ImmutableList<String>,
 )