refactor(backend): ♻️ align variable names, eliminate dead-code, and finalize recipe services

mealie/routes/recipe/recipe_crud_routes.py

@@ -2,24 +2,20 @@ import json
 import shutil
 from zipfile import ZipFile
 
-from fastapi import APIRouter, BackgroundTasks, Depends, File
+from fastapi import APIRouter, Depends, File
 from fastapi.datastructures import UploadFile
 from scrape_schema_recipe import scrape_url
 from sqlalchemy.orm.session import Session
 from starlette.responses import FileResponse
 
-from mealie.core.config import settings
+from mealie.core.dependencies import temporary_zip_path
 from mealie.core.root_logger import get_logger
 from mealie.db.database import db
 from mealie.db.db_setup import generate_session
-from mealie.core.dependencies import get_current_user, temporary_zip_path
 from mealie.routes.routers import UserAPIRouter
 from mealie.schema.recipe import CreateRecipeByURL, Recipe, RecipeImageTypes
 from mealie.schema.recipe.recipe import CreateRecipe
-from mealie.schema.user import UserInDB
-from mealie.services.events import create_recipe_event
 from mealie.services.image.image import write_image
-from mealie.services.recipe.media import check_assets
 from mealie.services.recipe.recipe_service import RecipeService
 from mealie.services.scraper.scraper import create_from_url
 
@@ -28,44 +24,30 @@ public_router = APIRouter()
 logger = get_logger()
 
 
+@public_router.get("/{slug}", response_model=Recipe)
+def get_recipe(recipe_service: RecipeService = Depends(RecipeService.read_existing)):
+    """ Takes in a recipe slug, returns all data for a recipe """
+    return recipe_service.recipe
+
+
 @user_router.post("", status_code=201, response_model=str)
 def create_from_name(data: CreateRecipe, recipe_service: RecipeService = Depends(RecipeService.base)) -> str:
     """ Takes in a JSON string and loads data into the database as a new entry"""
     return recipe_service.create_recipe(data).slug
 
 
-@user_router.post("/test-scrape-url")
-def test_parse_recipe_url(url: CreateRecipeByURL):
-    return scrape_url(url.url)
-
-
 @user_router.post("/create-url", status_code=201, response_model=str)
-def parse_recipe_url(
-    background_tasks: BackgroundTasks,
-    url: CreateRecipeByURL,
-    session: Session = Depends(generate_session),
-    current_user: UserInDB = Depends(get_current_user),
-):
+def parse_recipe_url(url: CreateRecipeByURL, recipe_service: RecipeService = Depends(RecipeService.base)):
     """ Takes in a URL and attempts to scrape data and load it into the database """
 
     recipe = create_from_url(url.url)
-    recipe: Recipe = db.recipes.create(session, recipe.dict())
-
-    background_tasks.add_task(
-        create_recipe_event,
-        "Recipe Created (URL)",
-        f"'{recipe.name}' by {current_user.full_name} \n {settings.BASE_URL}/recipe/{recipe.slug}",
-        session=session,
-        attachment=recipe.image_dir.joinpath("min-original.webp"),
-    )
-
-    return recipe.slug
+    return recipe_service.create_recipe(recipe).slug
 
 
-@public_router.get("/{slug}", response_model=Recipe)
-def get_recipe(recipe_service: RecipeService = Depends(RecipeService.read_existing)):
-    """ Takes in a recipe slug, returns all data for a recipe """
-    return recipe_service.recipe
+@user_router.post("/test-scrape-url")
+def test_parse_recipe_url(url: CreateRecipeByURL):
+    # TODO: Replace with more current implementation of testing schema
+    return scrape_url(url.url)
 
 
 @user_router.post("/create-from-zip")
@@ -98,54 +80,36 @@ async def create_recipe_from_zip(
     return recipe
 
 
-@public_router.get("/{recipe_slug}/zip")
+@public_router.get("/{slug}/zip")
 async def get_recipe_as_zip(
-    recipe_slug: str, session: Session = Depends(generate_session), temp_path=Depends(temporary_zip_path)
+    slug: str, session: Session = Depends(generate_session), temp_path=Depends(temporary_zip_path)
 ):
     """ Get a Recipe and It's Original Image as a Zip File """
-    recipe: Recipe = db.recipes.get(session, recipe_slug)
+    recipe: Recipe = db.recipes.get(session, slug)
 
     image_asset = recipe.image_dir.joinpath(RecipeImageTypes.original.value)
 
     with ZipFile(temp_path, "w") as myzip:
-        myzip.writestr(f"{recipe_slug}.json", recipe.json())
+        myzip.writestr(f"{slug}.json", recipe.json())
 
         if image_asset.is_file():
             myzip.write(image_asset, arcname=image_asset.name)
 
-    return FileResponse(temp_path, filename=f"{recipe_slug}.zip")
+    return FileResponse(temp_path, filename=f"{slug}.zip")
 
 
-@user_router.put("/{recipe_slug}")
-def update_recipe(
-    recipe_slug: str,
-    data: Recipe,
-    session: Session = Depends(generate_session),
-):
+@user_router.put("/{slug}")
+def update_recipe(data: Recipe, recipe_service: RecipeService = Depends(RecipeService.write_existing)):
     """ Updates a recipe by existing slug and data. """
 
-    recipe: Recipe = db.recipes.update(session, recipe_slug, data.dict())
-
-    check_assets(original_slug=recipe_slug, recipe=recipe)
-
-    return recipe
+    return recipe_service.update_recipe(data)
 
 
-@user_router.patch("/{recipe_slug}")
-def patch_recipe(
-    recipe_slug: str,
-    data: Recipe,
-    session: Session = Depends(generate_session),
-):
+@user_router.patch("/{slug}")
+def patch_recipe(data: Recipe, recipe_service: RecipeService = Depends(RecipeService.write_existing)):
     """ Updates a recipe by existing slug and data. """
 
-    recipe: Recipe = db.recipes.patch(
-        session, recipe_slug, new_data=data.dict(exclude_unset=True, exclude_defaults=True)
-    )
-
-    check_assets(original_slug=recipe_slug, recipe=recipe)
-
-    return recipe
+    return recipe_service.patch_recipe(data)
 
 
 @user_router.delete("/{slug}")