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

refactor: complete module-driven architecture migration

Browse Source 
This commit completes the migration to a fully module-driven architecture:

## Models Migration
- Moved all domain models from models/database/ to their respective modules:
  - tenancy: User, Admin, Vendor, Company, Platform, VendorDomain, etc.
  - cms: MediaFile, VendorTheme
  - messaging: Email, VendorEmailSettings, VendorEmailTemplate
  - core: AdminMenuConfig
- models/database/ now only contains Base and TimestampMixin (infrastructure)

## Schemas Migration
- Moved all domain schemas from models/schema/ to their respective modules:
  - tenancy: company, vendor, admin, team, vendor_domain
  - cms: media, image, vendor_theme
  - messaging: email
- models/schema/ now only contains base.py and auth.py (infrastructure)

## Routes Migration
- Moved admin routes from app/api/v1/admin/ to modules:
  - menu_config.py -> core module
  - modules.py -> tenancy module
  - module_config.py -> tenancy module
- app/api/v1/admin/ now only aggregates auto-discovered module routes

## Menu System
- Implemented module-driven menu system with MenuDiscoveryService
- Extended FrontendType enum: PLATFORM, ADMIN, VENDOR, STOREFRONT
- Added MenuItemDefinition and MenuSectionDefinition dataclasses
- Each module now defines its own menu items in definition.py
- MenuService integrates with MenuDiscoveryService for template rendering

## Documentation
- Updated docs/architecture/models-structure.md
- Updated docs/architecture/menu-management.md
- Updated architecture validation rules for new exceptions

## Architecture Validation
- Updated MOD-019 rule to allow base.py in models/schema/
- Created core module exceptions.py and schemas/ directory
- All validation errors resolved (only warnings remain)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Samir Boulahtit
2026-02-01 21:02:56 +01:00
parent 09d7d282c6
commit d7a0ff8818
307 changed files with 5536 additions and 3826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/modules/customers/definition.py
View File

