amsdal_crm 0.1.9__py3-none-any.whl → 0.2.0__py3-none-any.whl

amsdal_crm/models/__init__.py

@@ -1,46 +1 @@
 """CRM Models."""
-
-# Import File first for Attachment's forward reference
-from amsdal.models.core.file import File  # noqa: F401
-
-from amsdal_crm.models.account import Account
-from amsdal_crm.models.activity import Activity
-from amsdal_crm.models.activity import ActivityRelatedTo
-from amsdal_crm.models.activity import ActivityType
-from amsdal_crm.models.activity import Call
-from amsdal_crm.models.activity import EmailActivity
-from amsdal_crm.models.activity import Event
-from amsdal_crm.models.activity import Note
-from amsdal_crm.models.activity import Task
-from amsdal_crm.models.attachment import Attachment
-from amsdal_crm.models.contact import Contact
-from amsdal_crm.models.custom_field_definition import CustomFieldDefinition
-from amsdal_crm.models.deal import Deal
-from amsdal_crm.models.pipeline import Pipeline
-from amsdal_crm.models.stage import Stage
-from amsdal_crm.models.workflow_rule import WorkflowRule
-
-__all__ = [
-    'Account',
-    'Activity',
-    'ActivityRelatedTo',
-    'ActivityType',
-    'Attachment',
-    'Call',
-    'Contact',
-    'CustomFieldDefinition',
-    'Deal',
-    'EmailActivity',
-    'Event',
-    'Note',
-    'Pipeline',
-    'Stage',
-    'Task',
-    'WorkflowRule',
-]
-
-# Rebuild models to resolve forward references
-Contact.model_rebuild()
-Deal.model_rebuild()
-Stage.model_rebuild()
-Attachment.model_rebuild()

amsdal_crm/models/activity.py

@@ -26,8 +26,7 @@ class ActivityType(str, Enum):
 class ActivityRelatedTo(str, Enum):
     """What type of record this activity is related to."""
 
-    CONTACT = 'Contact'
-    ACCOUNT = 'Account'
+    ENTITY = 'Entity'
     DEAL = 'Deal'
 
 
@@ -41,7 +40,6 @@ class Activity(TimestampMixin, Model):
     __module_type__: ClassVar[ModuleType] = ModuleType.CONTRIB
     __indexes__: ClassVar[list[IndexInfo]] = [
         IndexInfo(name='idx_activity_related_to', field='related_to_id'),
-        IndexInfo(name='idx_activity_owner', field='owner_email'),
         IndexInfo(name='idx_activity_created_at', field='created_at'),
         IndexInfo(name='idx_activity_due_date', field='due_date'),
     ]
@@ -54,12 +52,10 @@ class Activity(TimestampMixin, Model):
     description: str | None = Field(default=None, title='Description')
 
     # Polymorphic relationship (generic FK pattern)
-    related_to_type: ActivityRelatedTo = Field(title='Related To Type')
-    related_to_id: str = Field(title='Related To ID')
-
-    # Owner
-    owner_email: str = Field(title='Owner Email')
+    related_to_type: ActivityRelatedTo | None = Field(title='Related To Type')
+    related_to_id: str | None = Field(title='Related To ID')
 
+    assigned_to: User | None = Field(default=None, title='Assigned To')
     # Timing
     due_date: datetime | None = Field(default=None, title='Due Date')
     completed_at: datetime | None = Field(default=None, title='Completed At')
