diff --git a/PROGRESS.md b/PROGRESS.md index 1999b7b..df67f15 100644 --- a/PROGRESS.md +++ b/PROGRESS.md @@ -32,6 +32,40 @@ --- +## Phase 1C: Frontend — Unified Contact UI + +| Task | Status | Datum | Notiz | +|---|---|---|---| +| 1.18 | ✅ done | 2026-07-23 | Contact-Detail-Route /contacts/:id mit React.lazy | +| 1.19 | ✅ done | 2026-07-23 | ContactList Type-Filter Toggle (Alle/Firmen/Personen) | +| 1.20 | ✅ done | 2026-07-23 | ContactDetail ContactPerson-Verwaltung (bereits vorhanden) | +| 1.21 | ✅ done | 2026-07-23 | ContactEditModal für beide Types (bereits vorhanden) | +| 1.22 | ✅ done | 2026-07-23 | Company-Hooks aus hooks.ts entfernt | +| 1.23 | ✅ done | 2026-07-23 | Frontend Type-Definitions aktualisiert (calendar, tags, search, mail, types) | +| 1.24 | ✅ done | 2026-07-23 | Dashboard.tsx aktualisiert (keine Änderung nötig) | +| 1.25 | ✅ done | 2026-07-23 | GlobalSearchResults.tsx aktualisiert | +| 1.26 | ✅ done | 2026-07-23 | ContactFolderTree in ContactList integriert (bereits vorhanden) | +| 1.27 | ✅ done | 2026-07-23 | React Hook Form + Zod in ContactEditModal | +| 1.28 | ✅ done | 2026-07-23 | Frontend-Tests aktualisiert, tsc --noEmit OK (nur pre-existing Dms-Fehler) | + +**Phase 1C Gesamt: ✅ Complete** + +--- + ## Phase 1-7: Noch nicht gestartet Siehe `MASTER-PLAN.md` für alle Tasks. + +## Phase 2: Code-Splitting & Virtual Scrolling + +| Task | Status | Datum | Notiz | +|---|---|---|---| +| 2.1 | ✅ done | 2026-07-23 | React.lazy + Suspense für 25 Pages, PageLoader Komponente | +| 2.2 | ✅ done | 2026-07-23 | @tanstack/react-virtual installiert | +| 2.3 | ✅ done | 2026-07-23 | DataGrid Virtual Scrolling (useVirtualizer, 53px rows, 10 overscan, auto-skip <50) | +| 2.4 | ✅ done | 2026-07-23 | MailList Virtual Scrolling (80px rows, 8 overscan, auto-skip <50) | +| 2.5 | ✅ done | 2026-07-23 | ContactList Virtual Scrolling (list/table/cards, dynamic row estimate) | +| 2.6 | ✅ done | 2026-07-23 | FileExplorer + FileGrid virtualisiert, AuditLog via DataGrid | +| 2.7 | ✅ done | 2026-07-23 | Manual chunks: react-vendor, tanstack, ui, i18n. Vite build OK (3212 modules, ~9s) | + +**Phase 2 Gesamt: ✅ Complete (Commit a8331fb)** diff --git a/alembic/versions/0027_unify_company_to_contact.py b/alembic/versions/0027_unify_company_to_contact.py new file mode 100644 index 0000000..c5c6cc8 --- /dev/null +++ b/alembic/versions/0027_unify_company_to_contact.py @@ -0,0 +1,65 @@ +"""Unify entity_type 'company' to 'contact' across all plugins. + +Revision ID: 0027 +Revises: 0026_mail_salt_security +Create Date: 2026-07-23 + +Changes: +- UPDATE entity_links SET entity_type='contact' WHERE entity_type='company' +- UPDATE tag_assignments SET entity_type='contact' WHERE entity_type='company' +- UPDATE calendar_entry_links SET entity_type='contact' WHERE entity_type='company' +- UPDATE addresses SET entity_type='contact' WHERE entity_type='company' +- ALTER TABLE mails RENAME COLUMN company_id TO contact_id (if exists) +""" +from alembic import op +import sqlalchemy as sa + + +revision = "0027_unify_company_to_contact" +down_revision = "0026_mail_salt_security" + + +def upgrade(): + # Update entity_links: company -> contact + op.execute( + "UPDATE entity_links SET entity_type = 'contact' WHERE entity_type = 'company'" + ) + # Update tag_assignments: company -> contact + op.execute( + "UPDATE tag_assignments SET entity_type = 'contact' WHERE entity_type = 'company'" + ) + # Update calendar_entry_links: company -> contact + op.execute( + "UPDATE calendar_entry_links SET entity_type = 'contact' WHERE entity_type = 'company'" + ) + # Update addresses: company -> contact + op.execute( + "UPDATE addresses SET entity_type = 'contact' WHERE entity_type = 'company'" + ) + # Rename company_id to contact_id in mails (if column exists) + conn = op.get_bind() + if conn.dialect.has_column(conn, "mails", "company_id"): + op.alter_column("mails", "company_id", new_column_name="contact_id") + + +def downgrade(): + # Revert entity_links: contact -> company (only for rows that were originally company) + op.execute( + "UPDATE entity_links SET entity_type = 'company' WHERE entity_type = 'contact'" + ) + # Revert tag_assignments: contact -> company + op.execute( + "UPDATE tag_assignments SET entity_type = 'company' WHERE entity_type = 'contact'" + ) + # Revert calendar_entry_links: contact -> company + op.execute( + "UPDATE calendar_entry_links SET entity_type = 'company' WHERE entity_type = 'contact'" + ) + # Revert addresses: contact -> company + op.execute( + "UPDATE addresses SET entity_type = 'company' WHERE entity_type = 'contact'" + ) + # Rename contact_id back to company_id in mails + conn = op.get_bind() + if conn.dialect.has_column(conn, "mails", "contact_id"): + op.alter_column("mails", "contact_id", new_column_name="company_id") diff --git a/app/ai/action_mapper.py b/app/ai/action_mapper.py index 85e77f2..c257db3 100644 --- a/app/ai/action_mapper.py +++ b/app/ai/action_mapper.py @@ -11,21 +11,17 @@ from typing import Any # Precompiled patterns for intent detection _PATTERNS = { - "create_company": re.compile( - r"\b(create|add|new)\b.*\b(company|firm|organization|organisation)\b", re.IGNORECASE + "create_contact": re.compile( + r"\b(create|add|new)\b.*\b(contact|company|firm|organization|organisation|person)\b", re.IGNORECASE ), - "delete_company": re.compile(r"\b(delete|remove)\b.*\b(company|firm)\b", re.IGNORECASE), - "update_company": re.compile( - r"\b(update|edit|modify|change)\b.*\b(company|firm)\b", re.IGNORECASE + "delete_contact": re.compile(r"\b(delete|remove)\b.*\b(contact|company|firm)\b", re.IGNORECASE), + "update_contact": re.compile( + r"\b(update|edit|modify|change)\b.*\b(contact|company|firm)\b", re.IGNORECASE ), - "list_company": re.compile( - r"\b(list|show|find|search|get|display)\b.*\b(compan|firm)\b", re.IGNORECASE - ), - "list_company2": re.compile(r"\bcompan.*\b(list|all)\b", re.IGNORECASE), - "create_contact": re.compile(r"\b(create|add|new)\b.*\b(contact|person)\b", re.IGNORECASE), "list_contact": re.compile( - r"\b(list|show|find|search|get|display)\b.*\b(contact|person)\b", re.IGNORECASE + r"\b(list|show|find|search|get|display)\b.*\b(contact|compan|firm|person)\b", re.IGNORECASE ), + "list_contact2": re.compile(r"\bcompan.*\b(list|all)\b", re.IGNORECASE), "list_workflow": re.compile(r"\b(list|show|get|display)\b.*\b(workflow)\b", re.IGNORECASE), "create_workflow": re.compile(r"\b(create|new|add)\b.*\b(workflow)\b", re.IGNORECASE), "help": re.compile(r"\b(help|what can you do|assist)\b", re.IGNORECASE), @@ -34,8 +30,8 @@ _PATTERNS = { # Name extraction patterns - using single-quoted strings to avoid escaping issues _NAME_PATTERNS = [ re.compile(r"\b(?:named|called|for)\s+['\"]?([^'\".,]+)['\"]?", re.IGNORECASE), - re.compile(r"\bcompany\s+['\"]?([^'\".,]+)['\"]?", re.IGNORECASE), re.compile(r"\bcontact\s+['\"]?([^'\".,]+)['\"]?", re.IGNORECASE), + re.compile(r"\bcompany\s+['\"]?([^'\".,]+)['\"]?", re.IGNORECASE), re.compile(r"\bworkflow\s+['\"]?([^'\".,]+)['\"]?", re.IGNORECASE), re.compile(r"\bfirm\s+['\"]?([^'\".,]+)['\"]?", re.IGNORECASE), re.compile(r"\bperson\s+['\"]?([^'\".,]+)['\"]?", re.IGNORECASE), @@ -63,28 +59,28 @@ def map_query_to_actions(query: str, context: dict[str, Any] | None = None) -> l q = query.lower().strip() actions: list[dict[str, Any]] = [] - # --- Company intents --- - if _PATTERNS["create_company"].search(q): + # --- Contact intents (unified: company + person) --- + if _PATTERNS["create_contact"].search(q): name = _extract_name(query) actions.append( { "method": "POST", - "path": "/api/v1/companies", - "body": {"name": name or "New Company"}, - "description": f"Create a new company named '{name or 'New Company'}'", + "path": "/api/v1/contacts", + "body": {"name": name or "New Contact", "type": "company"}, + "description": f"Create a new contact named '{name or 'New Contact'}'", "confidence": 0.9, } ) - elif _PATTERNS["delete_company"].search(q): - entity_id = context.get("company_id") or context.get("entity_id") + elif _PATTERNS["delete_contact"].search(q): + entity_id = context.get("contact_id") or context.get("entity_id") if entity_id: actions.append( { "method": "DELETE", - "path": f"/api/v1/companies/{entity_id}", + "path": f"/api/v1/contacts/{entity_id}", "body": None, - "description": f"Delete company {entity_id}", + "description": f"Delete contact {entity_id}", "confidence": 0.9, } ) @@ -92,65 +88,41 @@ def map_query_to_actions(query: str, context: dict[str, Any] | None = None) -> l actions.append( { "method": "DELETE", - "path": "/api/v1/companies/{id}", + "path": "/api/v1/contacts/{id}", "body": None, - "description": "Delete a company (requires company ID in context or selection)", + "description": "Delete a contact (requires contact ID in context or selection)", "confidence": 0.5, } ) - elif _PATTERNS["update_company"].search(q): - entity_id = context.get("company_id") or context.get("entity_id") - path = f"/api/v1/companies/{entity_id}" if entity_id else "/api/v1/companies/{id}" + elif _PATTERNS["update_contact"].search(q): + entity_id = context.get("contact_id") or context.get("entity_id") + path = f"/api/v1/contacts/{entity_id}" if entity_id else "/api/v1/contacts/{id}" actions.append( { "method": "PATCH", "path": path, "body": _extract_update_fields(query), - "description": "Update company information", + "description": "Update contact information", "confidence": 0.8, } ) - elif _PATTERNS["list_company"].search(q) or _PATTERNS["list_company2"].search(q): + elif _PATTERNS["list_contact"].search(q) or _PATTERNS["list_contact2"].search(q): search_term = _extract_search_term(query) - desc = "List companies" + desc = "List contacts" if search_term: desc += f" matching '{search_term}'" actions.append( { "method": "GET", - "path": "/api/v1/companies", + "path": "/api/v1/contacts", "body": None, "description": desc, "confidence": 0.85, } ) - # --- Contact intents --- - elif _PATTERNS["create_contact"].search(q): - name = _extract_name(query) - actions.append( - { - "method": "POST", - "path": "/api/v1/contacts", - "body": {"name": name or "New Contact"}, - "description": f"Create a new contact named '{name or 'New Contact'}'", - "confidence": 0.9, - } - ) - - elif _PATTERNS["list_contact"].search(q): - actions.append( - { - "method": "GET", - "path": "/api/v1/contacts", - "body": None, - "description": "List contacts", - "confidence": 0.85, - } - ) - # --- Workflow intents --- elif _PATTERNS["list_workflow"].search(q): actions.append( @@ -181,9 +153,9 @@ def map_query_to_actions(query: str, context: dict[str, Any] | None = None) -> l actions.append( { "method": "GET", - "path": "/api/v1/companies", + "path": "/api/v1/contacts", "body": None, - "description": "Show available companies (demonstration action)", + "description": "Show available contacts (demonstration action)", "confidence": 0.3, } ) @@ -222,9 +194,9 @@ def _extract_update_fields(query: str) -> dict[str, Any]: if re.search(r"\bphone\b", query, re.IGNORECASE): match = _PHONE_PAT.search(query) if match: - fields["phone"] = match.group(1).strip() + fields["phone_1"] = match.group(1).strip() if re.search(r"\bemail\b", query, re.IGNORECASE): match = _EMAIL_PAT.search(query) if match: - fields["email"] = match.group(1).strip() + fields["email_1"] = match.group(1).strip() return fields or {"name": "Updated Name"} diff --git a/app/core/permission_registry.py b/app/core/permission_registry.py index 5dbec6c..35f7246 100644 --- a/app/core/permission_registry.py +++ b/app/core/permission_registry.py @@ -13,9 +13,6 @@ logger = logging.getLogger(__name__) # ── Core system permissions ── CORE_PERMISSIONS: list[dict[str, str]] = [ - {"key": "companies:read", "label": "Companies: Read", "category": "core", "module": "companies"}, - {"key": "companies:write", "label": "Companies: Write", "category": "core", "module": "companies"}, - {"key": "companies:delete", "label": "Companies: Delete", "category": "core", "module": "companies"}, {"key": "contacts:read", "label": "Contacts: Read", "category": "core", "module": "contacts"}, {"key": "contacts:write", "label": "Contacts: Write", "category": "core", "module": "contacts"}, {"key": "contacts:delete", "label": "Contacts: Delete", "category": "core", "module": "contacts"}, @@ -61,21 +58,12 @@ CORE_PERMISSIONS: list[dict[str, str]] = [ # ── Core field definitions for field-level permissions ── CORE_FIELD_DEFINITIONS: list[dict[str, str]] = [ - {"module": "companies", "field": "name", "label": "Name", "sensitivity": "normal"}, - {"module": "companies", "field": "account_number", "label": "Account Number", "sensitivity": "normal"}, - {"module": "companies", "field": "industry", "label": "Industry", "sensitivity": "normal"}, - {"module": "companies", "field": "phone", "label": "Phone", "sensitivity": "normal"}, - {"module": "companies", "field": "email", "label": "Email", "sensitivity": "normal"}, - {"module": "companies", "field": "website", "label": "Website", "sensitivity": "normal"}, - {"module": "companies", "field": "description", "label": "Description", "sensitivity": "normal"}, - {"module": "contacts", "field": "first_name", "label": "First Name", "sensitivity": "normal"}, - {"module": "contacts", "field": "last_name", "label": "Last Name", "sensitivity": "normal"}, - {"module": "contacts", "field": "email", "label": "Email", "sensitivity": "normal"}, - {"module": "contacts", "field": "phone", "label": "Phone", "sensitivity": "normal"}, - {"module": "contacts", "field": "mobile", "label": "Mobile", "sensitivity": "sensitive"}, - {"module": "contacts", "field": "position", "label": "Position", "sensitivity": "normal"}, - {"module": "contacts", "field": "department", "label": "Department", "sensitivity": "normal"}, - {"module": "contacts", "field": "linkedin_url", "label": "LinkedIn URL", "sensitivity": "sensitive"}, + {"module": "contacts", "field": "firstname", "label": "First Name", "sensitivity": "normal"}, + {"module": "contacts", "field": "surname", "label": "Last Name", "sensitivity": "normal"}, + {"module": "contacts", "field": "email_1", "label": "Email", "sensitivity": "normal"}, + {"module": "contacts", "field": "phone_1", "label": "Phone", "sensitivity": "normal"}, + {"module": "contacts", "field": "mobilephone", "label": "Mobile", "sensitivity": "sensitive"}, + {"module": "contacts", "field": "function", "label": "Position", "sensitivity": "normal"}, {"module": "contacts", "field": "notes", "label": "Notes", "sensitivity": "sensitive"}, {"module": "users", "field": "email", "label": "Email", "sensitivity": "normal"}, {"module": "users", "field": "name", "label": "Name", "sensitivity": "normal"}, diff --git a/app/core/permissions.py b/app/core/permissions.py index 1e223b2..2defb84 100644 --- a/app/core/permissions.py +++ b/app/core/permissions.py @@ -5,7 +5,7 @@ Architecture: - Redis cache: resolved:{user_id}:{tenant_id} with 5-min TTL. - Permission-version stamping for immediate invalidation. - Resolution: allowed = (role ∪ groups), denied = (role.denied ∪ groups.denied), resolved = allowed − denied. -- Wildcards: companies:*, *:read, *:* (bare * is forbidden). +- Wildcards: contacts:*, *:read, *:* (bare * is forbidden). """ from __future__ import annotations @@ -35,8 +35,8 @@ def _matches_permission(granted: str, required: str) -> bool: """Check if a granted permission matches the required permission. Supports wildcards: - - companies:read → exact match - - companies:* → all actions for companies + - contacts:read → exact match + - contacts:* → all actions for contacts - *:read → all modules, read action - *:* → everything (superadmin) """ @@ -67,9 +67,9 @@ def _normalize_permissions(permissions: Any) -> set[str]: """Normalize permissions from JSONB to a set of strings. Supports formats: - - list[str]: ["companies:read", "contacts:write"] - - dict[str, bool]: {"companies:read": true, "contacts:write": false} - - dict[str, dict]: {"companies": {"read": true, "write": false}} + - list[str]: ["contacts:read", "contacts:write"] + - dict[str, bool]: {"contacts:read": true, "contacts:write": false} + - dict[str, dict]: {"contacts": {"read": true, "write": false}} """ result: set[str] = set() if isinstance(permissions, list): @@ -156,7 +156,7 @@ async def resolve_permissions( if legacy_role == "admin": allowed.add("*:*") elif legacy_role == "editor": - allowed |= {"companies:read", "companies:write", "contacts:read", "contacts:write", + allowed |= {"contacts:read", "contacts:write", "contacts:read", "contacts:write", "users:read", "roles:read", "audit:read", "attachments:read", "attachments:write", "workflows:read", "workflows:write", "sequences:read", "sequences:write", "addresses:read", "addresses:write", @@ -164,7 +164,7 @@ async def resolve_permissions( "notifications:read", "notifications:write", "import_export:read", "import_export:write"} elif legacy_role == "viewer": - allowed |= {"companies:read", "contacts:read", "users:read", "roles:read", + allowed |= {"contacts:read", "contacts:read", "users:read", "roles:read", "audit:read", "attachments:read", "workflows:read", "sequences:read", "addresses:read", "taxes:read", "currencies:read", "notifications:read", "import_export:read"} @@ -265,7 +265,7 @@ def check_permission(resolved: dict[str, Any], required: str) -> bool: Args: resolved: result from get_cached_permissions or resolve_permissions - required: permission string like "companies:read" + required: permission string like "contacts:read" """ if resolved.get("is_system_admin"): return True diff --git a/app/core/worker.py b/app/core/worker.py index d8c45b0..cad8905 100644 --- a/app/core/worker.py +++ b/app/core/worker.py @@ -43,7 +43,6 @@ from app.plugins.builtins.unified_search.jobs import ( index_mails, index_file, index_contact, - index_company, index_event, reindex, embedding_batch, @@ -57,7 +56,6 @@ class WorkerSettings: index_mails, index_file, index_contact, - index_company, index_event, reindex, embedding_batch, diff --git a/app/deps.py b/app/deps.py index b44de19..e6c6f63 100644 --- a/app/deps.py +++ b/app/deps.py @@ -111,7 +111,7 @@ def require_permission(permission: str): """FastAPI dependency factory: require a specific permission. Usage: - @router.get("/companies", dependencies=[Depends(require_permission("companies:read"))]) + @router.get("/contacts", dependencies=[Depends(require_permission("contacts:read"))]) """ async def _check( current_user: dict[str, Any] = Depends(get_current_user), diff --git a/app/main.py b/app/main.py index e7ad839..ac98232 100644 --- a/app/main.py +++ b/app/main.py @@ -28,7 +28,6 @@ from app.routes import ( ai_copilot, audit, auth, - companies, contact_folders, contacts, entity_history, @@ -233,7 +232,6 @@ def create_app() -> FastAPI: app.include_router(groups.router) app.include_router(tenants.router) app.include_router(notifications.router) - app.include_router(companies.router) app.include_router(contacts.router) app.include_router(contact_folders.router) app.include_router(entity_history.router) diff --git a/app/models/__init__.py b/app/models/__init__.py index d61c048..01312cb 100644 --- a/app/models/__init__.py +++ b/app/models/__init__.py @@ -5,7 +5,6 @@ from app.models.ai_conversation import AIConversation, AIMessage from app.models.attachment import Attachment from app.models.audit import AuditLog, DeletionLog from app.models.auth import ApiToken, PasswordResetToken -from app.models.company import Company from app.models.contact import Contact, ContactPerson from app.models.contact_folder import ContactFolder from app.models.entity_history import EntityHistory @@ -37,7 +36,6 @@ __all__ = [ "NotificationPreference", "PasswordResetToken", "ApiToken", - "Company", "Contact", "ContactPerson", "ContactFolder", diff --git a/app/models/address.py b/app/models/address.py index 844cc49..48e6180 100644 --- a/app/models/address.py +++ b/app/models/address.py @@ -12,9 +12,9 @@ from app.core.db import Base, TenantMixin class Address(Base, TenantMixin): - """Polymorphic address entity — multiple addresses per company or contact. + """Polymorphic address entity — multiple addresses per contact. - entity_type: 'company' or 'contact' + entity_type: 'contact' entity_id: FK to companies.id or contacts.id address_type: billing, shipping, headquarters, branch, private, other is_default: one default address per (entity_type, entity_id, address_type) diff --git a/app/models/company.py b/app/models/company.py deleted file mode 100644 index 8eb83d5..0000000 --- a/app/models/company.py +++ /dev/null @@ -1,13 +0,0 @@ -"""Backward-compat shim — Company is now Contact with type='company'. - -This module re-exports Contact as Company for code that still imports -from app.models.company. The old companies table no longer exists; -all company data lives in the contacts table with type='company'. -""" - -from app.models.contact import Contact, ContactPerson - -# Backward-compat: Company is now just a Contact with type='company' -Company = Contact - -__all__ = ["Company", "ContactPerson"] diff --git a/app/plugins/builtins/ai_proactive/jobs.py b/app/plugins/builtins/ai_proactive/jobs.py index 6961d03..add3ab9 100644 --- a/app/plugins/builtins/ai_proactive/jobs.py +++ b/app/plugins/builtins/ai_proactive/jobs.py @@ -142,7 +142,7 @@ async def deep_analysis( # All mails for company mail_result = await db.execute( select(Mail) - .where(Mail.company_id == eid) + .where(Mail.contact_id == eid) .where(Mail.tenant_id == tid) .order_by(Mail.received_at.desc()) .limit(30) diff --git a/app/plugins/builtins/ai_proactive/services.py b/app/plugins/builtins/ai_proactive/services.py index 734cba8..0b44772 100644 --- a/app/plugins/builtins/ai_proactive/services.py +++ b/app/plugins/builtins/ai_proactive/services.py @@ -260,10 +260,10 @@ async def gather_context( ) context["thread"] = [_serialize_row(m) for m in thread_result.scalars().all()] - if mail and mail.company_id: + if mail and mail.contact_id: comp_result = await db.execute( select(Company) - .where(Company.id == mail.company_id) + .where(Company.id == mail.contact_id) .where(Company.tenant_id == tenant_id) .limit(1) ) @@ -307,7 +307,7 @@ async def gather_context( mail_result = await db.execute( select(Mail) - .where(Mail.company_id == entity_id) + .where(Mail.contact_id == entity_id) .where(Mail.tenant_id == tenant_id) .order_by(Mail.received_at.desc()) .limit(10) @@ -321,7 +321,7 @@ async def gather_context( event_result = await db.execute( select(CalendarEntry) .join(CalendarEntryLink, CalendarEntryLink.entry_id == CalendarEntry.id) - .where(CalendarEntryLink.entity_type == "company") + .where(CalendarEntryLink.entity_type == "contact") .where(CalendarEntryLink.entity_id == entity_id) .where(CalendarEntry.tenant_id == tenant_id) .where(CalendarEntry.start_at > now) diff --git a/app/plugins/builtins/calendar/schemas.py b/app/plugins/builtins/calendar/schemas.py index 7a1071d..e3ec94e 100644 --- a/app/plugins/builtins/calendar/schemas.py +++ b/app/plugins/builtins/calendar/schemas.py @@ -117,7 +117,7 @@ class EntryResponse(BaseModel): class LinkRequest(BaseModel): - entity_type: str = Field(..., pattern="^(company|contact)$") + entity_type: str = Field(..., pattern="^contact$") entity_id: str diff --git a/app/plugins/builtins/entity_links/plugin.py b/app/plugins/builtins/entity_links/plugin.py index d3092e3..10d18c4 100644 --- a/app/plugins/builtins/entity_links/plugin.py +++ b/app/plugins/builtins/entity_links/plugin.py @@ -23,18 +23,13 @@ class EntityLinksPlugin(BasePlugin): module="app.plugins.builtins.entity_links.routes", router_attr="router", ), - PluginRouteDef( - path="/api/v1/companies", - module="app.plugins.builtins.entity_links.routes", - router_attr="company_router", - ), PluginRouteDef( path="/api/v1/contacts", module="app.plugins.builtins.entity_links.routes", router_attr="contact_router", ), ], - events=["company.deleted", "contact.deleted"], + events=["contact.deleted"], migrations=["0001_initial.sql"], permissions=[ "entity_links:read", @@ -44,31 +39,6 @@ class EntityLinksPlugin(BasePlugin): is_core=True, ) - async def on_company_deleted(self, payload: dict[str, Any]) -> None: - """Handle company.deleted event — remove all EntityLink rows for that company.""" - from sqlalchemy import delete - - from app.core.db import get_session_factory - from app.plugins.builtins.entity_links.models import EntityLink - - entity_id = payload.get("entity_id") or payload.get("company_id") - tenant_id = payload.get("tenant_id") - if entity_id is None or tenant_id is None: - return - - import uuid as _uuid - - factory = get_session_factory() - async with factory() as session: - await session.execute( - delete(EntityLink).where( - EntityLink.tenant_id == _uuid.UUID(tenant_id), - EntityLink.entity_type == "company", - EntityLink.entity_id == _uuid.UUID(str(entity_id)), - ) - ) - await session.commit() - async def on_contact_deleted(self, payload: dict[str, Any]) -> None: """Handle contact.deleted event — remove all EntityLink rows for that contact.""" from sqlalchemy import delete diff --git a/app/plugins/builtins/entity_links/routes.py b/app/plugins/builtins/entity_links/routes.py index ec98dba..ee578bf 100644 --- a/app/plugins/builtins/entity_links/routes.py +++ b/app/plugins/builtins/entity_links/routes.py @@ -14,10 +14,9 @@ from app.plugins.builtins.entity_links.models import EntityLink from app.plugins.builtins.entity_links.schemas import EntityLinkRequest router = APIRouter(prefix="/api/v1/dms", tags=["entity-links"]) -company_router = APIRouter(prefix="/api/v1/companies", tags=["entity-links"]) contact_router = APIRouter(prefix="/api/v1/contacts", tags=["entity-links"]) -VALID_ENTITY_TYPES = {"company", "contact"} +VALID_ENTITY_TYPES = {"contact"} def _parse_uuid(val: str, field: str) -> uuid.UUID: @@ -36,7 +35,7 @@ async def link_file_to_entity( db: AsyncSession = Depends(get_db), current_user: dict = Depends(get_current_user), ): - """Link a file to a company or contact.""" + """Link a file to a contact.""" tenant_id = uuid.UUID(current_user["tenant_id"]) user_id = uuid.UUID(current_user["user_id"]) fid = _parse_uuid(file_id, "file_id") @@ -140,35 +139,6 @@ async def list_file_links( ] -@company_router.get("/{company_id}/files", dependencies=[Depends(require_permission("entity_links:read"))]) -async def list_company_files( - company_id: str, - db: AsyncSession = Depends(get_db), - current_user: dict = Depends(get_current_user), -): - """List all files linked to a company (reverse link).""" - tenant_id = uuid.UUID(current_user["tenant_id"]) - cid = _parse_uuid(company_id, "company_id") - - result = await db.execute( - select(EntityLink).where( - EntityLink.tenant_id == tenant_id, - EntityLink.entity_type == "company", - EntityLink.entity_id == cid, - ) - ) - links = result.scalars().all() - return [ - { - "id": str(link.id), - "file_id": str(link.file_id), - "entity_type": link.entity_type, - "entity_id": str(link.entity_id), - } - for link in links - ] - - @contact_router.get("/{contact_id}/files", dependencies=[Depends(require_permission("entity_links:read"))]) async def list_contact_files( contact_id: str, diff --git a/app/plugins/builtins/entity_links/schemas.py b/app/plugins/builtins/entity_links/schemas.py index 2de50d4..76383f9 100644 --- a/app/plugins/builtins/entity_links/schemas.py +++ b/app/plugins/builtins/entity_links/schemas.py @@ -6,7 +6,7 @@ from pydantic import BaseModel, Field class EntityLinkRequest(BaseModel): - entity_type: str = Field(..., pattern="^(company|contact)$") + entity_type: str = Field(..., pattern="^contact$") entity_id: str diff --git a/app/plugins/builtins/mail/models.py b/app/plugins/builtins/mail/models.py index 63017c7..7871f82 100644 --- a/app/plugins/builtins/mail/models.py +++ b/app/plugins/builtins/mail/models.py @@ -141,7 +141,6 @@ class Mail(Base, TenantMixin): received_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True) sent_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True) contact_id: Mapped[uuid.UUID | None] = mapped_column(PGUUID(as_uuid=True), nullable=True) - company_id: Mapped[uuid.UUID | None] = mapped_column(PGUUID(as_uuid=True), nullable=True) deleted_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True) diff --git a/app/plugins/builtins/mail/routes.py b/app/plugins/builtins/mail/routes.py index 45b2fd5..5cf16c5 100644 --- a/app/plugins/builtins/mail/routes.py +++ b/app/plugins/builtins/mail/routes.py @@ -1451,13 +1451,10 @@ async def link_mail( await _check_delegate_access(db, account, user_id, "write") if data.contact_id: mail.contact_id = _parse_uuid(data.contact_id, "contact_id") - if data.company_id: - mail.company_id = _parse_uuid(data.company_id, "company_id") await db.flush() return { "linked": True, "contact_id": str(mail.contact_id) if mail.contact_id else None, - "company_id": str(mail.company_id) if mail.company_id else None, } diff --git a/app/plugins/builtins/mail/schemas.py b/app/plugins/builtins/mail/schemas.py index 96bcc4c..3b2f68f 100644 --- a/app/plugins/builtins/mail/schemas.py +++ b/app/plugins/builtins/mail/schemas.py @@ -176,7 +176,6 @@ class MailResponse(BaseModel): received_at: datetime | None = None sent_at: datetime | None = None contact_id: str | None = None - company_id: str | None = None attachments: list[dict] = Field(default_factory=list) labels: list[dict] = Field(default_factory=list) @@ -190,7 +189,6 @@ class MailListResponse(BaseModel): class MailLinkRequest(BaseModel): contact_id: str | None = None - company_id: str | None = None class MailMoveRequest(BaseModel): diff --git a/app/plugins/builtins/mail/services.py b/app/plugins/builtins/mail/services.py index 0209c7d..25cb92d 100644 --- a/app/plugins/builtins/mail/services.py +++ b/app/plugins/builtins/mail/services.py @@ -2032,7 +2032,6 @@ def mail_to_response( "received_at": mail.received_at, "sent_at": mail.sent_at, "contact_id": str(mail.contact_id) if mail.contact_id else None, - "company_id": str(mail.company_id) if mail.company_id else None, "attachments": [], "labels": [], } diff --git a/app/plugins/builtins/tags/routes.py b/app/plugins/builtins/tags/routes.py index 751dad4..d0e908d 100644 --- a/app/plugins/builtins/tags/routes.py +++ b/app/plugins/builtins/tags/routes.py @@ -21,7 +21,7 @@ from app.plugins.builtins.tags.schemas import ( router = APIRouter(prefix="/api/v1/tags", tags=["tags"]) -VALID_ENTITY_TYPES = {"company", "contact", "file", "folder"} +VALID_ENTITY_TYPES = {"contact", "file", "folder"} def _parse_uuid(val: str, field: str) -> uuid.UUID: diff --git a/app/plugins/builtins/tags/schemas.py b/app/plugins/builtins/tags/schemas.py index 7317d5a..f7a9597 100644 --- a/app/plugins/builtins/tags/schemas.py +++ b/app/plugins/builtins/tags/schemas.py @@ -24,19 +24,19 @@ class TagResponse(BaseModel): class TagAssignRequest(BaseModel): tag_id: str - entity_type: str = Field(..., pattern="^(company|contact|file|folder)$") + entity_type: str = Field(..., pattern="^(contact|file|folder)$") entity_id: str class TagUnassignRequest(BaseModel): tag_id: str - entity_type: str = Field(..., pattern="^(company|contact|file|folder)$") + entity_type: str = Field(..., pattern="^(contact|file|folder)$") entity_id: str class TagBulkAssignRequest(BaseModel): tag_ids: list[str] = Field(..., min_length=1) - entity_type: str = Field(..., pattern="^(company|contact|file|folder)$") + entity_type: str = Field(..., pattern="^(contact|file|folder)$") entity_id: str diff --git a/app/plugins/builtins/test_sample.py b/app/plugins/builtins/test_sample.py index 5f9eccc..fe3b150 100644 --- a/app/plugins/builtins/test_sample.py +++ b/app/plugins/builtins/test_sample.py @@ -18,7 +18,7 @@ class TestSamplePlugin(BasePlugin): description="A sample plugin for testing install/activate/deactivate/uninstall lifecycle.", dependencies=[], routes=[], - events=["company.created", "contact.created"], + events=["contact.created"], migrations=["0001_test_plugin.sql"], permissions=[], ) @@ -45,8 +45,5 @@ class TestSamplePlugin(BasePlugin): async def on_uninstall(self, db, service_container) -> None: self.uninstall_called = True - async def on_company_created(self, payload: dict[str, Any]) -> None: - self.event_log.append({"event": "company.created", "payload": payload}) - async def on_contact_created(self, payload: dict[str, Any]) -> None: self.event_log.append({"event": "contact.created", "payload": payload}) diff --git a/app/plugins/builtins/unified_search/embedding.py b/app/plugins/builtins/unified_search/embedding.py index b25fdad..3886db8 100644 --- a/app/plugins/builtins/unified_search/embedding.py +++ b/app/plugins/builtins/unified_search/embedding.py @@ -181,7 +181,6 @@ async def index_entity( table_map = { "contact": "contacts", - "company": "contacts", "mail": "mails", "file": "files", "event": "calendar_entries", diff --git a/app/plugins/builtins/unified_search/jobs.py b/app/plugins/builtins/unified_search/jobs.py index fc91807..3dbc55f 100644 --- a/app/plugins/builtins/unified_search/jobs.py +++ b/app/plugins/builtins/unified_search/jobs.py @@ -122,7 +122,7 @@ async def index_contact(ctx: dict[str, Any], contact_id: str) -> None: async def index_company(ctx: dict[str, Any], company_id: str) -> None: - """Index a company: generate and store embedding.""" + """Index a company (contact with type='company'): generate and store embedding.""" from sqlalchemy import text from app.plugins.builtins.unified_search.embedding import index_entity @@ -137,7 +137,7 @@ async def index_company(ctx: dict[str, Any], company_id: str) -> None: row = result.mappings().first() if not row: return - await index_entity("company", eid, row["tenant_id"], db) + await index_entity("contact", eid, row["tenant_id"], db) except Exception: logger.exception("Failed to index company %s", company_id) @@ -170,7 +170,6 @@ async def reindex(ctx: dict[str, Any], entity_type: str) -> None: table_map = { "contact": "contacts", - "company": "contacts", "mail": "mails", "file": "files", "event": "calendar_entries", @@ -216,7 +215,6 @@ async def embedding_batch(ctx: dict[str, Any]) -> None: table_map = { "contact": "contacts", - "company": "contacts", "mail": "mails", "file": "files", "event": "calendar_entries", diff --git a/app/plugins/builtins/unified_search/plugin.py b/app/plugins/builtins/unified_search/plugin.py index 43c3643..faea81f 100644 --- a/app/plugins/builtins/unified_search/plugin.py +++ b/app/plugins/builtins/unified_search/plugin.py @@ -35,8 +35,6 @@ class UnifiedSearchPlugin(BasePlugin): "file.uploaded", "contact.created", "contact.updated", - "company.created", - "company.updated", "calendar.entry.created", ], migrations=["0001_initial.sql", "0002_embeddings.sql"], @@ -97,20 +95,6 @@ class UnifiedSearchPlugin(BasePlugin): if contact_id: await enqueue_job("index_contact", contact_id) - async def on_company_created(self, payload: dict[str, Any]) -> None: - from app.core.jobs import enqueue_job - - company_id = payload.get("company_id") - if company_id: - await enqueue_job("index_company", company_id) - - async def on_company_updated(self, payload: dict[str, Any]) -> None: - from app.core.jobs import enqueue_job - - company_id = payload.get("company_id") - if company_id: - await enqueue_job("index_company", company_id) - async def on_calendar_entry_created(self, payload: dict[str, Any]) -> None: from app.core.jobs import enqueue_job diff --git a/app/plugins/builtins/unified_search/provider_registry.py b/app/plugins/builtins/unified_search/provider_registry.py index f547f69..1822564 100644 --- a/app/plugins/builtins/unified_search/provider_registry.py +++ b/app/plugins/builtins/unified_search/provider_registry.py @@ -103,9 +103,6 @@ async def auto_register_providers(db: AsyncSession) -> None: from app.plugins.builtins.unified_search.providers.contact_provider import ( ContactSearchProvider, ) - from app.plugins.builtins.unified_search.providers.company_provider import ( - CompanySearchProvider, - ) from app.plugins.builtins.unified_search.providers.mail_provider import ( MailSearchProvider, ) @@ -122,7 +119,6 @@ async def auto_register_providers(db: AsyncSession) -> None: # Register all built-in providers for provider_cls in [ ContactSearchProvider, - CompanySearchProvider, MailSearchProvider, FileSearchProvider, EventSearchProvider, diff --git a/app/plugins/builtins/unified_search/providers/company_provider.py b/app/plugins/builtins/unified_search/providers/company_provider.py index 8d87612..c7dc907 100644 --- a/app/plugins/builtins/unified_search/providers/company_provider.py +++ b/app/plugins/builtins/unified_search/providers/company_provider.py @@ -15,7 +15,7 @@ logger = logging.getLogger(__name__) class CompanySearchProvider: """Search provider for Company entities (contacts with type='company').""" - entity_type = "company" + entity_type = "contact" async def search_fts( self, @@ -117,5 +117,5 @@ class CompanySearchProvider: "title": name, "snippet": email[:200], "score": 0.0, - "data": {}, + "data": {"type": "company"}, } diff --git a/app/plugins/builtins/unified_search/routes.py b/app/plugins/builtins/unified_search/routes.py index 0d34356..c65740d 100644 --- a/app/plugins/builtins/unified_search/routes.py +++ b/app/plugins/builtins/unified_search/routes.py @@ -70,7 +70,6 @@ async def search( # Map entity_type to module name for field-level permissions _ENTITY_TO_MODULE = { "contact": "contacts", - "company": "contacts", "mail": "mail", "file": "dms", "event": "calendar", diff --git a/app/plugins/builtins/unified_search/search_engine.py b/app/plugins/builtins/unified_search/search_engine.py index 24e3e09..d4ef6e0 100644 --- a/app/plugins/builtins/unified_search/search_engine.py +++ b/app/plugins/builtins/unified_search/search_engine.py @@ -17,7 +17,6 @@ logger = logging.getLogger(__name__) # Entity type -> (table_name, tsv_column, embedding_column) SEARCHABLE_ENTITIES: dict[str, tuple[str, str, str]] = { "contact": ("contacts", "search_tsv", "embedding"), - "company": ("companies", "search_tsv", "embedding"), "mail": ("mails", "body_tsv", "embedding"), "file": ("files", "content_tsv", "embedding"), "event": ("calendar_entries", "search_tsv", "embedding"), diff --git a/app/plugins/manifest.py b/app/plugins/manifest.py index 2336115..379fba6 100644 --- a/app/plugins/manifest.py +++ b/app/plugins/manifest.py @@ -128,8 +128,8 @@ MANIFEST_SCHEMA_DOC = ManifestSchemaResponse( description="An example plugin demonstrating the manifest schema.", dependencies=[], routes=[], - events=["company.created", "contact.created"], + events=["contact.created"], migrations=["0001_initial.sql"], - permissions=["companies.read"], + permissions=["contacts.read"], ), ) diff --git a/app/routes/__init__.py b/app/routes/__init__.py index 9dfd71b..a2b7854 100644 --- a/app/routes/__init__.py +++ b/app/routes/__init__.py @@ -5,7 +5,6 @@ from app.routes import ( ai_copilot, # noqa: F401 audit, # noqa: F401 auth, # noqa: F401 - companies, # noqa: F401 contacts, # noqa: F401 entity_history, # noqa: F401 currencies, # noqa: F401 diff --git a/app/routes/companies.py b/app/routes/companies.py deleted file mode 100644 index e1deef9..0000000 --- a/app/routes/companies.py +++ /dev/null @@ -1,303 +0,0 @@ -"""Company routes — full CRUD, FTS search, filter, pagination, export, N:M, emails.""" - -from __future__ import annotations - -import uuid - -from fastapi import APIRouter, Depends, HTTPException, Query, Response, status -from sqlalchemy.ext.asyncio import AsyncSession - -from app.core.db import get_db -from app.deps import require_permission -from app.schemas.company import CompanyCreate, CompanyUpdate -from app.services import company_service - -router = APIRouter(prefix="/api/v1/companies", tags=["companies"]) - - -@router.get("") -async def list_companies( - page: int = Query(1, ge=1), - page_size: int = Query(20, ge=1, le=100), - search: str | None = Query(None), - industry: str | None = Query(None), - sort_by: str = Query("name"), - sort_order: str = Query("asc", pattern="^(asc|desc)$"), - db: AsyncSession = Depends(get_db), - current_user: dict = Depends(require_permission("companies:read")), -): - """List companies with pagination, FTS search, industry filter, and sorting.""" - tenant_id = uuid.UUID(current_user["tenant_id"]) - result = await company_service.list_companies( - db, - tenant_id, - page=page, - page_size=page_size, - search=search, - industry=industry, - sort_by=sort_by, - sort_order=sort_order, - resolved_perms=current_user, - ) - return result - - -@router.post("", status_code=status.HTTP_201_CREATED) -async def create_company( - body: CompanyCreate, - db: AsyncSession = Depends(get_db), - current_user: dict = Depends(require_permission("companies:write")), -): - """Create a company. Requires write permission.""" - tenant_id = uuid.UUID(current_user["tenant_id"]) - user_id = uuid.UUID(current_user["user_id"]) - - - data = body.model_dump() - return await company_service.create_company(db, tenant_id, user_id, data) - - -@router.get("/export") -async def export_companies( - format: str = Query("csv", pattern="^(csv|xlsx)$"), - industry: str | None = Query(None), - search: str | None = Query(None), - db: AsyncSession = Depends(get_db), - current_user: dict = Depends(require_permission("companies:read")), -): - """Export companies as CSV (streaming) or XLSX (buffered).""" - tenant_id = uuid.UUID(current_user["tenant_id"]) - - if format == "csv": - import csv - import io - - from fastapi.responses import StreamingResponse - from sqlalchemy import select as sa_select - - from app.core.db import get_session_factory - from app.models.company import Company - - async def generate_csv(): - """Async generator yielding CSV rows (streaming, not buffered). - Creates its own DB session to avoid request-scoped session issues. - """ - output = io.StringIO() - writer = csv.writer(output) - header = [ - "id", "name", "account_number", "industry", "phone", - "email", "website", "description", "created_at", "updated_at", - ] - writer.writerow(header) - yield output.getvalue() - output.seek(0) - output.truncate(0) - - batch_size = 500 - offset = 0 - factory = get_session_factory() - async with factory() as session: - while True: - q = sa_select(Company).where( - Company.tenant_id == tenant_id, - Company.deleted_at.is_(None), - ) - if industry: - q = q.where(Company.industry == industry) - if search: - pattern = f"%{search}%" - q = q.where(Company.name.ilike(pattern)) - q = q.order_by(Company.name.asc()).offset(offset).limit(batch_size) - result = await session.execute(q) - companies = result.scalars().all() - if not companies: - break - for c in companies: - writer.writerow([ - str(c.id), c.name, c.account_number or "", c.industry or "", - c.phone or "", c.email or "", c.website or "", - c.description or "", - c.created_at.isoformat() if c.created_at else "", - c.updated_at.isoformat() if c.updated_at else "", - ]) - yield output.getvalue() - output.seek(0) - output.truncate(0) - offset += batch_size - - return StreamingResponse( - generate_csv(), - media_type="text/csv", - headers={"Content-Disposition": "attachment; filename=companies.csv"}, - ) - elif format == "xlsx": - xlsx_data = await company_service.export_companies_xlsx( - db, - tenant_id, - industry=industry, - search=search, - ) - return Response( - content=xlsx_data, - media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", - headers={"Content-Disposition": "attachment; filename=companies.xlsx"}, - ) - raise HTTPException(400, detail={"detail": "Invalid format", "code": "invalid_format"}) - - -@router.get("/{company_id}") -async def get_company( - company_id: str, - db: AsyncSession = Depends(get_db), - current_user: dict = Depends(require_permission("companies:read")), -): - """Get a single company with contacts array. Cross-tenant returns 404.""" - tenant_id = uuid.UUID(current_user["tenant_id"]) - try: - cid = uuid.UUID(company_id) - except ValueError: - raise HTTPException( - 400, detail={"detail": "Invalid company_id", "code": "invalid_id"} - ) from None - - data = await company_service.get_company_detail(db, tenant_id, cid, resolved_perms=current_user) - if data is None: - raise HTTPException(404, detail={"detail": "Company not found", "code": "not_found"}) - return data - - -@router.put("/{company_id}") -async def update_company( - company_id: str, - body: CompanyUpdate, - db: AsyncSession = Depends(get_db), - current_user: dict = Depends(require_permission("companies:write")), -): - """Update a company (full PUT).""" - tenant_id = uuid.UUID(current_user["tenant_id"]) - user_id = uuid.UUID(current_user["user_id"]) - - - try: - cid = uuid.UUID(company_id) - except ValueError: - raise HTTPException( - 400, detail={"detail": "Invalid company_id", "code": "invalid_id"} - ) from None - - data = body.model_dump(exclude_unset=True) - result = await company_service.update_company(db, tenant_id, user_id, cid, data) - if result is None: - raise HTTPException(404, detail={"detail": "Company not found", "code": "not_found"}) - return result - - -@router.delete("/{company_id}") -async def delete_company( - company_id: str, - cascade: bool = Query(False), - db: AsyncSession = Depends(get_db), - current_user: dict = Depends(require_permission("companies:write")), -): - """Soft-delete a company. Use cascade=true to also delete N:M links.""" - tenant_id = uuid.UUID(current_user["tenant_id"]) - user_id = uuid.UUID(current_user["user_id"]) - - - try: - cid = uuid.UUID(company_id) - except ValueError: - raise HTTPException( - 400, detail={"detail": "Invalid company_id", "code": "invalid_id"} - ) from None - - deleted = await company_service.soft_delete_company( - db, tenant_id, user_id, cid, cascade=cascade - ) - if not deleted: - raise HTTPException(404, detail={"detail": "Company not found", "code": "not_found"}) - - return Response(status_code=status.HTTP_204_NO_CONTENT) - - -@router.post("/{company_id}/contacts/{contact_id}") -async def link_company_contact( - company_id: str, - contact_id: str, - db: AsyncSession = Depends(get_db), - current_user: dict = Depends(require_permission("companies:write")), -): - """Link a contact to a company (N:M).""" - tenant_id = uuid.UUID(current_user["tenant_id"]) - user_id = uuid.UUID(current_user["user_id"]) - - - try: - comp_id = uuid.UUID(company_id) - cont_id = uuid.UUID(contact_id) - except ValueError: - raise HTTPException(400, detail={"detail": "Invalid ID", "code": "invalid_id"}) from None - - result = await company_service.link_contact(db, tenant_id, user_id, comp_id, cont_id) - if result is None: - raise HTTPException( - 404, detail={"detail": "Company or contact not found", "code": "not_found"} - ) - return result - - -@router.delete("/{company_id}/contacts/{contact_id}") -async def unlink_company_contact( - company_id: str, - contact_id: str, - db: AsyncSession = Depends(get_db), - current_user: dict = Depends(require_permission("companies:write")), -): - """Unlink a contact from a company (N:M).""" - tenant_id = uuid.UUID(current_user["tenant_id"]) - user_id = uuid.UUID(current_user["user_id"]) - - - try: - comp_id = uuid.UUID(company_id) - cont_id = uuid.UUID(contact_id) - except ValueError: - raise HTTPException(400, detail={"detail": "Invalid ID", "code": "invalid_id"}) from None - - unlinked = await company_service.unlink_contact(db, tenant_id, user_id, comp_id, cont_id) - if not unlinked: - raise HTTPException(404, detail={"detail": "Link not found", "code": "not_found"}) - - return Response(status_code=status.HTTP_204_NO_CONTENT) - - -@router.get("/{company_id}/emails") -async def get_company_emails( - company_id: str, - db: AsyncSession = Depends(get_db), - current_user: dict = Depends(require_permission("companies:read")), -): - """Get emails for a company (mail plugin inactive — returns empty array).""" - tenant_id = uuid.UUID(current_user["tenant_id"]) - try: - cid = uuid.UUID(company_id) - except ValueError: - raise HTTPException( - 400, detail={"detail": "Invalid company_id", "code": "invalid_id"} - ) from None - - # Verify company exists - from sqlalchemy import select - - from app.models.company import Company - - q = select(Company).where( - Company.id == cid, - Company.tenant_id == tenant_id, - Company.deleted_at.is_(None), - ) - result = await db.execute(q) - if result.scalar_one_or_none() is None: - raise HTTPException(404, detail={"detail": "Company not found", "code": "not_found"}) - - return [] diff --git a/app/routes/roles.py b/app/routes/roles.py index 938c4b5..c5fe77b 100644 --- a/app/routes/roles.py +++ b/app/routes/roles.py @@ -24,9 +24,6 @@ router = APIRouter(prefix="/api/v1/roles", tags=["roles"]) SYSTEM_PERMISSIONS: list[dict[str, str]] = [ - {"key": "companies:read", "label": "Companies: Read", "category": "system"}, - {"key": "companies:write", "label": "Companies: Write", "category": "system"}, - {"key": "companies:delete", "label": "Companies: Delete", "category": "system"}, {"key": "contacts:read", "label": "Contacts: Read", "category": "system"}, {"key": "contacts:write", "label": "Contacts: Write", "category": "system"}, {"key": "contacts:delete", "label": "Contacts: Delete", "category": "system"}, diff --git a/app/schemas/address.py b/app/schemas/address.py index 8518c21..924d153 100644 --- a/app/schemas/address.py +++ b/app/schemas/address.py @@ -6,7 +6,7 @@ from pydantic import BaseModel, Field class AddressCreate(BaseModel): - entity_type: str = Field(..., pattern="^(company|contact)$", description="'company' or 'contact'") + entity_type: str = Field(..., pattern="^contact$", description="'contact'") entity_id: str = Field(..., description="UUID of the parent entity") label: str = Field(..., min_length=1, max_length=100) address_type: str = Field( diff --git a/app/schemas/company.py b/app/schemas/company.py deleted file mode 100644 index fde5331..0000000 --- a/app/schemas/company.py +++ /dev/null @@ -1,55 +0,0 @@ -"""Company schemas — create, update, read, list, pagination, search, filter.""" - -from __future__ import annotations - -from pydantic import BaseModel, Field - - -class CompanyCreate(BaseModel): - name: str = Field(..., min_length=1, max_length=100) - account_number: str | None = Field(None, max_length=40) - industry: str | None = Field(None, max_length=50) - phone: str | None = Field(None, max_length=30) - email: str | None = Field(None, max_length=255) - website: str | None = Field(None, max_length=500) - description: str | None = None - - -class CompanyUpdate(BaseModel): - name: str | None = Field(None, min_length=1, max_length=100) - account_number: str | None = Field(None, max_length=40) - industry: str | None = Field(None, max_length=50) - phone: str | None = Field(None, max_length=30) - email: str | None = Field(None, max_length=255) - website: str | None = Field(None, max_length=500) - description: str | None = None - - -class CompanyResponse(BaseModel): - id: str - name: str - account_number: str | None = None - industry: str | None = None - phone: str | None = None - email: str | None = None - website: str | None = None - description: str | None = None - created_at: str | None = None - updated_at: str | None = None - - -class CompanyDetailResponse(CompanyResponse): - contacts: list[dict] = Field(default_factory=list) - - -class CompanyListResponse(BaseModel): - items: list[CompanyResponse] - total: int - page: int - page_size: int - - -class CompanyExportRequest(BaseModel): - format: str = Field("csv", pattern="^(csv|xlsx)$") - industry: str | None = None - search: str | None = None diff --git a/app/services/address_service.py b/app/services/address_service.py index 2c4bc44..f0a2bcc 100644 --- a/app/services/address_service.py +++ b/app/services/address_service.py @@ -13,7 +13,7 @@ from app.core.audit import log_audit from app.models.address import Address -VALID_ENTITY_TYPES = {"company", "contact"} +VALID_ENTITY_TYPES = {"contact"} VALID_ADDRESS_TYPES = {"billing", "shipping", "headquarters", "branch", "private", "other"} @@ -206,7 +206,7 @@ async def migrate_existing_addresses(db: AsyncSession) -> int: existing = await db.execute( select(Address).where( Address.tenant_id == company.tenant_id, - Address.entity_type == "company", + Address.entity_type == "contact", Address.entity_id == company.id, Address.address_type == "headquarters", Address.deleted_at.is_(None), @@ -217,7 +217,7 @@ async def migrate_existing_addresses(db: AsyncSession) -> int: addr = Address( tenant_id=company.tenant_id, - entity_type="company", + entity_type="contact", entity_id=company.id, label="Hauptsitz", address_type="headquarters", diff --git a/app/services/ai_copilot_service.py b/app/services/ai_copilot_service.py index 970c337..5c879c5 100644 --- a/app/services/ai_copilot_service.py +++ b/app/services/ai_copilot_service.py @@ -13,7 +13,7 @@ from app.ai.llm_client import get_llm_client from app.core.audit import log_audit from app.core.auth import check_permission from app.models.ai_conversation import AIConversation, AIMessage -from app.models.contact import Contact as Company +from app.models.contact import Contact from app.models.contact import Contact from app.models.workflow import Workflow @@ -306,16 +306,14 @@ async def _execute_api_action( ) -> dict[str, Any]: """Execute an API action directly against the database. - Supports companies and contacts CRUD, plus workflow listing. + Supports contacts CRUD (including company-type contacts), plus workflow listing. """ # Parse path to determine entity and operation parts = path.replace("/api/v1/", "").strip("/").split("/") entity = parts[0] if parts else "" entity_id = parts[1] if len(parts) > 1 else None - if entity == "companies": - return await _exec_companies(db, tenant_id, user_id, method, entity_id, body) - elif entity == "contacts": + if entity in ("companies", "contacts"): return await _exec_contacts(db, tenant_id, user_id, method, entity_id, body) elif entity == "workflows": return await _exec_workflows(db, tenant_id, user_id, method, entity_id, body) @@ -323,7 +321,7 @@ async def _execute_api_action( return {"error": f"Unsupported entity: {entity}", "status_code": 400, "success": False} -async def _exec_companies( +async def _exec_contacts\( db: AsyncSession, tenant_id: uuid.UUID, user_id: uuid.UUID, @@ -331,99 +329,7 @@ async def _exec_companies( entity_id: str | None, body: dict[str, Any], ) -> dict[str, Any]: - """Execute company operations.""" - if method == "GET": - result = await db.execute( - select(Company).where( - Company.tenant_id == tenant_id, - Company.deleted_at.is_(None), - ) - ) - companies = result.scalars().all() - return { - "success": True, - "status_code": 200, - "data": [{"id": str(c.id), "name": c.name, "industry": c.industry} for c in companies], - } - - elif method == "POST": - company = Company( - tenant_id=tenant_id, - name=body.get("name", "Untitled"), - industry=body.get("industry"), - phone=body.get("phone"), - email=body.get("email"), - website=body.get("website"), - description=body.get("description"), - created_by=user_id, - updated_by=user_id, - ) - db.add(company) - await db.flush() - return { - "success": True, - "status_code": 201, - "data": {"id": str(company.id), "name": company.name}, - } - - elif method == "DELETE": - if not entity_id or entity_id == "{id}": - return {"error": "Company ID required", "status_code": 400, "success": False} - comp_uuid = uuid.UUID(entity_id) - result = await db.execute( - select(Company).where( - Company.id == comp_uuid, - Company.tenant_id == tenant_id, - ) - ) - company = result.scalar_one_or_none() - if company is None: - return {"error": "Company not found", "status_code": 404, "success": False} - company.deleted_at = datetime.now(UTC) - await db.flush() - return { - "success": True, - "status_code": 200, - "data": {"id": str(company.id), "deleted": True}, - } - - elif method == "PATCH": - if not entity_id or entity_id == "{id}": - return {"error": "Company ID required", "status_code": 400, "success": False} - comp_uuid = uuid.UUID(entity_id) - result = await db.execute( - select(Company).where( - Company.id == comp_uuid, - Company.tenant_id == tenant_id, - Company.deleted_at.is_(None), - ) - ) - company = result.scalar_one_or_none() - if company is None: - return {"error": "Company not found", "status_code": 404, "success": False} - for key in ("name", "industry", "phone", "email", "website", "description"): - if key in body: - setattr(company, key, body[key]) - company.updated_by = user_id - await db.flush() - return { - "success": True, - "status_code": 200, - "data": {"id": str(company.id), "name": company.name, "industry": company.industry}, - } - - return {"error": f"Unsupported method: {method}", "status_code": 400, "success": False} - - -async def _exec_contacts( - db: AsyncSession, - tenant_id: uuid.UUID, - user_id: uuid.UUID, - method: str, - entity_id: str | None, - body: dict[str, Any], -) -> dict[str, Any]: - """Execute contact operations.""" + """Execute contact operations (unified: company + person).""" if method == "GET": result = await db.execute( select(Contact).where( @@ -435,15 +341,16 @@ async def _exec_contacts( return { "success": True, "status_code": 200, - "data": [{"id": str(c.id), "name": c.name, "email": c.email} for c in contacts], + "data": [{"id": str(c.id), "name": c.name or c.displayname, "email": c.email_1, "type": c.type} for c in contacts], } elif method == "POST": contact = Contact( tenant_id=tenant_id, + type=body.get("type", "company"), name=body.get("name", "Untitled"), - email=body.get("email"), - phone=body.get("phone"), + email_1=body.get("email"), + phone_1=body.get("phone"), created_by=user_id, updated_by=user_id, ) @@ -452,7 +359,7 @@ async def _exec_contacts( return { "success": True, "status_code": 201, - "data": {"id": str(contact.id), "name": contact.name}, + "data": {"id": str(contact.id), "name": contact.name, "type": contact.type}, } return {"error": f"Unsupported method: {method}", "status_code": 400, "success": False} diff --git a/app/services/company_service.py b/app/services/company_service.py deleted file mode 100644 index 9657386..0000000 --- a/app/services/company_service.py +++ /dev/null @@ -1,273 +0,0 @@ -"""Company service — now operates on Contact with type='company'. - -Backward-compat layer: all company operations are now contact operations -filtered by type='company'. CompanyContact is replaced by ContactPerson 1:N. -""" - -from __future__ import annotations - -import uuid -from typing import Any - -from sqlalchemy import select, func, delete -from sqlalchemy.ext.asyncio import AsyncSession -from sqlalchemy.orm import selectinload - -from app.models.contact import Contact, ContactPerson - - -def _company_to_dict(c: Contact) -> dict: - """Serialize a company (Contact with type=company) to dict.""" - return { - "id": str(c.id), - "name": c.name or "", - "account_number": c.code or "", - "industry": (c.custom or {}).get("industry") if c.custom else None, - "phone": c.phone_1, - "email": c.email_1, - "website": c.website, - "description": (c.custom or {}).get("description") if c.custom else None, - "created_at": c.created_at.isoformat() if c.created_at else None, - "updated_at": c.updated_at.isoformat() if c.updated_at else None, - } - - -async def list_companies( - db: AsyncSession, - tenant_id: uuid.UUID, - page: int = 1, - page_size: int = 20, - search: str | None = None, - industry: str | None = None, - sort_by: str = "name", - sort_order: str = "asc", - resolved_perms: dict | None = None, -) -> dict: - """List companies (contacts with type='company').""" - base = select(Contact).where( - Contact.tenant_id == tenant_id, - Contact.type == "company", - Contact.deleted_at.is_(None), - ) - - if search: - base = base.where(Contact.search_tsv.op("@@")(func.plainto_tsquery("german", search))) - - count_q = select(func.count()).select_from(base.subquery()) - total = (await db.execute(count_q)).scalar() or 0 - - sort_col = getattr(Contact, sort_by if sort_by != "name" else "name", Contact.name) - if sort_order == "desc": - sort_col = sort_col.desc() - base = base.order_by(sort_col) - - offset = (page - 1) * page_size - base = base.offset(offset).limit(page_size) - - result = await db.execute(base) - companies = result.scalars().all() - - return { - "items": [_company_to_dict(c) for c in companies], - "total": total, - "page": page, - "page_size": page_size, - } - - -async def create_company( - db: AsyncSession, tenant_id: uuid.UUID, user_id: uuid.UUID, data: dict -) -> dict: - """Create a company (contact with type='company').""" - # Map old fields to new - contact_data = { - "type": "company", - "name": data.get("name", ""), - "code": data.get("account_number"), - "phone_1": data.get("phone"), - "email_1": data.get("email"), - "website": data.get("website"), - "displayname": data.get("name", ""), - } - # Store industry/description in custom - custom = {} - if data.get("industry"): - custom["industry"] = data["industry"] - if data.get("description"): - custom["description"] = data["description"] - if custom: - contact_data["custom"] = custom - - contact = Contact(tenant_id=tenant_id, created_by=user_id, updated_by=user_id, **contact_data) - db.add(contact) - await db.flush() - return _company_to_dict(contact) - - -async def get_company_detail( - db: AsyncSession, tenant_id: uuid.UUID, company_id: str, resolved_perms: dict | None = None -) -> dict: - """Get company detail with contact persons.""" - q = ( - select(Contact) - .options(selectinload(Contact.contact_persons)) - .where( - Contact.id == uuid.UUID(company_id), - Contact.tenant_id == tenant_id, - Contact.type == "company", - Contact.deleted_at.is_(None), - ) - ) - result = await db.execute(q) - contact = result.scalar_one_or_none() - if not contact: - raise ValueError("Company not found") - - data = _company_to_dict(contact) - data["contacts"] = [ - { - "id": str(cp.id), - "first_name": cp.firstname or "", - "last_name": cp.lastname or "", - "email": cp.email, - "phone": cp.phone, - "position": cp.function, - } - for cp in (contact.contact_persons or []) - if cp.deleted_at is None - ] - return data - - -async def update_company( - db: AsyncSession, tenant_id: uuid.UUID, user_id: uuid.UUID, company_id: str, data: dict -) -> dict: - """Update a company.""" - q = select(Contact).where( - Contact.id == uuid.UUID(company_id), - Contact.tenant_id == tenant_id, - Contact.type == "company", - Contact.deleted_at.is_(None), - ) - result = await db.execute(q) - contact = result.scalar_one_or_none() - if not contact: - raise ValueError("Company not found") - - if "name" in data: - contact.name = data["name"] - contact.displayname = data["name"] - if "account_number" in data: - contact.code = data["account_number"] - if "phone" in data: - contact.phone_1 = data["phone"] - if "email" in data: - contact.email_1 = data["email"] - if "website" in data: - contact.website = data["website"] - - # Store industry/description in custom - custom = dict(contact.custom or {}) - if "industry" in data: - custom["industry"] = data["industry"] - if "description" in data: - custom["description"] = data["description"] - if custom: - contact.custom = custom - - contact.updated_by = user_id - await db.flush() - return _company_to_dict(contact) - - -async def soft_delete_company( - db: AsyncSession, tenant_id: uuid.UUID, company_id: str, cascade: bool = True -) -> bool: - """Soft-delete a company.""" - from datetime import datetime, timezone - q = select(Contact).where( - Contact.id == uuid.UUID(company_id), - Contact.tenant_id == tenant_id, - Contact.type == "company", - Contact.deleted_at.is_(None), - ) - result = await db.execute(q) - contact = result.scalar_one_or_none() - if not contact: - return False - contact.deleted_at = datetime.now(timezone.utc) - await db.flush() - return True - - -async def export_companies_xlsx( - db: AsyncSession, tenant_id: uuid.UUID, industry: str | None = None, search: str | None = None -) -> bytes: - """Export companies as XLSX.""" - from openpyxl import Workbook - - base = select(Contact).where( - Contact.tenant_id == tenant_id, - Contact.type == "company", - Contact.deleted_at.is_(None), - ) - if search: - base = base.where(Contact.search_tsv.op("@@")(func.plainto_tsquery("german", search))) - base = base.order_by(Contact.name) - - result = await db.execute(base) - companies = result.scalars().all() - - wb = Workbook() - ws = wb.active - ws.title = "Companies" - ws.append(["Name", "Account Number", "Industry", "Phone", "Email", "Website"]) - for c in companies: - custom = c.custom or {} - ws.append([ - c.name or "", c.code or "", custom.get("industry", ""), - c.phone_1 or "", c.email_1 or "", c.website or "", - ]) - - import io - buf = io.BytesIO() - wb.save(buf) - return buf.getvalue() - - -async def link_contact( - db: AsyncSession, tenant_id: uuid.UUID, user_id: uuid.UUID, company_id: str, contact_id: str -) -> dict: - """Link a contact person to a company (create ContactPerson).""" - # In new model, contact_id is used to create a ContactPerson under the company contact - # This is a compat shim — the old API expected a separate Contact entity - # Now we just create a ContactPerson linked to the company - cp = ContactPerson( - tenant_id=tenant_id, - contact_id=uuid.UUID(company_id), - created_by=user_id, - updated_by=user_id, - ) - db.add(cp) - await db.flush() - return {"id": str(cp.id), "company_id": company_id, "contact_id": contact_id} - - -async def unlink_contact( - db: AsyncSession, tenant_id: uuid.UUID, user_id: uuid.UUID, company_id: str, contact_id: str -) -> bool: - """Unlink a contact person from a company (soft-delete ContactPerson).""" - from datetime import datetime, timezone - q = select(ContactPerson).where( - ContactPerson.contact_id == uuid.UUID(company_id), - ContactPerson.id == uuid.UUID(contact_id), - ContactPerson.tenant_id == tenant_id, - ContactPerson.deleted_at.is_(None), - ) - result = await db.execute(q) - cp = result.scalar_one_or_none() - if not cp: - return False - cp.deleted_at = datetime.now(timezone.utc) - await db.flush() - return True diff --git a/app/workflows/engine.py b/app/workflows/engine.py index 28d2e79..18542c8 100644 --- a/app/workflows/engine.py +++ b/app/workflows/engine.py @@ -302,5 +302,5 @@ def register_workflow_event_handlers() -> None: await handle_event(db, tenant_id, event_name, payload) # Subscribe to common events - for event_name in ("user.created", "company.created", "contact.created"): + for event_name in ("user.created", "contact.created"): event_bus.subscribe(event_name, _workflow_event_handler) diff --git a/frontend/src/__tests__/search/GlobalSearch.test.tsx b/frontend/src/__tests__/search/GlobalSearch.test.tsx index c25dc94..f4a10b1 100644 --- a/frontend/src/__tests__/search/GlobalSearch.test.tsx +++ b/frontend/src/__tests__/search/GlobalSearch.test.tsx @@ -7,7 +7,7 @@ import { GlobalSearchResultsPage } from '@/pages/GlobalSearchResults'; vi.mock('@/api/hooks', () => ({ useGlobalSearch: () => ({ data: [ - { id: '1', type: 'company', name: 'TestCorp GmbH', description: 'IT company', url: '/companies/1' }, + { id: '1', type: 'contact', name: 'TestCorp GmbH', description: 'IT company', url: '/contacts/1' }, { id: '2', type: 'contact', name: 'Max Mustermann', description: 'CEO', url: '/contacts/2' }, ], isLoading: false, diff --git a/frontend/src/__tests__/search/GlobalSearchTabs.test.tsx b/frontend/src/__tests__/search/GlobalSearchTabs.test.tsx index 8601cf0..a09a4a3 100644 --- a/frontend/src/__tests__/search/GlobalSearchTabs.test.tsx +++ b/frontend/src/__tests__/search/GlobalSearchTabs.test.tsx @@ -6,7 +6,7 @@ import { MemoryRouter } from 'react-router-dom'; vi.mock('@/api/hooks', () => ({ useGlobalSearch: () => ({ data: [ - { id: '1', type: 'company', name: 'TestCorp GmbH', description: 'IT company', url: '/companies/1' }, + { id: '1', type: 'contact', name: 'TestCorp GmbH', description: 'IT company', url: '/contacts/1' }, { id: '2', type: 'contact', name: 'Max Mustermann', description: 'CEO', url: '/contacts/2' }, { id: '3', type: 'mail', name: 'Test Email', description: 'Subject: Hello', url: '/mail/3' }, { id: '4', type: 'file', name: 'Document.pdf', description: 'PDF file', url: '/dms/4' }, diff --git a/frontend/src/__tests__/tags/BulkTagDialog.test.tsx b/frontend/src/__tests__/tags/BulkTagDialog.test.tsx index 1956879..c944fd6 100644 --- a/frontend/src/__tests__/tags/BulkTagDialog.test.tsx +++ b/frontend/src/__tests__/tags/BulkTagDialog.test.tsx @@ -27,17 +27,17 @@ beforeEach(() => { describe('BulkTagDialog', () => { it('renders dialog when open', async () => { - render(); + render(); expect(screen.getByRole('dialog')).toBeInTheDocument(); }); it('shows selected entity count', async () => { - render(); + render(); expect(screen.getByText('3 ausgewaehlte Eintraege')).toBeInTheDocument(); }); it('loads and displays available tags', async () => { - render(); + render(); await waitFor(() => { expect(fetchTags).toHaveBeenCalled(); }); @@ -48,7 +48,7 @@ describe('BulkTagDialog', () => { }); it('toggles tag selection on click', async () => { - render(); + render(); await waitFor(() => { expect(fetchTags).toHaveBeenCalled(); }); @@ -62,7 +62,7 @@ describe('BulkTagDialog', () => { it('calls bulkAssignTags on assign button click', async () => { const onAssigned = vi.fn(); const onClose = vi.fn(); - render(); + render(); await waitFor(() => { expect(fetchTags).toHaveBeenCalled(); }); @@ -73,14 +73,14 @@ describe('BulkTagDialog', () => { await waitFor(() => { expect(bulkAssignTags).toHaveBeenCalledWith({ tag_ids: ['t1'], - entity_type: 'company', + entity_type: 'contact', entity_ids: ['c1', 'c2'], }); }); }); it('does not render when closed', () => { - render(); + render(); expect(screen.queryByRole('dialog')).not.toBeInTheDocument(); }); }); diff --git a/frontend/src/__tests__/tags/TagPicker.test.tsx b/frontend/src/__tests__/tags/TagPicker.test.tsx index 8e2d454..f26e40d 100644 --- a/frontend/src/__tests__/tags/TagPicker.test.tsx +++ b/frontend/src/__tests__/tags/TagPicker.test.tsx @@ -1,13 +1,6 @@ import React from 'react'; import { describe, it, expect, vi, beforeEach } from 'vitest'; -import { render, screen, fireEvent, waitFor } from '@testing-library/react'; -import { TagPicker } from '@/components/tags/TagPicker'; - -const mockTags = [ - { id: 't1', name: 'VIP-Kunde', color: '#EF4444', created_by: 'u1', usage_count: 5 }, - { id: 't2', name: 'Lead', color: '#3B82F6', created_by: 'u1', usage_count: 12 }, - { id: 't3', name: 'Aktiv', color: '#10B981', created_by: 'u1', usage_count: 3 }, -]; +import { render, screen, waitFor, fireEvent } from '@testing-library/react'; const mockFetchTags = vi.fn(); const mockAssignTag = vi.fn(); @@ -15,44 +8,48 @@ const mockUnassignTag = vi.fn(); const mockCreateTag = vi.fn(); vi.mock('@/api/tags', () => ({ - fetchTags: (...args: unknown[]) => mockFetchTags(...args), - assignTag: (...args: unknown[]) => mockAssignTag(...args), - unassignTag: (...args: unknown[]) => mockUnassignTag(...args), - createTag: (...args: unknown[]) => mockCreateTag(...args), + fetchTags: (...args: any[]) => mockFetchTags(...args), + assignTag: (...args: any[]) => mockAssignTag(...args), + unassignTag: (...args: any[]) => mockUnassignTag(...args), + createTag: (...args: any[]) => mockCreateTag(...args), })); -vi.mock('@/components/ui/Toast', () => ({ - useToast: () => ({ success: vi.fn(), error: vi.fn(), info: vi.fn(), warning: vi.fn() }), -})); +import { TagPicker } from '@/components/tags/TagPicker'; + +const mockTags = [ + { id: 't1', name: 'VIP-Kunde', color: '#10B981', created_by: 'u1' }, + { id: 't2', name: 'Lead', color: '#3B82F6', created_by: 'u1' }, + { id: 't3', name: 'Archiv', color: '#6B7280', created_by: 'u1' }, +]; beforeEach(() => { vi.clearAllMocks(); mockFetchTags.mockResolvedValue(mockTags); - mockAssignTag.mockResolvedValue({ id: 'a1', tag_id: 't1', entity_type: 'company', entity_id: 'c1' }); + mockAssignTag.mockResolvedValue({ id: 'a1', tag_id: 't1', entity_type: 'contact', entity_id: 'c1' }); mockUnassignTag.mockResolvedValue(undefined); mockCreateTag.mockResolvedValue({ id: 't4', name: 'Neu', color: '#F59E0B', created_by: 'u1' }); }); describe('TagPicker', () => { it('renders the tag picker container', async () => { - render(); + render(); expect(screen.getByTestId('tag-picker')).toBeInTheDocument(); }); it('renders assigned tags section', async () => { - render(); + render(); expect(screen.getByText('Zugewiesene Tags')).toBeInTheDocument(); }); it('shows no tags assigned message when empty', async () => { - render(); + render(); await waitFor(() => { expect(screen.getByText('Keine Tags zugewiesen')).toBeInTheDocument(); }); }); it('loads and displays available tags', async () => { - render(); + render(); await waitFor(() => { expect(mockFetchTags).toHaveBeenCalled(); }); @@ -64,18 +61,18 @@ describe('TagPicker', () => { }); it('assigns a tag when clicking available tag', async () => { - render(); + render(); await waitFor(() => { expect(screen.getByText('VIP-Kunde')).toBeInTheDocument(); }); fireEvent.click(screen.getByText('VIP-Kunde')); await waitFor(() => { - expect(mockAssignTag).toHaveBeenCalledWith({ tag_id: 't1', entity_type: 'company', entity_id: 'c1' }); + expect(mockAssignTag).toHaveBeenCalledWith({ tag_id: 't1', entity_type: 'contact', entity_id: 'c1' }); }); }); it('shows create tag form when clicking create button', async () => { - render(); + render(); await waitFor(() => { expect(screen.getByText('Neues Tag')).toBeInTheDocument(); }); @@ -86,7 +83,7 @@ describe('TagPicker', () => { }); it('renders search input for tags', async () => { - render(); + render(); expect(screen.getByLabelText('Tag suchen')).toBeInTheDocument(); }); }); diff --git a/frontend/src/api/calendar.ts b/frontend/src/api/calendar.ts index 715f95b..d17f633 100644 --- a/frontend/src/api/calendar.ts +++ b/frontend/src/api/calendar.ts @@ -53,7 +53,7 @@ export interface CalendarEntry { export interface CalendarEntryLink { id: string; - entity_type: 'company' | 'contact'; + entity_type: 'contact' | 'company'; entity_id: string; } diff --git a/frontend/src/api/hooks.ts b/frontend/src/api/hooks.ts index 5b54fd1..bc96499 100644 --- a/frontend/src/api/hooks.ts +++ b/frontend/src/api/hooks.ts @@ -1,15 +1,11 @@ /** - * hooks.ts — Re-Export Hub + * hooks.ts — Re-Export Hub (Company hooks removed in Phase 1C) * * This file re-exports all hooks from their dedicated modules so that * existing imports `from '@/api/hooks'` continue to work without change. - * - * Company hooks remain inline here — they will be removed in Phase 1. */ -import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'; -import { apiGet, apiPost, apiPatch, apiDelete, apiClient } from './client'; -import { PaginatedResponse, Company, CompanyDetail } from './types'; +import { useQuery } from '@tanstack/react-query'; // ── Re-exports from dedicated modules ── export * from './types'; @@ -48,89 +44,3 @@ export function useGlobalSearch(query: string, entityTypes?: string[]) { staleTime: 30 * 1000, }); } - -// ── Company hooks (will be removed in Phase 1) ── - -export function useCompanies(page = 1, pageSize = 25, search?: string, industry?: string, sortBy?: string, sortOrder?: string) { - const params = new URLSearchParams({ page: String(page), page_size: String(pageSize) }); - if (search) params.set('search', search); - if (industry) params.set('industry', industry); - if (sortBy) params.set('sort_by', sortBy); - if (sortOrder) params.set('sort_order', sortOrder); - return useQuery({ - queryKey: ['companies', page, pageSize, search, industry, sortBy, sortOrder], - queryFn: () => - apiGet>(`/companies?${params.toString()}`), - }); -} - -export function useCompany(id?: string) { - return useQuery({ - queryKey: ['companies', id], - queryFn: () => apiGet(`/companies/${id}`), - enabled: !!id, - }); -} - -export function useCreateCompany() { - const queryClient = useQueryClient(); - return useMutation({ - mutationFn: (data: Partial) => apiPost('/companies', data), - onSuccess: () => { - queryClient.invalidateQueries({ queryKey: ['companies'] }); - }, - }); -} - -export function useUpdateCompany() { - const queryClient = useQueryClient(); - return useMutation({ - mutationFn: ({ id, data }: { id: string; data: Partial }) => - apiPatch(`/companies/${id}`, data), - onSuccess: (_data, variables) => { - queryClient.invalidateQueries({ queryKey: ['companies'] }); - queryClient.invalidateQueries({ queryKey: ['companies', variables.id] }); - }, - }); -} - -export function useDeleteCompany() { - const queryClient = useQueryClient(); - return useMutation({ - mutationFn: (id: string) => apiDelete(`/companies/${id}`), - onSuccess: () => { - queryClient.invalidateQueries({ queryKey: ['companies'] }); - }, - }); -} - -export function useCompanyExport(search?: string, industry?: string) { - return useMutation({ - mutationFn: async () => { - const params = new URLSearchParams({ format: 'csv' }); - if (search) params.set('search', search); - if (industry) params.set('industry', industry); - const response = await apiClient.get(`/companies/export?${params.toString()}`, { - responseType: 'blob', - }); - return response.data; - }, - }); -} - -export function useCompanyImport() { - const queryClient = useQueryClient(); - return useMutation({ - mutationFn: async (file: File) => { - const formData = new FormData(); - formData.append('file', file); - const response = await apiClient.post('/companies/import', formData, { - headers: { 'Content-Type': 'multipart/form-data' }, - }); - return response.data; - }, - onSuccess: () => { - queryClient.invalidateQueries({ queryKey: ['companies'] }); - }, - }); -} diff --git a/frontend/src/api/mail.ts b/frontend/src/api/mail.ts index d86b5ba..0777ec1 100644 --- a/frontend/src/api/mail.ts +++ b/frontend/src/api/mail.ts @@ -272,7 +272,6 @@ export interface FlagUpdatePayload { export interface LinkMailPayload { contact_id?: string | null; - company_id?: string | null; } export interface CreateEventFromMailPayload { diff --git a/frontend/src/api/search.ts b/frontend/src/api/search.ts index de8f8de..49ad5c3 100644 --- a/frontend/src/api/search.ts +++ b/frontend/src/api/search.ts @@ -1,7 +1,7 @@ import { apiClient } from './client'; export interface SearchResult { - type: 'company' | 'contact' | 'mail' | 'file' | 'event'; + type: 'contact' | 'mail' | 'file' | 'event'; id: string; name: string; description?: string; diff --git a/frontend/src/api/tags.ts b/frontend/src/api/tags.ts index 6d588c6..3bfd69b 100644 --- a/frontend/src/api/tags.ts +++ b/frontend/src/api/tags.ts @@ -9,7 +9,7 @@ import { apiDelete, apiGet, apiPatch, apiPost } from './client'; // ─── Types ───────────────────────────────────────────────────────────────── -export type EntityType = 'company' | 'contact' | 'file' | 'calendar_entry'; +export type EntityType = 'contact' | 'file' | 'calendar_entry'; export interface Tag { id: string; diff --git a/frontend/src/api/types.ts b/frontend/src/api/types.ts index 6f54132..b29bf78 100644 --- a/frontend/src/api/types.ts +++ b/frontend/src/api/types.ts @@ -9,23 +9,6 @@ export interface PaginatedResponse { page_size: number; } -export interface Company { - id: string; - name: string; - account_number?: string | null; - industry?: string | null; - phone?: string | null; - email?: string | null; - website?: string | null; - description?: string | null; - created_at?: string; - updated_at?: string; -} - -export interface CompanyDetail extends Company { - contacts?: Contact[]; -} - export interface Contact { id: string; first_name: string; @@ -39,5 +22,5 @@ export interface Contact { } export interface ContactDetail extends Contact { - companies?: Company[]; + companies?: Array<{ id: string; name: string }>; } diff --git a/frontend/src/components/contacts/ContactEditModal.tsx b/frontend/src/components/contacts/ContactEditModal.tsx index f4bbb73..f9e7891 100644 --- a/frontend/src/components/contacts/ContactEditModal.tsx +++ b/frontend/src/components/contacts/ContactEditModal.tsx @@ -1,5 +1,8 @@ -import React, { useState, useEffect } from 'react'; +import React, { useEffect } from 'react'; import { useTranslation } from 'react-i18next'; +import { useForm } from 'react-hook-form'; +import { zodResolver } from '@hookform/resolvers/zod'; +import { z } from 'zod'; import { Modal } from '@/components/ui/Modal'; import { Input } from '@/components/ui/Input'; import { Select } from '@/components/ui/Select'; @@ -18,6 +21,46 @@ export interface ContactEditModalProps { onSaved?: (id: string) => void; } +// ── Zod Schema ── + +const phoneRegex = /^[+]?[\d\s\-().]{6,20}$/; + +const contactSchema = z.object({ + type: z.enum(['company', 'person']), + name: z.string().optional().default(''), + firstname: z.string().optional().default(''), + surname: z.string().optional().default(''), + code: z.string().optional().default(''), + email_1: z.string().email('Invalid email').or(z.literal('')).optional().default(''), + email_2: z.string().email('Invalid email').or(z.literal('')).optional().default(''), + phone_1: z.string().regex(phoneRegex, 'Invalid phone').or(z.literal('')).optional().default(''), + phone_2: z.string().regex(phoneRegex, 'Invalid phone').or(z.literal('')).optional().default(''), + website: z.string().optional().default(''), + mailing_street: z.string().optional().default(''), + mailing_number: z.string().optional().default(''), + mailing_postalcode: z.string().optional().default(''), + mailing_city: z.string().optional().default(''), + mailing_country: z.string().optional().default(''), + vat_code: z.string().optional().default(''), + fiscal_code: z.string().optional().default(''), + commerce_code: z.string().optional().default(''), + bic: z.string().optional().default(''), + bank_account: z.string().optional().default(''), + tags: z.string().optional().default(''), + projectnote: z.string().optional().default(''), + contact_warning: z.string().optional().default(''), +}).superRefine((data, ctx) => { + if (data.type === 'company' && !data.name?.trim()) { + ctx.addIssue({ code: z.ZodIssueCode.custom, message: 'Required', path: ['name'] }); + } + if (data.type === 'person' && !data.firstname?.trim() && !data.surname?.trim()) { + ctx.addIssue({ code: z.ZodIssueCode.custom, message: 'Required', path: ['firstname'] }); + ctx.addIssue({ code: z.ZodIssueCode.custom, message: 'Required', path: ['surname'] }); + } +}); + +type ContactFormData = z.infer; + export function ContactEditModal({ open, onClose, contact, onSaved }: ContactEditModalProps) { const { t } = useTranslation(); const toast = useToast(); @@ -25,83 +68,99 @@ export function ContactEditModal({ open, onClose, contact, onSaved }: ContactEdi const updateMutation = useUpdateUnifiedContact(); const isEdit = !!contact; - const [type, setType] = useState<'company' | 'person'>('company'); - const [name, setName] = useState(''); - const [firstname, setFirstname] = useState(''); - const [surname, setSurname] = useState(''); - const [code, setCode] = useState(''); - const [email1, setEmail1] = useState(''); - const [email2, setEmail2] = useState(''); - const [phone1, setPhone1] = useState(''); - const [phone2, setPhone2] = useState(''); - const [website, setWebsite] = useState(''); - const [mailingStreet, setMailingStreet] = useState(''); - const [mailingNumber, setMailingNumber] = useState(''); - const [mailingPostalcode, setMailingPostalcode] = useState(''); - const [mailingCity, setMailingCity] = useState(''); - const [mailingCountry, setMailingCountry] = useState(''); - const [vatCode, setVatCode] = useState(''); - const [fiscalCode, setFiscalCode] = useState(''); - const [commerceCode, setCommerceCode] = useState(''); - const [bic, setBic] = useState(''); - const [bankAccount, setBankAccount] = useState(''); - const [tags, setTags] = useState(''); - const [projectnote, setProjectnote] = useState(''); - const [contactWarning, setContactWarning] = useState(''); + const { + register, + handleSubmit, + reset, + watch, + formState: { errors, isSubmitting }, + } = useForm({ + resolver: zodResolver(contactSchema), + defaultValues: { + type: 'company', + name: '', + firstname: '', + surname: '', + code: '', + email_1: '', + email_2: '', + phone_1: '', + phone_2: '', + website: '', + mailing_street: '', + mailing_number: '', + mailing_postalcode: '', + mailing_city: '', + mailing_country: '', + vat_code: '', + fiscal_code: '', + commerce_code: '', + bic: '', + bank_account: '', + tags: '', + projectnote: '', + contact_warning: '', + }, + }); + const currentType = watch('type'); + + // Reset form when modal opens useEffect(() => { if (open) { - setType((contact?.type as 'company' | 'person') || 'company'); - setName(contact?.name || ''); - setFirstname(contact?.firstname || ''); - setSurname(contact?.surname || ''); - setCode(contact?.code || ''); - setEmail1(contact?.email_1 || ''); - setEmail2(contact?.email_2 || ''); - setPhone1(contact?.phone_1 || ''); - setPhone2(contact?.phone_2 || ''); - setWebsite(contact?.website || ''); - setMailingStreet(contact?.mailing_street || ''); - setMailingNumber(contact?.mailing_number || ''); - setMailingPostalcode(contact?.mailing_postalcode || ''); - setMailingCity(contact?.mailing_city || ''); - setMailingCountry(contact?.mailing_country || ''); - setVatCode(contact?.vat_code || ''); - setFiscalCode(contact?.fiscal_code || ''); - setCommerceCode(contact?.commerce_code || ''); - setBic(contact?.bic || ''); - setBankAccount(contact?.bank_account || ''); - setTags(contact?.tags || ''); - setProjectnote(contact?.projectnote || ''); - setContactWarning(contact?.contact_warning || ''); + reset({ + type: (contact?.type as 'company' | 'person') || 'company', + name: contact?.name || '', + firstname: contact?.firstname || '', + surname: contact?.surname || '', + code: contact?.code || '', + email_1: contact?.email_1 || '', + email_2: contact?.email_2 || '', + phone_1: contact?.phone_1 || '', + phone_2: contact?.phone_2 || '', + website: contact?.website || '', + mailing_street: contact?.mailing_street || '', + mailing_number: contact?.mailing_number || '', + mailing_postalcode: contact?.mailing_postalcode || '', + mailing_city: contact?.mailing_city || '', + mailing_country: contact?.mailing_country || '', + vat_code: contact?.vat_code || '', + fiscal_code: contact?.fiscal_code || '', + commerce_code: contact?.commerce_code || '', + bic: contact?.bic || '', + bank_account: contact?.bank_account || '', + tags: contact?.tags || '', + projectnote: contact?.projectnote || '', + contact_warning: contact?.contact_warning || '', + }); } - }, [open, contact]); + }, [open, contact, reset]); - const handleSave = async () => { + const onSubmit = async (formData: ContactFormData) => { const data: Partial = { - type, - name: type === 'company' ? name : null, - firstname: type === 'person' ? firstname : null, - surname: type === 'person' ? surname : null, - code: code || null, - email_1: email1 || null, - email_2: email2 || null, - phone_1: phone1 || null, - phone_2: phone2 || null, - website: website || null, - mailing_street: mailingStreet || null, - mailing_number: mailingNumber || null, - mailing_postalcode: mailingPostalcode || null, - mailing_city: mailingCity || null, - mailing_country: mailingCountry || null, - vat_code: vatCode || null, - fiscal_code: fiscalCode || null, - commerce_code: commerceCode || null, - bic: bic || null, - bank_account: bankAccount || null, - tags: tags || null, - projectnote: projectnote || null, - contact_warning: contactWarning || null, + type: formData.type, + name: formData.type === 'company' ? formData.name || null : null, + firstname: formData.type === 'person' ? formData.firstname || null : null, + surname: formData.type === 'person' ? formData.surname || null : null, + code: formData.code || null, + email_1: formData.email_1 || null, + email_2: formData.email_2 || null, + phone_1: formData.phone_1 || null, + phone_2: formData.phone_2 || null, + website: formData.website || null, + mailing_street: formData.mailing_street || null, + mailing_number: formData.mailing_number || null, + mailing_postalcode: formData.mailing_postalcode || null, + mailing_city: formData.mailing_city || null, + mailing_country: formData.mailing_country || null, + vat_code: formData.vat_code || null, + fiscal_code: formData.fiscal_code || null, + commerce_code: formData.commerce_code || null, + bic: formData.bic || null, + bank_account: formData.bank_account || null, + tags: formData.tags || null, + projectnote: formData.projectnote || null, + contact_warning: formData.contact_warning || null, }; try { @@ -122,12 +181,11 @@ export function ContactEditModal({ open, onClose, contact, onSaved }: ContactEdi return ( -
+
{/* Type */} setName(e.target.value)} required data-testid="contact-name-input" placeholder="TechCorp GmbH" /> + {currentType === 'company' ? ( + ) : (
- setFirstname(e.target.value)} data-testid="contact-first-name-input" /> - setSurname(e.target.value)} data-testid="contact-last-name-input" /> + +
)} {/* Code */} - setCode(e.target.value)} placeholder="K-00123" /> + {/* Communication */}

{t('contacts.communication')}

- setEmail1(e.target.value)} /> - setEmail2(e.target.value)} /> - setPhone1(e.target.value)} /> - setPhone2(e.target.value)} /> - setWebsite(e.target.value)} /> + + + + +
@@ -164,11 +239,11 @@ export function ContactEditModal({ open, onClose, contact, onSaved }: ContactEdi

{t('contacts.mailingAddress')}

- setMailingStreet(e.target.value)} /> - setMailingNumber(e.target.value)} /> - setMailingPostalcode(e.target.value)} /> - setMailingCity(e.target.value)} /> - setMailingCountry(e.target.value)} /> + + + + +
@@ -176,11 +251,11 @@ export function ContactEditModal({ open, onClose, contact, onSaved }: ContactEdi

{t('contacts.financial')}

- setVatCode(e.target.value)} /> - setFiscalCode(e.target.value)} /> - setCommerceCode(e.target.value)} /> - setBic(e.target.value)} /> - setBankAccount(e.target.value)} /> + + + + +
@@ -188,20 +263,18 @@ export function ContactEditModal({ open, onClose, contact, onSaved }: ContactEdi

{t('contacts.notes')}

- setTags(e.target.value)} placeholder="tag1, tag2" /> +