sboulahtit/orion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: move transaction management from services to API endpoints

Browse Source 
- Services now use db.flush() instead of db.commit() for database operations
- API endpoints handle transaction commit after service calls
- Remove db.rollback() from services (let exception handlers manage this)
- Ensures consistent transaction boundaries at API layer

This pattern gives API endpoints full control over when to commit,
allowing for better error handling and potential multi-operation transactions.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Samir Boulahtit
2025-12-06 18:34:41 +01:00
parent 5d40551d98
commit 3520bcb069
33 changed files with 118 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/api/v1/admin/code_quality.py
View File

@@ -142,6 +142,7 @@ async def trigger_scan(
scan = code_quality_service.run_scan( scan = code_quality_service.run_scan(
db, triggered_by=f"manual:{current_user.username}" db, triggered_by=f"manual:{current_user.username}"
) )
db.commit()
return ScanResponse( return ScanResponse(
id=scan.id, id=scan.id,
@@ -338,6 +339,7 @@ async def assign_violation(
due_date=request.due_date, due_date=request.due_date,
priority=request.priority, priority=request.priority,
) )
db.commit()
return { return {
"id": assignment.id, "id": assignment.id,
@@ -371,6 +373,7 @@ async def resolve_violation(
resolved_by=current_user.id, resolved_by=current_user.id,
resolution_note=request.resolution_note, resolution_note=request.resolution_note,
) )
db.commit()
return { return {
"id": violation.id, "id": violation.id,
@@ -402,6 +405,7 @@ async def ignore_violation(
ignored_by=current_user.id, ignored_by=current_user.id,
reason=request.reason, reason=request.reason,
) )
db.commit()
return { return {
"id": violation.id, "id": violation.id,
@@ -432,6 +436,7 @@ async def add_comment(
user_id=current_user.id, user_id=current_user.id,
comment=request.comment, comment=request.comment,
) )
db.commit()
return { return {
"id": comment.id, "id": comment.id,

3
app/api/v1/admin/content_pages.py
View File

@@ -149,6 +149,7 @@ def create_platform_page(
display_order=page_data.display_order, display_order=page_data.display_order,
created_by=current_user.id, created_by=current_user.id,
) )
db.commit()
return page.to_dict() return page.to_dict()
@@ -211,6 +212,7 @@ def update_page(
display_order=page_data.display_order, display_order=page_data.display_order,
updated_by=current_user.id, updated_by=current_user.id,
) )
db.commit()
return page.to_dict() return page.to_dict()
@@ -222,3 +224,4 @@ def delete_page(
): ):
"""Delete a content page.""" """Delete a content page."""
content_page_service.delete_page_or_raise(db, page_id) content_page_service.delete_page_or_raise(db, page_id)
db.commit()

1
app/api/v1/admin/marketplace.py
View File

@@ -83,6 +83,7 @@ async def create_marketplace_import_job(
vendor=vendor, vendor=vendor,
user=current_admin, user=current_admin,
) )
db.commit()
logger.info( logger.info(
f"Admin {current_admin.username} created import job {job.id} " f"Admin {current_admin.username} created import job {job.id} "

4
app/api/v1/admin/settings.py
View File

@@ -113,6 +113,7 @@ def create_setting(
"value_type": setting_data.value_type, "value_type": setting_data.value_type,
}, },
) )
db.commit()
return result return result
@@ -140,6 +141,7 @@ def update_setting(
target_id=key, target_id=key,
details={"old_value": str(old_value), "new_value": update_data.value}, details={"old_value": str(old_value), "new_value": update_data.value},
) )
db.commit()
return result return result
@@ -168,6 +170,7 @@ def upsert_setting(
target_id=setting_data.key, target_id=setting_data.key,
details={"category": setting_data.category}, details={"category": setting_data.category},
) )
db.commit()
return result return result
@@ -204,5 +207,6 @@ def delete_setting(
target_id=key, target_id=key,
details={}, details={},
) )
db.commit()
return {"message": message} return {"message": message}

4
app/api/v1/admin/users.py
View File