@@ -83,7 +79,7 @@ class Activity(TimestampMixin, Model):
             True if user has permission, False otherwise
         """
         # Owner has all permissions
-        if self.owner_email == user.email:
+        if self.assigned_to and self.assigned_to.email == user.email:
             return True
 
         # Check admin permissions

amsdal_crm/models/attachment.py

@@ -27,7 +27,7 @@ class Attachment(Model):
     file: File = Field(title='File')
 
     # Polymorphic relationship
-    related_to_type: Literal['Contact', 'Account', 'Deal', 'Activity'] = Field(title='Related To Type')
+    related_to_type: Literal['Entity', 'Deal', 'Activity'] = Field(title='Related To Type')
     related_to_id: str = Field(title='Related To ID')
 
     # Metadata

amsdal_crm/models/custom_field_definition.py

@@ -22,7 +22,9 @@ class CustomFieldDefinition(Model):
         UniqueConstraint(name='unq_custom_field_entity_name', fields=['entity_type', 'field_name'])
     ]
 
-    entity_type: Literal['Contact', 'Account', 'Deal'] = Field(title='Entity Type')
+    entity_type: Literal[
+        'Entity', 'EntityRelationship', 'Deal', 'EntityIdentifier', 'EntityContactPoint', 'EntityAddress'
+    ] = Field(title='Entity Type')
     field_name: str = Field(title='Field Name')
     field_label: str = Field(title='Field Label')
     field_type: Literal['text', 'number', 'date', 'choice'] = Field(title='Field Type')

amsdal_crm/models/deal.py

@@ -3,7 +3,7 @@
 import datetime as _dt
 from typing import Any
 from typing import ClassVar
-from typing import Optional
+from typing import Literal
 
 from amsdal.contrib.auth.models.user import User
 from amsdal.models.mixins import TimestampMixin
@@ -29,7 +29,6 @@ class Deal(TimestampMixin, Model):
 
     __module_type__: ClassVar[ModuleType] = ModuleType.CONTRIB
     __indexes__: ClassVar[list[IndexInfo]] = [
-        IndexInfo(name='idx_deal_owner_email', field='owner_email'),
         IndexInfo(name='idx_deal_close_date', field='expected_close_date'),
         IndexInfo(name='idx_deal_created_at', field='created_at'),
     ]
@@ -40,18 +39,16 @@ class Deal(TimestampMixin, Model):
     currency: str = Field(default='USD', title='Currency')
 
     # Relationships
-    account: Optional['Account'] = Field(default=None, title='Account')
-    contact: Optional['Contact'] = Field(default=None, title='Primary Contact')
+    entity: 'Entity' = Field(title='Entity')
     stage: 'Stage' = Field(title='Stage')
-    owner_email: str = Field(title='Owner Email')
+    assigned_to: User | None = Field(default=None, title='Assigned To')
 
     # Dates
     expected_close_date: _dt.datetime | None = Field(default=None, title='Expected Close Date')
     closed_date: _dt.datetime | None = Field(default=None, title='Closed Date')
 
     # Status tracking
-    is_closed: bool = Field(default=False, title='Is Closed')
-    is_won: bool = Field(default=False, title='Is Won')
+    status: Literal['open', 'closed_won', 'closed_lost'] = Field(default='open', title='Status')
 
     # Custom fields (JSON)
     custom_fields: dict[str, Any] | None = Field(default=None, title='Custom Fields')
@@ -78,8 +75,9 @@ class Deal(TimestampMixin, Model):
         Returns:
             True if user has permission, False otherwise
         """
+
         # Owner has all permissions
-        if self.owner_email == user.email:
+        if self.assigned_to and self.assigned_to.email == user.email:
             return True
 
         # Check admin permissions
@@ -124,10 +122,16 @@ class Deal(TimestampMixin, Model):
         from amsdal_models.classes.helpers.reference_loader import ReferenceLoader
 
         stage = ReferenceLoader(self.stage).load_reference() if isinstance(self.stage, Reference) else self.stage
-        self.is_closed = stage.is_closed_won or stage.is_closed_lost
-        self.is_won = stage.is_closed_won
 
-        if self.is_closed and not self.closed_date:
+        if stage.status == 'open':
+            self.status = 'open'
+        if stage.status == 'closed_won':
+            self.status = 'closed_won'
+
+        if stage.status == 'closed_lost':
+            self.status = 'closed_lost'
+
+        if self.status in ('closed_won', 'closed_lost') and not self.closed_date:
             self.closed_date = _dt.datetime.now(_dt.UTC)
 
         # Call parent to handle timestamps
