Fix issues 4
This commit is contained in:
Urtzi Alfaro
@@ -30,24 +30,61 @@ class IngredientRepository(BaseRepository[Ingredient, IngredientCreate, Ingredie
|
||||
create_data = ingredient_data.model_dump()
|
||||
create_data['tenant_id'] = tenant_id
|
||||
|
||||
# Map 'category' from schema to appropriate model fields
|
||||
# Handle product_type enum conversion
|
||||
product_type_value = create_data.get('product_type', 'ingredient')
|
||||
if 'product_type' in create_data:
|
||||
from app.models.inventory import ProductType
|
||||
try:
|
||||
# Convert string to enum object
|
||||
if isinstance(product_type_value, str):
|
||||
for enum_member in ProductType:
|
||||
if enum_member.value == product_type_value or enum_member.name == product_type_value:
|
||||
create_data['product_type'] = enum_member
|
||||
break
|
||||
else:
|
||||
# If not found, default to INGREDIENT
|
||||
create_data['product_type'] = ProductType.INGREDIENT
|
||||
# If it's already an enum, keep it
|
||||
except Exception:
|
||||
# Fallback to INGREDIENT if any issues
|
||||
create_data['product_type'] = ProductType.INGREDIENT
|
||||
|
||||
# Handle category mapping based on product type
|
||||
if 'category' in create_data:
|
||||
category_value = create_data.pop('category')
|
||||
# For now, assume all items are ingredients and map to ingredient_category
|
||||
# Convert string to enum object
|
||||
from app.models.inventory import IngredientCategory
|
||||
try:
|
||||
# Find the enum member by value
|
||||
for enum_member in IngredientCategory:
|
||||
if enum_member.value == category_value:
|
||||
create_data['ingredient_category'] = enum_member
|
||||
break
|
||||
else:
|
||||
# If not found, default to OTHER
|
||||
create_data['ingredient_category'] = IngredientCategory.OTHER
|
||||
except Exception:
|
||||
# Fallback to OTHER if any issues
|
||||
create_data['ingredient_category'] = IngredientCategory.OTHER
|
||||
|
||||
if product_type_value == 'finished_product' or product_type_value == 'FINISHED_PRODUCT':
|
||||
# Map to product_category for finished products
|
||||
from app.models.inventory import ProductCategory
|
||||
if category_value:
|
||||
try:
|
||||
# Find the enum member by value
|
||||
for enum_member in ProductCategory:
|
||||
if enum_member.value == category_value:
|
||||
create_data['product_category'] = enum_member
|
||||
break
|
||||
else:
|
||||
# If not found, default to OTHER
|
||||
create_data['product_category'] = ProductCategory.OTHER_PRODUCTS
|
||||
except Exception:
|
||||
# Fallback to OTHER if any issues
|
||||
create_data['product_category'] = ProductCategory.OTHER_PRODUCTS
|
||||
else:
|
||||
# Map to ingredient_category for ingredients
|
||||
from app.models.inventory import IngredientCategory
|
||||
if category_value:
|
||||
try:
|
||||
# Find the enum member by value
|
||||
for enum_member in IngredientCategory:
|
||||
if enum_member.value == category_value:
|
||||
create_data['ingredient_category'] = enum_member
|
||||
break
|
||||
else:
|
||||
# If not found, default to OTHER
|
||||
create_data['ingredient_category'] = IngredientCategory.OTHER
|
||||
except Exception:
|
||||
# Fallback to OTHER if any issues
|
||||
create_data['ingredient_category'] = IngredientCategory.OTHER
|
||||
|
||||
# Convert unit_of_measure string to enum object
|
||||
if 'unit_of_measure' in create_data:
|
||||
@@ -81,6 +118,92 @@ class IngredientRepository(BaseRepository[Ingredient, IngredientCreate, Ingredie
|
||||
logger.error("Failed to create ingredient", error=str(e), tenant_id=tenant_id)
|
||||
raise
|
||||
|
||||
async def update(self, record_id: Any, obj_in: IngredientUpdate, **kwargs) -> Optional[Ingredient]:
|
||||
"""Override update to handle product_type and category enum conversions"""
|
||||
try:
|
||||
# Prepare data and map schema fields to model fields
|
||||
update_data = obj_in.model_dump(exclude_unset=True)
|
||||
|
||||
# Handle product_type enum conversion
|
||||
if 'product_type' in update_data:
|
||||
product_type_value = update_data['product_type']
|
||||
from app.models.inventory import ProductType
|
||||
try:
|
||||
# Convert string to enum object
|
||||
if isinstance(product_type_value, str):
|
||||
for enum_member in ProductType:
|
||||
if enum_member.value == product_type_value or enum_member.name == product_type_value:
|
||||
update_data['product_type'] = enum_member
|
||||
break
|
||||
else:
|
||||
# If not found, keep original value (don't update)
|
||||
del update_data['product_type']
|
||||
# If it's already an enum, keep it
|
||||
except Exception:
|
||||
# Remove invalid product_type to avoid update
|
||||
del update_data['product_type']
|
||||
|
||||
# Handle category mapping based on product type
|
||||
if 'category' in update_data:
|
||||
category_value = update_data.pop('category')
|
||||
product_type_value = update_data.get('product_type', 'ingredient')
|
||||
|
||||
# Get current product if we need to determine type
|
||||
if 'product_type' not in update_data:
|
||||
current_record = await self.get_by_id(record_id)
|
||||
if current_record:
|
||||
product_type_value = current_record.product_type.value if current_record.product_type else 'ingredient'
|
||||
|
||||
if product_type_value == 'finished_product' or product_type_value == 'FINISHED_PRODUCT':
|
||||
# Map to product_category for finished products
|
||||
from app.models.inventory import ProductCategory
|
||||
if category_value:
|
||||
try:
|
||||
for enum_member in ProductCategory:
|
||||
if enum_member.value == category_value:
|
||||
update_data['product_category'] = enum_member
|
||||
# Clear ingredient_category when setting product_category
|
||||
update_data['ingredient_category'] = None
|
||||
break
|
||||
except Exception:
|
||||
pass
|
||||
else:
|
||||
# Map to ingredient_category for ingredients
|
||||
from app.models.inventory import IngredientCategory
|
||||
if category_value:
|
||||
try:
|
||||
for enum_member in IngredientCategory:
|
||||
if enum_member.value == category_value:
|
||||
update_data['ingredient_category'] = enum_member
|
||||
# Clear product_category when setting ingredient_category
|
||||
update_data['product_category'] = None
|
||||
break
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Handle unit_of_measure enum conversion
|
||||
if 'unit_of_measure' in update_data:
|
||||
unit_value = update_data['unit_of_measure']
|
||||
from app.models.inventory import UnitOfMeasure
|
||||
try:
|
||||
if isinstance(unit_value, str):
|
||||
for enum_member in UnitOfMeasure:
|
||||
if enum_member.value == unit_value:
|
||||
update_data['unit_of_measure'] = enum_member
|
||||
break
|
||||
else:
|
||||
# If not found, keep original value
|
||||
del update_data['unit_of_measure']
|
||||
except Exception:
|
||||
del update_data['unit_of_measure']
|
||||
|
||||
# Call parent update method
|
||||
return await super().update(record_id, update_data, **kwargs)
|
||||
|
||||
except Exception as e:
|
||||
logger.error("Failed to update ingredient", error=str(e), record_id=record_id)
|
||||
raise
|
||||
|
||||
async def get_ingredients_by_tenant(
|
||||
self,
|
||||
tenant_id: UUID,
|
||||
|
||||
Reference in New Issue
Block a user