add merge funcions for units (#1146)

mealie/routes/unit_and_foods/foods.py

@@ -8,12 +8,7 @@ from mealie.routes._base.controller import controller
 from mealie.routes._base.mixins import CrudMixins
 from mealie.schema import mapper
 from mealie.schema.query import GetAll
-from mealie.schema.recipe.recipe_ingredient import (
-    CreateIngredientFood,
-    IngredientFood,
-    IngredientMerge,
-    SaveIngredientFood,
-)
+from mealie.schema.recipe.recipe_ingredient import CreateIngredientFood, IngredientFood, MergeFood, SaveIngredientFood
 from mealie.schema.response.responses import SuccessResponse
 
 router = APIRouter(prefix="/foods", tags=["Recipes: Foods"])
@@ -34,7 +29,7 @@ class IngredientFoodsController(BaseUserController):
         )
 
     @router.put("/merge", response_model=SuccessResponse)
-    def merge_one(self, data: IngredientMerge):
+    def merge_one(self, data: MergeFood):
         try:
             self.repo.merge(data.from_food, data.to_food)
             return SuccessResponse.respond("Successfully merged foods")

mealie/routes/unit_and_foods/units.py

@@ -1,6 +1,6 @@
 from functools import cached_property
 
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, HTTPException
 from pydantic import UUID4
 
 from mealie.routes._base.abc_controller import BaseUserController
@@ -8,7 +8,8 @@ from mealie.routes._base.controller import controller
 from mealie.routes._base.mixins import CrudMixins
 from mealie.schema import mapper
 from mealie.schema.query import GetAll
-from mealie.schema.recipe.recipe_ingredient import CreateIngredientUnit, IngredientUnit, SaveIngredientUnit
+from mealie.schema.recipe.recipe_ingredient import CreateIngredientUnit, IngredientUnit, MergeUnit, SaveIngredientUnit
+from mealie.schema.response.responses import SuccessResponse
 
 router = APIRouter(prefix="/units", tags=["Recipes: Units"])
 
@@ -27,6 +28,15 @@ class IngredientUnitsController(BaseUserController):
             self.registered_exceptions,
         )
 
+    @router.put("/merge", response_model=SuccessResponse)
+    def merge_one(self, data: MergeUnit):
+        try:
+            self.repo.merge(data.from_unit, data.to_unit)
+            return SuccessResponse.respond("Successfully merged units")
+        except Exception as e:
+            self.deps.logger.error(e)
+            raise HTTPException(500, "Failed to merge units") from e
+
     @router.get("", response_model=list[IngredientUnit])
     def get_all(self, q: GetAll = Depends(GetAll)):
         return self.repo.get_all(start=q.start, limit=q.limit)