@@ -83,6 +83,7 @@ def create_user(
role=user_data.role, role=user_data.role,
current_admin_id=current_admin.id, current_admin_id=current_admin.id,
) )
db.commit()
return UserDetailResponse( return UserDetailResponse(
id=user.id, id=user.id,
@@ -175,6 +176,7 @@ def update_user(
role=update_data.get("role"), role=update_data.get("role"),
is_active=update_data.get("is_active"), is_active=update_data.get("is_active"),
) )
db.commit()
return UserDetailResponse( return UserDetailResponse(
id=user.id, id=user.id,
@@ -206,6 +208,7 @@ def toggle_user_status(
user_id=user_id, user_id=user_id,
current_admin_id=current_admin.id, current_admin_id=current_admin.id,
) )
db.commit()
return UserStatusToggleResponse(message=message, is_active=user.is_active) return UserStatusToggleResponse(message=message, is_active=user.is_active)
@@ -222,5 +225,6 @@ def delete_user(
user_id=user_id, user_id=user_id,
current_admin_id=current_admin.id, current_admin_id=current_admin.id,
) )
db.commit()
return UserDeleteResponse(message=message) return UserDeleteResponse(message=message)

4
app/api/v1/admin/vendor_domains.py
View File

@@ -68,6 +68,7 @@ def add_vendor_domain(
domain = vendor_domain_service.add_domain( domain = vendor_domain_service.add_domain(
db=db, vendor_id=vendor_id, domain_data=domain_data db=db, vendor_id=vendor_id, domain_data=domain_data
) )
db.commit()
return VendorDomainResponse( return VendorDomainResponse(
id=domain.id, id=domain.id,
@@ -186,6 +187,7 @@ def update_vendor_domain(
domain = vendor_domain_service.update_domain( domain = vendor_domain_service.update_domain(
db=db, domain_id=domain_id, domain_update=domain_update db=db, domain_id=domain_id, domain_update=domain_update
) )
db.commit()
return VendorDomainResponse( return VendorDomainResponse(
id=domain.id, id=domain.id,
@@ -224,6 +226,7 @@ def delete_vendor_domain(
# Delete domain # Delete domain
message = vendor_domain_service.delete_domain(db, domain_id) message = vendor_domain_service.delete_domain(db, domain_id)
db.commit()
return DomainDeletionResponse( return DomainDeletionResponse(
message=message, domain=domain_name, vendor_id=vendor_id message=message, domain=domain_name, vendor_id=vendor_id
@@ -259,6 +262,7 @@ def verify_domain_ownership(
- 502: DNS query failed - 502: DNS query failed
""" """
domain, message = vendor_domain_service.verify_domain(db, domain_id) domain, message = vendor_domain_service.verify_domain(db, domain_id)
db.commit()
return DomainVerificationResponse( return DomainVerificationResponse(
message=message, message=message,

3
app/api/v1/admin/vendor_themes.py
View File

@@ -136,6 +136,7 @@ async def update_vendor_theme(
# Service handles all validation and raises appropriate exceptions # Service handles all validation and raises appropriate exceptions
# Global exception handler converts them to proper HTTP responses # Global exception handler converts them to proper HTTP responses
theme = vendor_theme_service.update_theme(db, vendor_code, theme_data) theme = vendor_theme_service.update_theme(db, vendor_code, theme_data)
db.commit()
return VendorThemeResponse(**theme.to_dict()) return VendorThemeResponse(**theme.to_dict())
@@ -185,6 +186,7 @@ async def apply_theme_preset(
# Raises ThemePresetNotFoundException if preset doesn't exist # Raises ThemePresetNotFoundException if preset doesn't exist
# Global exception handler converts to HTTP 404 # Global exception handler converts to HTTP 404
theme = vendor_theme_service.apply_theme_preset(db, vendor_code, preset_name) theme = vendor_theme_service.apply_theme_preset(db, vendor_code, preset_name)
db.commit()
return ThemePresetResponse( return ThemePresetResponse(
message=f"Applied {preset_name} preset successfully", message=f"Applied {preset_name} preset successfully",
@@ -226,4 +228,5 @@ async def delete_vendor_theme(
# Service handles deletion and raises exceptions if needed # Service handles deletion and raises exceptions if needed
# Global exception handler converts them to proper HTTP responses # Global exception handler converts them to proper HTTP responses
result = vendor_theme_service.delete_theme(db, vendor_code) result = vendor_theme_service.delete_theme(db, vendor_code)
db.commit()
return ThemeDeleteResponse(message=result.get("message", "Theme deleted successfully")) return ThemeDeleteResponse(message=result.get("message", "Theme deleted successfully"))

3
app/api/v1/admin/vendors.py
View File

@@ -50,6 +50,7 @@ def create_vendor(
The vendor inherits owner and contact information from its parent company. The vendor inherits owner and contact information from its parent company.
""" """
vendor = admin_service.create_vendor(db=db, vendor_data=vendor_data) vendor = admin_service.create_vendor(db=db, vendor_data=vendor_data)
db.commit()
return VendorCreateResponse( return VendorCreateResponse(
# Vendor fields # Vendor fields
@@ -204,6 +205,7 @@ def update_vendor(
""" """
vendor = vendor_service.get_vendor_by_identifier(db, vendor_identifier) vendor = vendor_service.get_vendor_by_identifier(db, vendor_identifier)
vendor = admin_service.update_vendor(db, vendor.id, vendor_update) vendor = admin_service.update_vendor(db, vendor.id, vendor_update)
db.commit()
return _build_vendor_detail_response(vendor) return _build_vendor_detail_response(vendor)
@@ -303,4 +305,5 @@ def delete_vendor(
vendor = vendor_service.get_vendor_by_identifier(db, vendor_identifier) vendor = vendor_service.get_vendor_by_identifier(db, vendor_identifier)
message = admin_service.delete_vendor(db, vendor.id) message = admin_service.delete_vendor(db, vendor.id)
db.commit()
return {"message": message} return {"message": message}

1
app/api/v1/shop/auth.py
View File

@@ -83,6 +83,7 @@ def register_customer(
customer = customer_service.register_customer( customer = customer_service.register_customer(
db=db, vendor_id=vendor.id, customer_data=customer_data db=db, vendor_id=vendor.id, customer_data=customer_data
) )
db.commit()
logger.info( logger.info(
f"New customer registered: {customer.email} for vendor {vendor.subdomain}", f"New customer registered: {customer.email} for vendor {vendor.subdomain}",

4
app/api/v1/shop/cart.py
View File

@@ -112,6 +112,7 @@ def add_to_cart(
product_id=cart_data.product_id, product_id=cart_data.product_id,
quantity=cart_data.quantity, quantity=cart_data.quantity,
) )
db.commit()
logger.info( logger.info(
f"[SHOP_API] add_to_cart result: {result}", f"[SHOP_API] add_to_cart result: {result}",
@@ -165,6 +166,7 @@ def update_cart_item(
product_id=product_id, product_id=product_id,
quantity=cart_data.quantity, quantity=cart_data.quantity,
) )
db.commit()
return CartOperationResponse(**result) return CartOperationResponse(**result)
@@ -201,6 +203,7 @@ def remove_from_cart(
result = cart_service.remove_from_cart( result = cart_service.remove_from_cart(
db=db, vendor_id=vendor.id, session_id=session_id, product_id=product_id db=db, vendor_id=vendor.id, session_id=session_id, product_id=product_id
) )
db.commit()
return CartOperationResponse(**result) return CartOperationResponse(**result)
@@ -230,5 +233,6 @@ def clear_cart(
) )
result = cart_service.clear_cart(db=db, vendor_id=vendor.id, session_id=session_id) result = cart_service.clear_cart(db=db, vendor_id=vendor.id, session_id=session_id)
db.commit()
return ClearCartResponse(**result) return ClearCartResponse(**result)

1
app/api/v1/shop/orders.py
View File

@@ -68,6 +68,7 @@ def place_order(
order = order_service.create_order( order = order_service.create_order(
db=db, vendor_id=vendor.id, order_data=order_data db=db, vendor_id=vendor.id, order_data=order_data
) )
db.commit()
logger.info( logger.info(
f"Order {order.order_number} placed for vendor {vendor.subdomain}, " f"Order {order.order_number} placed for vendor {vendor.subdomain}, "

3
app/api/v1/vendor/content_pages.py vendored
View File

@@ -191,6 +191,7 @@ def create_vendor_page(
display_order=page_data.display_order, display_order=page_data.display_order,
created_by=current_user.id, created_by=current_user.id,
) )
db.commit()
return page.to_dict() return page.to_dict()
@@ -226,6 +227,7 @@ def update_vendor_page(
display_order=page_data.display_order, display_order=page_data.display_order,
updated_by=current_user.id, updated_by=current_user.id,
) )
db.commit()
return page.to_dict() return page.to_dict()
@@ -247,3 +249,4 @@ def delete_vendor_page(
# Delete with ownership check in service layer # Delete with ownership check in service layer
content_page_service.delete_vendor_page(db, page_id, current_user.vendor_id) content_page_service.delete_vendor_page(db, page_id, current_user.vendor_id)
db.commit()

25
app/api/v1/vendor/inventory.py vendored
View File

@@ -36,7 +36,9 @@ def set_inventory(
db: Session = Depends(get_db), db: Session = Depends(get_db),
): ):
"""Set exact inventory quantity (replaces existing).""" """Set exact inventory quantity (replaces existing)."""
return inventory_service.set_inventory(db, current_user.token_vendor_id, inventory) result = inventory_service.set_inventory(db, current_user.token_vendor_id, inventory)
db.commit()
return result
@router.post("/inventory/adjust", response_model=InventoryResponse) @router.post("/inventory/adjust", response_model=InventoryResponse)
@@ -46,7 +48,9 @@ def adjust_inventory(
db: Session = Depends(get_db), db: Session = Depends(get_db),
): ):
"""Adjust inventory (positive to add, negative to remove).""" """Adjust inventory (positive to add, negative to remove)."""
return inventory_service.adjust_inventory(db, current_user.token_vendor_id, adjustment) result = inventory_service.adjust_inventory(db, current_user.token_vendor_id, adjustment)
db.commit()
return result
@router.post("/inventory/reserve", response_model=InventoryResponse) @router.post("/inventory/reserve", response_model=InventoryResponse)
@@ -56,7 +60,9 @@ def reserve_inventory(
db: Session = Depends(get_db), db: Session = Depends(get_db),
): ):
"""Reserve inventory for an order.""" """Reserve inventory for an order."""
return inventory_service.reserve_inventory(db, current_user.token_vendor_id, reservation) result = inventory_service.reserve_inventory(db, current_user.token_vendor_id, reservation)
db.commit()
return result
@router.post("/inventory/release", response_model=InventoryResponse) @router.post("/inventory/release", response_model=InventoryResponse)
@@ -66,7 +72,9 @@ def release_reservation(
db: Session = Depends(get_db), db: Session = Depends(get_db),
): ):
"""Release reserved inventory (cancel order).""" """Release reserved inventory (cancel order)."""
return inventory_service.release_reservation(db, current_user.token_vendor_id, reservation) result = inventory_service.release_reservation(db, current_user.token_vendor_id, reservation)
db.commit()
return result
@router.post("/inventory/fulfill", response_model=InventoryResponse) @router.post("/inventory/fulfill", response_model=InventoryResponse)
@@ -76,7 +84,9 @@ def fulfill_reservation(
db: Session = Depends(get_db), db: Session = Depends(get_db),
): ):
"""Fulfill reservation (complete order, remove from stock).""" """Fulfill reservation (complete order, remove from stock)."""
return inventory_service.fulfill_reservation(db, current_user.token_vendor_id, reservation) result = inventory_service.fulfill_reservation(db, current_user.token_vendor_id, reservation)
db.commit()
return result
@router.get("/inventory/product/{product_id}", response_model=ProductInventorySummary) @router.get("/inventory/product/{product_id}", response_model=ProductInventorySummary)
@@ -119,9 +129,11 @@ def update_inventory(
db: Session = Depends(get_db), db: Session = Depends(get_db),
): ):
"""Update inventory entry.""" """Update inventory entry."""
return inventory_service.update_inventory( result = inventory_service.update_inventory(
db, current_user.token_vendor_id, inventory_id, inventory_update db, current_user.token_vendor_id, inventory_id, inventory_update
) )
db.commit()
return result
@router.delete("/inventory/{inventory_id}", response_model=InventoryMessageResponse) @router.delete("/inventory/{inventory_id}", response_model=InventoryMessageResponse)
@@ -132,4 +144,5 @@ def delete_inventory(
): ):
"""Delete inventory entry.""" """Delete inventory entry."""
inventory_service.delete_inventory(db, current_user.token_vendor_id, inventory_id) inventory_service.delete_inventory(db, current_user.token_vendor_id, inventory_id)
db.commit()
return InventoryMessageResponse(message="Inventory deleted successfully") return InventoryMessageResponse(message="Inventory deleted successfully")

1
app/api/v1/vendor/marketplace.py vendored
View File

@@ -47,6 +47,7 @@ async def import_products_from_marketplace(
import_job = marketplace_import_job_service.create_import_job( import_job = marketplace_import_job_service.create_import_job(
db, request, vendor, current_user db, request, vendor, current_user
) )
db.commit()
# Process in background # Process in background
background_tasks.add_task( background_tasks.add_task(

1
app/api/v1/vendor/orders.py vendored
View File

@@ -106,6 +106,7 @@ def update_order_status(
order_id=order_id, order_id=order_id,
order_update=order_update, order_update=order_update,
) )
db.commit()
logger.info( logger.info(
f"Order {order.order_number} status updated to {order.status} " f"Order {order.order_number} status updated to {order.status} "

4
app/api/v1/vendor/products.py vendored
View File

@@ -92,6 +92,7 @@ def add_product_to_catalog(
product = product_service.create_product( product = product_service.create_product(
db=db, vendor_id=current_user.token_vendor_id, product_data=product_data db=db, vendor_id=current_user.token_vendor_id, product_data=product_data
) )
db.commit()
logger.info( logger.info(
f"Product {product.id} added to catalog by user {current_user.username} " f"Product {product.id} added to catalog by user {current_user.username} "
@@ -115,6 +116,7 @@ def update_product(
product_id=product_id, product_id=product_id,
product_update=product_data, product_update=product_data,
) )
db.commit()
logger.info( logger.info(
f"Product {product_id} updated by user {current_user.username} " f"Product {product_id} updated by user {current_user.username} "
@@ -134,6 +136,7 @@ def remove_product_from_catalog(
product_service.delete_product( product_service.delete_product(
db=db, vendor_id=current_user.token_vendor_id, product_id=product_id db=db, vendor_id=current_user.token_vendor_id, product_id=product_id
) )
db.commit()
logger.info( logger.info(
f"Product {product_id} removed from catalog by user {current_user.username} " f"Product {product_id} removed from catalog by user {current_user.username} "
@@ -161,6 +164,7 @@ def publish_from_marketplace(
product = product_service.create_product( product = product_service.create_product(
db=db, vendor_id=current_user.token_vendor_id, product_data=product_data db=db, vendor_id=current_user.token_vendor_id, product_data=product_data
) )
db.commit()
logger.info( logger.info(
f"Marketplace product {marketplace_product_id} published to catalog " f"Marketplace product {marketplace_product_id} published to catalog "

6
app/api/v1/vendor/team.py vendored
View File

@@ -150,6 +150,7 @@ def invite_team_member(
email=invitation.email, email=invitation.email,
role_name="staff", role_name="staff",
) )
db.commit()
logger.info( logger.info(
f"Invitation sent: {invitation.email} to {vendor.vendor_code} " f"Invitation sent: {invitation.email} to {vendor.vendor_code} "
@@ -189,6 +190,7 @@ def accept_invitation(acceptance: InvitationAccept, db: Session = Depends(get_db
first_name=acceptance.first_name, first_name=acceptance.first_name,
last_name=acceptance.last_name, last_name=acceptance.last_name,
) )
db.commit()
logger.info( logger.info(
f"Invitation accepted: {result['user'].email} " f"Invitation accepted: {result['user'].email} "
@@ -272,6 +274,7 @@ def update_team_member(
new_role_id=update_data.role_id, new_role_id=update_data.role_id,
is_active=update_data.is_active, is_active=update_data.is_active,
) )
db.commit()
logger.info( logger.info(
f"Team member updated: {user_id} in {vendor.vendor_code} " f"Team member updated: {user_id} in {vendor.vendor_code} "
@@ -307,6 +310,7 @@ def remove_team_member(
vendor = request.state.vendor vendor = request.state.vendor
vendor_team_service.remove_team_member(db=db, vendor=vendor, user_id=user_id) vendor_team_service.remove_team_member(db=db, vendor=vendor, user_id=user_id)
db.commit()
logger.info( logger.info(
f"Team member removed: {user_id} from {vendor.vendor_code} " f"Team member removed: {user_id} from {vendor.vendor_code} "
@@ -344,6 +348,8 @@ def bulk_remove_team_members(
failed_count += 1 failed_count += 1
errors.append({"user_id": user_id, "error": str(e)}) errors.append({"user_id": user_id, "error": str(e)})
db.commit()
logger.info( logger.info(
f"Bulk remove completed: {success_count} removed, {failed_count} failed " f"Bulk remove completed: {success_count} removed, {failed_count} failed "
f"in {vendor.vendor_code}" f"in {vendor.vendor_code}"

3
app/services/admin_audit_service.py
View File

@@ -66,7 +66,7 @@ class AdminAuditService:
) )
db.add(audit_log) db.add(audit_log)
db.commit() db.flush()
db.refresh(audit_log) db.refresh(audit_log)
logger.info( logger.info(
@@ -77,7 +77,6 @@ class AdminAuditService:
return audit_log return audit_log
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Failed to log admin action: {str(e)}") logger.error(f"Failed to log admin action: {str(e)}")
# Don't raise exception - audit logging should not break operations # Don't raise exception - audit logging should not break operations
return None return None

24
app/services/admin_service.py
View File

@@ -82,7 +82,7 @@ class AdminService:
original_status = user.is_active original_status = user.is_active
user.is_active = not user.is_active user.is_active = not user.is_active
user.updated_at = datetime.now(UTC) user.updated_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(user) db.refresh(user)
status_action = "activated" if user.is_active else "deactivated" status_action = "activated" if user.is_active else "deactivated"
@@ -92,7 +92,6 @@ class AdminService:
return user, message return user, message
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Failed to toggle user {user_id} status: {str(e)}") logger.error(f"Failed to toggle user {user_id} status: {str(e)}")
raise UserStatusChangeException( raise UserStatusChangeException(
user_id=user_id, user_id=user_id,
@@ -185,7 +184,7 @@ class AdminService:
is_active=True, is_active=True,
) )
db.add(user) db.add(user)
db.commit() db.flush()
db.refresh(user) db.refresh(user)
logger.info(f"Admin {current_admin_id} created user {user.username}") logger.info(f"Admin {current_admin_id} created user {user.username}")
@@ -266,7 +265,7 @@ class AdminService:
user.is_active = is_active user.is_active = is_active
user.updated_at = datetime.now(UTC) user.updated_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(user) db.refresh(user)
logger.info(f"Admin {current_admin_id} updated user {user.username}") logger.info(f"Admin {current_admin_id} updated user {user.username}")
@@ -305,7 +304,6 @@ class AdminService:
username = user.username username = user.username
db.delete(user) db.delete(user)
db.commit()
logger.info(f"Admin {current_admin_id} deleted user {username}") logger.info(f"Admin {current_admin_id} deleted user {username}")
return f"User {username} deleted successfully" return f"User {username} deleted successfully"
@@ -405,7 +403,7 @@ class AdminService:
# Create default roles for vendor # Create default roles for vendor
self._create_default_roles(db, vendor.id) self._create_default_roles(db, vendor.id)
db.commit() db.flush()
db.refresh(vendor) db.refresh(vendor)
logger.info( logger.info(
@@ -415,10 +413,8 @@ class AdminService:
return vendor return vendor
except (VendorAlreadyExistsException, ValidationException): except (VendorAlreadyExistsException, ValidationException):
db.rollback()
raise raise
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Failed to create vendor: {str(e)}") logger.error(f"Failed to create vendor: {str(e)}")
raise AdminOperationException( raise AdminOperationException(
operation="create_vendor", operation="create_vendor",
@@ -499,7 +495,7 @@ class AdminService:
if vendor.is_verified: if vendor.is_verified:
vendor.verified_at = datetime.now(UTC) vendor.verified_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(vendor) db.refresh(vendor)
status_action = "verified" if vendor.is_verified else "unverified" status_action = "verified" if vendor.is_verified else "unverified"
@@ -509,7 +505,6 @@ class AdminService:
return vendor, message return vendor, message
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Failed to verify vendor {vendor_id}: {str(e)}") logger.error(f"Failed to verify vendor {vendor_id}: {str(e)}")
raise VendorVerificationException( raise VendorVerificationException(
vendor_id=vendor_id, vendor_id=vendor_id,
@@ -525,7 +520,7 @@ class AdminService:
original_status = vendor.is_active original_status = vendor.is_active
vendor.is_active = not vendor.is_active vendor.is_active = not vendor.is_active
vendor.updated_at = datetime.now(UTC) vendor.updated_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(vendor) db.refresh(vendor)
status_action = "activated" if vendor.is_active else "deactivated" status_action = "activated" if vendor.is_active else "deactivated"
@@ -535,7 +530,6 @@ class AdminService:
return vendor, message return vendor, message
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Failed to toggle vendor {vendor_id} status: {str(e)}") logger.error(f"Failed to toggle vendor {vendor_id} status: {str(e)}")
raise AdminOperationException( raise AdminOperationException(
operation="toggle_vendor_status", operation="toggle_vendor_status",
@@ -560,13 +554,11 @@ class AdminService:
# - Delete import jobs # - Delete import jobs
db.delete(vendor) db.delete(vendor)
db.commit()
logger.warning(f"Vendor {vendor_code} and all associated data deleted") logger.warning(f"Vendor {vendor_code} and all associated data deleted")
return f"Vendor {vendor_code} successfully deleted" return f"Vendor {vendor_code} successfully deleted"
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Failed to delete vendor {vendor_id}: {str(e)}") logger.error(f"Failed to delete vendor {vendor_id}: {str(e)}")
raise AdminOperationException( raise AdminOperationException(
operation="delete_vendor", reason="Database deletion failed" operation="delete_vendor", reason="Database deletion failed"
@@ -650,7 +642,7 @@ class AdminService:
vendor.updated_at = datetime.now(UTC) vendor.updated_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(vendor) db.refresh(vendor)
logger.info( logger.info(
@@ -660,10 +652,8 @@ class AdminService:
return vendor return vendor
except ValidationException: except ValidationException:
db.rollback()
raise raise
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Failed to update vendor {vendor_id}: {str(e)}") logger.error(f"Failed to update vendor {vendor_id}: {str(e)}")
raise AdminOperationException( raise AdminOperationException(
operation="update_vendor", reason=f"Database update failed: {str(e)}" operation="update_vendor", reason=f"Database update failed: {str(e)}"

10
app/services/admin_settings_service.py
View File

@@ -163,7 +163,7 @@ class AdminSettingsService:
) )
db.add(setting) db.add(setting)
db.commit() db.flush()
db.refresh(setting) db.refresh(setting)
logger.info(f"Setting '{setting.key}' created by admin {admin_user_id}") logger.info(f"Setting '{setting.key}' created by admin {admin_user_id}")
@@ -171,10 +171,8 @@ class AdminSettingsService:
return AdminSettingResponse.model_validate(setting) return AdminSettingResponse.model_validate(setting)
except ValidationException: except ValidationException:
db.rollback()
raise raise
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Failed to create setting: {str(e)}") logger.error(f"Failed to create setting: {str(e)}")
raise AdminOperationException( raise AdminOperationException(
operation="create_setting", reason="Database operation failed" operation="create_setting", reason="Database operation failed"
@@ -205,7 +203,7 @@ class AdminSettingsService:
setting.last_modified_by_user_id = admin_user_id setting.last_modified_by_user_id = admin_user_id
setting.updated_at = datetime.now(UTC) setting.updated_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(setting) db.refresh(setting)
logger.info(f"Setting '{setting.key}' updated by admin {admin_user_id}") logger.info(f"Setting '{setting.key}' updated by admin {admin_user_id}")
@@ -213,10 +211,8 @@ class AdminSettingsService:
return AdminSettingResponse.model_validate(setting) return AdminSettingResponse.model_validate(setting)
except ValidationException: except ValidationException:
db.rollback()
raise raise
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Failed to update setting {key}: {str(e)}") logger.error(f"Failed to update setting {key}: {str(e)}")
raise AdminOperationException( raise AdminOperationException(
operation="update_setting", reason="Database operation failed" operation="update_setting", reason="Database operation failed"
@@ -244,14 +240,12 @@ class AdminSettingsService:
try: try:
db.delete(setting) db.delete(setting)
db.commit()
logger.warning(f"Setting '{key}' deleted by admin {admin_user_id}") logger.warning(f"Setting '{key}' deleted by admin {admin_user_id}")
return f"Setting '{key}' successfully deleted" return f"Setting '{key}' successfully deleted"
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Failed to delete setting {key}: {str(e)}") logger.error(f"Failed to delete setting {key}: {str(e)}")
raise AdminOperationException( raise AdminOperationException(
operation="delete_setting", reason="Database operation failed" operation="delete_setting", reason="Database operation failed"

9
app/services/cart_service.py
View File

@@ -206,7 +206,7 @@ class CartService:
) )
existing_item.quantity = new_quantity existing_item.quantity = new_quantity
db.commit() db.flush()
db.refresh(existing_item) db.refresh(existing_item)
logger.info( logger.info(
@@ -245,7 +245,7 @@ class CartService:
price_at_add=current_price, price_at_add=current_price,
) )
db.add(cart_item) db.add(cart_item)
db.commit() db.flush()
db.refresh(cart_item) db.refresh(cart_item)
logger.info( logger.info(
@@ -337,7 +337,7 @@ class CartService:
# Update quantity # Update quantity
cart_item.quantity = quantity cart_item.quantity = quantity
db.commit() db.flush()
db.refresh(cart_item) db.refresh(cart_item)
logger.info( logger.info(
@@ -392,7 +392,6 @@ class CartService:
) )
db.delete(cart_item) db.delete(cart_item)
db.commit()
logger.info( logger.info(
"[CART_SERVICE] Removed item from cart", "[CART_SERVICE] Removed item from cart",
@@ -426,8 +425,6 @@ class CartService:
.delete() .delete()
) )
db.commit()
logger.info( logger.info(
"[CART_SERVICE] Cleared cart", "[CART_SERVICE] Cleared cart",
extra={ extra={

10
app/services/code_quality_service.py
View File

@@ -117,7 +117,7 @@ class CodeQualityService:
) )
db.add(violation) db.add(violation)
db.commit() db.flush()
db.refresh(scan) db.refresh(scan)
logger.info(f"Scan completed: {scan.total_violations} violations found") logger.info(f"Scan completed: {scan.total_violations} violations found")
@@ -268,7 +268,7 @@ class CodeQualityService:
priority=priority, priority=priority,
) )
db.add(assignment) db.add(assignment)
db.commit() db.flush()
logger.info(f"Violation {violation_id} assigned to user {user_id}") logger.info(f"Violation {violation_id} assigned to user {user_id}")
return assignment return assignment
@@ -297,7 +297,7 @@ class CodeQualityService:
violation.resolved_by = resolved_by violation.resolved_by = resolved_by
violation.resolution_note = resolution_note violation.resolution_note = resolution_note
db.commit() db.flush()
logger.info(f"Violation {violation_id} resolved by user {resolved_by}") logger.info(f"Violation {violation_id} resolved by user {resolved_by}")
return violation return violation
@@ -325,7 +325,7 @@ class CodeQualityService:
violation.resolved_by = ignored_by violation.resolved_by = ignored_by
violation.resolution_note = f"Ignored: {reason}" violation.resolution_note = f"Ignored: {reason}"
db.commit() db.flush()
logger.info(f"Violation {violation_id} ignored by user {ignored_by}") logger.info(f"Violation {violation_id} ignored by user {ignored_by}")
return violation return violation
@@ -348,7 +348,7 @@ class CodeQualityService:
violation_id=violation_id, user_id=user_id, comment=comment violation_id=violation_id, user_id=user_id, comment=comment
) )
db.add(comment_obj) db.add(comment_obj)
db.commit() db.flush()
logger.info(f"Comment added to violation {violation_id} by user {user_id}") logger.info(f"Comment added to violation {violation_id} by user {user_id}")
return comment_obj return comment_obj

5
app/services/content_page_service.py
View File

@@ -211,7 +211,7 @@ class ContentPageService:
) )
db.add(page) db.add(page)
db.commit() db.flush()
db.refresh(page) db.refresh(page)
logger.info( logger.info(
@@ -288,7 +288,7 @@ class ContentPageService:
if updated_by is not None: if updated_by is not None:
page.updated_by = updated_by page.updated_by = updated_by
db.commit() db.flush()
db.refresh(page) db.refresh(page)
logger.info(f"Updated content page: id={page_id}, slug={page.slug}") logger.info(f"Updated content page: id={page_id}, slug={page.slug}")
@@ -313,7 +313,6 @@ class ContentPageService:
return False return False
db.delete(page) db.delete(page)
db.commit()
logger.info(f"Deleted content page: id={page_id}, slug={page.slug}") logger.info(f"Deleted content page: id={page_id}, slug={page.slug}")
return True return True

10
app/services/customer_service.py
View File

@@ -108,7 +108,7 @@ class CustomerService:
try: try:
db.add(customer) db.add(customer)
db.commit() db.flush()
db.refresh(customer) db.refresh(customer)
logger.info( logger.info(
@@ -120,7 +120,6 @@ class CustomerService:
return customer return customer
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error registering customer: {str(e)}") logger.error(f"Error registering customer: {str(e)}")
raise CustomerValidationException( raise CustomerValidationException(
message="Failed to register customer", details={"error": str(e)} message="Failed to register customer", details={"error": str(e)}
@@ -310,7 +309,7 @@ class CustomerService:
setattr(customer, field, value) setattr(customer, field, value)
try: try:
db.commit() db.flush()
db.refresh(customer) db.refresh(customer)
logger.info(f"Customer updated: {customer.email} (ID: {customer.id})") logger.info(f"Customer updated: {customer.email} (ID: {customer.id})")
@@ -318,7 +317,6 @@ class CustomerService:
return customer return customer
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error updating customer: {str(e)}") logger.error(f"Error updating customer: {str(e)}")
raise CustomerValidationException( raise CustomerValidationException(
message="Failed to update customer", details={"error": str(e)} message="Failed to update customer", details={"error": str(e)}
@@ -344,7 +342,7 @@ class CustomerService:
customer = self.get_customer(db, vendor_id, customer_id) customer = self.get_customer(db, vendor_id, customer_id)
customer.is_active = False customer.is_active = False
db.commit() db.flush()
db.refresh(customer) db.refresh(customer)
logger.info(f"Customer deactivated: {customer.email} (ID: {customer.id})") logger.info(f"Customer deactivated: {customer.email} (ID: {customer.id})")
@@ -369,8 +367,6 @@ class CustomerService:
customer.total_spent += order_total customer.total_spent += order_total
customer.last_order_date = datetime.utcnow() customer.last_order_date = datetime.utcnow()
db.commit()
logger.debug(f"Updated stats for customer {customer.email}") logger.debug(f"Updated stats for customer {customer.email}")
def _generate_customer_number( def _generate_customer_number(

18
app/services/inventory_service.py
View File

@@ -62,7 +62,7 @@ class InventoryService:
old_qty = existing.quantity old_qty = existing.quantity
existing.quantity = inventory_data.quantity existing.quantity = inventory_data.quantity
existing.updated_at = datetime.now(UTC) existing.updated_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(existing) db.refresh(existing)
logger.info( logger.info(
@@ -79,7 +79,7 @@ class InventoryService:
gtin=product.marketplace_product.gtin, # Optional reference gtin=product.marketplace_product.gtin, # Optional reference
) )
db.add(new_inventory) db.add(new_inventory)
db.commit() db.flush()
db.refresh(new_inventory) db.refresh(new_inventory)
logger.info( logger.info(
@@ -143,7 +143,7 @@ class InventoryService:
gtin=product.marketplace_product.gtin, gtin=product.marketplace_product.gtin,
) )
db.add(new_inventory) db.add(new_inventory)
db.commit() db.flush()
db.refresh(new_inventory) db.refresh(new_inventory)
logger.info( logger.info(
@@ -165,7 +165,7 @@ class InventoryService:
existing.quantity = new_qty existing.quantity = new_qty
existing.updated_at = datetime.now(UTC) existing.updated_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(existing) db.refresh(existing)
logger.info( logger.info(
@@ -227,7 +227,7 @@ class InventoryService:
# Reserve inventory # Reserve inventory
inventory.reserved_quantity += reserve_data.quantity inventory.reserved_quantity += reserve_data.quantity
inventory.updated_at = datetime.now(UTC) inventory.updated_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(inventory) db.refresh(inventory)
logger.info( logger.info(
@@ -287,7 +287,7 @@ class InventoryService:
inventory.reserved_quantity -= reserve_data.quantity inventory.reserved_quantity -= reserve_data.quantity
inventory.updated_at = datetime.now(UTC) inventory.updated_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(inventory) db.refresh(inventory)
logger.info( logger.info(
@@ -353,7 +353,7 @@ class InventoryService:
0, inventory.reserved_quantity - reserve_data.quantity 0, inventory.reserved_quantity - reserve_data.quantity
) )
inventory.updated_at = datetime.now(UTC) inventory.updated_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(inventory) db.refresh(inventory)
logger.info( logger.info(
@@ -507,7 +507,7 @@ class InventoryService:
inventory.location = self._validate_location(inventory_update.location) inventory.location = self._validate_location(inventory_update.location)
inventory.updated_at = datetime.now(UTC) inventory.updated_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(inventory) db.refresh(inventory)
logger.info(f"Updated inventory {inventory_id}") logger.info(f"Updated inventory {inventory_id}")
@@ -535,7 +535,7 @@ class InventoryService:
raise InventoryNotFoundException(f"Inventory {inventory_id} not found") raise InventoryNotFoundException(f"Inventory {inventory_id} not found")
db.delete(inventory) db.delete(inventory)
db.commit() db.flush()
logger.info(f"Deleted inventory {inventory_id}") logger.info(f"Deleted inventory {inventory_id}")
return True return True

3
app/services/marketplace_import_job_service.py
View File

@@ -53,7 +53,7 @@ class MarketplaceImportJobService:
) )
db.add(import_job) db.add(import_job)
db.commit() db.flush()
db.refresh(import_job) db.refresh(import_job)
logger.info( logger.info(
@@ -65,7 +65,6 @@ class MarketplaceImportJobService:
return import_job return import_job
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error creating import job: {str(e)}") logger.error(f"Error creating import job: {str(e)}")
raise ValidationException("Failed to create import job") raise ValidationException("Failed to create import job")

11
app/services/marketplace_product_service.py
View File

@@ -92,7 +92,7 @@ class MarketplaceProductService:
db_product = MarketplaceProduct(**product_data.model_dump()) db_product = MarketplaceProduct(**product_data.model_dump())
db.add(db_product) db.add(db_product)
db.commit() db.flush()
db.refresh(db_product) db.refresh(db_product)
logger.info(f"Created product {db_product.marketplace_product_id}") logger.info(f"Created product {db_product.marketplace_product_id}")
@@ -102,10 +102,8 @@ class MarketplaceProductService:
InvalidMarketplaceProductDataException, InvalidMarketplaceProductDataException,
MarketplaceProductValidationException, MarketplaceProductValidationException,
): ):
db.rollback()
raise # Re-raise custom exceptions raise # Re-raise custom exceptions
except IntegrityError as e: except IntegrityError as e:
db.rollback()
logger.error(f"Database integrity error: {str(e)}") logger.error(f"Database integrity error: {str(e)}")
if "marketplace_product_id" in str(e).lower() or "unique" in str(e).lower(): if "marketplace_product_id" in str(e).lower() or "unique" in str(e).lower():
raise MarketplaceProductAlreadyExistsException( raise MarketplaceProductAlreadyExistsException(
@@ -115,7 +113,6 @@ class MarketplaceProductService:
"Data integrity constraint violation" "Data integrity constraint violation"
) )
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error creating product: {str(e)}") logger.error(f"Error creating product: {str(e)}")
raise ValidationException("Failed to create product") raise ValidationException("Failed to create product")
@@ -271,7 +268,7 @@ class MarketplaceProductService:
setattr(product, key, value) setattr(product, key, value)
product.updated_at = datetime.now(UTC) product.updated_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(product) db.refresh(product)
logger.info(f"Updated product {marketplace_product_id}") logger.info(f"Updated product {marketplace_product_id}")
@@ -282,10 +279,8 @@ class MarketplaceProductService:
InvalidMarketplaceProductDataException, InvalidMarketplaceProductDataException,
MarketplaceProductValidationException, MarketplaceProductValidationException,
): ):
db.rollback()
raise # Re-raise custom exceptions raise # Re-raise custom exceptions
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error updating product {marketplace_product_id}: {str(e)}") logger.error(f"Error updating product {marketplace_product_id}: {str(e)}")
raise ValidationException("Failed to update product") raise ValidationException("Failed to update product")
@@ -311,7 +306,6 @@ class MarketplaceProductService:
db.query(Inventory).filter(Inventory.gtin == product.gtin).delete() db.query(Inventory).filter(Inventory.gtin == product.gtin).delete()
db.delete(product) db.delete(product)
db.commit()
logger.info(f"Deleted product {marketplace_product_id}") logger.info(f"Deleted product {marketplace_product_id}")
return True return True
@@ -319,7 +313,6 @@ class MarketplaceProductService:
except MarketplaceProductNotFoundException: except MarketplaceProductNotFoundException:
raise # Re-raise custom exceptions raise # Re-raise custom exceptions
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error deleting product {marketplace_product_id}: {str(e)}") logger.error(f"Error deleting product {marketplace_product_id}: {str(e)}")
raise ValidationException("Failed to delete product") raise ValidationException("Failed to delete product")

8
app/services/order_service.py
View File

@@ -227,7 +227,7 @@ class OrderService:
order_item = OrderItem(order_id=order.id, **item_data) order_item = OrderItem(order_id=order.id, **item_data)
db.add(order_item) db.add(order_item)
db.commit() db.flush()
db.refresh(order) db.refresh(order)
logger.info( logger.info(
@@ -242,10 +242,8 @@ class OrderService:
InsufficientInventoryException, InsufficientInventoryException,
CustomerNotFoundException, CustomerNotFoundException,
): ):
db.rollback()
raise raise
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error creating order: {str(e)}") logger.error(f"Error creating order: {str(e)}")
raise ValidationException(f"Failed to create order: {str(e)}") raise ValidationException(f"Failed to create order: {str(e)}")
@@ -354,7 +352,7 @@ class OrderService:
order.internal_notes = order_update.internal_notes order.internal_notes = order_update.internal_notes
order.updated_at = datetime.now(UTC) order.updated_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(order) db.refresh(order)
logger.info(f"Order {order.order_number} updated: status={order.status}") logger.info(f"Order {order.order_number} updated: status={order.status}")
@@ -362,10 +360,8 @@ class OrderService:
return order return order
except OrderNotFoundException: except OrderNotFoundException:
db.rollback()
raise raise
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error updating order: {str(e)}") logger.error(f"Error updating order: {str(e)}")
raise ValidationException(f"Failed to update order: {str(e)}") raise ValidationException(f"Failed to update order: {str(e)}")

10
app/services/product_service.py
View File

@@ -126,17 +126,15 @@ class ProductService:
) )
db.add(product) db.add(product)
db.commit() db.flush()
db.refresh(product) db.refresh(product)
logger.info(f"Added product {product.id} to vendor {vendor_id} catalog") logger.info(f"Added product {product.id} to vendor {vendor_id} catalog")
return product return product
except (ProductAlreadyExistsException, ValidationException): except (ProductAlreadyExistsException, ValidationException):
db.rollback()
raise raise
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error creating product: {str(e)}") logger.error(f"Error creating product: {str(e)}")
raise ValidationException("Failed to create product") raise ValidationException("Failed to create product")
@@ -168,17 +166,15 @@ class ProductService:
setattr(product, key, value) setattr(product, key, value)
product.updated_at = datetime.now(UTC) product.updated_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(product) db.refresh(product)
logger.info(f"Updated product {product_id} in vendor {vendor_id} catalog") logger.info(f"Updated product {product_id} in vendor {vendor_id} catalog")
return product return product
except ProductNotFoundException: except ProductNotFoundException:
db.rollback()
raise raise
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error updating product: {str(e)}") logger.error(f"Error updating product: {str(e)}")
raise ValidationException("Failed to update product") raise ValidationException("Failed to update product")
@@ -198,7 +194,6 @@ class ProductService:
product = self.get_product(db, vendor_id, product_id) product = self.get_product(db, vendor_id, product_id)
db.delete(product) db.delete(product)
db.commit()
logger.info(f"Deleted product {product_id} from vendor {vendor_id} catalog") logger.info(f"Deleted product {product_id} from vendor {vendor_id} catalog")
return True return True
@@ -206,7 +201,6 @@ class ProductService:
except ProductNotFoundException: except ProductNotFoundException:
raise raise
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error deleting product: {str(e)}") logger.error(f"Error deleting product: {str(e)}")
raise ValidationException("Failed to delete product") raise ValidationException("Failed to delete product")

5
app/services/team_service.py
View File

@@ -135,7 +135,7 @@ class TeamService:
vendor_user.is_active = update_data["is_active"] vendor_user.is_active = update_data["is_active"]
vendor_user.updated_at = datetime.now(UTC) vendor_user.updated_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(vendor_user) db.refresh(vendor_user)
return { return {
@@ -144,7 +144,6 @@ class TeamService:
} }
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error updating team member: {str(e)}") logger.error(f"Error updating team member: {str(e)}")
raise ValidationException("Failed to update team member") raise ValidationException("Failed to update team member")
@@ -178,13 +177,11 @@ class TeamService:
# Soft delete # Soft delete
vendor_user.is_active = False vendor_user.is_active = False
vendor_user.updated_at = datetime.now(UTC) vendor_user.updated_at = datetime.now(UTC)
db.commit()
logger.info(f"Removed user {user_id} from vendor {vendor_id}") logger.info(f"Removed user {user_id} from vendor {vendor_id}")
return True return True
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error removing team member: {str(e)}") logger.error(f"Error removing team member: {str(e)}")
raise ValidationException("Failed to remove team member") raise ValidationException("Failed to remove team member")

13
app/services/vendor_domain_service.py
View File

@@ -113,7 +113,7 @@ class VendorDomainService:
) )
db.add(new_domain) db.add(new_domain)
db.commit() db.flush()
db.refresh(new_domain) db.refresh(new_domain)
logger.info(f"Domain {normalized_domain} added to vendor {vendor_id}") logger.info(f"Domain {normalized_domain} added to vendor {vendor_id}")
@@ -126,10 +126,8 @@ class VendorDomainService:
InvalidDomainFormatException, InvalidDomainFormatException,
ReservedDomainException, ReservedDomainException,
): ):
db.rollback()
raise raise
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error adding domain: {str(e)}") logger.error(f"Error adding domain: {str(e)}")
raise ValidationException("Failed to add domain") raise ValidationException("Failed to add domain")
@@ -223,17 +221,15 @@ class VendorDomainService:
if domain_update.is_active is not None: if domain_update.is_active is not None:
domain.is_active = domain_update.is_active domain.is_active = domain_update.is_active
db.commit() db.flush()
db.refresh(domain) db.refresh(domain)
logger.info(f"Domain {domain.domain} updated") logger.info(f"Domain {domain.domain} updated")
return domain return domain
except (VendorDomainNotFoundException, DomainNotVerifiedException): except (VendorDomainNotFoundException, DomainNotVerifiedException):
db.rollback()
raise raise
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error updating domain: {str(e)}") logger.error(f"Error updating domain: {str(e)}")
raise ValidationException("Failed to update domain") raise ValidationException("Failed to update domain")
@@ -257,16 +253,13 @@ class VendorDomainService:
vendor_id = domain.vendor_id vendor_id = domain.vendor_id
db.delete(domain) db.delete(domain)
db.commit()
logger.info(f"Domain {domain_name} deleted from vendor {vendor_id}") logger.info(f"Domain {domain_name} deleted from vendor {vendor_id}")
return f"Domain {domain_name} deleted successfully" return f"Domain {domain_name} deleted successfully"
except VendorDomainNotFoundException: except VendorDomainNotFoundException:
db.rollback()
raise raise
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error deleting domain: {str(e)}") logger.error(f"Error deleting domain: {str(e)}")
raise ValidationException("Failed to delete domain") raise ValidationException("Failed to delete domain")
@@ -312,7 +305,7 @@ class VendorDomainService:
# Verification successful # Verification successful
domain.is_verified = True domain.is_verified = True
domain.verified_at = datetime.now(UTC) domain.verified_at = datetime.now(UTC)
db.commit() db.flush()
db.refresh(domain) db.refresh(domain)
logger.info(f"Domain {domain.domain} verified successfully") logger.info(f"Domain {domain.domain} verified successfully")

13
app/services/vendor_team_service.py
View File

@@ -112,7 +112,7 @@ class VendorTeamService:
) )
existing_membership.invitation_sent_at = datetime.utcnow() existing_membership.invitation_sent_at = datetime.utcnow()
existing_membership.invitation_accepted_at = None existing_membership.invitation_accepted_at = None
db.commit() db.flush()
logger.info( logger.info(
f"Re-invited user {email} to vendor {vendor.vendor_code}" f"Re-invited user {email} to vendor {vendor.vendor_code}"
@@ -170,7 +170,7 @@ class VendorTeamService:
is_active=False, # Will be activated on acceptance is_active=False, # Will be activated on acceptance
) )
db.add(vendor_user) db.add(vendor_user)
db.commit() db.flush()
logger.info( logger.info(
f"Invited {email} to vendor {vendor.vendor_code} " f"Invited {email} to vendor {vendor.vendor_code} "
@@ -190,7 +190,6 @@ class VendorTeamService:
except (TeamMemberAlreadyExistsException, MaxTeamMembersReachedException): except (TeamMemberAlreadyExistsException, MaxTeamMembersReachedException):
raise raise
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error inviting team member: {str(e)}") logger.error(f"Error inviting team member: {str(e)}")
raise raise
@@ -255,7 +254,7 @@ class VendorTeamService:
vendor_user.invitation_accepted_at = datetime.utcnow() vendor_user.invitation_accepted_at = datetime.utcnow()
vendor_user.invitation_token = None # Clear token vendor_user.invitation_token = None # Clear token
db.commit() db.flush()
logger.info( logger.info(
f"User {user.email} accepted invitation to vendor {vendor.vendor_code}" f"User {user.email} accepted invitation to vendor {vendor.vendor_code}"
@@ -273,7 +272,6 @@ class VendorTeamService:
): ):
raise raise
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error accepting invitation: {str(e)}") logger.error(f"Error accepting invitation: {str(e)}")
raise raise
@@ -315,7 +313,6 @@ class VendorTeamService:
# Soft delete - just deactivate # Soft delete - just deactivate
vendor_user.is_active = False vendor_user.is_active = False
db.commit()
logger.info(f"Removed user {user_id} from vendor {vendor.vendor_code}") logger.info(f"Removed user {user_id} from vendor {vendor.vendor_code}")
return True return True
@@ -323,7 +320,6 @@ class VendorTeamService:
except (UserNotFoundException, CannotRemoveOwnerException): except (UserNotFoundException, CannotRemoveOwnerException):
raise raise
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error removing team member: {str(e)}") logger.error(f"Error removing team member: {str(e)}")
raise raise
@@ -374,7 +370,7 @@ class VendorTeamService:
) )
vendor_user.role_id = new_role.id vendor_user.role_id = new_role.id
db.commit() db.flush()
logger.info( logger.info(
f"Updated role for user {user_id} in vendor {vendor.vendor_code} " f"Updated role for user {user_id} in vendor {vendor.vendor_code} "
@@ -386,7 +382,6 @@ class VendorTeamService:
except (UserNotFoundException, CannotRemoveOwnerException): except (UserNotFoundException, CannotRemoveOwnerException):
raise raise
except Exception as e: except Exception as e:
db.rollback()
logger.error(f"Error updating member role: {str(e)}") logger.error(f"Error updating member role: {str(e)}")
raise raise

12
app/services/vendor_theme_service.py
View File

@@ -194,8 +194,8 @@ class VendorThemeService:
# Update theme fields # Update theme fields
self._apply_theme_updates(theme, theme_data) self._apply_theme_updates(theme, theme_data)
# Commit changes # Flush changes
db.commit() db.flush()
db.refresh(theme) db.refresh(theme)
self.logger.info(f"Theme updated successfully for vendor {vendor_code}") self.logger.info(f"Theme updated successfully for vendor {vendor_code}")
@@ -206,7 +206,6 @@ class VendorThemeService:
raise raise
except Exception as e: except Exception as e:
db.rollback()
self.logger.error(f"Failed to update theme for vendor {vendor_code}: {e}") self.logger.error(f"Failed to update theme for vendor {vendor_code}: {e}")
raise ThemeOperationException( raise ThemeOperationException(
operation="update", vendor_code=vendor_code, reason=str(e) operation="update", vendor_code=vendor_code, reason=str(e)
@@ -312,8 +311,8 @@ class VendorThemeService:
# Apply preset using helper function # Apply preset using helper function
apply_preset(theme, preset_name) apply_preset(theme, preset_name)
# Commit changes # Flush changes
db.commit() db.flush()
db.refresh(theme) db.refresh(theme)
self.logger.info( self.logger.info(
@@ -326,7 +325,6 @@ class VendorThemeService:
raise raise
except Exception as e: except Exception as e:
db.rollback()
self.logger.error(f"Failed to apply preset to vendor {vendor_code}: {e}") self.logger.error(f"Failed to apply preset to vendor {vendor_code}: {e}")
raise ThemeOperationException( raise ThemeOperationException(
operation="apply_preset", vendor_code=vendor_code, reason=str(e) operation="apply_preset", vendor_code=vendor_code, reason=str(e)
@@ -386,7 +384,6 @@ class VendorThemeService:
# Delete theme # Delete theme
db.delete(theme) db.delete(theme)
db.commit()
self.logger.info(f"Theme deleted for vendor {vendor_code}") self.logger.info(f"Theme deleted for vendor {vendor_code}")
return { return {
@@ -398,7 +395,6 @@ class VendorThemeService:
raise raise
except Exception as e: except Exception as e:
db.rollback()
self.logger.error(f"Failed to delete theme for vendor {vendor_code}: {e}") self.logger.error(f"Failed to delete theme for vendor {vendor_code}: {e}")
raise ThemeOperationException( raise ThemeOperationException(
operation="delete", vendor_code=vendor_code, reason=str(e) operation="delete", vendor_code=vendor_code, reason=str(e)