Release 1.2.0 with calmer snack planning and PDF exports

nouri/reminders.py

@@ -18,6 +18,15 @@ MEAL_PUSH_RULES = [
     {"slug": "dinner", "setting": "push_missing_dinner", "hour": 18, "minute": 0, "end_hour": 24, "label": "Abendessen"},
 ]
 
+SNACK_PUSH_RULE = {
+    "slugs": ("morning-snack", "afternoon-snack", "late-snack"),
+    "setting": "push_small_snack",
+    "hour": 15,
+    "minute": 0,
+    "end_hour": 20,
+    "label": "Etwas Kleines",
+}
+
 
 def current_local_time() -> datetime:
     timezone_name = current_app.config.get("TIMEZONE", "Europe/Berlin")
@@ -73,6 +82,24 @@ def plan_exists_for_daypart(user, *, planned_date: date, daypart_id: int) -> boo
     return bool(int(row["count"] or 0))
 
 
+def plan_exists_for_any_daypart(user, *, planned_date: date, daypart_ids: list[int]) -> bool:
+    if not daypart_ids:
+        return False
+    placeholders = ", ".join("?" for _ in daypart_ids)
+    row = get_db().execute(
+        f"""
+        SELECT COUNT(*) AS count
+        FROM plan_entries
+        WHERE household_id = ?
+          AND plan_date = ?
+          AND daypart_id IN ({placeholders})
+          AND (visibility = 'shared' OR owner_user_id = ?)
+        """,
+        [int(user["household_id"]), planned_date.isoformat(), *daypart_ids, int(user["id"])],
+    ).fetchone()
+    return bool(int(row["count"] or 0))
+
+
 def reminder_event_exists(user_id: int, event_key: str) -> bool:
     row = get_db().execute(
         "SELECT 1 FROM reminder_events WHERE user_id = ? AND event_key = ? LIMIT 1",
@@ -119,6 +146,13 @@ def build_push_message(label: str, suggestion: dict | None) -> tuple[str, str]:
     return title, f"Für {label.lower()} ist noch nichts geplant."
 
 
+def build_small_snack_push_message(suggestion: dict | None) -> tuple[str, str]:
+    title = "Nouri · Etwas Kleines"
+    if suggestion and suggestion.get("title"):
+        return title, f"Für später wäre etwas Kleines möglich. Zuhause passt gerade: {suggestion['title']}."
+    return title, "Für später wäre etwas Kleines möglich. Vielleicht passt heute etwas Einfaches wie Nüsse oder ein Apfel."
+
+
 def best_suggestion_for_user(user, daypart_id: int) -> dict | None:
     previous_user = getattr(g, "user", None)
     g.user = user
@@ -129,6 +163,19 @@ def best_suggestion_for_user(user, daypart_id: int) -> dict | None:
     return suggestions[0] if suggestions else None
 
 
+def best_small_snack_suggestion_for_user(user, daypart_ids: list[int]) -> tuple[int | None, dict | None]:
+    previous_user = getattr(g, "user", None)
+    g.user = user
+    try:
+        for daypart_id in daypart_ids:
+            suggestions = build_home_recipe_suggestions(daypart_id, limit=1)
+            if suggestions:
+                return daypart_id, suggestions[0]
+    finally:
+        g.user = previous_user
+    return (daypart_ids[0] if daypart_ids else None), None
+
+
 def send_due_meal_pushes(now: datetime | None = None) -> int:
     now = now or current_local_time()
     planned_date = now.date()
@@ -190,6 +237,50 @@ def send_due_meal_pushes(now: datetime | None = None) -> int:
                 mark_reminder_event(int(user["id"]), event_key)
                 sent_count += 1
 
+        snack_rule = SNACK_PUSH_RULE
+        if settings.get(snack_rule["setting"]) and due_for_rule(
+            now,
+            hour=snack_rule["hour"],
+            minute=snack_rule["minute"],
+            end_hour=snack_rule["end_hour"],
+        ):
+            snack_daypart_ids = [
+                int(dayparts[slug]["id"])
+                for slug in snack_rule["slugs"]
+                if slug in dayparts
+            ]
+            if snack_daypart_ids and not plan_exists_for_any_daypart(
+                user,
+                planned_date=planned_date,
+                daypart_ids=snack_daypart_ids,
+            ):
+                event_key = f"meal-push:{planned_date.isoformat()}:small-snack"
+                if not reminder_event_exists(int(user["id"]), event_key):
+                    daypart_id, suggestion = best_small_snack_suggestion_for_user(user, snack_daypart_ids)
+                    title, body = build_small_snack_push_message(suggestion)
+                    url = build_push_target_url(
+                        planned_date=planned_date,
+                        daypart_id=daypart_id or snack_daypart_ids[0],
+                        suggestion=suggestion,
+                    )
+
+                    delivered = False
+                    for subscription in subscriptions:
+                        ok, _error = send_push_message(
+                            {
+                                "endpoint": subscription["endpoint"],
+                                "keys": {"p256dh": subscription["p256dh"], "auth": subscription["auth"]},
+                            },
+                            title=title,
+                            body=body,
+                            url=url,
+                        )
+                        delivered = delivered or ok
+
+                    if delivered:
+                        mark_reminder_event(int(user["id"]), event_key)
+                        sent_count += 1
+
     return sent_count