@@ -148,10 +152,15 @@ class Deal(TimestampMixin, Model):
         # Load stage if it's a reference and sync closed status
 
         stage = await self.stage
-        self.is_closed = stage.is_closed_won or stage.is_closed_lost
-        self.is_won = stage.is_closed_won
+        if stage.status == 'open':
+            self.status = 'open'
+        if stage.status == 'closed_won':
+            self.status = 'closed_won'
 
-        if self.is_closed and not self.closed_date:
+        if stage.status == 'closed_lost':
+            self.status = 'closed_lost'
+
+        if self.status in ('closed_won', 'closed_lost') and not self.closed_date:
             self.closed_date = _dt.datetime.now(_dt.UTC)
 
         # Call parent to handle timestamps
@@ -167,11 +176,10 @@ class Deal(TimestampMixin, Model):
         """Async hook called after updating deal."""
         from amsdal_crm.services.workflow_service import WorkflowService
 
-        WorkflowService.execute_rules('Deal', 'update', self)
+        await WorkflowService.aexecute_rules('Deal', 'update', self)
 
 
-from amsdal_crm.models.account import Account
-from amsdal_crm.models.contact import Contact
+from amsdal_crm.models.entity import Entity
 from amsdal_crm.models.stage import Stage
 
 Deal.model_rebuild()

amsdal_crm/models/entity.py

