From 664b50c7f0b51a8b525c5a612eb38c3eee85bb24 Mon Sep 17 00:00:00 2001 From: hay-kot Date: Tue, 9 Feb 2021 19:57:53 -0900 Subject: [PATCH] db to session --- mealie/routes/backup_routes.py | 8 ++++---- mealie/routes/debug_routes.py | 13 +------------ mealie/routes/meal_routes.py | 28 ++++++++++++++-------------- mealie/routes/migration_routes.py | 6 +++--- mealie/routes/setting_routes.py | 8 ++++---- mealie/routes/theme_routes.py | 20 ++++++++++---------- mealie/services/backups/exports.py | 2 +- 7 files changed, 37 insertions(+), 48 deletions(-) diff --git a/mealie/routes/backup_routes.py b/mealie/routes/backup_routes.py index c1c1d3dd9..df64c38f7 100644 --- a/mealie/routes/backup_routes.py +++ b/mealie/routes/backup_routes.py @@ -32,10 +32,10 @@ def available_imports(): @router.post("/export/database", status_code=201) -def export_database(data: BackupJob, db: Session = Depends(generate_session)): +def export_database(data: BackupJob, session: Session = Depends(generate_session)): """Generates a backup of the recipe database in json format.""" export_path = backup_all( - session=db, + session=session, tag=data.tag, templates=data.templates, export_recipes=data.options.recipes, @@ -80,12 +80,12 @@ async def upload_nextcloud_zipfile(file_name: str): @router.post("/{file_name}/import", status_code=200) def import_database( - file_name: str, import_data: ImportJob, db: Session = Depends(generate_session) + file_name: str, import_data: ImportJob, session: Session = Depends(generate_session) ): """ Import a database backup file generated from Mealie. """ import_db = ImportDatabase( - session=db, + session=session, zip_archive=import_data.name, import_recipes=import_data.recipes, force_import=import_data.force, diff --git a/mealie/routes/debug_routes.py b/mealie/routes/debug_routes.py index 0ba1d7883..2c0d8f3b7 100644 --- a/mealie/routes/debug_routes.py +++ b/mealie/routes/debug_routes.py @@ -27,18 +27,7 @@ async def get_log(num: int): """ Doc Str """ with open(LOGGER_FILE, "rb") as f: log_text = tail(f, num) - HTML_RESPONSE = f""" - - - Mealie Log - - -

- {log_text} -

- - - """ + HTML_RESPONSE = log_text return HTML_RESPONSE diff --git a/mealie/routes/meal_routes.py b/mealie/routes/meal_routes.py index df04d730a..9df739e25 100644 --- a/mealie/routes/meal_routes.py +++ b/mealie/routes/meal_routes.py @@ -10,53 +10,53 @@ router = APIRouter(prefix="/api/meal-plans", tags=["Meal Plan"]) @router.get("/all", response_model=List[MealPlan]) -def get_all_meals(db: Session = Depends(generate_session)): +def get_all_meals(session: Session = Depends(generate_session)): """ Returns a list of all available Meal Plan """ - return MealPlan.get_all(db) + return MealPlan.get_all(session) @router.post("/create") -def set_meal_plan(data: MealPlan, db: Session = Depends(generate_session)): +def set_meal_plan(data: MealPlan, session: Session = Depends(generate_session)): """ Creates a meal plan database entry """ - data.process_meals(db) - data.save_to_db(db) + data.process_meals(session) + data.save_to_db(session) return SnackResponse.success("Mealplan Created") @router.get("/this-week", response_model=MealPlan) -def get_this_week(db: Session = Depends(generate_session)): +def get_this_week(session: Session = Depends(generate_session)): """ Returns the meal plan data for this week """ - return MealPlan.this_week(db) + return MealPlan.this_week(session) @router.put("/{plan_id}") def update_meal_plan( - plan_id: str, meal_plan: MealPlan, db: Session = Depends(generate_session) + plan_id: str, meal_plan: MealPlan, session: Session = Depends(generate_session) ): """ Updates a meal plan based off ID """ - meal_plan.process_meals(db) - meal_plan.update(db, plan_id) + meal_plan.process_meals(session) + meal_plan.update(session, plan_id) return SnackResponse.info("Mealplan Updated") @router.delete("/{plan_id}") -def delete_meal_plan(plan_id, db: Session = Depends(generate_session)): +def delete_meal_plan(plan_id, session: Session = Depends(generate_session)): """ Removes a meal plan from the database """ - MealPlan.delete(db, plan_id) + MealPlan.delete(session, plan_id) return SnackResponse.error("Mealplan Deleted") @router.get("/today", tags=["Meal Plan"]) -def get_today(db: Session = Depends(generate_session)): +def get_today(session: Session = Depends(generate_session)): """ Returns the recipe slug for the meal scheduled for today. If no meal is scheduled nothing is returned """ - return MealPlan.today(db) + return MealPlan.today(session) diff --git a/mealie/routes/migration_routes.py b/mealie/routes/migration_routes.py index 8fc2f0b76..19e2c7a5d 100644 --- a/mealie/routes/migration_routes.py +++ b/mealie/routes/migration_routes.py @@ -37,14 +37,14 @@ def get_avaiable_nextcloud_imports(): @router.post("/{type}/{file_name}/import") def import_nextcloud_directory( - type: str, file_name: str, db: Session = Depends(generate_session) + type: str, file_name: str, session: Session = Depends(generate_session) ): """ Imports all the recipes in a given directory """ file_path = MIGRATION_DIR.joinpath(type, file_name) if type == "nextcloud": - return nextcloud_migrate(db, file_path) + return nextcloud_migrate(session, file_path) elif type == "chowdown": - return chowdow_migrate(db, file_path) + return chowdow_migrate(session, file_path) else: return SnackResponse.error("Incorrect Migration Type Selected") diff --git a/mealie/routes/setting_routes.py b/mealie/routes/setting_routes.py index a6480e894..414f92fbf 100644 --- a/mealie/routes/setting_routes.py +++ b/mealie/routes/setting_routes.py @@ -9,10 +9,10 @@ router = APIRouter(prefix="/api/site-settings", tags=["Settings"]) @router.get("") -def get_main_settings(db: Session = Depends(generate_session)): +def get_main_settings(session: Session = Depends(generate_session)): """ Returns basic site settings """ - return SiteSettings.get_site_settings(db) + return SiteSettings.get_site_settings(session) @router.post("/webhooks/test") @@ -23,8 +23,8 @@ def test_webhooks(): @router.put("") -def update_settings(data: SiteSettings, db: Session = Depends(generate_session)): +def update_settings(data: SiteSettings, session: Session = Depends(generate_session)): """ Returns Site Settings """ - data.update(db) + data.update(session) return SnackResponse.success("Settings Updated") diff --git a/mealie/routes/theme_routes.py b/mealie/routes/theme_routes.py index 3c244931c..d656fb595 100644 --- a/mealie/routes/theme_routes.py +++ b/mealie/routes/theme_routes.py @@ -8,39 +8,39 @@ router = APIRouter(prefix="/api", tags=["Themes"]) @router.get("/themes") -def get_all_themes(db: Session = Depends(generate_session)): +def get_all_themes(session: Session = Depends(generate_session)): """ Returns all site themes """ - return SiteTheme.get_all(db) + return SiteTheme.get_all(session) @router.post("/themes/create") -def create_theme(data: SiteTheme, db: Session = Depends(generate_session)): +def create_theme(data: SiteTheme, session: Session = Depends(generate_session)): """ Creates a site color theme database entry """ - data.save_to_db(db) + data.save_to_db(session) return SnackResponse.success("Theme Saved") @router.get("/themes/{theme_name}") -def get_single_theme(theme_name: str, db: Session = Depends(generate_session)): +def get_single_theme(theme_name: str, session: Session = Depends(generate_session)): """ Returns a named theme """ - return SiteTheme.get_by_name(db, theme_name) + return SiteTheme.get_by_name(session, theme_name) @router.put("/themes/{theme_name}") def update_theme( - theme_name: str, data: SiteTheme, db: Session = Depends(generate_session) + theme_name: str, data: SiteTheme, session: Session = Depends(generate_session) ): """ Update a theme database entry """ - data.update_document(db) + data.update_document(session) return SnackResponse.info(f"Theme Updated: {theme_name}") @router.delete("/themes/{theme_name}") -def delete_theme(theme_name: str, db: Session = Depends(generate_session)): +def delete_theme(theme_name: str, session: Session = Depends(generate_session)): """ Deletes theme from the database """ - SiteTheme.delete_theme(db, theme_name) + SiteTheme.delete_theme(session, theme_name) return SnackResponse.error(f"Theme Deleted: {theme_name}") diff --git a/mealie/services/backups/exports.py b/mealie/services/backups/exports.py index f8e946c09..fc6b7d3a3 100644 --- a/mealie/services/backups/exports.py +++ b/mealie/services/backups/exports.py @@ -110,7 +110,7 @@ class ExportDatabase: ExportDatabase._write_json_file(meal_plans, out_file) @staticmethod - def _write_json_file(data, out_file: Path): + def _write_json_file(data: dict, out_file: Path): json_data = json.dumps(data, indent=4, default=str) with open(out_file, "w") as f: