Release v0.1.0 Candidate (#85)

* Changed uvicorn port to 80

* Changed port in docker-compose to match dockerfile

* Readded environment variables in docker-compose

* production image rework

* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available

* fixed instrucitons on parse

* add last_recipe

* automated testing

* roadmap update

* Sqlite (#75)

* file structure

* auto-test

* take 2

* refactor ap scheduler and startup process

* fixed scraper error

* database abstraction

* database abstraction

* port recipes over to new schema

* meal migration

* start settings migration

* finale mongo port

* backup improvements

* migration imports to new DB structure

* unused import cleanup

* docs strings

* settings and theme import logic

* cleanup

* fixed tinydb error

* requirements

* fuzzy search

* remove scratch file

* sqlalchemy models

* improved search ui

* recipe models almost done

* sql modal population

* del scratch

* rewrite database model mixins

* mostly grabage

* recipe updates

* working sqllite

* remove old files and reorganize

* final cleanup

Co-authored-by: Hayden <hay-kot@pm.me>

* Backup card (#78)

* backup / import dialog

* upgrade to new tag method

* New import card

* rename settings.py to app_config.py

* migrate to poetry for development

* fix failing test

Co-authored-by: Hayden <hay-kot@pm.me>

* added mkdocs to docker-compose

* Translations (#72)

* Translations + danish

* changed back proxy target to use ENV

* Resolved more merge conflicts

* Removed test in translation

* Documentation of translations

* Updated translations

* removed old packages

Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>

* fail to start bug fixes

* feature: prep/cook/total time slots (#80)

Co-authored-by: Hayden <hay-kot@pm.me>

* missing bind attributes

* Bug fixes (#81)

* fix: url remains after succesful import

* docs: changelog + update todos

* arm image

* arm compose

* compose updates

* update poetry

* arm support

Co-authored-by: Hayden <hay-kot@pm.me>

* dockerfile hotfix

* dockerfile hotfix

* Version Release Final Touches (#84)

* Remove slim

* bug: opacity issues

* bug: startup failure with no database

* ci/cd on dev branch

* formatting

* v0.1.0 documentation

Co-authored-by: Hayden <hay-kot@pm.me>

* db init hotfix

* bug: fix crash in mongo

* fix mongo bug

* fixed version notifier

* finale changelog

Co-authored-by: kentora <=>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>

mealie/services/meal_services.py

@@ -1,9 +1,8 @@
-import json
 from datetime import date, timedelta
 from pathlib import Path
 from typing import List, Optional
 
-from db.meal_models import MealDocument, MealPlanDocument
+from db.database import db
 from pydantic import BaseModel
 
 from services.recipe_services import Recipe
@@ -80,73 +79,30 @@ class MealPlan(BaseModel):
         self.meals = meals
 
     def save_to_db(self):
-        meal_docs = []
-        for meal in self.meals:
-            meal = meal.dict()
-            meal_doc = MealDocument(**meal)
-            meal_docs.append(meal_doc)
-
-        self.meals = meal_docs
-
-        meal_plan = MealPlanDocument(**self.dict())
-
-        meal_plan.save()
+        db.meals.save_new(self.dict())
 
     @staticmethod
     def get_all() -> List:
-        all_meals = []
-        for plan in MealPlanDocument.objects.order_by("startDate"):
-            all_meals.append(MealPlan._unpack_doc(plan))
 
-        print(all_meals)
+        all_meals = [MealPlan(**x) for x in db.meals.get_all(order_by="startDate")]
+
         return all_meals
 
     def update(self, uid):
-        document = MealPlanDocument.objects.get(uid=uid)
-
-        meal_docs = []
-        for meal in self.meals:
-            meal = meal.dict()
-            meal_doc = MealDocument(**meal)
-            meal_docs.append(meal_doc)
-
-        self.meals = meal_docs
-        if document:
-            document.update(set__meals=self.meals)
-            document.save()
+        db.meals.update(uid, self.dict())
 
     @staticmethod
     def delete(uid):
-        document = MealPlanDocument.objects.get(uid=uid)
-
-        if document:
-            document.delete()
-
-    @staticmethod
-    def _unpack_doc(document: MealPlanDocument):
-        meal_plan = json.loads(document.to_json())
-        del meal_plan["_id"]["$oid"]
-        print(meal_plan)
-        meal_plan["uid"] = meal_plan["uid"]["$uuid"]
-
-        meal_plan["startDate"] = meal_plan["startDate"]["$date"]
-        meal_plan["endDate"] = meal_plan["endDate"]["$date"]
-
-        meals = []
-        for meal in meal_plan["meals"]:
-            meal["date"] = meal["date"]["$date"]
-            meals.append(Meal(**meal))
-
-        meal_plan["meals"] = meals
-        return MealPlan(**meal_plan)
+        db.meals.delete(uid)
 
     @staticmethod
     def today() -> str:
         """ Returns the meal slug for Today """
-        meal_plan = MealPlanDocument.objects.order_by("startDate").limit(1)
-        meal_plan = MealPlan._unpack_doc(meal_plan[0])
+        meal_plan = db.meals.get_all(limit=1, order_by="startDate")
 
-        for meal in meal_plan.meals:
+        meal_docs = [Meal(**meal) for meal in meal_plan["meals"]]
+
+        for meal in meal_docs:
             if meal.date == date.today():
                 return meal.slug
 
@@ -154,7 +110,6 @@ class MealPlan(BaseModel):
 
     @staticmethod
     def this_week():
-        meal_plan = MealPlanDocument.objects.order_by("startDate").limit(1)
-        meal_plan = MealPlan._unpack_doc(meal_plan[0])
+        meal_plan = db.meals.get_all(limit=1, order_by="startDate")
 
         return meal_plan