@@ -0,0 +1,318 @@
+"""Account Model."""
+
+from typing import Any
+from typing import ClassVar
+from typing import Literal
+
+from amsdal.contrib.auth.models.user import User
+from amsdal.models.mixins import TimestampMixin
+from amsdal_models.classes.data_models.constraints import UniqueConstraint
+from amsdal_models.classes.data_models.indexes import IndexInfo
+from amsdal_models.classes.model import Model
+from amsdal_utils.models.enums import ModuleType
+from pydantic.fields import Field
+
+
+class Entity(TimestampMixin, Model):
+    """Entity (Person/Organization/Trust) model.
+
+    Represents a company or organization in the CRM system.
+    Owned by individual users with permission controls.
+    """
+
+    __module_type__: ClassVar[ModuleType] = ModuleType.CONTRIB
+    __constraints__: ClassVar[list[UniqueConstraint]] = [UniqueConstraint(name='unq_entity_name', fields=['name'])]
+    __indexes__: ClassVar[list[IndexInfo]] = [
+        IndexInfo(name='idx_entity_created_at', field='created_at'),
+    ]
+
+    # Core fields
+    name: str = Field(title='Entity Name')
+    legal_name: str | None = Field(default=None, title='Legal Name')
+    status: Literal['Active', 'Inactive'] = Field(default='Active', title='Status')
+    note: str | None = Field(default=None, title='Note')
+
+    assigned_to: User | None = Field(default=None, title='Assigned To')
+
+    # Custom fields (JSON)
+    custom_fields: dict[str, Any] | None = Field(default=None, title='Custom Fields')
+
+    @property
+    def display_name(self) -> str:
+        """Return display name for the account."""
+        return self.name
+
+    def has_object_permission(self, user: 'User', action: str) -> bool:
+        """Check if user has permission to perform action on this account.
+
+        Args:
+            user: The user attempting the action
+            action: The action being attempted (read, create, update, delete)
+
+        Returns:
+            True if user has permission, False otherwise
+        """
+        if self.assigned_to and self.assigned_to.email == user.email:
+            return True
+
+        # Check admin permissions
+        if user.permissions:
+            for permission in user.permissions:
+                if permission.model == '*' and permission.action in ('*', action):
+                    return True
+                if permission.model == 'Entity' and permission.action in ('*', action):
+                    return True
+
+        return False
+
+    def pre_create(self) -> None:
+        """Hook called before creating account."""
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = CustomFieldService.validate_custom_fields('Entity', self.custom_fields)
+        super().pre_create()
+
+    async def apre_create(self) -> None:
+        """Async hook called before creating account."""
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields('Entity', self.custom_fields)
+        await super().apre_create()
+
+    def pre_update(self) -> None:
+        """Hook called before updating account."""
+        # Validate custom fields first
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = CustomFieldService.validate_custom_fields('Entity', self.custom_fields)
+
+        # Call parent to handle timestamps
+        super().pre_update()
+
+    async def apre_update(self) -> None:
+        """Async hook called before updating account."""
+        # Validate custom fields first
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields('Entity', self.custom_fields)
+
+        # Call parent to handle timestamps
+        await super().apre_update()
+
+    def post_update(self) -> None:
+        """Hook called after updating account."""
+        from amsdal_crm.services.workflow_service import WorkflowService
+
+        WorkflowService.execute_rules('Entity', 'update', self)
+
+    async def apost_update(self) -> None:
+        """Async hook called after updating account."""
+        from amsdal_crm.services.workflow_service import WorkflowService
+
+        await WorkflowService.aexecute_rules('Entity', 'update', self)
+
+
+class EntityRelationship(TimestampMixin, Model):
+    from_entity: Entity = Field(title='From Entity')
+    to_entity: Entity = Field(title='To Entity')
+    start_date: str | None = Field(default=None, title='Start Date')
+    end_date: str | None = Field(default=None, title='End Date')
+    relationship_group_name: str | None = Field(default=None, title='Relationship Group Name')
+
+    def pre_create(self) -> None:
+        """Hook called before creating account."""
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = CustomFieldService.validate_custom_fields('EntityRelationship', self.custom_fields)
+        super().pre_create()
+
+    async def apre_create(self) -> None:
+        """Async hook called before creating account."""
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields(
+                'EntityRelationship', self.custom_fields
+            )
+        await super().apre_create()
+
+    def pre_update(self) -> None:
+        """Hook called before updating account."""
+        # Validate custom fields first
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = CustomFieldService.validate_custom_fields('EntityRelationship', self.custom_fields)
+
+        # Call parent to handle timestamps
+        super().pre_update()
+
+    async def apre_update(self) -> None:
+        """Async hook called before updating account."""
+        # Validate custom fields first
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields(
+                'EntityRelationship', self.custom_fields
+            )
+
+            # Call parent to handle timestamps
+            await super().apre_update()
+
+
+class EntityIdentifier(TimestampMixin, Model):
+    entity: Entity = Field(title='Entity')
+    value: str = Field(title='Identifier Value')
+    country: str | None = Field(default=None, title='Country')
+
+    # TODO: validate one per entity
+    is_primary: bool = Field(default=False, title='Is Primary')
+
+    def pre_create(self) -> None:
+        """Hook called before creating account."""
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = CustomFieldService.validate_custom_fields('EntityIdentifier', self.custom_fields)
+        super().pre_create()
+
+    async def apre_create(self) -> None:
+        """Async hook called before creating account."""
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields(
+                'EntityIdentifier', self.custom_fields
+            )
+        await super().apre_create()
+
+    def pre_update(self) -> None:
+        """Hook called before updating account."""
+        # Validate custom fields first
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = CustomFieldService.validate_custom_fields('EntityIdentifier', self.custom_fields)
+
+        # Call parent to handle timestamps
+        super().pre_update()
+
+    async def apre_update(self) -> None:
+        """Async hook called before updating account."""
+        # Validate custom fields first
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields(
+                'EntityIdentifier', self.custom_fields
+            )
+
+            # Call parent to handle timestamps
+            await super().apre_update()
+
+
+class EntityContactPoint(TimestampMixin, Model):
+    entity: Entity = Field(title='Entity')
+    value: str = Field(title='Contact Point Value')
+
+    # TODO: validate one per entity
+    is_primary: bool = Field(default=False, title='Is Primary')
+    can_contact: bool = Field(default=True, title='Can Contact')
+
+    def pre_create(self) -> None:
+        """Hook called before creating account."""
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = CustomFieldService.validate_custom_fields('EntityContactPoint', self.custom_fields)
+        super().pre_create()
+
+    async def apre_create(self) -> None:
+        """Async hook called before creating account."""
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields(
+                'EntityContactPoint', self.custom_fields
+            )
+        await super().apre_create()
+
+    def pre_update(self) -> None:
+        """Hook called before updating account."""
+        # Validate custom fields first
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = CustomFieldService.validate_custom_fields('EntityContactPoint', self.custom_fields)
+
+        # Call parent to handle timestamps
+        super().pre_update()
+
+    async def apre_update(self) -> None:
+        """Async hook called before updating account."""
+        # Validate custom fields first
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields(
+                'EntityContactPoint', self.custom_fields
+            )
+
+            # Call parent to handle timestamps
+            await super().apre_update()
+
+
+class EntityAddress(TimestampMixin, Model):
+    line1: str | None = Field(title='Address Line 1')
+    line2: str | None = Field(default=None, title='Address Line 2')
+    city: str | None = Field(title='City')
+    region: str | None = Field(default=None, title='Region/State')
+    postal_code: str | None = Field(default=None, title='Postal Code')
+    country: str | None = Field(title='Country')
+
+    # TODO: validate one per entity
+    is_primary: bool = Field(default=False, title='Is Primary')
+
+    def pre_create(self) -> None:
+        """Hook called before creating account."""
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = CustomFieldService.validate_custom_fields('EntityAddress', self.custom_fields)
+        super().pre_create()
+
+    async def apre_create(self) -> None:
+        """Async hook called before creating account."""
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields('EntityAddress', self.custom_fields)
+        await super().apre_create()
+
+    def pre_update(self) -> None:
+        """Hook called before updating account."""
+        # Validate custom fields first
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = CustomFieldService.validate_custom_fields('EntityAddress', self.custom_fields)
+
+        # Call parent to handle timestamps
+        super().pre_update()
+
+    async def apre_update(self) -> None:
+        """Async hook called before updating account."""
+        # Validate custom fields first
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields('EntityAddress', self.custom_fields)
+
+            # Call parent to handle timestamps
+            await super().apre_update()

