diff --git a/app/dashboard/backend/router.py b/app/dashboard/backend/router.py new file mode 100644 index 0000000..950e0b9 --- /dev/null +++ b/app/dashboard/backend/router.py @@ -0,0 +1,64 @@ +from fastapi import APIRouter, HTTPException +from app.core.database import execute_query +from typing import Dict, Any, List +import logging + +logger = logging.getLogger(__name__) + +router = APIRouter() + +@router.get("/stats", response_model=Dict[str, Any]) +async def get_dashboard_stats(): + """ + Get aggregated statistics for the dashboard + """ + try: + logger.info("📊 Fetching dashboard stats...") + + # 1. Customer Counts + logger.info("Fetching customer count...") + customer_res = execute_query("SELECT COUNT(*) as count FROM customers WHERE deleted_at IS NULL", fetchone=True) + customer_count = customer_res['count'] if customer_res else 0 + + # 2. Contact Counts + logger.info("Fetching contact count...") + contact_res = execute_query("SELECT COUNT(*) as count FROM contacts", fetchone=True) + contact_count = contact_res['count'] if contact_res else 0 + + # 3. Vendor Counts + logger.info("Fetching vendor count...") + vendor_res = execute_query("SELECT COUNT(*) as count FROM vendors", fetchone=True) + vendor_count = vendor_res['count'] if vendor_res else 0 + + # 4. Recent Customers (Real "Activity") + logger.info("Fetching recent customers...") + recent_customers = execute_query(""" + SELECT id, name, created_at, 'customer' as type + FROM customers + WHERE deleted_at IS NULL + ORDER BY created_at DESC + LIMIT 5 + """) + + # 5. Vendor Categories Distribution + logger.info("Fetching vendor distribution...") + vendor_categories = execute_query(""" + SELECT category, COUNT(*) as count + FROM vendors + GROUP BY category + """) + + logger.info("✅ Dashboard stats fetched successfully") + return { + "counts": { + "customers": customer_count, + "contacts": contact_count, + "vendors": vendor_count + }, + "recent_activity": recent_customers or [], + "vendor_distribution": vendor_categories or [], + "system_status": "online" + } + except Exception as e: + logger.error(f"❌ Error fetching dashboard stats: {e}", exc_info=True) + raise HTTPException(status_code=500, detail=str(e)) diff --git a/app/dashboard/backend/views.py b/app/dashboard/backend/views.py index 5d66642..376969f 100644 --- a/app/dashboard/backend/views.py +++ b/app/dashboard/backend/views.py @@ -5,7 +5,7 @@ from fastapi.responses import HTMLResponse router = APIRouter() templates = Jinja2Templates(directory="app") -@router.get("/", response_class=HTMLResponse) +@router.get("/dashboard", response_class=HTMLResponse) async def dashboard(request: Request): """ Render the dashboard page diff --git a/app/dashboard/frontend/index.html b/app/dashboard/frontend/index.html index 14525b9..1e80c08 100644 --- a/app/dashboard/frontend/index.html +++ b/app/dashboard/frontend/index.html @@ -9,123 +9,199 @@

Velkommen tilbage, Christian

- - +
+ + +
+
+ + +
+
-

Aktive Kunder

+

Kunder

+ +
+

-

+ Aktive i systemet +
+
+
+
+
+

Kontakter

-

124

- 12% denne måned +

-

+ Tilknyttede personer
-

Hardware

- +

Leverandører

+
-

856

- Enheder online +

-

+ Aktive leverandøraftaler
-

Support

- +

System Status

+
-

12

- 3 kræver handling -
-
-
-
-
-

Omsætning

- -
-

450k

- Over budget +

Online

