Fix issues 4
This commit is contained in:
@@ -61,7 +61,15 @@ class InventoryService:
|
||||
ingredient = await repository.create_ingredient(ingredient_data, tenant_id)
|
||||
|
||||
# Convert to response schema
|
||||
response = IngredientResponse(**ingredient.to_dict())
|
||||
ingredient_dict = ingredient.to_dict()
|
||||
|
||||
# Map category field based on product type
|
||||
if ingredient.product_type and ingredient.product_type.value == 'finished_product':
|
||||
ingredient_dict['category'] = ingredient.product_category.value if ingredient.product_category else None
|
||||
else:
|
||||
ingredient_dict['category'] = ingredient.ingredient_category.value if ingredient.ingredient_category else None
|
||||
|
||||
response = IngredientResponse(**ingredient_dict)
|
||||
|
||||
# Add computed fields
|
||||
response.current_stock = 0.0
|
||||
@@ -90,7 +98,15 @@ class InventoryService:
|
||||
stock_totals = await stock_repo.get_total_stock_by_ingredient(tenant_id, ingredient_id)
|
||||
|
||||
# Convert to response schema
|
||||
response = IngredientResponse(**ingredient.to_dict())
|
||||
ingredient_dict = ingredient.to_dict()
|
||||
|
||||
# Map category field based on product type
|
||||
if ingredient.product_type and ingredient.product_type.value == 'finished_product':
|
||||
ingredient_dict['category'] = ingredient.product_category.value if ingredient.product_category else None
|
||||
else:
|
||||
ingredient_dict['category'] = ingredient.ingredient_category.value if ingredient.ingredient_category else None
|
||||
|
||||
response = IngredientResponse(**ingredient_dict)
|
||||
response.current_stock = stock_totals['total_available']
|
||||
response.is_low_stock = stock_totals['total_available'] <= ingredient.low_stock_threshold
|
||||
response.needs_reorder = stock_totals['total_available'] <= ingredient.reorder_point
|
||||
@@ -138,7 +154,15 @@ class InventoryService:
|
||||
stock_totals = await stock_repo.get_total_stock_by_ingredient(tenant_id, ingredient_id)
|
||||
|
||||
# Convert to response schema
|
||||
response = IngredientResponse(**updated_ingredient.to_dict())
|
||||
ingredient_dict = updated_ingredient.to_dict()
|
||||
|
||||
# Map category field based on product type
|
||||
if updated_ingredient.product_type and updated_ingredient.product_type.value == 'finished_product':
|
||||
ingredient_dict['category'] = updated_ingredient.product_category.value if updated_ingredient.product_category else None
|
||||
else:
|
||||
ingredient_dict['category'] = updated_ingredient.ingredient_category.value if updated_ingredient.ingredient_category else None
|
||||
|
||||
response = IngredientResponse(**ingredient_dict)
|
||||
response.current_stock = stock_totals['total_available']
|
||||
response.is_low_stock = stock_totals['total_available'] <= updated_ingredient.low_stock_threshold
|
||||
response.needs_reorder = stock_totals['total_available'] <= updated_ingredient.reorder_point
|
||||
@@ -173,7 +197,15 @@ class InventoryService:
|
||||
stock_totals = await stock_repo.get_total_stock_by_ingredient(tenant_id, ingredient.id)
|
||||
|
||||
# Convert to response schema
|
||||
response = IngredientResponse(**ingredient.to_dict())
|
||||
ingredient_dict = ingredient.to_dict()
|
||||
|
||||
# Map category field based on product type
|
||||
if ingredient.product_type and ingredient.product_type.value == 'finished_product':
|
||||
ingredient_dict['category'] = ingredient.product_category.value if ingredient.product_category else None
|
||||
else:
|
||||
ingredient_dict['category'] = ingredient.ingredient_category.value if ingredient.ingredient_category else None
|
||||
|
||||
response = IngredientResponse(**ingredient_dict)
|
||||
response.current_stock = stock_totals['total_available']
|
||||
response.is_low_stock = stock_totals['total_available'] <= ingredient.low_stock_threshold
|
||||
response.needs_reorder = stock_totals['total_available'] <= ingredient.reorder_point
|
||||
|
||||
Reference in New Issue
Block a user