amsdal_crm/models/stage.py

@@ -1,6 +1,7 @@
 """Stage Model."""
 
 from typing import ClassVar
+from typing import Literal
 
 from amsdal_models.classes.data_models.indexes import IndexInfo
 from amsdal_models.classes.model import Model
@@ -33,10 +34,11 @@ class Stage(Model):
 
     pipeline: 'Pipeline' = Field(title='Pipeline')
     name: str = Field(title='Stage Name')
+    description: str | None = Field(default=None, title='Description')
     order: int = Field(title='Order')
     probability: float = Field(default=0.0, title='Win Probability (%)', ge=0, le=100)
-    is_closed_won: bool = Field(default=False, title='Is Closed Won')
-    is_closed_lost: bool = Field(default=False, title='Is Closed Lost')
+
+    status: Literal['open', 'closed_won', 'closed_lost'] = Field(default='open', title='Status')
 
     @property
     def display_name(self) -> str:

amsdal_crm/models/workflow_rule.py

@@ -19,7 +19,7 @@ class WorkflowRule(Model):
     __module_type__: ClassVar[ModuleType] = ModuleType.CONTRIB
 
     name: str = Field(title='Rule Name')
-    entity_type: Literal['Contact', 'Account', 'Deal', 'Activity'] = Field(title='Entity Type')
+    entity_type: Literal['Entity', 'Deal', 'Activity'] = Field(title='Entity Type')
 
     # Trigger
     trigger_event: Literal['create', 'update', 'delete'] = Field(title='Trigger Event')

amsdal_crm/services/deal_service.py