@@ -6,8 +6,8 @@ Defines the customers module including its features, menu items,
route configurations, and self-contained module settings.
"""
from app.modules.base import ModuleDefinition
from models.database.admin_menu_config import FrontendType
from app.modules.base import MenuItemDefinition, MenuSectionDefinition, ModuleDefinition
from app.modules.enums import FrontendType
def _get_admin_router():
@@ -46,6 +46,43 @@ customers_module = ModuleDefinition(
"customers", # Vendor customer list
],
},
# New module-driven menu definitions
menus={
FrontendType.ADMIN: [
MenuSectionDefinition(
id="vendorOps",
label_key="customers.menu.vendor_operations",
icon="user-group",
order=40,
items=[
MenuItemDefinition(
id="customers",
label_key="customers.menu.customers",
icon="user-group",
route="/admin/customers",
order=20,
),
],
),
],
FrontendType.VENDOR: [
MenuSectionDefinition(
id="customers",
label_key="customers.menu.customers_section",
icon="user-group",
order=30,
items=[
MenuItemDefinition(
id="customers",
label_key="customers.menu.all_customers",
icon="user-group",
route="/vendor/{vendor_code}/customers",
order=10,
),
],
),
],
},
is_core=True, # Customers is a core module - customer data is fundamental
# =========================================================================
# Self-Contained Module Configuration

22
app/modules/customers/locales/de.json
View File

@@ -1 +1,21 @@
{}
{
"customers": {
"title": "Kunden",
"customer": "Kunde",
"add_customer": "Kunde hinzufügen",
"edit_customer": "Kunde bearbeiten",
"customer_name": "Kundenname",
"customer_email": "Kunden-E-Mail",
"customer_phone": "Kundentelefon",
"customer_number": "Kundennummer",
"first_name": "Vorname",
"last_name": "Nachname",
"company": "Firma",
"total_orders": "Bestellungen gesamt",
"total_spent": "Gesamtausgaben",
"last_order": "Letzte Bestellung",
"registered": "Registriert",
"no_customers": "Keine Kunden gefunden",
"search_customers": "Kunden suchen..."
}
}

27
app/modules/customers/locales/en.json
View File

@@ -1 +1,26 @@
{}
{
"customers": {
"title": "Customers",
"customer": "Customer",
"add_customer": "Add Customer",
"edit_customer": "Edit Customer",
"customer_name": "Customer Name",
"customer_email": "Customer Email",
"customer_phone": "Customer Phone",
"customer_number": "Customer Number",
"first_name": "First Name",
"last_name": "Last Name",
"company": "Company",
"total_orders": "Total Orders",
"total_spent": "Total Spent",
"last_order": "Last Order",
"registered": "Registered",
"no_customers": "No customers found",
"search_customers": "Search customers..."
},
"messages": {
"failed_to_toggle_customer_status": "Failed to toggle customer status",
"failed_to_load_customer_details": "Failed to load customer details",
"failed_to_load_customer_orders": "Failed to load customer orders"
}
}

22
app/modules/customers/locales/fr.json
View File

@@ -1 +1,21 @@
{}
{
"customers": {
"title": "Clients",
"customer": "Client",
"add_customer": "Ajouter un client",
"edit_customer": "Modifier le client",
"customer_name": "Nom du client",
"customer_email": "E-mail du client",
"customer_phone": "Téléphone du client",
"customer_number": "Numéro client",
"first_name": "Prénom",
"last_name": "Nom",
"company": "Entreprise",
"total_orders": "Total des commandes",
"total_spent": "Total dépensé",
"last_order": "Dernière commande",
"registered": "Inscrit",
"no_customers": "Aucun client trouvé",
"search_customers": "Rechercher des clients..."
}
}

22
app/modules/customers/locales/lb.json
View File

@@ -1 +1,21 @@
{}
{
"customers": {
"title": "Clienten",
"customer": "Client",
"add_customer": "Client derbäisetzen",
"edit_customer": "Client änneren",
"customer_name": "Clientennumm",
"customer_email": "Client E-Mail",
"customer_phone": "Client Telefon",
"customer_number": "Clientennummer",
"first_name": "Virnumm",
"last_name": "Nonumm",
"company": "Firma",
"total_orders": "Bestellungen insgesamt",
"total_spent": "Total ausginn",
"last_order": "Lescht Bestellung",
"registered": "Registréiert",
"no_customers": "Keng Clienten fonnt",
"search_customers": "Clienten sichen..."
}
}

4
app/modules/customers/routes/pages/admin.py
View File

@@ -13,8 +13,8 @@ from sqlalchemy.orm import Session
from app.api.deps import get_db, require_menu_access
from app.modules.core.utils.page_context import get_admin_context
from app.templates_config import templates
from models.database.admin_menu_config import FrontendType
from models.database.user import User
from app.modules.enums import FrontendType
from app.modules.tenancy.models import User
router = APIRouter()

2
app/modules/customers/routes/pages/vendor.py
View File

@@ -13,7 +13,7 @@ from sqlalchemy.orm import Session
from app.api.deps import get_current_vendor_from_cookie_or_header, get_db
from app.modules.core.utils.page_context import get_vendor_context
from app.templates_config import templates
from models.database.user import User
from app.modules.tenancy.models import User
router = APIRouter()

2
app/modules/customers/services/admin_customer_service.py
View File

@@ -13,7 +13,7 @@ from sqlalchemy.orm import Session
from app.modules.customers.exceptions import CustomerNotFoundException
from app.modules.customers.models import Customer
from models.database.vendor import Vendor
from app.modules.tenancy.models import Vendor
logger = logging.getLogger(__name__)

2
app/modules/customers/services/customer_service.py
View File

@@ -26,7 +26,7 @@ from app.modules.tenancy.exceptions import VendorNotActiveException, VendorNotFo
from app.modules.core.services.auth_service import AuthService
from app.modules.customers.models import Customer, PasswordResetToken
from app.modules.customers.schemas import CustomerRegister, CustomerUpdate
from models.database.vendor import Vendor
from app.modules.tenancy.models import Vendor
logger = logging.getLogger(__name__)

5
app/modules/customers/static/admin/js/customers.js
View File

@@ -101,6 +101,9 @@ function adminCustomers() {
},
async init() {
// Load i18n translations
await I18n.loadModule('customers');
customersLog.debug('Customers page initialized');
// Load platform settings for rows per page
@@ -369,7 +372,7 @@ function adminCustomers() {
customersLog.info(response.message);
} catch (error) {
customersLog.error('Failed to toggle status:', error);
Utils.showToast(error.message || 'Failed to toggle customer status', 'error');
Utils.showToast(error.message || I18n.t('customers.messages.failed_to_toggle_customer_status'), 'error');
}
},

7
app/modules/customers/static/vendor/js/customers.js vendored
View File

@@ -97,6 +97,9 @@ function vendorCustomers() {
},
async init() {
// Load i18n translations
await I18n.loadModule('customers');
vendorCustomersLog.info('Customers init() called');
// Guard against multiple initialization
@@ -218,7 +221,7 @@ function vendorCustomers() {
vendorCustomersLog.info('Loaded customer details:', customer.id);
} catch (error) {
vendorCustomersLog.error('Failed to load customer details:', error);
Utils.showToast(error.message || 'Failed to load customer details', 'error');
Utils.showToast(error.message || I18n.t('customers.messages.failed_to_load_customer_details'), 'error');
} finally {
this.loading = false;
}
@@ -237,7 +240,7 @@ function vendorCustomers() {
vendorCustomersLog.info('Loaded customer orders:', customer.id, this.customerOrders.length);
} catch (error) {
vendorCustomersLog.error('Failed to load customer orders:', error);
Utils.showToast(error.message || 'Failed to load customer orders', 'error');
Utils.showToast(error.message || I18n.t('customers.messages.failed_to_load_customer_orders'), 'error');
} finally {
this.loading = false;
}