Admin features (audit, log, settings)
This commit is contained in:
@@ -32,7 +32,7 @@ from app.exceptions import (
|
||||
from models.schema.marketplace_import_job import MarketplaceImportJobResponse
|
||||
from models.schema.vendor import VendorCreate
|
||||
from models.database.marketplace_import_job import MarketplaceImportJob
|
||||
from models.database.vendor import Vendor, Role
|
||||
from models.database.vendor import Vendor, Role, VendorUser
|
||||
from models.database.user import User
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -108,6 +108,12 @@ class AdminService:
|
||||
"""
|
||||
Create vendor with owner user account.
|
||||
|
||||
Creates:
|
||||
1. User account with owner_email (for authentication)
|
||||
2. Vendor with contact_email (for business contact)
|
||||
|
||||
If contact_email not provided, defaults to owner_email.
|
||||
|
||||
Returns: (vendor, owner_user, temporary_password)
|
||||
"""
|
||||
try:
|
||||
@@ -132,13 +138,12 @@ class AdminService:
|
||||
# Generate temporary password for owner
|
||||
temp_password = self._generate_temp_password()
|
||||
|
||||
# Create owner user
|
||||
# Create owner user with owner_email
|
||||
from middleware.auth import AuthManager
|
||||
auth_manager = AuthManager()
|
||||
|
||||
owner_username = f"{vendor_data.vendor_code.lower()}_owner"
|
||||
owner_email = vendor_data.owner_email if hasattr(vendor_data,
|
||||
'owner_email') else f"{owner_username}@{vendor_data.subdomain}.com"
|
||||
owner_username = f"{vendor_data.subdomain}_owner"
|
||||
owner_email = vendor_data.owner_email # ✅ For User authentication
|
||||
|
||||
# Check if user with this email already exists
|
||||
existing_user = db.query(User).filter(
|
||||
@@ -151,31 +156,35 @@ class AdminService:
|
||||
else:
|
||||
# Create new owner user
|
||||
owner_user = User(
|
||||
email=owner_email,
|
||||
email=owner_email, # ✅ Authentication email
|
||||
username=owner_username,
|
||||
hashed_password=auth_manager.hash_password(temp_password),
|
||||
role="user", # Will be vendor owner through relationship
|
||||
role="user",
|
||||
is_active=True,
|
||||
)
|
||||
db.add(owner_user)
|
||||
db.flush() # Get owner_user.id
|
||||
|
||||
# Determine contact_email
|
||||
# If provided, use it; otherwise default to owner_email
|
||||
contact_email = vendor_data.contact_email or owner_email
|
||||
|
||||
# Create vendor
|
||||
vendor = Vendor(
|
||||
vendor_code=vendor_data.vendor_code.upper(),
|
||||
subdomain=vendor_data.subdomain.lower(),
|
||||
name=vendor_data.name,
|
||||
description=getattr(vendor_data, 'description', None),
|
||||
description=vendor_data.description,
|
||||
owner_user_id=owner_user.id,
|
||||
contact_email=owner_email,
|
||||
contact_phone=getattr(vendor_data, 'contact_phone', None),
|
||||
website=getattr(vendor_data, 'website', None),
|
||||
business_address=getattr(vendor_data, 'business_address', None),
|
||||
tax_number=getattr(vendor_data, 'tax_number', None),
|
||||
letzshop_csv_url_fr=getattr(vendor_data, 'letzshop_csv_url_fr', None),
|
||||
letzshop_csv_url_en=getattr(vendor_data, 'letzshop_csv_url_en', None),
|
||||
letzshop_csv_url_de=getattr(vendor_data, 'letzshop_csv_url_de', None),
|
||||
theme_config=getattr(vendor_data, 'theme_config', {}),
|
||||
contact_email=contact_email, # ✅ Business contact email
|
||||
contact_phone=vendor_data.contact_phone,
|
||||
website=vendor_data.website,
|
||||
business_address=vendor_data.business_address,
|
||||
tax_number=vendor_data.tax_number,
|
||||
letzshop_csv_url_fr=vendor_data.letzshop_csv_url_fr,
|
||||
letzshop_csv_url_en=vendor_data.letzshop_csv_url_en,
|
||||
letzshop_csv_url_de=vendor_data.letzshop_csv_url_de,
|
||||
theme_config=vendor_data.theme_config or {},
|
||||
is_active=True,
|
||||
is_verified=True,
|
||||
)
|
||||
@@ -190,7 +199,8 @@ class AdminService:
|
||||
db.refresh(owner_user)
|
||||
|
||||
logger.info(
|
||||
f"Vendor {vendor.vendor_code} created with owner {owner_user.username}"
|
||||
f"Vendor {vendor.vendor_code} created with owner {owner_user.username} "
|
||||
f"(owner_email: {owner_email}, contact_email: {contact_email})"
|
||||
)
|
||||
|
||||
# TODO: Send welcome email to owner with credentials
|
||||
@@ -340,6 +350,231 @@ class AdminService:
|
||||
reason="Database deletion failed"
|
||||
)
|
||||
|
||||
def update_vendor(
|
||||
self,
|
||||
db: Session,
|
||||
vendor_id: int,
|
||||
vendor_update # VendorUpdate schema
|
||||
) -> Vendor:
|
||||
"""
|
||||
Update vendor information (Admin only).
|
||||
|
||||
Can update:
|
||||
- Vendor details (name, description, subdomain)
|
||||
- Business contact info (contact_email, phone, etc.)
|
||||
- Status (is_active, is_verified)
|
||||
|
||||
Cannot update:
|
||||
- owner_email (use transfer_vendor_ownership instead)
|
||||
- vendor_code (immutable)
|
||||
- owner_user_id (use transfer_vendor_ownership instead)
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
vendor_id: ID of vendor to update
|
||||
vendor_update: VendorUpdate schema with updated data
|
||||
|
||||
Returns:
|
||||
Updated vendor object
|
||||
|
||||
Raises:
|
||||
VendorNotFoundException: If vendor not found
|
||||
ValidationException: If subdomain already taken
|
||||
"""
|
||||
vendor = self._get_vendor_by_id_or_raise(db, vendor_id)
|
||||
|
||||
try:
|
||||
# Get update data
|
||||
update_data = vendor_update.model_dump(exclude_unset=True)
|
||||
|
||||
# Check subdomain uniqueness if changing
|
||||
if 'subdomain' in update_data and update_data['subdomain'] != vendor.subdomain:
|
||||
existing = db.query(Vendor).filter(
|
||||
Vendor.subdomain == update_data['subdomain'],
|
||||
Vendor.id != vendor_id
|
||||
).first()
|
||||
if existing:
|
||||
raise ValidationException(
|
||||
f"Subdomain '{update_data['subdomain']}' is already taken"
|
||||
)
|
||||
|
||||
# Update vendor fields
|
||||
for field, value in update_data.items():
|
||||
setattr(vendor, field, value)
|
||||
|
||||
vendor.updated_at = datetime.now(timezone.utc)
|
||||
|
||||
db.commit()
|
||||
db.refresh(vendor)
|
||||
|
||||
logger.info(
|
||||
f"Vendor {vendor_id} ({vendor.vendor_code}) updated by admin. "
|
||||
f"Fields updated: {', '.join(update_data.keys())}"
|
||||
)
|
||||
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)}"
|
||||
)
|
||||
|
||||
# Add this NEW method for transferring ownership:
|
||||
|
||||
def transfer_vendor_ownership(
|
||||
self,
|
||||
db: Session,
|
||||
vendor_id: int,
|
||||
transfer_data # VendorTransferOwnership schema
|
||||
) -> Tuple[Vendor, User, User]:
|
||||
"""
|
||||
Transfer vendor ownership to another user.
|
||||
|
||||
This method:
|
||||
1. Validates new owner exists and is active
|
||||
2. Removes old owner from "Owner" role (demotes to Manager)
|
||||
3. Assigns new owner to "Owner" role
|
||||
4. Updates vendor.owner_user_id
|
||||
5. Creates audit log entry
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
vendor_id: ID of vendor
|
||||
transfer_data: Transfer details (new owner ID, confirmation, reason)
|
||||
|
||||
Returns:
|
||||
Tuple of (vendor, old_owner, new_owner)
|
||||
|
||||
Raises:
|
||||
VendorNotFoundException: If vendor not found
|
||||
UserNotFoundException: If new owner user not found
|
||||
ValidationException: If confirmation not provided or user already owner
|
||||
"""
|
||||
|
||||
# Require confirmation
|
||||
if not transfer_data.confirm_transfer:
|
||||
raise ValidationException(
|
||||
"Ownership transfer requires confirmation (confirm_transfer=true)"
|
||||
)
|
||||
|
||||
# Get vendor
|
||||
vendor = self._get_vendor_by_id_or_raise(db, vendor_id)
|
||||
old_owner = vendor.owner
|
||||
|
||||
# Get new owner
|
||||
new_owner = db.query(User).filter(
|
||||
User.id == transfer_data.new_owner_user_id
|
||||
).first()
|
||||
|
||||
if not new_owner:
|
||||
raise UserNotFoundException(str(transfer_data.new_owner_user_id))
|
||||
|
||||
# Check if new owner is active
|
||||
if not new_owner.is_active:
|
||||
raise ValidationException(
|
||||
f"User {new_owner.username} (ID: {new_owner.id}) is not active"
|
||||
)
|
||||
|
||||
# Check if already owner
|
||||
if new_owner.id == old_owner.id:
|
||||
raise ValidationException(
|
||||
f"User {new_owner.username} is already the owner of this vendor"
|
||||
)
|
||||
|
||||
try:
|
||||
# Get Owner role for this vendor
|
||||
owner_role = db.query(Role).filter(
|
||||
Role.vendor_id == vendor_id,
|
||||
Role.name == "Owner"
|
||||
).first()
|
||||
|
||||
if not owner_role:
|
||||
raise ValidationException("Owner role not found for vendor")
|
||||
|
||||
# Get Manager role (to demote old owner)
|
||||
manager_role = db.query(Role).filter(
|
||||
Role.vendor_id == vendor_id,
|
||||
Role.name == "Manager"
|
||||
).first()
|
||||
|
||||
# Remove old owner from Owner role
|
||||
old_owner_link = db.query(VendorUser).filter(
|
||||
VendorUser.vendor_id == vendor_id,
|
||||
VendorUser.user_id == old_owner.id,
|
||||
VendorUser.role_id == owner_role.id
|
||||
).first()
|
||||
|
||||
if old_owner_link:
|
||||
if manager_role:
|
||||
# Demote to Manager role
|
||||
old_owner_link.role_id = manager_role.id
|
||||
logger.info(
|
||||
f"Old owner {old_owner.username} demoted to Manager role "
|
||||
f"for vendor {vendor.vendor_code}"
|
||||
)
|
||||
else:
|
||||
# No Manager role, just remove Owner link
|
||||
db.delete(old_owner_link)
|
||||
logger.warning(
|
||||
f"Old owner {old_owner.username} removed from vendor {vendor.vendor_code} "
|
||||
f"(no Manager role available)"
|
||||
)
|
||||
|
||||
# Check if new owner already has a vendor_user link
|
||||
new_owner_link = db.query(VendorUser).filter(
|
||||
VendorUser.vendor_id == vendor_id,
|
||||
VendorUser.user_id == new_owner.id
|
||||
).first()
|
||||
|
||||
if new_owner_link:
|
||||
# Update existing link to Owner role
|
||||
new_owner_link.role_id = owner_role.id
|
||||
new_owner_link.is_active = True
|
||||
else:
|
||||
# Create new Owner link
|
||||
new_owner_link = VendorUser(
|
||||
vendor_id=vendor_id,
|
||||
user_id=new_owner.id,
|
||||
role_id=owner_role.id,
|
||||
is_active=True
|
||||
)
|
||||
db.add(new_owner_link)
|
||||
|
||||
# Update vendor owner_user_id
|
||||
vendor.owner_user_id = new_owner.id
|
||||
vendor.updated_at = datetime.now(timezone.utc)
|
||||
|
||||
db.commit()
|
||||
db.refresh(vendor)
|
||||
|
||||
logger.warning(
|
||||
f"OWNERSHIP TRANSFERRED for vendor {vendor.vendor_code}: "
|
||||
f"{old_owner.username} (ID: {old_owner.id}) -> "
|
||||
f"{new_owner.username} (ID: {new_owner.id}). "
|
||||
f"Reason: {transfer_data.transfer_reason or 'Not provided'}"
|
||||
)
|
||||
|
||||
# TODO: Send notification emails to both old and new owners
|
||||
# self._send_ownership_transfer_emails(vendor, old_owner, new_owner, transfer_data.transfer_reason)
|
||||
|
||||
return vendor, old_owner, new_owner
|
||||
|
||||
except (ValidationException, UserNotFoundException):
|
||||
db.rollback()
|
||||
raise
|
||||
except Exception as e:
|
||||
db.rollback()
|
||||
logger.error(f"Failed to transfer ownership for vendor {vendor_id}: {str(e)}")
|
||||
raise AdminOperationException(
|
||||
operation="transfer_vendor_ownership",
|
||||
reason=f"Ownership transfer failed: {str(e)}"
|
||||
)
|
||||
|
||||
# ============================================================================
|
||||
# MARKETPLACE IMPORT JOBS
|
||||
# ============================================================================
|
||||
|
||||
Reference in New Issue
Block a user