+ v1.0.0
+
-
-
Seneste Aktiviteter
+
+
+
Seneste Tilføjelser
+ Se alle +
- - - - + + + + - + - - - - - - - - - - - - - - - - +
KundeHandlingStatusTidNavnTypeOprettetHandling
Advokatgruppen A/SFirewall konfigurationFuldført10:23
Byg & Bo ApSLicens fornyelseAfventerI går
Cafe MøllerNetværksnedbrudKritiskI går + +
-
-
-
System Status
- -
-
- CPU LOAD - 24% -
-
-
-
-
-
-
- MEMORY - 56% -
-
-
+ +
+
+
Leverandør Fordeling
+
+
+
- -
-
- - Alle systemer kører optimalt. -
+
+ + +
+
Genveje
+
+ +
+ +
+
+
Indstillinger
+ Konfigurer systemet +
+ + +
+ +
+
+
Leverandører
+ Administrer aftaler +
+
-{% endblock %} \ No newline at end of file +{% endblock %} + +{% block extra_js %} + +{% endblock %} diff --git a/app/settings/backend/router.py b/app/settings/backend/router.py new file mode 100644 index 0000000..f5a8361 --- /dev/null +++ b/app/settings/backend/router.py @@ -0,0 +1,239 @@ +""" +Settings and User Management API Router +""" + +from fastapi import APIRouter, HTTPException +from typing import List, Optional, Dict +from pydantic import BaseModel +from app.core.database import execute_query +import logging + +logger = logging.getLogger(__name__) +router = APIRouter() + + +# Pydantic Models +class Setting(BaseModel): + id: int + key: str + value: Optional[str] + category: str + description: Optional[str] + value_type: str + is_public: bool + + +class SettingUpdate(BaseModel): + value: str + + +class User(BaseModel): + id: int + username: str + email: Optional[str] + full_name: Optional[str] + is_active: bool + last_login: Optional[str] + created_at: str + + +class UserCreate(BaseModel): + username: str + email: str + password: str + full_name: Optional[str] = None + + +class UserUpdate(BaseModel): + email: Optional[str] = None + full_name: Optional[str] = None + is_active: Optional[bool] = None + + +# Settings Endpoints +@router.get("/settings", response_model=List[Setting], tags=["Settings"]) +async def get_settings(category: Optional[str] = None): + """Get all settings or filter by category""" + query = "SELECT * FROM settings" + params = [] + + if category: + query += " WHERE category = %s" + params.append(category) + + query += " ORDER BY category, key" + result = execute_query(query, tuple(params) if params else None) + return result or [] + + +@router.get("/settings/{key}", response_model=Setting, tags=["Settings"]) +async def get_setting(key: str): + """Get a specific setting by key""" + query = "SELECT * FROM settings WHERE key = %s" + result = execute_query(query, (key,)) + + if not result: + raise HTTPException(status_code=404, detail="Setting not found") + + return result[0] + + +@router.put("/settings/{key}", response_model=Setting, tags=["Settings"]) +async def update_setting(key: str, setting: SettingUpdate): + """Update a setting value""" + query = """ + UPDATE settings + SET value = %s, updated_at = CURRENT_TIMESTAMP + WHERE key = %s + RETURNING * + """ + result = execute_query(query, (setting.value, key)) + + if not result: + raise HTTPException(status_code=404, detail="Setting not found") + + logger.info(f"✅ Updated setting: {key}") + return result[0] + + +@router.get("/settings/categories/list", tags=["Settings"]) +async def get_setting_categories(): + """Get list of all setting categories""" + query = "SELECT DISTINCT category FROM settings ORDER BY category" + result = execute_query(query) + return [row['category'] for row in result] if result else [] + + +# User Management Endpoints +@router.get("/users", response_model=List[User], tags=["Users"]) +async def get_users(is_active: Optional[bool] = None): + """Get all users""" + query = "SELECT user_id as id, username, email, full_name, is_active, last_login, created_at FROM users" + params = [] + + if is_active is not None: + query += " WHERE is_active = %s" + params.append(is_active) + + query += " ORDER BY username" + result = execute_query(query, tuple(params) if params else None) + return result or [] + + +@router.get("/users/{user_id}", response_model=User, tags=["Users"]) +async def get_user(user_id: int): + """Get user by ID""" + query = "SELECT user_id as id, username, email, full_name, is_active, last_login, created_at FROM users WHERE user_id = %s" + result = execute_query(query, (user_id,)) + + if not result: + raise HTTPException(status_code=404, detail="User not found") + + return result[0] + + +@router.post("/users", response_model=User, tags=["Users"]) +async def create_user(user: UserCreate): + """Create a new user""" + # Check if username exists + existing = execute_query("SELECT user_id FROM users WHERE username = %s", (user.username,)) + if existing: + raise HTTPException(status_code=400, detail="Username already exists") + + # Hash password (simple SHA256 for now - should use bcrypt in production) + import hashlib + password_hash = hashlib.sha256(user.password.encode()).hexdigest() + + query = """ + INSERT INTO users (username, email, password_hash, full_name, is_active) + VALUES (%s, %s, %s, %s, true) + RETURNING user_id as id, username, email, full_name, is_active, last_login, created_at + """ + result = execute_query(query, (user.username, user.email, password_hash, user.full_name)) + + if not result: + raise HTTPException(status_code=500, detail="Failed to create user") + + logger.info(f"✅ Created user: {user.username}") + return result[0] + + +@router.put("/users/{user_id}", response_model=User, tags=["Users"]) +async def update_user(user_id: int, user: UserUpdate): + """Update user details""" + # Check if user exists + existing = execute_query("SELECT user_id FROM users WHERE user_id = %s", (user_id,)) + if not existing: + raise HTTPException(status_code=404, detail="User not found") + + # Build update query + update_fields = [] + params = [] + + if user.email is not None: + update_fields.append("email = %s") + params.append(user.email) + if user.full_name is not None: + update_fields.append("full_name = %s") + params.append(user.full_name) + if user.is_active is not None: + update_fields.append("is_active = %s") + params.append(user.is_active) + + if not update_fields: + raise HTTPException(status_code=400, detail="No fields to update") + + params.append(user_id) + query = f""" + UPDATE users + SET {', '.join(update_fields)}, updated_at = CURRENT_TIMESTAMP + WHERE user_id = %s + RETURNING user_id as id, username, email, full_name, is_active, last_login, created_at + """ + + result = execute_query(query, tuple(params)) + + if not result: + raise HTTPException(status_code=500, detail="Failed to update user") + + logger.info(f"✅ Updated user: {user_id}") + return result[0] + + +@router.delete("/users/{user_id}", tags=["Users"]) +async def deactivate_user(user_id: int): + """Deactivate a user (soft delete)""" + query = """ + UPDATE users + SET is_active = false, updated_at = CURRENT_TIMESTAMP + WHERE user_id = %s + RETURNING user_id as id + """ + result = execute_query(query, (user_id,)) + + if not result: + raise HTTPException(status_code=404, detail="User not found") + + logger.info(f"✅ Deactivated user: {user_id}") + return {"message": "User deactivated successfully"} + + +@router.post("/users/{user_id}/reset-password", tags=["Users"]) +async def reset_user_password(user_id: int, new_password: str): + """Reset user password""" + import hashlib + password_hash = hashlib.sha256(new_password.encode()).hexdigest() + + query = """ + UPDATE users + SET password_hash = %s, updated_at = CURRENT_TIMESTAMP + WHERE user_id = %s + RETURNING user_id as id + """ + result = execute_query(query, (password_hash, user_id)) + + if not result: + raise HTTPException(status_code=404, detail="User not found") + + logger.info(f"✅ Reset password for user: {user_id}") + return {"message": "Password reset successfully"} diff --git a/app/settings/backend/views.py b/app/settings/backend/views.py new file mode 100644 index 0000000..a8f396b --- /dev/null +++ b/app/settings/backend/views.py @@ -0,0 +1,19 @@ +""" +Settings Frontend Views +""" + +from fastapi import APIRouter, Request +from fastapi.responses import HTMLResponse +from fastapi.templating import Jinja2Templates + +router = APIRouter() +templates = Jinja2Templates(directory="app") + + +@router.get("/settings", response_class=HTMLResponse, tags=["Frontend"]) +async def settings_page(request: Request): + """Render settings page""" + return templates.TemplateResponse("settings/frontend/settings.html", { + "request": request, + "title": "Indstillinger" + }) diff --git a/app/settings/frontend/settings.html b/app/settings/frontend/settings.html new file mode 100644 index 0000000..e2b5a83 --- /dev/null +++ b/app/settings/frontend/settings.html @@ -0,0 +1,508 @@ +{% extends "shared/frontend/base.html" %} + +{% block title %}Indstillinger - BMC Hub{% endblock %} + +{% block extra_css %} + +{% endblock %} + +{% block content %} +
+
+

