diff --git a/SERVICE_CONTRACT_WIZARD_README.md b/SERVICE_CONTRACT_WIZARD_README.md new file mode 100644 index 0000000..f403036 --- /dev/null +++ b/SERVICE_CONTRACT_WIZARD_README.md @@ -0,0 +1,201 @@ +# Service Contract Migration Wizard - Implementation Summary + +## ✅ What Was Built + +A step-by-step wizard that migrates Vtiger service contracts to Hub systems: +- **Cases** → Archived to `tticket_archived_tickets` +- **Timelogs** → Transferred as klippekort top-ups (prepaid card hours) + +Features: +- ✅ Dry-run toggle (preview mode without database writes) +- ✅ Step-by-step review of each case/timelog +- ✅ Manual klippekort selection per timelog +- ✅ Progress tracking and summary report +- ✅ Read-only from Vtiger (no writes back to Vtiger) + +## 🎯 Files Created/Modified + +### New Files: +1. **[app/timetracking/backend/service_contract_wizard.py](app/timetracking/backend/service_contract_wizard.py)** (275 lines) + - Core wizard service with all business logic + - Methods: `load_contract_detailed_data()`, `archive_case()`, `transfer_timelog_to_klippekort()`, `get_wizard_summary()` + - Dry-run support built into each method + +2. **[app/timetracking/frontend/service_contract_wizard.html](app/timetracking/frontend/service_contract_wizard.html)** (650 lines) + - Complete wizard UI with Nordic design + - Contract dropdown selector + - Progress bar with live counters + - Current item display with conditional klippekort dropdown + - Summary report on completion + +### Modified Files: +1. **[app/services/vtiger_service.py](app/services/vtiger_service.py)** (+65 lines) + - Added `get_service_contracts(account_id=None)` - Fetch active service contracts + - Added `get_service_contract_cases(contract_id)` - Fetch cases linked to contract + - Added `get_service_contract_timelogs(contract_id)` - Fetch timelogs linked to contract + +2. **[app/timetracking/backend/models.py](app/timetracking/backend/models.py)** (+70 lines) + - `ServiceContractBase` - Base contract model + - `ServiceContractItem` - Single case/timelog item + - `ServiceContractWizardData` - Complete contract data for wizard + - `ServiceContractWizardAction` - Action result (archive/transfer) + - `ServiceContractWizardSummary` - Final summary + - `TimologTransferRequest` - Request model for timelog transfer + - `TimologTransferResult` - Transfer result + +3. **[app/timetracking/backend/router.py](app/timetracking/backend/router.py)** (+180 lines) + - `GET /api/v1/timetracking/service-contracts` - List contracts dropdown + - `POST /api/v1/timetracking/service-contracts/wizard/load` - Load contract data + - `POST /api/v1/timetracking/service-contracts/wizard/archive-case` - Archive case + - `POST /api/v1/timetracking/service-contracts/wizard/transfer-timelog` - Transfer timelog + - `GET /api/v1/timetracking/service-contracts/wizard/customer-cards/{customer_id}` - Get klippekort + +4. **[app/timetracking/frontend/views.py](app/timetracking/frontend/views.py)** (+5 lines) + - Added frontend route: `/timetracking/service-contract-wizard` + +## 🚀 How to Test + +### 1. Start the API +```bash +docker-compose up -d api +docker-compose logs -f api +``` + +### 2. Access the Wizard +``` +http://localhost:8000/timetracking/service-contract-wizard +``` + +### 3. Dry-Run Mode (Recommended First) +1. Check the "Preview Mode" checkbox at top (enabled by default) +2. Select a service contract from dropdown +3. Review each case/timelog and click "Gem & Næste" +4. No data is written to database in dry-run mode +5. Review summary report to see what WOULD be changed + +### 4. Live Mode +1. **Uncheck** "Preview Mode" checkbox +2. Select same or different contract +3. Process items - changes ARE committed to database +4. Cases are exported to `tticket_archived_tickets` +5. Timelogs are added to klippekort via top-up transaction + +## 🔍 Database Changes + +### Dryrun Mode: +- All operations are **logged** but **NOT committed** +- Queries are constructed but rolled back +- UI shows what WOULD happen + +### Live Mode: +- Cases are inserted into `tticket_archived_tickets` with: + - `source_system = 'vtiger_service_contract'` + - `external_id = vtiger case ID` + - Full case data in `raw_data` JSONB field + +- Timelogs create transactions in `tticket_prepaid_transactions` with: + - `transaction_type = 'top_up'` + - Hours added to klippekort `purchased_hours` + - Description references vTiger timelog + +## 📊 Data Flow + +``` +Vtiger Service Contract + ↓ +SelectContract (dropdown) + ↓ +LoadContractData + ├─ Cases → Archive to tticket_archived_tickets + └─ Timelogs → Transfer to klippekort (top-up) + ↓ +WizardProgress (step-by-step review) + ├─ [DRY RUN] Preview mode (no DB writes) + └─ [LIVE] Commit to database + ↓ +Summary Report + ├─ Cases archived: N + ├─ Hours transferred: N + └─ Failed items: N +``` + +## 🔐 Safety Features + +1. **Dry-run mode enabled by default** - Users see what WOULD happen first +2. **Customer linking** - Looks up Hub customer ID from vTiger account +3. **Klippekort validation** - Verifies card belongs to customer before transfer +4. **Read-only from Vtiger** - No writes back to Vtiger (only reads) +5. **Transaction handling** - Each operation is atomic +6. **Audit logging** - All actions logged with DRY RUN/COMMITTED markers + +## 🛠️ Technical Details + +### Wizard Service (`ServiceContractWizardService`) +- Stateless service class +- All methods are static +- Database operations via `execute_query()` helpers +- Klippekort transfers via `KlippekortService.top_up_card()` + +### Frontend UI +- Vanilla JavaScript (no frameworks) +- Nordic Top design system (matches existing Hub UI) +- Responsive Bootstrap 5 grid +- Real-time progress updates +- Conditional klippekort dropdown (only for timelogs) + +### API Endpoints +- RESTful architecture +- All endpoints support `dry_run` query parameter +- Request/response models use Pydantic validation +- Comprehensive error handling with HTTPException + +## 📝 Logging Output + +### Dry-Run Mode: +``` +🔍 DRY RUN: Would archive case 1x123: 'Case Title' +🔍 DRY RUN: Would transfer 5h to card 42 from timelog 2x456 +``` + +### Live Mode: +``` +✅ Archived case 1x123 to tticket_archived_tickets (ID: 1234) +✅ Transferred 5h from timelog 2x456 to card 42 +``` + +## 🐛 Troubleshooting + +### Contracts dropdown is empty: +- Verify Vtiger integration is configured (VTIGER_URL, VTIGER_USERNAME, VTIGER_API_KEY in .env) +- Check vTiger has active ServiceContracts +- Check API user has access to ServiceContracts module + +### Klippekort dropdown empty for customer: +- Customer may not have any active prepaid cards +- Or customer is not linked between Vtiger account and Hub customer +- Create a prepaid card for the customer first + +### Dry-run mode not working: +- Ensure checkbox is checked +- Check browser console for JavaScript errors +- Verify `dry_run` parameter is passed to API endpoints + +## 📋 Next Steps + +1. **Test with sample data** - Create test service contract in Vtiger +2. **Verify database changes** - Query `tticket_archived_tickets` post-migration +3. **Monitor klippekort** - Check `tticket_prepaid_transactions` for top-up entries +4. **Adjust as needed** - Tweak timelog filtering or case mapping based on results + +## 🔗 Related Components + +- **Klippekort System**: [app/ticket/backend/klippekort_service.py](app/ticket/backend/klippekort_service.py) +- **Archive System**: Database table `tticket_archived_tickets` +- **Timetracking Module**: [app/timetracking/](app/timetracking/) +- **Vtiger Integration**: [app/services/vtiger_service.py](app/services/vtiger_service.py) + +--- + +**Status**: ✅ Ready for testing and deployment +**Estimated Time to Test**: 15-20 minutes +**Database Dependency**: PostgreSQL (no migrations needed - uses existing tables) diff --git a/app/contacts/frontend/contact_detail.html b/app/contacts/frontend/contact_detail.html index 12b46bf..4613b32 100644 --- a/app/contacts/frontend/contact_detail.html +++ b/app/contacts/frontend/contact_detail.html @@ -98,6 +98,18 @@ box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1); transform: translateY(-2px); } + + .session-card { + background: var(--bg-card); + border: 1px solid rgba(0, 0, 0, 0.1); + border-radius: 12px; + padding: 1rem; + } + + .session-meta { + font-size: 0.9rem; + color: var(--text-secondary); + } .remove-company-btn { position: absolute; @@ -147,6 +159,11 @@ Firmaer +
  • + + Remote Sessions + +
    • @@ -236,6 +253,29 @@ + + +
    +
    +
    Remote Sessions
    +
    + + + + +
    +
    +
    +
    +
    + +
    +
    +
    @@ -354,6 +394,22 @@ + + + {% endblock %} {% block extra_js %} @@ -369,6 +425,13 @@ document.addEventListener('DOMContentLoaded', () => { document.querySelector('a[href="#companies"]').addEventListener('shown.bs.tab', () => { loadCompanies(); }); + + const remoteSessionsTab = document.querySelector('a[href="#remote-sessions"]'); + if (remoteSessionsTab) { + remoteSessionsTab.addEventListener('shown.bs.tab', () => { + loadRemoteSessions(); + }); + } }); async function loadContact() { @@ -415,6 +478,8 @@ function displayContact(contact) { ? 'Aktiv' : 'Inaktiv'; document.getElementById('companyCount').textContent = contact.companies ? contact.companies.length : 0; + + populateSessionCompanySelect(contact); // System Info document.getElementById('vtigerId').textContent = contact.vtiger_id || '-'; @@ -426,6 +491,27 @@ function displayContact(contact) { } } +function populateSessionCompanySelect(contact) { + const select = document.getElementById('sessionCompanySelect'); + if (!select) return; + + const companies = contact.companies || []; + if (companies.length === 0) { + select.innerHTML = ''; + select.disabled = true; + return; + } + + const primary = companies.find(c => c.is_primary) || companies[0]; + select.innerHTML = companies.map(c => { + const label = c.is_primary ? `${c.name} (Primær)` : c.name; + return ``; + }).join(''); + + select.value = String(primary.id); + select.disabled = false; +} + async function loadCompanies() { if (!contactData) return; displayCompanies(contactData.companies); @@ -470,6 +556,164 @@ function displayCompanies(companies) { `).join(''); } +async function loadRemoteSessions() { + const container = document.getElementById('remoteSessionsContainer'); + if (!container) return; + + container.innerHTML = ` +
    + +
    + `; + + try { + const response = await fetch(`/api/v1/anydesk/sessions?contact_id=${contactId}`); + if (!response.ok) { + throw new Error('Kunne ikke hente sessioner'); + } + + const data = await response.json(); + displayRemoteSessions(data.sessions || []); + } catch (error) { + console.error('Failed to load sessions:', error); + container.innerHTML = '
    Kunne ikke hente sessioner
    '; + } +} + +function displayRemoteSessions(sessions) { + const container = document.getElementById('remoteSessionsContainer'); + if (!container) return; + + if (!sessions || sessions.length === 0) { + container.innerHTML = '
    Ingen remote sessions endnu
    '; + return; + } + + container.innerHTML = sessions.map(session => { + const badgeClass = getSessionBadgeClass(session.status); + const duration = session.duration_minutes ? `${session.duration_minutes} min` : '—'; + const startedAt = session.started_at ? new Date(session.started_at).toLocaleString('da-DK') : '-'; + const endedAt = session.ended_at ? new Date(session.ended_at).toLocaleString('da-DK') : '-'; + const linkButton = session.session_link + ? `Åbn Link` + : ''; + const worklogButton = session.status === 'completed' + ? `` + : ''; + + return ` +
    +
    +
    +
    +
    + ${escapeHtml(session.status || 'ukendt')} + Session #${session.id} +
    +
    Start: ${startedAt} | Slut: ${endedAt} | Varighed: ${duration}
    + ${session.sag_id ? `
    Sag ID: ${session.sag_id}
    ` : ''} +
    +
    + ${linkButton} + ${worklogButton} +
    +
    +
    +
    + `; + }).join(''); +} + +async function startRemoteSession() { + const alertBox = document.getElementById('remoteSessionAlert'); + const select = document.getElementById('sessionCompanySelect'); + + if (!contactData || !select || select.disabled) { + alert('Kontakt skal have mindst et firma for at starte en session'); + return; + } + + const customerId = parseInt(select.value); + const sagIdValue = document.getElementById('sessionSagIdInput').value; + const sagId = sagIdValue ? parseInt(sagIdValue) : null; + + try { + const response = await fetch('/api/v1/anydesk/start-session', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + customer_id: customerId, + contact_id: contactId, + sag_id: sagId, + description: `Remote support for ${contactData.first_name} ${contactData.last_name}` + }) + }); + + if (!response.ok) { + const error = await response.json(); + throw new Error(error.detail || 'Kunne ikke starte session'); + } + + const data = await response.json(); + if (alertBox) { + alertBox.classList.remove('d-none'); + alertBox.innerHTML = `Session startet. ${data.session_link ? `Link: ${data.session_link}` : ''}`; + } + + if (data.session_link) { + window.open(data.session_link, '_blank'); + } + + await loadRemoteSessions(); + } catch (error) { + console.error('Failed to start session:', error); + alert('Fejl: ' + error.message); + } +} + +async function showWorklogSuggestion(sessionId) { + try { + const response = await fetch(`/api/v1/anydesk/sessions/${sessionId}/worklog-suggestion`); + if (!response.ok) { + const error = await response.json(); + throw new Error(error.detail || 'Kunne ikke hente forslag'); + } + + const suggestion = await response.json(); + const body = document.getElementById('worklogSuggestionBody'); + if (body) { + body.innerHTML = ` +
    Varighed: ${suggestion.duration_hours} timer
    +
    Start: ${new Date(suggestion.start_time).toLocaleString('da-DK')}
    +
    Slut: ${new Date(suggestion.end_time).toLocaleString('da-DK')}
    +
    Beskrivelse: ${escapeHtml(suggestion.description || '')}
    +
    Forslaget kan bruges til manuel tidsregistrering
    + `; + } + + const modal = new bootstrap.Modal(document.getElementById('worklogSuggestionModal')); + modal.show(); + } catch (error) { + console.error('Failed to load suggestion:', error); + alert('Fejl: ' + error.message); + } +} + +function getSessionBadgeClass(status) { + switch ((status || '').toLowerCase()) { + case 'active': + return 'bg-success'; + case 'completed': + return 'bg-primary'; + case 'failed': + return 'bg-danger'; + case 'cancelled': + return 'bg-secondary'; + default: + return 'bg-light text-dark'; + } +} + async function loadCompaniesForSelect() { try { const response = await fetch('/api/v1/customers?limit=1000'); diff --git a/app/core/config.py b/app/core/config.py index 2fa4171..266d6d5 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -68,6 +68,13 @@ class Settings(BaseSettings): NEXTCLOUD_TIMEOUT_SECONDS: int = 15 NEXTCLOUD_CACHE_TTL_SECONDS: int = 300 NEXTCLOUD_ENCRYPTION_KEY: str = "" + + # Wiki.js Integration + WIKI_BASE_URL: str = "https://wiki.bmcnetworks.dk" + WIKI_API_TOKEN: str = "" + WIKI_API_KEY: str = "" + WIKI_TIMEOUT_SECONDS: int = 12 + WIKI_READ_ONLY: bool = True # Ollama LLM OLLAMA_ENDPOINT: str = "http://localhost:11434" @@ -197,6 +204,21 @@ class Settings(BaseSettings): REMINDERS_MAX_PER_USER_PER_HOUR: int = 5 REMINDERS_QUEUE_BATCH_SIZE: int = 10 + # AnyDesk Remote Support Integration + ANYDESK_LICENSE_ID: str = "" + ANYDESK_API_TOKEN: str = "" + ANYDESK_PASSWORD: str = "" + ANYDESK_READ_ONLY: bool = True # SAFETY: Prevent API calls if true + ANYDESK_DRY_RUN: bool = True # SAFETY: Log without executing API calls + ANYDESK_TIMEOUT_SECONDS: int = 30 + ANYDESK_AUTO_START_SESSION: bool = True # Auto-start session when requested + + # SMS Integration (CPSMS) + SMS_API_KEY: str = "" + SMS_USERNAME: str = "" + SMS_SENDER: str = "BMC Networks" + SMS_WEBHOOK_SECRET: str = "" + # Dev-only shortcuts DEV_ALLOW_ARCHIVED_IMPORT: bool = False diff --git a/app/customers/backend/router.py b/app/customers/backend/router.py index 424ec31..ea85e38 100644 --- a/app/customers/backend/router.py +++ b/app/customers/backend/router.py @@ -34,6 +34,7 @@ class CustomerBase(BaseModel): postal_code: Optional[str] = None country: Optional[str] = "DK" website: Optional[str] = None + wiki_slug: Optional[str] = None is_active: Optional[bool] = True invoice_email: Optional[str] = None mobile_phone: Optional[str] = None @@ -53,6 +54,7 @@ class CustomerUpdate(BaseModel): postal_code: Optional[str] = None country: Optional[str] = None website: Optional[str] = None + wiki_slug: Optional[str] = None is_active: Optional[bool] = None invoice_email: Optional[str] = None mobile_phone: Optional[str] = None diff --git a/app/customers/frontend/customer_detail.html b/app/customers/frontend/customer_detail.html index 60d31c8..f5da03c 100644 --- a/app/customers/frontend/customer_detail.html +++ b/app/customers/frontend/customer_detail.html @@ -97,6 +97,18 @@ box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1); transform: translateY(-2px); } + + .session-card { + background: var(--bg-card); + border: 1px solid rgba(0, 0, 0, 0.1); + border-radius: 12px; + padding: 1rem; + } + + .session-meta { + font-size: 0.9rem; + color: var(--text-secondary); + } .activity-item { padding: 1.5rem; @@ -326,6 +338,11 @@ Nextcloud +
  • + + Remote Sessions + +
  • Aktivitet @@ -372,6 +389,10 @@ Hjemmeside - +
    + Kunde Wiki + - +
    @@ -704,6 +725,28 @@ {% include "modules/nextcloud/templates/tab.html" %} + +
    +
    +
    Remote Sessions
    +
    + + + +
    +
    +
    +
    +
    + +
    +
    +
    +
    Aktivitet
    @@ -795,6 +838,12 @@
    + +
    + + +
    Bygger https://wiki.bmcnetworks.dk/en/Kunder/{slug}
    +
    @@ -1098,6 +1147,22 @@
    + + + {% endblock %} {% block extra_js %} @@ -1181,6 +1246,14 @@ document.addEventListener('DOMContentLoaded', () => { loadNextcloudStatus(); }, { once: false }); } + + // Load remote sessions when tab is shown + const remoteSessionsTab = document.querySelector('a[href="#remote-sessions"]'); + if (remoteSessionsTab) { + remoteSessionsTab.addEventListener('shown.bs.tab', () => { + loadCustomerSessions(); + }, { once: false }); + } eventListenersAdded = true; }); @@ -1265,6 +1338,18 @@ function displayCustomer(customer) { document.getElementById('email').textContent = customer.email || '-'; document.getElementById('phone').textContent = customer.phone || '-'; document.getElementById('website').textContent = customer.website || '-'; + + const wikiEl = document.getElementById('wikiLink'); + if (wikiEl) { + const slug = (customer.wiki_slug || '').trim(); + if (slug) { + const encoded = encodeURIComponent(slug); + const url = `https://wiki.bmcnetworks.dk/en/Kunder/${encoded}/`; + wikiEl.innerHTML = `    /en/Kunder/${escapeHtml(slug)}`; + } else { + wikiEl.textContent = '-'; + } + } // Economic Information document.getElementById('economicNumber').textContent = customer.economic_customer_number || '-'; @@ -3131,6 +3216,7 @@ function editCustomer() { document.getElementById('editPhone').value = customerData.phone || ''; document.getElementById('editMobilePhone').value = customerData.mobile_phone || ''; document.getElementById('editWebsite').value = customerData.website || ''; + document.getElementById('editWikiSlug').value = customerData.wiki_slug || ''; document.getElementById('editCountry').value = customerData.country || 'DK'; document.getElementById('editAddress').value = customerData.address || ''; document.getElementById('editPostalCode').value = customerData.postal_code || ''; @@ -3151,6 +3237,7 @@ async function saveCustomerEdit() { phone: document.getElementById('editPhone').value || null, mobile_phone: document.getElementById('editMobilePhone').value || null, website: document.getElementById('editWebsite').value || null, + wiki_slug: document.getElementById('editWikiSlug').value || null, country: document.getElementById('editCountry').value || 'DK', address: document.getElementById('editAddress').value || null, postal_code: document.getElementById('editPostalCode').value || null, @@ -3500,6 +3587,154 @@ async function saveSubscription() { } } +async function loadCustomerSessions() { + const container = document.getElementById('customerSessionsContainer'); + if (!container) return; + + container.innerHTML = ` +
    + +
    + `; + + try { + const response = await fetch(`/api/v1/anydesk/sessions?customer_id=${customerId}`); + if (!response.ok) { + throw new Error('Kunne ikke hente sessioner'); + } + + const data = await response.json(); + displayCustomerSessions(data.sessions || []); + } catch (error) { + console.error('Failed to load sessions:', error); + container.innerHTML = '
    Kunne ikke hente sessioner
    '; + } +} + +function displayCustomerSessions(sessions) { + const container = document.getElementById('customerSessionsContainer'); + if (!container) return; + + if (!sessions || sessions.length === 0) { + container.innerHTML = '
    Ingen remote sessions endnu
    '; + return; + } + + container.innerHTML = sessions.map(session => { + const badgeClass = getSessionBadgeClass(session.status); + const duration = session.duration_minutes ? `${session.duration_minutes} min` : '—'; + const startedAt = session.started_at ? new Date(session.started_at).toLocaleString('da-DK') : '-'; + const endedAt = session.ended_at ? new Date(session.ended_at).toLocaleString('da-DK') : '-'; + const linkButton = session.session_link + ? `Åbn Link` + : ''; + const worklogButton = session.status === 'completed' + ? `` + : ''; + + return ` +
    +
    +
    +
    +
    + ${escapeHtml(session.status || 'ukendt')} + Session #${session.id} +
    +
    Start: ${startedAt} | Slut: ${endedAt} | Varighed: ${duration}
    + ${session.contact_name ? `
    Kontakt: ${escapeHtml(session.contact_name)}
    ` : ''} + ${session.sag_id ? `
    Sag ID: ${session.sag_id}
    ` : ''} +
    +
    + ${linkButton} + ${worklogButton} +
    +
    +
    +
    + `; + }).join(''); +} + +async function startCustomerSession() { + const alertBox = document.getElementById('customerSessionAlert'); + const description = document.getElementById('customerSessionDescription')?.value?.trim() || null; + + try { + const response = await fetch('/api/v1/anydesk/start-session', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + customer_id: customerId, + description: description || `Remote support for ${customerData?.name || 'customer'}` + }) + }); + + if (!response.ok) { + const error = await response.json(); + throw new Error(error.detail || 'Kunne ikke starte session'); + } + + const data = await response.json(); + if (alertBox) { + alertBox.classList.remove('d-none'); + alertBox.innerHTML = `Session startet. ${data.session_link ? `Link: ${data.session_link}` : ''}`; + } + + if (data.session_link) { + window.open(data.session_link, '_blank'); + } + + await loadCustomerSessions(); + } catch (error) { + console.error('Failed to start session:', error); + alert('Fejl: ' + error.message); + } +} + +async function showCustomerWorklogSuggestion(sessionId) { + try { + const response = await fetch(`/api/v1/anydesk/sessions/${sessionId}/worklog-suggestion`); + if (!response.ok) { + const error = await response.json(); + throw new Error(error.detail || 'Kunne ikke hente forslag'); + } + + const suggestion = await response.json(); + const body = document.getElementById('customerWorklogSuggestionBody'); + if (body) { + body.innerHTML = ` +
    Varighed: ${suggestion.duration_hours} timer
    +
    Start: ${new Date(suggestion.start_time).toLocaleString('da-DK')}
    +
    Slut: ${new Date(suggestion.end_time).toLocaleString('da-DK')}
    +
    Beskrivelse: ${escapeHtml(suggestion.description || '')}
    +
    Forslaget kan bruges til manuel tidsregistrering
    + `; + } + + const modal = new bootstrap.Modal(document.getElementById('customerWorklogSuggestionModal')); + modal.show(); + } catch (error) { + console.error('Failed to load suggestion:', error); + alert('Fejl: ' + error.message); + } +} + +function getSessionBadgeClass(status) { + switch ((status || '').toLowerCase()) { + case 'active': + return 'bg-success'; + case 'completed': + return 'bg-primary'; + case 'failed': + return 'bg-danger'; + case 'cancelled': + return 'bg-secondary'; + default: + return 'bg-light text-dark'; + } +} + function getInitials(name) { if (!name) return '?'; const words = name.trim().split(' '); diff --git a/app/models/schemas.py b/app/models/schemas.py index da2092c..544b2f3 100644 --- a/app/models/schemas.py +++ b/app/models/schemas.py @@ -192,3 +192,78 @@ class GroupCreate(BaseModel): class GroupPermissionsUpdate(BaseModel): permission_ids: List[int] + + +# ===================================================== +# AnyDesk Remote Support Integration Schemas +# ===================================================== + +class AnyDeskSessionCreate(BaseModel): + """Schema for creating a new AnyDesk session""" + customer_id: int + contact_id: Optional[int] = None + sag_id: Optional[int] = None # Case/ticket ID + description: Optional[str] = None + created_by_user_id: Optional[int] = None + + +class AnyDeskSession(BaseModel): + """Full AnyDesk session schema""" + id: int + anydesk_session_id: str + customer_id: int + contact_id: Optional[int] = None + sag_id: Optional[int] = None + session_link: Optional[str] = None + status: str # active, completed, failed, cancelled + started_at: str + ended_at: Optional[str] = None + duration_minutes: Optional[int] = None + created_by_user_id: Optional[int] = None + created_at: str + updated_at: Optional[str] = None + + model_config = ConfigDict(from_attributes=True) + + +class AnyDeskSessionDetail(AnyDeskSession): + """AnyDesk session with additional details""" + contact_name: Optional[str] = None + customer_name: Optional[str] = None + sag_title: Optional[str] = None + created_by_user_name: Optional[str] = None + device_info: Optional[dict] = None + metadata: Optional[dict] = None + + +class AnyDeskWorklogSuggestion(BaseModel): + """Suggested worklog entry from a completed session""" + session_id: int + duration_hours: float + duration_minutes: int + description: str + start_time: str + end_time: str + billable: bool = True + work_type: str = "remote_support" + + +class AnyDeskSessionWithWorklog(BaseModel): + """AnyDesk session with suggested worklog entry""" + session: AnyDeskSession + suggested_worklog: AnyDeskWorklogSuggestion + + +class AnyDeskSessionHistory(BaseModel): + """Session history response""" + sessions: List[AnyDeskSessionDetail] + total: int + limit: int + offset: int + + +class AnyDeskSessionUpdate(BaseModel): + """Schema for updating a session (mainly status updates)""" + status: str + ended_at: Optional[str] = None + duration_minutes: Optional[int] = None diff --git a/app/modules/hardware/backend/router.py b/app/modules/hardware/backend/router.py index b0a04fb..0c5c5ad 100644 --- a/app/modules/hardware/backend/router.py +++ b/app/modules/hardware/backend/router.py @@ -45,6 +45,32 @@ async def list_hardware( return result or [] +@router.get("/hardware/by-customer/{customer_id}", response_model=List[dict]) +async def list_hardware_by_customer(customer_id: int): + """List hardware assets owned by a customer.""" + query = """ + SELECT * FROM hardware_assets + WHERE deleted_at IS NULL AND current_owner_customer_id = %s + ORDER BY created_at DESC + """ + result = execute_query(query, (customer_id,)) + return result or [] + + +@router.get("/hardware/by-contact/{contact_id}", response_model=List[dict]) +async def list_hardware_by_contact(contact_id: int): + """List hardware assets linked to a contact via company relations.""" + query = """ + SELECT h.* + FROM hardware_assets h + JOIN contact_companies cc ON cc.customer_id = h.current_owner_customer_id + WHERE cc.contact_id = %s AND h.deleted_at IS NULL + ORDER BY h.created_at DESC + """ + result = execute_query(query, (contact_id,)) + return result or [] + + @router.post("/hardware", response_model=dict) async def create_hardware(data: dict): """Create a new hardware asset.""" @@ -53,9 +79,10 @@ async def create_hardware(data: dict): INSERT INTO hardware_assets ( asset_type, brand, model, serial_number, customer_asset_id, internal_asset_id, notes, current_owner_type, current_owner_customer_id, - status, status_reason, warranty_until, end_of_life + status, status_reason, warranty_until, end_of_life, + anydesk_id, anydesk_link ) - VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) + VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING * """ params = ( @@ -72,6 +99,8 @@ async def create_hardware(data: dict): data.get("status_reason"), data.get("warranty_until"), data.get("end_of_life"), + data.get("anydesk_id"), + data.get("anydesk_link"), ) result = execute_query(query, params) if not result: @@ -103,6 +132,50 @@ async def create_hardware(data: dict): raise HTTPException(status_code=500, detail=str(e)) +@router.post("/hardware/quick", response_model=dict) +async def quick_create_hardware(data: dict): + """Quick create hardware with minimal fields (name + AnyDesk info).""" + try: + name = (data.get("name") or "").strip() + customer_id = data.get("customer_id") + anydesk_id = (data.get("anydesk_id") or "").strip() or None + anydesk_link = (data.get("anydesk_link") or "").strip() or None + + if not name: + raise HTTPException(status_code=400, detail="Name is required") + if not customer_id: + raise HTTPException(status_code=400, detail="Customer ID is required") + + query = """ + INSERT INTO hardware_assets ( + asset_type, model, current_owner_type, current_owner_customer_id, + status, anydesk_id, anydesk_link, notes + ) + VALUES (%s, %s, %s, %s, %s, %s, %s, %s) + RETURNING * + """ + params = ( + "andet", + name, + "customer", + customer_id, + "active", + anydesk_id, + anydesk_link, + "Quick created from case/ticket flow", + ) + result = execute_query(query, params) + if not result: + raise HTTPException(status_code=500, detail="Failed to create hardware") + + return result[0] + except HTTPException: + raise + except Exception as e: + logger.error(f"❌ Failed to quick-create hardware: {str(e)}") + raise HTTPException(status_code=500, detail=str(e)) + + @router.get("/hardware/{hardware_id}", response_model=dict) async def get_hardware(hardware_id: int): """Get hardware details by ID.""" @@ -127,7 +200,7 @@ async def update_hardware(hardware_id: int, data: dict): "asset_type", "brand", "model", "serial_number", "customer_asset_id", "internal_asset_id", "notes", "current_owner_type", "current_owner_customer_id", "status", "status_reason", "warranty_until", "end_of_life", - "follow_up_date", "follow_up_owner_user_id" + "follow_up_date", "follow_up_owner_user_id", "anydesk_id", "anydesk_link" ] for field in allowed_fields: diff --git a/app/modules/hardware/templates/create.html b/app/modules/hardware/templates/create.html index 0a75e25..23657df 100644 --- a/app/modules/hardware/templates/create.html +++ b/app/modules/hardware/templates/create.html @@ -203,6 +203,21 @@ + +
    +

    🧷 AnyDesk

    +
    +
    + + +
    +
    + + +
    +
    +
    +

    👥 Ejerskab

    diff --git a/app/modules/hardware/templates/detail.html b/app/modules/hardware/templates/detail.html index 76389ee..e87076e 100644 --- a/app/modules/hardware/templates/detail.html +++ b/app/modules/hardware/templates/detail.html @@ -266,6 +266,29 @@
    + +
    +
    +
    AnyDesk
    +
    +
    +
    + AnyDesk ID + {{ hardware.anydesk_id or '-' }} +
    +
    + AnyDesk Link + + {% if hardware.anydesk_link %} + Connect + {% else %} + - + {% endif %} + +
    +
    +
    +
    diff --git a/app/modules/hardware/templates/edit.html b/app/modules/hardware/templates/edit.html index 412d747..4173827 100644 --- a/app/modules/hardware/templates/edit.html +++ b/app/modules/hardware/templates/edit.html @@ -203,6 +203,21 @@
    + +
    +

    🧷 AnyDesk

    +
    +
    + + +
    +
    + + +
    +
    +
    +

    👥 Ejerskab

    diff --git a/app/modules/sag/templates/create.html b/app/modules/sag/templates/create.html index 071791f..f8604c6 100644 --- a/app/modules/sag/templates/create.html +++ b/app/modules/sag/templates/create.html @@ -200,6 +200,44 @@
    + +
    Hardware (AnyDesk)
    +
    +
    +
    +
    Vælg en kontakt for at se relateret hardware.
    +
    +
    +
    +
    +
    +
    Quick opret hardware
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    Type, Status & Ansvar
    @@ -258,6 +296,7 @@ +{% endblock %} diff --git a/app/timetracking/frontend/views.py b/app/timetracking/frontend/views.py index 652f732..a20ed61 100644 --- a/app/timetracking/frontend/views.py +++ b/app/timetracking/frontend/views.py @@ -50,3 +50,9 @@ async def timetracking_customers(request: Request): async def timetracking_orders(request: Request): """Order oversigt""" return templates.TemplateResponse("timetracking/frontend/orders.html", {"request": request}) + + +@router.get("/timetracking/service-contract-wizard", response_class=HTMLResponse, name="service_contract_wizard") +async def service_contract_wizard(request: Request): + """Service Contract Migration Wizard""" + return templates.TemplateResponse("timetracking/frontend/service_contract_wizard.html", {"request": request}) diff --git a/apply_migration_115.py b/apply_migration_115.py new file mode 100644 index 0000000..bf15e66 --- /dev/null +++ b/apply_migration_115.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python3 +"""Apply AnyDesk migration""" + +import psycopg2 +import os +import sys + +try: + db_url = os.getenv('DATABASE_URL', 'postgresql://bmc_hub:bmc_hub@localhost:5433/bmc_hub') + conn = psycopg2.connect(db_url) + cursor = conn.cursor() + + with open('migrations/115_anydesk_sessions.sql', 'r') as f: + sql = f.read() + + # Split by semicolons to execute statements separately + statements = [s.strip() for s in sql.split(';') if s.strip()] + + for statement in statements: + print(f"Executing: {statement[:80]}...") + cursor.execute(statement) + + conn.commit() + print("✅ Migration 115_anydesk_sessions.sql applied successfully!") + + # Verify tables created + cursor.execute(""" + SELECT table_name FROM information_schema.tables + WHERE table_name LIKE 'anydesk%' + """) + + tables = cursor.fetchall() + print(f"✅ Created tables: {[t[0] for t in tables]}") + + cursor.close() + conn.close() + +except Exception as e: + print(f"❌ Error: {str(e)}") + import traceback + traceback.print_exc() + sys.exit(1) diff --git a/docker-compose.yml b/docker-compose.yml index 3599b51..25c29b4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,6 +42,7 @@ services: - ./migrations:/app/migrations:ro # Mount for local development - live code reload - ./app:/app/app:ro + - ./templates:/app/templates:ro - ./main.py:/app/main.py:ro - ./VERSION:/app/VERSION:ro env_file: diff --git a/main.py b/main.py index b93458e..03c0b9e 100644 --- a/main.py +++ b/main.py @@ -70,6 +70,7 @@ from app.auth.backend import views as auth_views from app.auth.backend import admin as auth_admin_api from app.devportal.backend import router as devportal_api from app.devportal.backend import views as devportal_views +from app.routers import anydesk # Modules from app.modules.webshop.backend import router as webshop_api @@ -83,6 +84,7 @@ from app.modules.locations.backend import router as locations_api from app.modules.locations.frontend import views as locations_views from app.modules.nextcloud.backend import router as nextcloud_api from app.modules.search.backend import router as search_api +from app.modules.wiki.backend import router as wiki_api from app.fixed_price.backend import router as fixed_price_api # Configure logging @@ -256,6 +258,7 @@ app.include_router(conversations_api.router, prefix="/api/v1", tags=["Conversati app.include_router(opportunities_api.router, prefix="/api/v1", tags=["Opportunities"]) app.include_router(auth_api.router, prefix="/api/v1/auth", tags=["Auth"]) app.include_router(auth_admin_api.router, prefix="/api/v1", tags=["Auth Admin"]) +app.include_router(anydesk.router, prefix="/api/v1", tags=["Remote Support"]) # Module Routers app.include_router(webshop_api.router, prefix="/api/v1", tags=["Webshop"]) @@ -265,6 +268,7 @@ app.include_router(hardware_module_api.router, prefix="/api/v1", tags=["Hardware app.include_router(locations_api, prefix="/api/v1", tags=["Locations"]) app.include_router(nextcloud_api.router, prefix="/api/v1/nextcloud", tags=["Nextcloud"]) app.include_router(search_api.router, prefix="/api/v1", tags=["Search"]) +app.include_router(wiki_api.router, prefix="/api/v1/wiki", tags=["Wiki"]) app.include_router(devportal_api.router, prefix="/api/v1/devportal", tags=["Devportal"]) # Frontend Routers diff --git a/migrations/114_add_customer_wiki_slug.sql b/migrations/114_add_customer_wiki_slug.sql new file mode 100644 index 0000000..d568c03 --- /dev/null +++ b/migrations/114_add_customer_wiki_slug.sql @@ -0,0 +1,12 @@ +-- Migration 114: Add wiki_slug to customers +-- Created: 2026-02-09 + +BEGIN; + +ALTER TABLE customers + ADD COLUMN IF NOT EXISTS wiki_slug VARCHAR(255); + +CREATE INDEX IF NOT EXISTS idx_customers_wiki_slug + ON customers(wiki_slug); + +COMMIT; diff --git a/migrations/115_anydesk_sessions.sql b/migrations/115_anydesk_sessions.sql new file mode 100644 index 0000000..60ce208 --- /dev/null +++ b/migrations/115_anydesk_sessions.sql @@ -0,0 +1,67 @@ +-- AnyDesk Remote Session Management +-- Tracks remote support sessions started via AnyDesk integration +-- Sessions can be linked to contacts, companies, or cases for activity history and time tracking + +CREATE TABLE IF NOT EXISTS anydesk_sessions ( + id SERIAL PRIMARY KEY, + anydesk_session_id VARCHAR(255) UNIQUE NOT NULL, -- External AnyDesk session ID + + -- Relationship fields (at least one should be set) + contact_id INTEGER REFERENCES contacts(id) ON DELETE SET NULL, + customer_id INTEGER REFERENCES customers(id) ON DELETE SET NULL, + sag_id INTEGER REFERENCES sag_sager(id) ON DELETE SET NULL, + + -- Session details + session_link TEXT, -- Generated AnyDesk link (unique access code) + device_info JSONB DEFAULT '{}', -- Device info: os, device_type, etc. + created_by_user_id INTEGER REFERENCES users(user_id) ON DELETE SET NULL, + + -- Session lifecycle + started_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP, + ended_at TIMESTAMP WITH TIME ZONE, + duration_minutes INTEGER, -- Calculated from started_at to ended_at + + -- Session status: draft, pending, active, completed, failed, cancelled + status VARCHAR(50) NOT NULL DEFAULT 'draft', + error_message TEXT, + + -- Timestamps + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + + -- Audit trail + metadata JSONB DEFAULT '{}' -- Flexible storage for additional info +); + +-- Create indexes for common queries +CREATE INDEX IF NOT EXISTS idx_anydesk_sessions_contact_id ON anydesk_sessions(contact_id); +CREATE INDEX IF NOT EXISTS idx_anydesk_sessions_customer_id ON anydesk_sessions(customer_id); +CREATE INDEX IF NOT EXISTS idx_anydesk_sessions_sag_id ON anydesk_sessions(sag_id); +CREATE INDEX IF NOT EXISTS idx_anydesk_sessions_created_by_user_id ON anydesk_sessions(created_by_user_id); +CREATE INDEX IF NOT EXISTS idx_anydesk_sessions_status ON anydesk_sessions(status); +CREATE INDEX IF NOT EXISTS idx_anydesk_sessions_started_at ON anydesk_sessions(started_at DESC); + +-- View: Session history with related data (for timeline/activity log) +CREATE OR REPLACE VIEW anydesk_session_timeline AS +SELECT + s.id, + s.anydesk_session_id, + s.contact_id, + c.first_name || ' ' || c.last_name as contact_name, + s.customer_id, + cust.name as customer_name, + s.sag_id, + sag.title as sag_title, + s.session_link, + s.started_at, + s.ended_at, + s.duration_minutes, + s.status, + u.full_name as started_by_user, + s.created_at +FROM anydesk_sessions s +LEFT JOIN contacts c ON s.contact_id = c.id +LEFT JOIN customers cust ON s.customer_id = cust.id +LEFT JOIN sag_sager sag ON s.sag_id = sag.id +LEFT JOIN users u ON s.created_by_user_id = u.user_id +ORDER BY s.started_at DESC; diff --git a/migrations/116_add_anydesk_hardware_assets.sql b/migrations/116_add_anydesk_hardware_assets.sql new file mode 100644 index 0000000..e798641 --- /dev/null +++ b/migrations/116_add_anydesk_hardware_assets.sql @@ -0,0 +1,8 @@ +-- Add AnyDesk fields to hardware_assets +-- Enables storing AnyDesk connection info per device + +ALTER TABLE hardware_assets +ADD COLUMN IF NOT EXISTS anydesk_id VARCHAR(100), +ADD COLUMN IF NOT EXISTS anydesk_link TEXT; + +CREATE INDEX IF NOT EXISTS idx_hardware_anydesk_id ON hardware_assets(anydesk_id); diff --git a/requirements.txt b/requirements.txt index e199d3a..eb0f914 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,7 @@ python-multipart==0.0.17 python-dateutil==2.8.2 jinja2==3.1.4 aiohttp==3.10.10 +httpx==0.27.2 aiosmtplib==3.0.2 PyJWT==2.10.1 pyotp==2.9.0 diff --git a/run_migration.py b/run_migration.py new file mode 100644 index 0000000..544a922 --- /dev/null +++ b/run_migration.py @@ -0,0 +1,63 @@ +#!/usr/bin/env python3 +""" +Simple migration runner - applies anydesk_sessions schema +""" + +import psycopg2 +import sys + +sql_statements = [ + """ + CREATE TABLE IF NOT EXISTS anydesk_sessions ( + id SERIAL PRIMARY KEY, + anydesk_session_id VARCHAR(255) UNIQUE NOT NULL, + contact_id INTEGER REFERENCES contacts(id) ON DELETE SET NULL, + customer_id INTEGER REFERENCES customers(id) ON DELETE SET NULL, + sag_id INTEGER REFERENCES sag_sager(id) ON DELETE SET NULL, + session_link TEXT, + device_info JSONB DEFAULT '{}', + created_by_user_id INTEGER REFERENCES users(user_id) ON DELETE SET NULL, + started_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP, + ended_at TIMESTAMP WITH TIME ZONE, + duration_minutes INTEGER, + status VARCHAR(50) NOT NULL DEFAULT 'draft', + error_message TEXT, + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + metadata JSONB DEFAULT '{}' + ) + """, + "CREATE INDEX IF NOT EXISTS idx_anydesk_sessions_contact_id ON anydesk_sessions(contact_id)", + "CREATE INDEX IF NOT EXISTS idx_anydesk_sessions_customer_id ON anydesk_sessions(customer_id)", + "CREATE INDEX IF NOT EXISTS idx_anydesk_sessions_sag_id ON anydesk_sessions(sag_id)", + "CREATE INDEX IF NOT EXISTS idx_anydesk_sessions_created_by_user_id ON anydesk_sessions(created_by_user_id)", + "CREATE INDEX IF NOT EXISTS idx_anydesk_sessions_status ON anydesk_sessions(status)", + "CREATE INDEX IF NOT EXISTS idx_anydesk_sessions_started_at ON anydesk_sessions(started_at DESC)", +] + +try: + # Connect to database + conn = psycopg2.connect("postgresql://bmc_hub:bmc_hub@localhost:5433/bmc_hub") + cursor = conn.cursor() + + print("Applying AnyDesk migration...") + for i, statement in enumerate(sql_statements, 1): + preview = statement.replace('\n', ' ')[:80] + print(f" [{i}/{len(sql_statements)}] {preview}...") + cursor.execute(statement) + + conn.commit() + print("✅ All statements executed successfully") + + # Verify + cursor.execute("SELECT COUNT(*) as count FROM information_schema.tables WHERE table_name = 'anydesk_sessions'") + result = cursor.fetchone() + if result[0] > 0: + print("✅ anydesk_sessions table verified") + + cursor.close() + conn.close() + +except Exception as e: + print(f"❌ Error: {e}", file=sys.stderr) + sys.exit(1) diff --git a/scripts/set_customer_wiki_slugs.py b/scripts/set_customer_wiki_slugs.py new file mode 100644 index 0000000..cf2b1e1 --- /dev/null +++ b/scripts/set_customer_wiki_slugs.py @@ -0,0 +1,272 @@ +#!/usr/bin/env python3 +""" +Set customers.wiki_slug based on a provided folder list. + +Usage: + python scripts/set_customer_wiki_slugs.py # dry run + python scripts/set_customer_wiki_slugs.py --apply # write changes +""" + +import os +import sys +import argparse +from typing import Dict, List, Tuple + +import psycopg2 +from psycopg2.extras import RealDictCursor + +FOLDERS = [ + "Alcare", + "Arbodania", + "Bellevue", + "DreamHack", + "Glarmester-Svensson", + "GODT_Media", + "Grønnegaards", + "HarbourHouse", + "hedegaardsvej88", + "highwire", + "ImpactTV", + "Kjæden", + "K-pro", + "Laudpeople", + "Maskinsikkerhed", + "Nordisk Film TV A/S", + "Norva24", + "PFA diverse info", + "PFA-The-Union", + "Portalen", + "SamNetworks", + "skuespillerforeningen", + "Snowman", + "Stena", + "Sydkysten", + "TMNconsult", + "TrinityHr", + "Zantay", + "NEMB", +] + + +SUFFIX_TOKENS = { + "a/s", + "as", + "aps", + "ab", + "ltd", + "gmbh", + "inc", + "llc", +} + + +def normalize_name(value: str) -> str: + if not value: + return "" + text = value.casefold() + text = ( + text.replace("&", " and ") + .replace("æ", "ae") + .replace("ø", "oe") + .replace("å", "aa") + ) + for ch in "/_-.,": + text = text.replace(ch, " ") + tokens = [token for token in text.split() if token] + while tokens and tokens[-1] in SUFFIX_TOKENS: + tokens.pop() + return "".join(ch for ch in "".join(tokens) if ch.isalnum()) + + +def fetch_customers(conn) -> List[Dict[str, str]]: + with conn.cursor(cursor_factory=RealDictCursor) as cur: + cur.execute( + "SELECT id, name, wiki_slug FROM customers WHERE deleted_at IS NULL" + ) + return cur.fetchall() + + +def build_lookup(customers: List[Dict[str, str]]) -> Dict[str, List[Dict[str, str]]]: + lookup: Dict[str, List[Dict[str, str]]] = {} + for cust in customers: + key = normalize_name(cust.get("name", "")) + if not key: + continue + lookup.setdefault(key, []).append(cust) + return lookup + + +def plan_updates( + lookup: Dict[str, List[Dict[str, str]]], + customers: List[Dict[str, str]], +) -> Tuple[List[Tuple[int, str, str]], List[str], List[str], Dict[str, List[str]]]: + updates: List[Tuple[int, str, str]] = [] + missing: List[str] = [] + ambiguous: List[str] = [] + suggestions: Dict[str, List[str]] = {} + + for folder in FOLDERS: + key = normalize_name(folder) + matches = lookup.get(key, []) + if not matches: + missing.append(folder) + folder_key = normalize_name(folder) + if folder_key: + ranked = [] + for cust in customers: + cand_key = normalize_name(cust.get("name", "")) + if not cand_key: + continue + score = 1.0 - ( + abs(len(folder_key) - len(cand_key)) + / max(len(folder_key), len(cand_key), 1) + ) + overlap = ( + sum(1 for ch in folder_key if ch in cand_key) + / max(len(folder_key), 1) + ) + ranked.append((score + overlap, cust.get("name", ""))) + ranked.sort(reverse=True) + suggestions[folder] = [name for _, name in ranked[:3] if name] + continue + if len(matches) > 1: + ambiguous.append(folder) + continue + cust = matches[0] + cust_id = cust.get("id") + current_slug = cust.get("wiki_slug") or "" + if current_slug.strip() != folder: + updates.append((cust_id, cust.get("name", ""), folder)) + return updates, missing, ambiguous, suggestions + + +def rank_candidates( + folder: str, + customers: List[Dict[str, str]], + limit: int = 5, +) -> List[Dict[str, str]]: + folder_key = normalize_name(folder) + if not folder_key: + return [] + ranked = [] + for cust in customers: + cand_key = normalize_name(cust.get("name", "")) + if not cand_key: + continue + score = 1.0 - ( + abs(len(folder_key) - len(cand_key)) / max(len(folder_key), len(cand_key), 1) + ) + overlap = sum(1 for ch in folder_key if ch in cand_key) / max(len(folder_key), 1) + ranked.append((score + overlap, cust)) + ranked.sort(key=lambda item: item[0], reverse=True) + return [cust for _, cust in ranked[:limit]] + + +def prompt_for_missing( + missing: List[str], + customers: List[Dict[str, str]], +) -> List[Tuple[int, str, str]]: + selections: List[Tuple[int, str, str]] = [] + if not missing: + return selections + + print("\nInteractive matching for missing folders:") + for folder in missing: + print(f"\nFolder: {folder}") + candidates = rank_candidates(folder, customers) + if not candidates: + print(" No candidates.") + continue + print(" Choose a customer (0 to skip):") + for idx, cust in enumerate(candidates, start=1): + print(f" {idx}) {cust.get('id')}: {cust.get('name')}") + while True: + choice = input(" Selection: ").strip() + if choice == "" or choice == "0": + break + if not choice.isdigit(): + print(" Please enter a number from the list.") + continue + index = int(choice) + if not 1 <= index <= len(candidates): + print(" Please enter a number from the list.") + continue + cust = candidates[index - 1] + current_slug = cust.get("wiki_slug") or "" + if current_slug.strip() == folder: + print(" Already set. Skipping.") + break + selections.append((cust.get("id"), cust.get("name", ""), folder)) + break + + return selections + + +def apply_updates(conn, updates: List[Tuple[int, str, str]]) -> int: + if not updates: + return 0 + with conn.cursor() as cur: + for cust_id, _, slug in updates: + cur.execute( + "UPDATE customers SET wiki_slug = %s WHERE id = %s", + (slug, cust_id), + ) + conn.commit() + return len(updates) + + +def main() -> int: + parser = argparse.ArgumentParser() + parser.add_argument("--apply", action="store_true", help="Write updates to database") + parser.add_argument( + "--interactive", + action="store_true", + help="Prompt to match missing folders", + ) + args = parser.parse_args() + + db_url = os.environ.get("DATABASE_URL") + if not db_url: + print("DATABASE_URL is not set", file=sys.stderr) + return 1 + + conn = psycopg2.connect(db_url) + try: + customers = fetch_customers(conn) + lookup = build_lookup(customers) + updates, missing, ambiguous, suggestions = plan_updates(lookup, customers) + if args.interactive and missing: + updates.extend(prompt_for_missing(missing, customers)) + + print("Planned updates:") + for cust_id, name, slug in updates: + print(f" - {cust_id}: {name} -> {slug}") + + if missing: + print("\nNo match for:") + for folder in missing: + hint = suggestions.get(folder, []) + if hint: + print(f" - {folder} (suggestions: {', '.join(hint)})") + else: + print(f" - {folder}") + + if ambiguous: + print("\nMultiple matches for:") + for folder in ambiguous: + print(f" - {folder}") + + if args.apply: + count = apply_updates(conn, updates) + print(f"\nApplied updates: {count}") + else: + print("\nDry run only. Use --apply to write changes.") + + finally: + conn.close() + + return 0 + + +if __name__ == "__main__": + raise SystemExit(main()) diff --git a/test_service_contract_wizard.py b/test_service_contract_wizard.py new file mode 100644 index 0000000..7554b46 --- /dev/null +++ b/test_service_contract_wizard.py @@ -0,0 +1,153 @@ +#!/usr/bin/env python3 +""" +Test Service Contract Wizard - Basic Verification +=================================================== + +Tests: +1. Frontend route is accessible +2. API endpoints have correct signatures +3. Wizard service functions can be called +4. Dry-run mode works without database writes +""" + +import asyncio +import sys +from decimal import Decimal + +# Test imports +print("🔍 Testing imports...") +try: + from app.timetracking.backend.service_contract_wizard import ServiceContractWizardService + from app.timetracking.backend.models import ( + ServiceContractWizardData, + ServiceContractWizardAction, + TimologTransferRequest, + ) + print("✅ Service imports OK") +except ImportError as e: + print(f"❌ Import error: {e}") + sys.exit(1) + +# Test Vtiger service +print("🔍 Testing Vtiger service extensions...") +try: + from app.services.vtiger_service import get_vtiger_service + vtiger_svc = get_vtiger_service() + + # Check methods exist + assert hasattr(vtiger_svc, 'get_service_contracts'), "Missing get_service_contracts" + assert hasattr(vtiger_svc, 'get_service_contract_cases'), "Missing get_service_contract_cases" + assert hasattr(vtiger_svc, 'get_service_contract_timelogs'), "Missing get_service_contract_timelogs" + + print("✅ Vtiger service methods OK") +except Exception as e: + print(f"❌ Vtiger service error: {e}") + sys.exit(1) + +# Test Klippekort service +print("🔍 Testing Klippekort service...") +try: + from app.ticket.backend.klippekort_service import KlippekortService + + # Check method exists + assert hasattr(KlippekortService, 'get_active_cards_for_customer'), "Missing get_active_cards_for_customer" + print("✅ Klippekort service OK") +except Exception as e: + print(f"❌ Klippekort service error: {e}") + sys.exit(1) + +# Test Pydantic models +print("🔍 Testing Pydantic models...") +try: + # Try creating a model instance + action = ServiceContractWizardAction( + type='archive', + item_id='test123', + title='Test Case', + success=True, + message='Test message', + dry_run=True + ) + assert action.type == 'archive' + assert action.dry_run == True + print("✅ Pydantic models OK") +except Exception as e: + print(f"❌ Model validation error: {e}") + sys.exit(1) + +# Test dry-run case archiving (no database writes) +print("🔍 Testing dry-run case archiving...") +try: + case_data = { + 'id': 'test_case_123', + 'title': 'Test Case Title', + 'description': 'Test Description', + 'status': 'Open', + 'priority': 'High' + } + + success, message, archived_id = ServiceContractWizardService.archive_case( + case_data, + 'test_contract_123', + dry_run=True + ) + + assert success == True, "Dry-run archiving failed" + assert '[DRY RUN]' in message, "Message should indicate dry-run" + assert archived_id is None, "Dry-run should not return an ID" + print(f"✅ Dry-run archiving OK: {message}") +except Exception as e: + print(f"❌ Dry-run archiving error: {e}") + sys.exit(1) + +# Test wizard summary generation +print("🔍 Testing wizard summary...") +try: + contract_data = { + 'contract_id': 'test_contract', + 'contract_number': 'SC-001', + 'subject': 'Test Contract' + } + + actions = [ + {'type': 'archive', 'success': True}, + {'type': 'transfer', 'success': True}, + {'type': 'archive', 'success': False}, + ] + + summary = ServiceContractWizardService.get_wizard_summary( + contract_data, + actions, + dry_run=True + ) + + assert summary['cases_archived'] == 1 + assert summary['timelogs_transferred'] == 1 + assert summary['failed_items'] == 1 + assert summary['dry_run'] == True + print(f"✅ Summary generation OK: {summary['status']}") +except Exception as e: + print(f"❌ Summary generation error: {e}") + sys.exit(1) + +# Test frontend route exists +print("🔍 Testing frontend route...") +try: + from app.timetracking.frontend.views import router as frontend_router + + # Check route exists + routes = [r.path for r in frontend_router.routes] + assert any('service-contract-wizard' in r for r in routes), "Frontend route not found" + print("✅ Frontend route OK") +except Exception as e: + print(f"❌ Frontend route error: {e}") + sys.exit(1) + +print("\n" + "="*60) +print("✅ ALL TESTS PASSED - Service Contract Wizard is ready!") +print("="*60) +print("\nNext steps:") +print("1. Start the Hub API server: docker-compose up -d api") +print("2. Access the wizard: http://localhost:8000/timetracking/service-contract-wizard") +print("3. Test with dry-run mode first (checkbox enabled)") +print("4. Then run with live mode to commit changes")