@@ -50,7 +50,6 @@ class DealService:
             description=note or f'Deal stage changed from {old_stage_name} to {new_stage.name}',
             related_to_type=ActivityRelatedTo.DEAL,
             related_to_id=deal._object_id,
-            owner_email=user_email,
             due_date=None,
             completed_at=None,
             is_completed=False,
@@ -66,9 +65,9 @@ class DealService:
             user_email=user_email,
         )
 
-        if new_stage.is_closed_won:
+        if new_stage.status == 'closed_won':
             LifecycleProducer.publish(CRMLifecycleEvent.ON_DEAL_WON, deal=deal, user_email=user_email)  # type: ignore[arg-type]
-        elif new_stage.is_closed_lost:
+        elif new_stage.status == 'closed_lost':
             LifecycleProducer.publish(CRMLifecycleEvent.ON_DEAL_LOST, deal=deal, user_email=user_email)  # type: ignore[arg-type]
 
         return deal
@@ -107,7 +106,6 @@ class DealService:
             description=note or f'Deal stage changed from {old_stage_name} to {new_stage.name}',
             related_to_type=ActivityRelatedTo.DEAL,
             related_to_id=deal._object_id,
-            owner_email=user_email,
             due_date=None,
             completed_at=None,
             is_completed=False,
@@ -123,9 +121,9 @@ class DealService:
             user_email=user_email,
         )
 
-        if new_stage.is_closed_won:
+        if new_stage.status == 'closed_won':
             await LifecycleProducer.publish_async(CRMLifecycleEvent.ON_DEAL_WON, deal=deal, user_email=user_email)  # type: ignore[arg-type]
-        elif new_stage.is_closed_lost:
+        elif new_stage.status == 'closed_lost':
             await LifecycleProducer.publish_async(CRMLifecycleEvent.ON_DEAL_LOST, deal=deal, user_email=user_email)  # type: ignore[arg-type]
 
         return deal

amsdal_crm/services/email_service.py

@@ -22,7 +22,6 @@ class EmailService:
         cc_addresses: list[str] | None,
         related_to_type: ActivityRelatedTo,
         related_to_id: str,
-        owner_email: str,
         *,
         is_outbound: bool = True,
     ) -> EmailActivity:
@@ -38,9 +37,8 @@ class EmailService:
             from_address: Sender email address
             to_addresses: List of recipient email addresses
             cc_addresses: List of CC email addresses
-            related_to_type: Type of related record (Contact, Account, Deal)
+            related_to_type: Type of related record (Entity, Deal)
             related_to_id: ID of related record
-            owner_email: Email of user who owns this activity
             is_outbound: True if sent from CRM, False if received
 
         Returns:
@@ -55,7 +53,6 @@ class EmailService:
             cc_addresses=cc_addresses,
             related_to_type=related_to_type,
             related_to_id=related_to_id,
-            owner_email=owner_email,
             is_outbound=is_outbound,
             description=f'Email: {subject}',
             due_date=None,
@@ -77,7 +74,6 @@ class EmailService:
         cc_addresses: list[str] | None,
         related_to_type: ActivityRelatedTo,
         related_to_id: str,
-        owner_email: str,
         *,
         is_outbound: bool = True,
     ) -> EmailActivity:
@@ -89,9 +85,8 @@ class EmailService:
             from_address: Sender email address
             to_addresses: List of recipient email addresses
             cc_addresses: List of CC email addresses
-            related_to_type: Type of related record (Contact, Account, Deal)
+            related_to_type: Type of related record (Entity, Deal)
             related_to_id: ID of related record
-            owner_email: Email of user who owns this activity
             is_outbound: True if sent from CRM, False if received
 
         Returns:
@@ -106,7 +101,6 @@ class EmailService:
             cc_addresses=cc_addresses,
             related_to_type=related_to_type,
             related_to_id=related_to_id,
-            owner_email=owner_email,
             is_outbound=is_outbound,
             description=f'Email: {subject}',
             due_date=None,