Fix: Smaller bugs

Author: TomBursch

backend/app/models/history.py

@@ -81,18 +81,36 @@ def find_all(cls) -> list[Self]:
 
     @classmethod
     def get_recent(cls, shoppinglist_id: int, limit: int = 9) -> list[Self]:
-        sq = db.session.query(ShoppinglistItems.item_id).subquery().select()
-        sq2 = (
-            cls.query.filter(
-                cls.shoppinglist_id == shoppinglist_id,
-                cls.status == Status.DROPPED,
-                cls.item_id.notin_(sq),
+        if "postgresql" in db.engine.name:
+            sq = db.session.query(ShoppinglistItems.item_id).subquery().select()
+            sq2 = (
+                cls.query.filter(
+                    cls.shoppinglist_id == shoppinglist_id,
+                    cls.status == Status.DROPPED,
+                    cls.item_id.notin_(sq),
+                )
+                .distinct(cls.item_id)
+                .order_by(cls.item_id, cls.created_at.desc())
+                .limit(limit)
+                .subquery()
+            )
+            alias = db.aliased(cls, sq2)
+            q = db.session.query(alias).order_by(alias.created_at.desc())
+            return q.all()
+        else:
+            sq = db.session.query(ShoppinglistItems.item_id).subquery().select()
+            sq2 = (
+                db.session.query(func.max(cls.id))
+                .filter(cls.status == Status.DROPPED)
+                .filter(cls.item_id.notin_(sq))
+                .group_by(cls.item_id)
+                .join(cls.item)
+                .subquery()
+                .select()
+            )
+            return (
+                cls.query.filter(cls.shoppinglist_id == shoppinglist_id)
+                .filter(cls.id.in_(sq2))
+                .order_by(cls.created_at.desc(), cls.item_id)
+                .limit(limit)
             )
-            .distinct(cls.item_id)
-            .order_by(cls.item_id, cls.created_at.desc())
-            .limit(limit)
-            .subquery()
-        )
-        alias = db.aliased(cls, sq2)
-        q = db.session.query(alias).order_by(alias.created_at.desc())
-        return q.all()

backend/app/service/recipe_scraping.py

@@ -12,7 +12,7 @@
 
 def scrapePublic(url: str, html: str, household: Household) -> dict | None:
     try:
-        scraper = scrape_html(html, url, supported_only=False, wild_mode=True)
+        scraper = scrape_html(html, url, supported_only=False)
     except:
         return None
     recipe = Recipe()
@@ -133,9 +133,7 @@ def scrapeKitchenOwl(original_url: str, api_url: str, recipe_id: int) -> dict |
     items = {}
 
     for ingredient in recipe["items"]:
-        items[ingredient["name"] + " " + ingredient["description"]] = (
-            ingredient.obj_to_item_dict()
-        )
+        items[ingredient["name"] + " " + ingredient["description"]] = ingredient
 
     return {"recipe": recipe, "items": items}
 
@@ -162,7 +160,11 @@ def scrape(url: str, household: Household) -> dict | None:
     if res.status_code != requests.codes.ok:
         return None
 
-    if kitchenowlMatch and hashlib.sha256(res.text.encode()).hexdigest() == "3fc2629051e92fa54c26cf5e44efac1014eb89a2eb46dd644dae4f3db5cd3eaa":
+    if (
+        kitchenowlMatch
+        and hashlib.sha256(res.text.encode()).hexdigest()
+        == "87d851b8a5949da174eb8f43579438242ae2119f0a6cac0718884c52f2a77124"
+    ):
         return scrapeKitchenOwl(
             url, kitchenowlMatch.group(1) + "/api", int(kitchenowlMatch.group(2))
         )

kitchenowl/lib/models/recipe.dart

@@ -73,7 +73,7 @@ class Recipe extends Model implements ISuspensionBean {
       source: map['source'] ?? '',
       image: map['photo'],
       imageHash: map['photo_hash'],
-      public: map['public'],
+      public: map['public'] ?? false,
       householdId: map['household_id'],
       items: items,
       tags: tags,