Indstillinger

+

System konfiguration og brugerstyring

+
+
+ +
+ +
+
+ +
+
+ + +
+
+ +
+
+
Firma Oplysninger
+
+
+ +
+
+
+
+ + +
+
+
vTiger CRM
+
+
+ +
+
+
+ +
+
e-conomic
+
+
+ +
+
+
+
+ + +
+
+
Notifikation Indstillinger
+
+
+ +
+
+
+
+ + +
+
+
+
Brugerstyring
+ +
+
+ + + + + + + + + + + + + + + + +
BrugerEmailStatusSidst LoginOprettetHandlinger
+ +
+
+
+
+ + +
+
+
System Indstillinger
+
+
+ +
+
+
+
+
+
+
+ + + + +{% endblock %} + +{% block extra_js %} + +{% endblock %} diff --git a/app/shared/frontend/base.html b/app/shared/frontend/base.html index a5f8ca3..37dc81d 100644 --- a/app/shared/frontend/base.html +++ b/app/shared/frontend/base.html @@ -170,7 +170,7 @@
  • Kunder
  • Kontakter
    • -
  • Leverandører
    • +
  • Leverandører
  • Leads
  • Rapporter
    • @@ -224,7 +224,7 @@ diff --git a/app/vendors/backend/router.py b/app/vendors/backend/router.py new file mode 100644 index 0000000..e08b4ab --- /dev/null +++ b/app/vendors/backend/router.py @@ -0,0 +1,174 @@ +""" +Vendors API Router +Endpoints for managing suppliers and vendors +""" + +from fastapi import APIRouter, HTTPException, Query +from typing import List, Optional +from app.models.schemas import Vendor, VendorCreate, VendorUpdate +from app.core.database import execute_query +import logging + +logger = logging.getLogger(__name__) +router = APIRouter() + + +@router.get("/vendors", response_model=List[Vendor], tags=["Vendors"]) +async def list_vendors( + search: Optional[str] = Query(None, description="Search by name, CVR, or domain"), + category: Optional[str] = Query(None, description="Filter by category"), + is_active: Optional[bool] = Query(None, description="Filter by active status"), + skip: int = Query(0, ge=0), + limit: int = Query(50, ge=1, le=100) +): + """Get list of vendors with optional filtering""" + query = "SELECT * FROM vendors WHERE 1=1" + params = [] + + if search: + query += " AND (name ILIKE %s OR cvr_number ILIKE %s OR domain ILIKE %s)" + search_param = f"%{search}%" + params.extend([search_param, search_param, search_param]) + + if category: + query += " AND category = %s" + params.append(category) + + if is_active is not None: + query += " AND is_active = %s" + params.append(is_active) + + query += " ORDER BY name LIMIT %s OFFSET %s" + params.extend([limit, skip]) + + result = execute_query(query, tuple(params)) + return result or [] + + +@router.get("/vendors/{vendor_id}", response_model=Vendor, tags=["Vendors"]) +async def get_vendor(vendor_id: int): + """Get vendor by ID""" + query = "SELECT * FROM vendors WHERE id = %s" + result = execute_query(query, (vendor_id,)) + + if not result or len(result) == 0: + raise HTTPException(status_code=404, detail="Vendor not found") + + return result[0] + + +@router.post("/vendors", response_model=Vendor, tags=["Vendors"]) +async def create_vendor(vendor: VendorCreate): + """Create a new vendor""" + try: + query = """ + INSERT INTO vendors ( + name, cvr_number, email, phone, address, postal_code, city, + website, domain, email_pattern, category, priority, notes, is_active + ) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) + RETURNING * + """ + params = ( + vendor.name, vendor.cvr_number, vendor.email, vendor.phone, + vendor.address, vendor.postal_code, vendor.city, vendor.website, + vendor.domain, vendor.email_pattern, vendor.category, vendor.priority, + vendor.notes, vendor.is_active + ) + + result = execute_query(query, params) + if not result or len(result) == 0: + raise HTTPException(status_code=500, detail="Failed to create vendor") + + logger.info(f"✅ Created vendor: {vendor.name}") + return result[0] + + except Exception as e: + logger.error(f"❌ Error creating vendor: {e}") + raise HTTPException(status_code=500, detail=str(e)) + + +@router.put("/vendors/{vendor_id}", response_model=Vendor, tags=["Vendors"]) +async def update_vendor(vendor_id: int, vendor: VendorUpdate): + """Update an existing vendor""" + # Check if vendor exists + existing = execute_query("SELECT id FROM vendors WHERE id = %s", (vendor_id,)) + if not existing: + raise HTTPException(status_code=404, detail="Vendor not found") + + # Build update query + update_fields = [] + params = [] + + if vendor.name is not None: + update_fields.append("name = %s") + params.append(vendor.name) + if vendor.cvr_number is not None: + update_fields.append("cvr_number = %s") + params.append(vendor.cvr_number) + if vendor.email is not None: + update_fields.append("email = %s") + params.append(vendor.email) + if vendor.phone is not None: + update_fields.append("phone = %s") + params.append(vendor.phone) + if vendor.address is not None: + update_fields.append("address = %s") + params.append(vendor.address) + if vendor.postal_code is not None: + update_fields.append("postal_code = %s") + params.append(vendor.postal_code) + if vendor.city is not None: + update_fields.append("city = %s") + params.append(vendor.city) + if vendor.website is not None: + update_fields.append("website = %s") + params.append(vendor.website) + if vendor.domain is not None: + update_fields.append("domain = %s") + params.append(vendor.domain) + if vendor.email_pattern is not None: + update_fields.append("email_pattern = %s") + params.append(vendor.email_pattern) + if vendor.category is not None: + update_fields.append("category = %s") + params.append(vendor.category) + if vendor.priority is not None: + update_fields.append("priority = %s") + params.append(vendor.priority) + if vendor.notes is not None: + update_fields.append("notes = %s") + params.append(vendor.notes) + if vendor.is_active is not None: + update_fields.append("is_active = %s") + params.append(vendor.is_active) + + if not update_fields: + raise HTTPException(status_code=400, detail="No fields to update") + + params.append(vendor_id) + query = f"UPDATE vendors SET {', '.join(update_fields)} WHERE id = %s RETURNING *" + + try: + result = execute_query(query, tuple(params)) + if not result: + raise HTTPException(status_code=500, detail="Failed to update vendor") + + logger.info(f"✅ Updated vendor: {vendor_id}") + return result[0] + + except Exception as e: + logger.error(f"❌ Error updating vendor: {e}") + raise HTTPException(status_code=500, detail=str(e)) + + +@router.delete("/vendors/{vendor_id}", tags=["Vendors"]) +async def delete_vendor(vendor_id: int): + """Soft delete a vendor (set is_active = false)""" + query = "UPDATE vendors SET is_active = false WHERE id = %s RETURNING id" + result = execute_query(query, (vendor_id,)) + + if not result: + raise HTTPException(status_code=404, detail="Vendor not found") + + logger.info(f"✅ Deleted vendor: {vendor_id}") + return {"message": "Vendor deleted successfully"} diff --git a/app/vendors/backend/views.py b/app/vendors/backend/views.py new file mode 100644 index 0000000..8cabce8 --- /dev/null +++ b/app/vendors/backend/views.py @@ -0,0 +1,33 @@ +""" +Vendors Frontend Views +Renders vendor list and detail pages +""" + +from fastapi import APIRouter, Request +from fastapi.responses import HTMLResponse +from fastapi.templating import Jinja2Templates +import logging + +logger = logging.getLogger(__name__) +router = APIRouter() + +templates = Jinja2Templates(directory="app") + + +@router.get("/vendors", response_class=HTMLResponse, tags=["Frontend"]) +async def vendors_page(request: Request): + """Render vendors list page""" + return templates.TemplateResponse("vendors/frontend/vendors.html", { + "request": request, + "title": "Leverandører" + }) + + +@router.get("/vendors/{vendor_id}", response_class=HTMLResponse, tags=["Frontend"]) +async def vendor_detail_page(request: Request, vendor_id: int): + """Render vendor detail page""" + return templates.TemplateResponse("vendors/frontend/vendor_detail.html", { + "request": request, + "vendor_id": vendor_id, + "title": "Leverandør Detaljer" + }) diff --git a/app/vendors/frontend/vendor_detail.html b/app/vendors/frontend/vendor_detail.html new file mode 100644 index 0000000..a5d19d0 --- /dev/null +++ b/app/vendors/frontend/vendor_detail.html @@ -0,0 +1,422 @@ +{% extends "shared/frontend/base.html" %} + +{% block title %}Leverandør Detaljer - BMC Hub{% endblock %} + +{% block extra_css %} + +{% endblock %} + +{% block content %} + +
    +
    +
    +
    +
    +
    +
    +
    +

    Loading...

    + +
    +
    + + +
    +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + + +
    +
    + +
    +
    + +
    +
    +
    Leverandør Information
    +
    +
    + +
    +
    +
    +
    + + +
    +
    +
    Kontakt Information
    +
    +
    + +
    +
    +
    + +
    +
    System Information
    +
    +
    + +
    +
    +
    +
    +
    +
    + + +
    +
    +
    Produkter fra denne leverandør
    +

    Produkt tracking kommer snart...

    +
    +
    + + +
    +
    +
    Leverandør Fakturaer
    +

    Faktura oversigt kommer snart...

    +
    +
    + + +
    +
    +
    Aktivitetslog
    +

    Aktivitetshistorik kommer snart...

    +
    +
    +
    +
    +
    +
    + +{% endblock %} + +{% block extra_js %} + +{% endblock %} diff --git a/app/vendors/frontend/vendors.html b/app/vendors/frontend/vendors.html new file mode 100644 index 0000000..3c7e4c6 --- /dev/null +++ b/app/vendors/frontend/vendors.html @@ -0,0 +1,423 @@ +{% extends "shared/frontend/base.html" %} + +{% block title %}Leverandører - BMC Hub{% endblock %} + +{% block extra_css %} + +{% endblock %} + +{% block content %} +
    +
    +

    Leverandører

    +

    Administrer dine leverandører og partnere

    +
    +
    + + +
    +
    + +
    + + + + + +
    + +
    +
    + + + + + + + + + + + + + + + + + +
    LeverandørKontakt InfoCVRKategoriPrioritetStatusHandlinger
    + +
    +
    + + +
    +
    + Viser 0-0 af 0 leverandører +
    +
    + + +
    +
    +
    + + + + +{% endblock %} + +{% block extra_js %} + +{% endblock %} diff --git a/main.py b/main.py index f63ce7f..1e63994 100644 --- a/main.py +++ b/main.py @@ -20,10 +20,15 @@ from app.customers.backend import router as customers_api from app.customers.backend import views as customers_views from app.contacts.backend import router as contacts_api from app.contacts.backend import views as contacts_views +from app.vendors.backend import router as vendors_api +from app.vendors.backend import views as vendors_views +from app.settings.backend import router as settings_api +from app.settings.backend import views as settings_views from app.hardware.backend import router as hardware_api from app.billing.backend import router as billing_api from app.system.backend import router as system_api from app.dashboard.backend import views as dashboard_views +from app.dashboard.backend import router as dashboard_api # Configure logging logging.basicConfig( @@ -83,15 +88,20 @@ app.add_middleware( app.include_router(auth_api.router, prefix="/api/v1/auth", tags=["Authentication"]) app.include_router(customers_api.router, prefix="/api/v1", tags=["Customers"]) app.include_router(contacts_api.router, prefix="/api/v1", tags=["Contacts"]) +app.include_router(vendors_api.router, prefix="/api/v1", tags=["Vendors"]) +app.include_router(settings_api.router, prefix="/api/v1", tags=["Settings"]) app.include_router(hardware_api.router, prefix="/api/v1", tags=["Hardware"]) app.include_router(billing_api.router, prefix="/api/v1", tags=["Billing"]) app.include_router(system_api.router, prefix="/api/v1", tags=["System"]) +app.include_router(dashboard_api.router, prefix="/api/v1/dashboard", tags=["Dashboard"]) # Frontend Routers app.include_router(auth_views.router, tags=["Frontend"]) app.include_router(dashboard_views.router, tags=["Frontend"]) app.include_router(customers_views.router, tags=["Frontend"]) app.include_router(contacts_views.router, tags=["Frontend"]) +app.include_router(vendors_views.router, tags=["Frontend"]) +app.include_router(settings_views.router, tags=["Frontend"]) # Serve static files (UI) app.mount("/static", StaticFiles(directory="static", html=True), name="static") diff --git a/migrations/006_settings.sql b/migrations/006_settings.sql new file mode 100644 index 0000000..5a8b894 --- /dev/null +++ b/migrations/006_settings.sql @@ -0,0 +1,75 @@ +-- Migration: Settings and User Management +-- Add settings table and extend users table + +-- Settings table for system configuration +CREATE TABLE IF NOT EXISTS settings ( + id SERIAL PRIMARY KEY, + key VARCHAR(255) UNIQUE NOT NULL, + value TEXT, + category VARCHAR(100) DEFAULT 'general', + description TEXT, + value_type VARCHAR(50) DEFAULT 'string', -- string, boolean, integer, json + is_public BOOLEAN DEFAULT false, -- Can be read by non-admin users + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_by_user_id INTEGER +); + +-- Default settings +INSERT INTO settings (key, value, category, description, value_type, is_public) VALUES + ('company_name', 'BMC Networks', 'company', 'Firmanavn', 'string', true), + ('company_cvr', '', 'company', 'CVR-nummer', 'string', false), + ('company_email', 'info@bmcnetworks.dk', 'company', 'Firma email', 'string', true), + ('company_phone', '', 'company', 'Firma telefon', 'string', true), + ('company_address', '', 'company', 'Firma adresse', 'string', false), + ('vtiger_enabled', 'false', 'integrations', 'vTiger integration aktiv', 'boolean', false), + ('vtiger_url', '', 'integrations', 'vTiger URL', 'string', false), + ('vtiger_username', '', 'integrations', 'vTiger brugernavn', 'string', false), + ('economic_enabled', 'false', 'integrations', 'e-conomic integration aktiv', 'boolean', false), + ('economic_app_secret', '', 'integrations', 'e-conomic App Secret Token', 'string', false), + ('economic_agreement_token', '', 'integrations', 'e-conomic Agreement Grant Token', 'string', false), + ('email_notifications', 'true', 'notifications', 'Email notifikationer', 'boolean', true), + ('system_timezone', 'Europe/Copenhagen', 'system', 'Tidszone', 'string', true) +ON CONFLICT (key) DO NOTHING; + +-- Extend users table with more fields (if not already added by auth migration) +DO $$ +BEGIN + IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='users' AND column_name='is_active') THEN + ALTER TABLE users ADD COLUMN is_active BOOLEAN DEFAULT true; + END IF; + + IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='users' AND column_name='last_login') THEN + ALTER TABLE users ADD COLUMN last_login TIMESTAMP; + END IF; + + IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='users' AND column_name='created_at') THEN + ALTER TABLE users ADD COLUMN created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP; + END IF; + + IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='users' AND column_name='updated_at') THEN + ALTER TABLE users ADD COLUMN updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP; + END IF; +END $$; + +-- Indexes +CREATE INDEX IF NOT EXISTS idx_settings_category ON settings(category); +CREATE INDEX IF NOT EXISTS idx_settings_key ON settings(key); + +-- Updated timestamp trigger for settings +CREATE OR REPLACE FUNCTION update_settings_updated_at() +RETURNS TRIGGER AS $$ +BEGIN + NEW.updated_at = CURRENT_TIMESTAMP; + RETURN NEW; +END; +$$ LANGUAGE plpgsql; + +CREATE TRIGGER settings_updated_at_trigger + BEFORE UPDATE ON settings + FOR EACH ROW + EXECUTE FUNCTION update_settings_updated_at(); + +COMMENT ON TABLE settings IS 'System configuration and settings'; +COMMENT ON COLUMN settings.value_type IS 'Data type: string, boolean, integer, json'; +COMMENT ON COLUMN settings.is_public IS 'Whether non-admin users can read this setting'; diff --git a/scripts/import_vendors_from_omnisync.py b/scripts/import_vendors_from_omnisync.py new file mode 100644 index 0000000..edf90c0 --- /dev/null +++ b/scripts/import_vendors_from_omnisync.py @@ -0,0 +1,113 @@ +""" +Import vendors from OmniSync database +""" + +import psycopg2 +from psycopg2.extras import RealDictCursor +import sqlite3 +import os +import logging + +logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s') +logger = logging.getLogger(__name__) + +OMNISYNC_DB = '/omnisync_data/fakturering.db' + + +def get_postgres_connection(): + """Get PostgreSQL connection""" + database_url = os.getenv('DATABASE_URL', 'postgresql://bmc_hub:bmc_hub@postgres:5432/bmc_hub') + return psycopg2.connect(database_url, cursor_factory=RealDictCursor) + + +def get_sqlite_connection(): + """Get SQLite connection to OmniSync database""" + return sqlite3.connect(OMNISYNC_DB) + + +def import_vendors(): + """Import vendors from OmniSync""" + sqlite_conn = get_sqlite_connection() + sqlite_cursor = sqlite_conn.cursor() + + imported = 0 + skipped = 0 + errors = [] + + try: + # Get vendors from OmniSync + sqlite_cursor.execute(""" + SELECT + name, domain, email_pattern, category, priority, notes, created_at + FROM vendors + WHERE deleted_at IS NULL + ORDER BY name + """) + + vendors = sqlite_cursor.fetchall() + logger.info(f"📥 Found {len(vendors)} active vendors in OmniSync") + + for row in vendors: + name, domain, email_pattern, category, priority, notes, created_at = row + + # Skip if no name + if not name or name.strip() == '': + skipped += 1 + continue + + # Individual connection per vendor + postgres_conn = get_postgres_connection() + postgres_cursor = postgres_conn.cursor() + + try: + postgres_cursor.execute(""" + INSERT INTO vendors ( + name, domain, email_pattern, category, priority, notes, is_active, created_at + ) VALUES (%s, %s, %s, %s, %s, %s, %s, %s) + ON CONFLICT (cvr_number) DO NOTHING + RETURNING id + """, ( + name, domain, email_pattern, category or 'general', + priority or 50, notes, True, created_at + )) + + result = postgres_cursor.fetchone() + postgres_conn.commit() + + if result: + imported += 1 + if imported % 10 == 0: + logger.info(f" Imported {imported} vendors...") + + except Exception as e: + error_msg = str(e)[:100] + if imported + skipped < 10: + logger.warning(f" ⚠️ Could not import '{name}': {error_msg}") + errors.append((name, error_msg)) + skipped += 1 + finally: + postgres_cursor.close() + postgres_conn.close() + + logger.info(f"✅ Vendors: {imported} imported, {skipped} skipped") + if len(errors) > 10: + logger.info(f" (Suppressed {len(errors)-10} error messages)") + + return imported + + except Exception as e: + logger.error(f"❌ Vendor import failed: {e}") + raise + finally: + sqlite_cursor.close() + sqlite_conn.close() + + +if __name__ == "__main__": + logger.info("🚀 Starting vendor import from OmniSync...") + logger.info(f"📂 Source: {OMNISYNC_DB}") + + vendor_count = import_vendors() + + logger.info(f"\n🎉 Import completed!") + logger.info(f" Vendors: {vendor_count}")