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

3
app/services/admin_audit_service.py
View File

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

24
app/services/admin_service.py
View File

@@ -82,7 +82,7 @@ class AdminService:
original_status = user.is_active
user.is_active = not user.is_active
user.updated_at = datetime.now(UTC)
db.commit()
db.flush()
db.refresh(user)
status_action = "activated" if user.is_active else "deactivated"
@@ -92,7 +92,6 @@ class AdminService:
return user, message
except Exception as e:
db.rollback()
logger.error(f"Failed to toggle user {user_id} status: {str(e)}")
raise UserStatusChangeException(
user_id=user_id,
@@ -185,7 +184,7 @@ class AdminService:
is_active=True,
)
db.add(user)
db.commit()
db.flush()
db.refresh(user)
logger.info(f"Admin {current_admin_id} created user {user.username}")
@@ -266,7 +265,7 @@ class AdminService:
user.is_active = is_active
user.updated_at = datetime.now(UTC)
db.commit()
db.flush()
db.refresh(user)
logger.info(f"Admin {current_admin_id} updated user {user.username}")
@@ -305,7 +304,6 @@ class AdminService:
username = user.username
db.delete(user)
db.commit()
logger.info(f"Admin {current_admin_id} deleted user {username}")
return f"User {username} deleted successfully"
@@ -405,7 +403,7 @@ class AdminService:
# Create default roles for vendor
self._create_default_roles(db, vendor.id)
db.commit()
db.flush()
db.refresh(vendor)
logger.info(
@@ -415,10 +413,8 @@ class AdminService:
return vendor
except (VendorAlreadyExistsException, ValidationException):
db.rollback()
raise
except Exception as e:
db.rollback()
logger.error(f"Failed to create vendor: {str(e)}")
raise AdminOperationException(
operation="create_vendor",
@@ -499,7 +495,7 @@ class AdminService:
if vendor.is_verified:
vendor.verified_at = datetime.now(UTC)
db.commit()
db.flush()
db.refresh(vendor)
status_action = "verified" if vendor.is_verified else "unverified"
@@ -509,7 +505,6 @@ class AdminService:
return vendor, message
except Exception as e:
db.rollback()
logger.error(f"Failed to verify vendor {vendor_id}: {str(e)}")
raise VendorVerificationException(
vendor_id=vendor_id,
@@ -525,7 +520,7 @@ class AdminService:
original_status = vendor.is_active
vendor.is_active = not vendor.is_active
vendor.updated_at = datetime.now(UTC)
db.commit()
db.flush()
db.refresh(vendor)
status_action = "activated" if vendor.is_active else "deactivated"
@@ -535,7 +530,6 @@ class AdminService:
return vendor, message
except Exception as e:
db.rollback()
logger.error(f"Failed to toggle vendor {vendor_id} status: {str(e)}")
raise AdminOperationException(
operation="toggle_vendor_status",
@@ -560,13 +554,11 @@ class AdminService:
# - Delete import jobs
db.delete(vendor)
db.commit()
logger.warning(f"Vendor {vendor_code} and all associated data deleted")
return f"Vendor {vendor_code} successfully deleted"
except Exception as e:
db.rollback()
logger.error(f"Failed to delete vendor {vendor_id}: {str(e)}")
raise AdminOperationException(
operation="delete_vendor", reason="Database deletion failed"
@@ -650,7 +642,7 @@ class AdminService:
vendor.updated_at = datetime.now(UTC)
db.commit()
db.flush()
db.refresh(vendor)
logger.info(
@@ -660,10 +652,8 @@ class AdminService:
return vendor
except ValidationException:
db.rollback()
raise
except Exception as e:
db.rollback()
logger.error(f"Failed to update vendor {vendor_id}: {str(e)}")
raise AdminOperationException(
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.commit()
db.flush()
db.refresh(setting)
logger.info(f"Setting '{setting.key}' created by admin {admin_user_id}")
@@ -171,10 +171,8 @@ class AdminSettingsService:
return AdminSettingResponse.model_validate(setting)
except ValidationException:
db.rollback()
raise
except Exception as e:
db.rollback()
logger.error(f"Failed to create setting: {str(e)}")
raise AdminOperationException(
operation="create_setting", reason="Database operation failed"
@@ -205,7 +203,7 @@ class AdminSettingsService:
setting.last_modified_by_user_id = admin_user_id
setting.updated_at = datetime.now(UTC)
db.commit()
db.flush()
db.refresh(setting)
logger.info(f"Setting '{setting.key}' updated by admin {admin_user_id}")
@@ -213,10 +211,8 @@ class AdminSettingsService:
return AdminSettingResponse.model_validate(setting)
except ValidationException:
db.rollback()
raise
except Exception as e:
db.rollback()
logger.error(f"Failed to update setting {key}: {str(e)}")
raise AdminOperationException(
operation="update_setting", reason="Database operation failed"
@@ -244,14 +240,12 @@ class AdminSettingsService:
try:
db.delete(setting)
db.commit()
logger.warning(f"Setting '{key}' deleted by admin {admin_user_id}")
return f"Setting '{key}' successfully deleted"
except Exception as e:
db.rollback()
logger.error(f"Failed to delete setting {key}: {str(e)}")
raise AdminOperationException(
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
db.commit()
db.flush()
db.refresh(existing_item)
logger.info(
@@ -245,7 +245,7 @@ class CartService:
price_at_add=current_price,
)
db.add(cart_item)
db.commit()
db.flush()
db.refresh(cart_item)
logger.info(
@@ -337,7 +337,7 @@ class CartService:
# Update quantity
cart_item.quantity = quantity
db.commit()
db.flush()
db.refresh(cart_item)
logger.info(
@@ -392,7 +392,6 @@ class CartService:
)
db.delete(cart_item)
db.commit()
logger.info(
"[CART_SERVICE] Removed item from cart",
@@ -426,8 +425,6 @@ class CartService:
.delete()
)
db.commit()
logger.info(
"[CART_SERVICE] Cleared cart",
extra={

10
app/services/code_quality_service.py
View File

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

5
app/services/content_page_service.py
View File

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

10
app/services/customer_service.py
View File

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

18
app/services/inventory_service.py
View File

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

3
app/services/marketplace_import_job_service.py
View File

@@ -53,7 +53,7 @@ class MarketplaceImportJobService:
)
db.add(import_job)
db.commit()
db.flush()
db.refresh(import_job)
logger.info(
@@ -65,7 +65,6 @@ class MarketplaceImportJobService:
return import_job
except Exception as e:
db.rollback()
logger.error(f"Error creating import job: {str(e)}")
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.add(db_product)
db.commit()
db.flush()
db.refresh(db_product)
logger.info(f"Created product {db_product.marketplace_product_id}")
@@ -102,10 +102,8 @@ class MarketplaceProductService:
InvalidMarketplaceProductDataException,
MarketplaceProductValidationException,
):
db.rollback()
raise # Re-raise custom exceptions
except IntegrityError as e:
db.rollback()
logger.error(f"Database integrity error: {str(e)}")
if "marketplace_product_id" in str(e).lower() or "unique" in str(e).lower():
raise MarketplaceProductAlreadyExistsException(
@@ -115,7 +113,6 @@ class MarketplaceProductService:
"Data integrity constraint violation"
)
except Exception as e:
db.rollback()
logger.error(f"Error creating product: {str(e)}")
raise ValidationException("Failed to create product")
@@ -271,7 +268,7 @@ class MarketplaceProductService:
setattr(product, key, value)
product.updated_at = datetime.now(UTC)
db.commit()
db.flush()
db.refresh(product)
logger.info(f"Updated product {marketplace_product_id}")
@@ -282,10 +279,8 @@ class MarketplaceProductService:
InvalidMarketplaceProductDataException,
MarketplaceProductValidationException,
):
db.rollback()
raise # Re-raise custom exceptions
except Exception as e:
db.rollback()
logger.error(f"Error updating product {marketplace_product_id}: {str(e)}")
raise ValidationException("Failed to update product")
@@ -311,7 +306,6 @@ class MarketplaceProductService:
db.query(Inventory).filter(Inventory.gtin == product.gtin).delete()
db.delete(product)
db.commit()
logger.info(f"Deleted product {marketplace_product_id}")
return True
@@ -319,7 +313,6 @@ class MarketplaceProductService:
except MarketplaceProductNotFoundException:
raise # Re-raise custom exceptions
except Exception as e:
db.rollback()
logger.error(f"Error deleting product {marketplace_product_id}: {str(e)}")
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)
db.add(order_item)
db.commit()
db.flush()
db.refresh(order)
logger.info(
@@ -242,10 +242,8 @@ class OrderService:
InsufficientInventoryException,
CustomerNotFoundException,
):
db.rollback()
raise
except Exception as e:
db.rollback()
logger.error(f"Error creating 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.updated_at = datetime.now(UTC)
db.commit()
db.flush()
db.refresh(order)
logger.info(f"Order {order.order_number} updated: status={order.status}")
@@ -362,10 +360,8 @@ class OrderService:
return order
except OrderNotFoundException:
db.rollback()
raise
except Exception as e:
db.rollback()
logger.error(f"Error updating 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.commit()
db.flush()
db.refresh(product)
logger.info(f"Added product {product.id} to vendor {vendor_id} catalog")
return product
except (ProductAlreadyExistsException, ValidationException):
db.rollback()
raise
except Exception as e:
db.rollback()
logger.error(f"Error creating product: {str(e)}")
raise ValidationException("Failed to create product")
@@ -168,17 +166,15 @@ class ProductService:
setattr(product, key, value)
product.updated_at = datetime.now(UTC)
db.commit()
db.flush()
db.refresh(product)
logger.info(f"Updated product {product_id} in vendor {vendor_id} catalog")
return product
except ProductNotFoundException:
db.rollback()
raise
except Exception as e:
db.rollback()
logger.error(f"Error updating product: {str(e)}")
raise ValidationException("Failed to update product")
@@ -198,7 +194,6 @@ class ProductService:
product = self.get_product(db, vendor_id, product_id)
db.delete(product)
db.commit()
logger.info(f"Deleted product {product_id} from vendor {vendor_id} catalog")
return True
@@ -206,7 +201,6 @@ class ProductService:
except ProductNotFoundException:
raise
except Exception as e:
db.rollback()
logger.error(f"Error deleting product: {str(e)}")
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.updated_at = datetime.now(UTC)
db.commit()
db.flush()
db.refresh(vendor_user)
return {
@@ -144,7 +144,6 @@ class TeamService:
}
except Exception as e:
db.rollback()
logger.error(f"Error updating team member: {str(e)}")
raise ValidationException("Failed to update team member")
@@ -178,13 +177,11 @@ class TeamService:
# Soft delete
vendor_user.is_active = False
vendor_user.updated_at = datetime.now(UTC)
db.commit()
logger.info(f"Removed user {user_id} from vendor {vendor_id}")
return True
except Exception as e:
db.rollback()
logger.error(f"Error removing team member: {str(e)}")
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.commit()
db.flush()
db.refresh(new_domain)
logger.info(f"Domain {normalized_domain} added to vendor {vendor_id}")
@@ -126,10 +126,8 @@ class VendorDomainService:
InvalidDomainFormatException,
ReservedDomainException,
):
db.rollback()
raise
except Exception as e:
db.rollback()
logger.error(f"Error adding domain: {str(e)}")
raise ValidationException("Failed to add domain")
@@ -223,17 +221,15 @@ class VendorDomainService:
if domain_update.is_active is not None:
domain.is_active = domain_update.is_active
db.commit()
db.flush()
db.refresh(domain)
logger.info(f"Domain {domain.domain} updated")
return domain
except (VendorDomainNotFoundException, DomainNotVerifiedException):
db.rollback()
raise
except Exception as e:
db.rollback()
logger.error(f"Error updating domain: {str(e)}")
raise ValidationException("Failed to update domain")
@@ -257,16 +253,13 @@ class VendorDomainService:
vendor_id = domain.vendor_id
db.delete(domain)
db.commit()
logger.info(f"Domain {domain_name} deleted from vendor {vendor_id}")
return f"Domain {domain_name} deleted successfully"
except VendorDomainNotFoundException:
db.rollback()
raise
except Exception as e:
db.rollback()
logger.error(f"Error deleting domain: {str(e)}")
raise ValidationException("Failed to delete domain")
@@ -312,7 +305,7 @@ class VendorDomainService:
# Verification successful
domain.is_verified = True
domain.verified_at = datetime.now(UTC)
db.commit()
db.flush()
db.refresh(domain)
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_accepted_at = None
db.commit()
db.flush()
logger.info(
f"Re-invited user {email} to vendor {vendor.vendor_code}"
@@ -170,7 +170,7 @@ class VendorTeamService:
is_active=False, # Will be activated on acceptance
)
db.add(vendor_user)
db.commit()
db.flush()
logger.info(
f"Invited {email} to vendor {vendor.vendor_code} "
@@ -190,7 +190,6 @@ class VendorTeamService:
except (TeamMemberAlreadyExistsException, MaxTeamMembersReachedException):
raise
except Exception as e:
db.rollback()
logger.error(f"Error inviting team member: {str(e)}")
raise
@@ -255,7 +254,7 @@ class VendorTeamService:
vendor_user.invitation_accepted_at = datetime.utcnow()
vendor_user.invitation_token = None # Clear token
db.commit()
db.flush()
logger.info(
f"User {user.email} accepted invitation to vendor {vendor.vendor_code}"
@@ -273,7 +272,6 @@ class VendorTeamService:
):
raise
except Exception as e:
db.rollback()
logger.error(f"Error accepting invitation: {str(e)}")
raise
@@ -315,7 +313,6 @@ class VendorTeamService:
# Soft delete - just deactivate
vendor_user.is_active = False
db.commit()
logger.info(f"Removed user {user_id} from vendor {vendor.vendor_code}")
return True
@@ -323,7 +320,6 @@ class VendorTeamService:
except (UserNotFoundException, CannotRemoveOwnerException):
raise
except Exception as e:
db.rollback()
logger.error(f"Error removing team member: {str(e)}")
raise
@@ -374,7 +370,7 @@ class VendorTeamService:
)
vendor_user.role_id = new_role.id
db.commit()
db.flush()
logger.info(
f"Updated role for user {user_id} in vendor {vendor.vendor_code} "
@@ -386,7 +382,6 @@ class VendorTeamService:
except (UserNotFoundException, CannotRemoveOwnerException):
raise
except Exception as e:
db.rollback()
logger.error(f"Error updating member role: {str(e)}")
raise

12
app/services/vendor_theme_service.py
View File

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