Feature/shopping lists second try (#927)

* generate types

* use generated types

* ui updates

* init button link for common styles

* add links

* setup label views

* add delete confirmation

* reset when not saved

* link label to foods and auto set when adding to shopping list

* generate types

* use inheritence to manage exception handling

* fix schema generation and add test for open_api generation

* add header to api docs

* move list consilidation to service

* split list and list items controller

* shopping list/list item tests - PARTIAL

* enable recipe add/remove in shopping lists

* generate types

* linting

* init global utility components

* update types and add list item api

* fix import cycle and database error

* add container and border classes

* new recipe list component

* fix tests

* breakout item editor

* refactor item editor

* update bulk actions

* update input / color contrast

* type generation

* refactor controller dependencies

* include food/unit editor

* remove console.logs

* fix and update type generation

* fix incorrect type for column

* fix postgres error

* fix delete by variable

* auto remove refs

* fix typo

mealie/routes/_base/abc_controller.py

@@ -1,8 +1,10 @@
 from abc import ABC
 from functools import cached_property
+from typing import Type
 
 from fastapi import Depends
 
+from mealie.core.exceptions import mealie_registered_exceptions
 from mealie.repos.all_repositories import AllRepositories
 from mealie.routes._base.checks import OperationChecks
 from mealie.routes._base.dependencies import SharedDependencies
@@ -27,6 +29,12 @@ class BaseUserController(ABC):
 
     deps: SharedDependencies = Depends(SharedDependencies.user)
 
+    def registered_exceptions(self, ex: Type[Exception]) -> str:
+        registered = {
+            **mealie_registered_exceptions(self.deps.t),
+        }
+        return registered.get(ex, "An unexpected error occurred.")
+
     @cached_property
     def repos(self):
         return AllRepositories(self.deps.session)

mealie/routes/admin/admin_management_groups.py

@@ -1,10 +1,8 @@
 from functools import cached_property
-from typing import Type
 
 from fastapi import APIRouter, Depends, HTTPException, status
 from pydantic import UUID4
 
-from mealie.core.exceptions import mealie_registered_exceptions
 from mealie.schema.group.group import GroupAdminUpdate
 from mealie.schema.mapper import mapper
 from mealie.schema.query import GetAll
@@ -29,14 +27,6 @@ class AdminUserManagementRoutes(BaseAdminController):
 
         return self.deps.repos.groups
 
-    def registered_exceptions(self, ex: Type[Exception]) -> str:
-
-        registered = {
-            **mealie_registered_exceptions(self.deps.t),
-        }
-
-        return registered.get(ex, "An unexpected error occurred.")
-
     # =======================================================================
     # CRUD Operations
 

mealie/routes/admin/admin_management_users.py

@@ -1,10 +1,8 @@
 from functools import cached_property
-from typing import Type
 
 from fastapi import APIRouter, Depends
 from pydantic import UUID4
 
-from mealie.core.exceptions import mealie_registered_exceptions
 from mealie.routes._base import BaseAdminController, controller
 from mealie.routes._base.dependencies import SharedDependencies
 from mealie.routes._base.mixins import CrudMixins
@@ -25,14 +23,6 @@ class AdminUserManagementRoutes(BaseAdminController):
 
         return self.deps.repos.users
 
-    def registered_exceptions(self, ex: Type[Exception]) -> str:
-
-        registered = {
-            **mealie_registered_exceptions(self.deps.t),
-        }
-
-        return registered.get(ex, "An unexpected error occurred.")
-
     # =======================================================================
     # CRUD Operations
 

mealie/routes/comments/__init__.py

@@ -26,14 +26,6 @@ class RecipeCommentRoutes(BaseUserController):
     def repo(self):
         return self.deps.repos.comments
 
-    def registered_exceptions(self, ex: Type[Exception]) -> str:
-
-        registered = {
-            **mealie_registered_exceptions(self.deps.t),
-        }
-
-        return registered.get(ex, "An unexpected error occurred.")
-
     # =======================================================================
     # CRUD Operations
 

mealie/routes/groups/__init__.py

@@ -25,5 +25,6 @@ router.include_router(controller_invitations.router)
 router.include_router(controller_migrations.router)
 router.include_router(controller_group_reports.router)
 router.include_router(controller_shopping_lists.router)
+router.include_router(controller_shopping_lists.item_router)
 router.include_router(controller_labels.router)
 router.include_router(controller_group_notifications.router)

mealie/routes/groups/controller_group_notifications.py

@@ -1,12 +1,10 @@
 from functools import cached_property
-from typing import Type
 
 from fastapi import APIRouter, Depends
 from pydantic import UUID4
 
-from mealie.core.exceptions import mealie_registered_exceptions
+from mealie.routes._base.abc_controller import BaseUserController
 from mealie.routes._base.controller import controller
-from mealie.routes._base.dependencies import SharedDependencies
 from mealie.routes._base.mixins import CrudMixins
 from mealie.schema.group.group_events import (
     GroupEventNotifierCreate,
@@ -23,8 +21,7 @@ router = APIRouter(prefix="/groups/events/notifications", tags=["Group: Event No
 
 
 @controller(router)
-class GroupEventsNotifierController:
-    deps: SharedDependencies = Depends(SharedDependencies.user)
+class GroupEventsNotifierController(BaseUserController):
     event_bus: EventBusService = Depends(EventBusService)
 
     @cached_property
@@ -34,14 +31,6 @@ class GroupEventsNotifierController:
 
         return self.deps.repos.group_event_notifier.by_group(self.deps.acting_user.group_id)
 
-    def registered_exceptions(self, ex: Type[Exception]) -> str:
-
-        registered = {
-            **mealie_registered_exceptions(self.deps.t),
-        }
-
-        return registered.get(ex, "An unexpected error occurred.")
-
     # =======================================================================
     # CRUD Operations
 

mealie/routes/groups/controller_labels.py

@@ -1,12 +1,10 @@
 from functools import cached_property
-from typing import Type
 
 from fastapi import APIRouter, Depends
 from pydantic import UUID4
 
-from mealie.core.exceptions import mealie_registered_exceptions
+from mealie.routes._base.abc_controller import BaseUserController
 from mealie.routes._base.controller import controller
-from mealie.routes._base.dependencies import SharedDependencies
 from mealie.routes._base.mixins import CrudMixins
 from mealie.schema.labels import (
     MultiPurposeLabelCreate,
@@ -22,9 +20,7 @@ router = APIRouter(prefix="/groups/labels", tags=["Group: Multi Purpose Labels"]
 
 
 @controller(router)
-class MultiPurposeLabelsController:
-    deps: SharedDependencies = Depends(SharedDependencies.user)
-
+class MultiPurposeLabelsController(BaseUserController):
     @cached_property
     def repo(self):
         if not self.deps.acting_user:
@@ -32,14 +28,6 @@ class MultiPurposeLabelsController:
 
         return self.deps.repos.group_multi_purpose_labels.by_group(self.deps.acting_user.group_id)
 
-    def registered_exceptions(self, ex: Type[Exception]) -> str:
-
-        registered = {
-            **mealie_registered_exceptions(self.deps.t),
-        }
-
-        return registered.get(ex, "An unexpected error occurred.")
-
     # =======================================================================
     # CRUD Operations
 

mealie/routes/groups/controller_shopping_lists.py

@@ -1,15 +1,16 @@
 from functools import cached_property
-from typing import Type
 
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, Query
 from pydantic import UUID4
 
-from mealie.core.exceptions import mealie_registered_exceptions
 from mealie.routes._base.abc_controller import BaseUserController
 from mealie.routes._base.controller import controller
 from mealie.routes._base.mixins import CrudMixins
 from mealie.schema.group.group_shopping_list import (
     ShoppingListCreate,
+    ShoppingListItemCreate,
+    ShoppingListItemOut,
+    ShoppingListItemUpdate,
     ShoppingListOut,
     ShoppingListSave,
     ShoppingListSummary,
@@ -17,10 +18,75 @@ from mealie.schema.group.group_shopping_list import (
 )
 from mealie.schema.mapper import cast
 from mealie.schema.query import GetAll
+from mealie.schema.response.responses import SuccessResponse
 from mealie.services.event_bus_service.event_bus_service import EventBusService
 from mealie.services.event_bus_service.message_types import EventTypes
 from mealie.services.group_services.shopping_lists import ShoppingListService
 
+item_router = APIRouter(prefix="/groups/shopping/items", tags=["Group: Shopping List Items"])
+
+
+@controller(item_router)
+class ShoppingListItemController(BaseUserController):
+    @cached_property
+    def service(self):
+        return ShoppingListService(self.repos)
+
+    @cached_property
+    def repo(self):
+        return self.deps.repos.group_shopping_list_item
+
+    @cached_property
+    def mixins(self):
+        return CrudMixins[ShoppingListItemCreate, ShoppingListItemOut, ShoppingListItemCreate](
+            self.repo,
+            self.deps.logger,
+        )
+
+    @item_router.put("", response_model=list[ShoppingListItemOut])
+    def update_many(self, data: list[ShoppingListItemUpdate]):
+        # TODO: Convert to update many with single call
+
+        all_updates = []
+        keep_ids = []
+
+        for item in self.service.consolidate_list_items(data):
+            updated_data = self.mixins.update_one(item, item.id)
+            all_updates.append(updated_data)
+            keep_ids.append(updated_data.id)
+
+        for item in data:
+            if item.id not in keep_ids:
+                self.mixins.delete_one(item.id)
+
+        return all_updates
+
+    @item_router.delete("", response_model=SuccessResponse)
+    def delete_many(self, ids: list[UUID4] = Query(None)):
+        x = 0
+        for item_id in ids:
+            self.mixins.delete_one(item_id)
+            x += 1
+
+        return SuccessResponse.respond(message=f"Successfully deleted {x} items")
+
+    @item_router.post("", response_model=ShoppingListItemOut, status_code=201)
+    def create_one(self, data: ShoppingListItemCreate):
+        return self.mixins.create_one(data)
+
+    @item_router.get("/{item_id}", response_model=ShoppingListItemOut)
+    def get_one(self, item_id: UUID4):
+        return self.mixins.get_one(item_id)
+
+    @item_router.put("/{item_id}", response_model=ShoppingListItemOut)
+    def update_one(self, item_id: UUID4, data: ShoppingListItemUpdate):
+        return self.mixins.update_one(data, item_id)
+
+    @item_router.delete("/{item_id}", response_model=ShoppingListItemOut)
+    def delete_one(self, item_id: UUID4):
+        return self.mixins.delete_one(item_id)  # type: ignore
+
+
 router = APIRouter(prefix="/groups/shopping/lists", tags=["Group: Shopping Lists"])
 
 
@@ -34,23 +100,12 @@ class ShoppingListController(BaseUserController):
 
     @cached_property
     def repo(self):
-        if not self.deps.acting_user:
-            raise Exception("No user is logged in.")
-
         return self.deps.repos.group_shopping_lists.by_group(self.deps.acting_user.group_id)
 
-    def registered_exceptions(self, ex: Type[Exception]) -> str:
-
-        registered = {
-            **mealie_registered_exceptions(self.deps.t),
-        }
-
-        return registered.get(ex, "An unexpected error occurred.")
-
     # =======================================================================
     # CRUD Operations
 
-    @property
+    @cached_property
     def mixins(self) -> CrudMixins:
         return CrudMixins(self.repo, self.deps.logger, self.registered_exceptions, "An unexpected error occurred.")
 
@@ -58,7 +113,7 @@ class ShoppingListController(BaseUserController):
     def get_all(self, q: GetAll = Depends(GetAll)):
         return self.repo.get_all(start=q.start, limit=q.limit, override_schema=ShoppingListSummary)
 
-    @router.post("", response_model=ShoppingListOut)
+    @router.post("", response_model=ShoppingListOut, status_code=201)
     def create_one(self, data: ShoppingListCreate):
         save_data = cast(data, ShoppingListSave, group_id=self.deps.acting_user.group_id)
         val = self.mixins.create_one(save_data)
@@ -74,7 +129,7 @@ class ShoppingListController(BaseUserController):
 
     @router.get("/{item_id}", response_model=ShoppingListOut)
     def get_one(self, item_id: UUID4):
-        return self.repo.get_one(item_id)
+        return self.mixins.get_one(item_id)
 
     @router.put("/{item_id}", response_model=ShoppingListOut)
     def update_one(self, item_id: UUID4, data: ShoppingListUpdate):

mealie/routes/unit_and_foods/foods.py

@@ -1,14 +1,12 @@
 from functools import cached_property
-from typing import Type
 
 from fastapi import APIRouter, Depends
 
-from mealie.core.exceptions import mealie_registered_exceptions
 from mealie.routes._base.abc_controller import BaseUserController
 from mealie.routes._base.controller import controller
 from mealie.routes._base.mixins import CrudMixins
 from mealie.schema.query import GetAll
-from mealie.schema.recipe.recipe_ingredient import CreateIngredientUnit, IngredientUnit
+from mealie.schema.recipe.recipe_ingredient import CreateIngredientFood, IngredientFood
 
 router = APIRouter(prefix="/foods", tags=["Recipes: Foods"])
 
@@ -19,38 +17,30 @@ class IngredientFoodsController(BaseUserController):
     def repo(self):
         return self.deps.repos.ingredient_foods
 
-    def registered_exceptions(self, ex: Type[Exception]) -> str:
-
-        registered = {
-            **mealie_registered_exceptions(self.deps.t),
-        }
-
-        return registered.get(ex, "An unexpected error occurred.")
-
     @cached_property
     def mixins(self):
-        return CrudMixins[CreateIngredientUnit, IngredientUnit, CreateIngredientUnit](
+        return CrudMixins[CreateIngredientFood, IngredientFood, CreateIngredientFood](
             self.repo,
             self.deps.logger,
             self.registered_exceptions,
         )
 
-    @router.get("", response_model=list[IngredientUnit])
+    @router.get("", response_model=list[IngredientFood])
     def get_all(self, q: GetAll = Depends(GetAll)):
         return self.repo.get_all(start=q.start, limit=q.limit)
 
-    @router.post("", response_model=IngredientUnit, status_code=201)
-    def create_one(self, data: CreateIngredientUnit):
+    @router.post("", response_model=IngredientFood, status_code=201)
+    def create_one(self, data: CreateIngredientFood):
         return self.mixins.create_one(data)
 
-    @router.get("/{item_id}", response_model=IngredientUnit)
+    @router.get("/{item_id}", response_model=IngredientFood)
     def get_one(self, item_id: int):
         return self.mixins.get_one(item_id)
 
-    @router.put("/{item_id}", response_model=IngredientUnit)
-    def update_one(self, item_id: int, data: CreateIngredientUnit):
+    @router.put("/{item_id}", response_model=IngredientFood)
+    def update_one(self, item_id: int, data: CreateIngredientFood):
         return self.mixins.update_one(data, item_id)
 
-    @router.delete("/{item_id}", response_model=IngredientUnit)
+    @router.delete("/{item_id}", response_model=IngredientFood)
     def delete_one(self, item_id: int):
         return self.mixins.delete_one(item_id)

mealie/routes/unit_and_foods/units.py

@@ -1,9 +1,7 @@
 from functools import cached_property
-from typing import Type
 
 from fastapi import APIRouter, Depends
 
-from mealie.core.exceptions import mealie_registered_exceptions
 from mealie.routes._base.abc_controller import BaseUserController
 from mealie.routes._base.controller import controller
 from mealie.routes._base.mixins import CrudMixins
@@ -19,14 +17,6 @@ class IngredientUnitsController(BaseUserController):
     def repo(self):
         return self.deps.repos.ingredient_units
 
-    def registered_exceptions(self, ex: Type[Exception]) -> str:
-
-        registered = {
-            **mealie_registered_exceptions(self.deps.t),
-        }
-
-        return registered.get(ex, "An unexpected error occurred.")
-
     @cached_property
     def mixins(self):
         return CrudMixins[CreateIngredientUnit, IngredientUnit, CreateIngredientUnit](