amsdal_crm 0.2.1__tar.gz → 0.2.3__tar.gz

{amsdal_crm-0.2.1 → amsdal_crm-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_crm
-Version: 0.2.1
+Version: 0.2.3
 Summary: amsdal-crm plugin for AMSDAL Framework
 Requires-Python: >=3.11
 Requires-Dist: aiohttp==3.12.15

amsdal_crm-0.2.3/amsdal_crm/__about__.py

@@ -0,0 +1 @@
+__version__ = '0.2.3'

{amsdal_crm-0.2.1 → amsdal_crm-0.2.3}/amsdal_crm/migrations/0000_initial.py

@@ -65,6 +65,7 @@ class Migration(migrations.Migration):
                 "properties": {
                     "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
                     "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
+                    "custom_fields": {"type": "anything", "title": "Custom Fields"},
                     "name": {"type": "string", "title": "Entity Name"},
                     "legal_name": {"type": "string", "title": "Legal Name"},
                     "status": {
@@ -75,10 +76,9 @@ class Migration(migrations.Migration):
                         "enum": ["Active", "Inactive"],
                     },
                     "note": {"type": "string", "title": "Note"},
-                    "custom_fields": {"type": "anything", "title": "Custom Fields"},
                     "assigned_to": {"type": "User", "title": "Assigned To"},
                 },
-                "custom_code": 'from amsdal.contrib.auth.models.user import User\n\n\n@property\ndef display_name(self) -> str:\n    """Return display name for the account."""\n    return self.name\n\nasync def apost_update(self) -> None:\n    """Async hook called after updating account."""\n    from amsdal_crm.services.workflow_service import WorkflowService\n    await WorkflowService.aexecute_rules(\'Entity\', \'update\', self)\n\nasync def apre_create(self) -> None:\n    """Async hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'Entity\', self.custom_fields)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    """Async hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'Entity\', self.custom_fields)\n    await super().apre_update()\n\ndef has_object_permission(self, user: \'User\', action: str) -> bool:\n    """Check if user has permission to perform action on this account.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        """\n    if self.assigned_to and self.assigned_to.email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == \'*\' and permission.action in (\'*\', action):\n                return True\n            if permission.model == \'Entity\' and permission.action in (\'*\', action):\n                return True\n    return False\n\ndef post_update(self) -> None:\n    """Hook called after updating account."""\n    from amsdal_crm.services.workflow_service import WorkflowService\n    WorkflowService.execute_rules(\'Entity\', \'update\', self)\n\ndef pre_create(self) -> None:\n    """Hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'Entity\', self.custom_fields)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    """Hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'Entity\', self.custom_fields)\n    super().pre_update()',
+                "custom_code": 'from amsdal.contrib.auth.models.user import User\n\n\n@classmethod\ndef custom_fields_cell_template(cls) -> str:\n    return \'JsonTemplate\'\n\n@property\ndef display_name(self) -> str:\n    """Return display name for the account."""\n    return self.name\n\nasync def _avalidate_custom_fields(self) -> None:\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(self.__class__.__name__, self.custom_fields)\n\nasync def apost_update(self) -> None:\n    """Async hook called after updating account."""\n    from amsdal_crm.services.workflow_service import WorkflowService\n    await WorkflowService.aexecute_rules(\'Entity\', \'update\', self)\n\nasync def apre_create(self) -> None:\n    await self._avalidate_custom_fields()\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    await self._avalidate_custom_fields()\n    await super().apre_update()\n\ndef _validate_custom_fields(self) -> None:\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(self.__class__.__name__, self.custom_fields)\n\ndef has_object_permission(self, user: \'User\', action: str) -> bool:\n    """Check if user has permission to perform action on this account.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        """\n    if self.assigned_to and self.assigned_to.email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == \'*\' and permission.action in (\'*\', action):\n                return True\n            if permission.model == \'Entity\' and permission.action in (\'*\', action):\n                return True\n    return False\n\ndef post_update(self) -> None:\n    """Hook called after updating account."""\n    from amsdal_crm.services.workflow_service import WorkflowService\n    WorkflowService.execute_rules(\'Entity\', \'update\', self)\n\ndef pre_create(self) -> None:\n    self._validate_custom_fields()\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self._validate_custom_fields()\n    super().pre_update()',
                 "storage_metadata": {
                     "table_name": "Entity",
                     "db_fields": {"assigned_to": ["assigned_to_partition_key"]},
@@ -100,6 +100,7 @@ class Migration(migrations.Migration):
                 "properties": {
                     "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
                     "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
+                    "custom_fields": {"type": "anything", "title": "Custom Fields"},
                     "line1": {"type": "string", "title": "Address Line 1"},
                     "line2": {"type": "string", "title": "Address Line 2"},
                     "city": {"type": "string", "title": "City"},
@@ -108,7 +109,7 @@ class Migration(migrations.Migration):
                     "country": {"type": "string", "title": "Country"},
                     "is_primary": {"type": "boolean", "default": False, "title": "Is Primary"},
                 },
-                "custom_code": 'async def apre_create(self) -> None:\n    """Async hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'EntityAddress\', self.custom_fields)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    """Async hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'EntityAddress\', self.custom_fields)\n        await super().apre_update()\n\ndef pre_create(self) -> None:\n    """Hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'EntityAddress\', self.custom_fields)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    """Hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'EntityAddress\', self.custom_fields)\n    super().pre_update()',
+                "custom_code": "@classmethod\ndef custom_fields_cell_template(cls) -> str:\n    return 'JsonTemplate'\n\nasync def _avalidate_custom_fields(self) -> None:\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(self.__class__.__name__, self.custom_fields)\n\nasync def apre_create(self) -> None:\n    await self._avalidate_custom_fields()\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    await self._avalidate_custom_fields()\n    await super().apre_update()\n\ndef _validate_custom_fields(self) -> None:\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(self.__class__.__name__, self.custom_fields)\n\ndef pre_create(self) -> None:\n    self._validate_custom_fields()\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self._validate_custom_fields()\n    super().pre_update()",
                 "storage_metadata": {
                     "table_name": "EntityAddress",
                     "db_fields": {},
@@ -372,6 +373,7 @@ class Migration(migrations.Migration):
                 "properties": {
                     "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
                     "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
+                    "custom_fields": {"type": "anything", "title": "Custom Fields"},
                     "value": {"type": "string", "title": "Contact Point Value"},
                     "is_primary": {"type": "boolean", "default": False, "title": "Is Primary"},
                     "can_contact": {"type": "boolean", "default": True, "title": "Can Contact"},
@@ -381,7 +383,7 @@ class Migration(migrations.Migration):
                         "description": "Entity (Person/Organization/Trust) model.\n\nRepresents a company or organization in the CRM system.\nOwned by individual users with permission controls.",
                     },
                 },
-                "custom_code": 'async def apre_create(self) -> None:\n    """Async hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'EntityContactPoint\', self.custom_fields)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    """Async hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'EntityContactPoint\', self.custom_fields)\n        await super().apre_update()\n\ndef pre_create(self) -> None:\n    """Hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'EntityContactPoint\', self.custom_fields)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    """Hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'EntityContactPoint\', self.custom_fields)\n    super().pre_update()',
+                "custom_code": "@classmethod\ndef custom_fields_cell_template(cls) -> str:\n    return 'JsonTemplate'\n\nasync def _avalidate_custom_fields(self) -> None:\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(self.__class__.__name__, self.custom_fields)\n\nasync def apre_create(self) -> None:\n    await self._avalidate_custom_fields()\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    await self._avalidate_custom_fields()\n    await super().apre_update()\n\ndef _validate_custom_fields(self) -> None:\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(self.__class__.__name__, self.custom_fields)\n\ndef pre_create(self) -> None:\n    self._validate_custom_fields()\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self._validate_custom_fields()\n    super().pre_update()",
                 "storage_metadata": {
                     "table_name": "EntityContactPoint",
                     "db_fields": {"entity": ["entity_partition_key"]},
@@ -399,6 +401,7 @@ class Migration(migrations.Migration):
                 "properties": {
                     "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
                     "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
+                    "custom_fields": {"type": "anything", "title": "Custom Fields"},
                     "value": {"type": "string", "title": "Identifier Value"},
                     "country": {"type": "string", "title": "Country"},
                     "is_primary": {"type": "boolean", "default": False, "title": "Is Primary"},
@@ -408,7 +411,7 @@ class Migration(migrations.Migration):
                         "description": "Entity (Person/Organization/Trust) model.\n\nRepresents a company or organization in the CRM system.\nOwned by individual users with permission controls.",
                     },
                 },
-                "custom_code": 'async def apre_create(self) -> None:\n    """Async hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'EntityIdentifier\', self.custom_fields)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    """Async hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'EntityIdentifier\', self.custom_fields)\n        await super().apre_update()\n\ndef pre_create(self) -> None:\n    """Hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'EntityIdentifier\', self.custom_fields)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    """Hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'EntityIdentifier\', self.custom_fields)\n    super().pre_update()',
+                "custom_code": "@classmethod\ndef custom_fields_cell_template(cls) -> str:\n    return 'JsonTemplate'\n\nasync def _avalidate_custom_fields(self) -> None:\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(self.__class__.__name__, self.custom_fields)\n\nasync def apre_create(self) -> None:\n    await self._avalidate_custom_fields()\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    await self._avalidate_custom_fields()\n    await super().apre_update()\n\ndef _validate_custom_fields(self) -> None:\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(self.__class__.__name__, self.custom_fields)\n\ndef pre_create(self) -> None:\n    self._validate_custom_fields()\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self._validate_custom_fields()\n    super().pre_update()",
                 "storage_metadata": {
                     "table_name": "EntityIdentifier",
                     "db_fields": {"entity": ["entity_partition_key"]},
@@ -426,6 +429,7 @@ class Migration(migrations.Migration):
                 "properties": {
                     "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
                     "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
+                    "custom_fields": {"type": "anything", "title": "Custom Fields"},
                     "start_date": {"type": "string", "title": "Start Date"},
                     "end_date": {"type": "string", "title": "End Date"},
                     "relationship_group_name": {"type": "string", "title": "Relationship Group Name"},
@@ -440,7 +444,7 @@ class Migration(migrations.Migration):
                         "description": "Entity (Person/Organization/Trust) model.\n\nRepresents a company or organization in the CRM system.\nOwned by individual users with permission controls.",
                     },
                 },
-                "custom_code": 'async def apre_create(self) -> None:\n    """Async hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'EntityRelationship\', self.custom_fields)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    """Async hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'EntityRelationship\', self.custom_fields)\n        await super().apre_update()\n\ndef pre_create(self) -> None:\n    """Hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'EntityRelationship\', self.custom_fields)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    """Hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'EntityRelationship\', self.custom_fields)\n    super().pre_update()',
+                "custom_code": "@classmethod\ndef custom_fields_cell_template(cls) -> str:\n    return 'JsonTemplate'\n\nasync def _avalidate_custom_fields(self) -> None:\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(self.__class__.__name__, self.custom_fields)\n\nasync def apre_create(self) -> None:\n    await self._avalidate_custom_fields()\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    await self._avalidate_custom_fields()\n    await super().apre_update()\n\ndef _validate_custom_fields(self) -> None:\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(self.__class__.__name__, self.custom_fields)\n\ndef pre_create(self) -> None:\n    self._validate_custom_fields()\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self._validate_custom_fields()\n    super().pre_update()",
                 "storage_metadata": {
                     "table_name": "EntityRelationship",
                     "db_fields": {
@@ -509,6 +513,7 @@ class Migration(migrations.Migration):
                 "properties": {
                     "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
                     "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
+                    "custom_fields": {"type": "anything", "title": "Custom Fields"},
                     "name": {"type": "string", "title": "Deal Name"},
                     "amount": {"type": "number", "title": "Amount"},
                     "currency": {"type": "string", "default": "USD", "title": "Currency"},
@@ -535,10 +540,9 @@ class Migration(migrations.Migration):
                         "title": "Status",
                         "enum": ["open", "closed_won", "closed_lost"],
                     },
-                    "custom_fields": {"type": "anything", "title": "Custom Fields"},
                     "assigned_to": {"type": "User", "title": "Assigned To"},
                 },
-                "custom_code": "import datetime as _dt\n\nfrom amsdal.contrib.auth.models.user import User\nfrom amsdal_utils.models.data_models.reference import Reference\n\n\n@property\ndef display_name(self) -> str:\n    \"\"\"Return display name for the deal.\"\"\"\n    return self.name\n\n@property\ndef stage_name(self) -> str:\n    \"\"\"Returns stage name for display.\"\"\"\n    if hasattr(self.stage, 'name'):\n        return self.stage.name\n    return str(self.stage)\n\nasync def apost_update(self) -> None:\n    \"\"\"Async hook called after updating deal.\"\"\"\n    from amsdal_crm.services.workflow_service import WorkflowService\n    await WorkflowService.aexecute_rules('Deal', 'update', self)\n\nasync def apre_create(self) -> None:\n    \"\"\"Async hook called before creating deal.\"\"\"\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields('Deal', self.custom_fields)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    \"\"\"Async hook called before updating deal.\n\n        Automatically syncs is_closed and is_won status with stage,\n        and sets closed_date when deal is closed.\n        \"\"\"\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields('Deal', self.custom_fields)\n    stage = await self.stage\n    if stage.status == 'open':\n        self.status = 'open'\n    if stage.status == 'closed_won':\n        self.status = 'closed_won'\n    if stage.status == 'closed_lost':\n        self.status = 'closed_lost'\n    if self.status in ('closed_won', 'closed_lost') and (not self.closed_date):\n        self.closed_date = _dt.datetime.now(_dt.UTC)\n    await super().apre_update()\n\ndef has_object_permission(self, user: 'User', action: str) -> bool:\n    \"\"\"Check if user has permission to perform action on this deal.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        \"\"\"\n    if self.assigned_to and self.assigned_to.email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == '*' and permission.action in ('*', action):\n                return True\n            if permission.model == 'Deal' and permission.action in ('*', action):\n                return True\n    return False\n\ndef post_update(self) -> None:\n    \"\"\"Hook called after updating deal.\"\"\"\n    from amsdal_crm.services.workflow_service import WorkflowService\n    WorkflowService.execute_rules('Deal', 'update', self)\n\ndef pre_create(self) -> None:\n    \"\"\"Hook called before creating deal.\"\"\"\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields('Deal', self.custom_fields)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    \"\"\"Hook called before updating deal.\n\n        Automatically syncs is_closed and is_won status with stage,\n        and sets closed_date when deal is closed.\n        \"\"\"\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields('Deal', self.custom_fields)\n    from amsdal_models.classes.helpers.reference_loader import ReferenceLoader\n    stage = ReferenceLoader(self.stage).load_reference() if isinstance(self.stage, Reference) else self.stage\n    if stage.status == 'open':\n        self.status = 'open'\n    if stage.status == 'closed_won':\n        self.status = 'closed_won'\n    if stage.status == 'closed_lost':\n        self.status = 'closed_lost'\n    if self.status in ('closed_won', 'closed_lost') and (not self.closed_date):\n        self.closed_date = _dt.datetime.now(_dt.UTC)\n    super().pre_update()",
+                "custom_code": "import datetime as _dt\n\nfrom amsdal.contrib.auth.models.user import User\nfrom amsdal_utils.models.data_models.reference import Reference\n\n\n@classmethod\ndef custom_fields_cell_template(cls) -> str:\n    return 'JsonTemplate'\n\n@property\ndef display_name(self) -> str:\n    \"\"\"Return display name for the deal.\"\"\"\n    return self.name\n\n@property\ndef stage_name(self) -> str:\n    \"\"\"Returns stage name for display.\"\"\"\n    if hasattr(self.stage, 'name'):\n        return self.stage.name\n    return str(self.stage)\n\nasync def _avalidate_custom_fields(self) -> None:\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(self.__class__.__name__, self.custom_fields)\n\nasync def apost_update(self) -> None:\n    \"\"\"Async hook called after updating deal.\"\"\"\n    from amsdal_crm.services.workflow_service import WorkflowService\n    await WorkflowService.aexecute_rules('Deal', 'update', self)\n\nasync def apre_create(self) -> None:\n    await self._avalidate_custom_fields()\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    \"\"\"Async hook called before updating deal.\n\n        Automatically syncs is_closed and is_won status with stage,\n        and sets closed_date when deal is closed.\n        \"\"\"\n    stage = await self.stage\n    if stage.status == 'open':\n        self.status = 'open'\n    if stage.status == 'closed_won':\n        self.status = 'closed_won'\n    if stage.status == 'closed_lost':\n        self.status = 'closed_lost'\n    if self.status in ('closed_won', 'closed_lost') and (not self.closed_date):\n        self.closed_date = _dt.datetime.now(_dt.UTC)\n    await super().apre_update()\n\ndef _validate_custom_fields(self) -> None:\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(self.__class__.__name__, self.custom_fields)\n\ndef has_object_permission(self, user: 'User', action: str) -> bool:\n    \"\"\"Check if user has permission to perform action on this deal.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        \"\"\"\n    if self.assigned_to and self.assigned_to.email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == '*' and permission.action in ('*', action):\n                return True\n            if permission.model == 'Deal' and permission.action in ('*', action):\n                return True\n    return False\n\ndef post_update(self) -> None:\n    \"\"\"Hook called after updating deal.\"\"\"\n    from amsdal_crm.services.workflow_service import WorkflowService\n    WorkflowService.execute_rules('Deal', 'update', self)\n\ndef pre_create(self) -> None:\n    self._validate_custom_fields()\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    \"\"\"Hook called before updating deal.\n\n        Automatically syncs is_closed and is_won status with stage,\n        and sets closed_date when deal is closed.\n        \"\"\"\n    from amsdal_models.classes.helpers.reference_loader import ReferenceLoader\n    stage = ReferenceLoader(self.stage).load_reference() if isinstance(self.stage, Reference) else self.stage\n    if stage.status == 'open':\n        self.status = 'open'\n    if stage.status == 'closed_won':\n        self.status = 'closed_won'\n    if stage.status == 'closed_lost':\n        self.status = 'closed_lost'\n    if self.status in ('closed_won', 'closed_lost') and (not self.closed_date):\n        self.closed_date = _dt.datetime.now(_dt.UTC)\n    super().pre_update()",
                 "storage_metadata": {
                     "table_name": "Deal",
                     "db_fields": {

amsdal_crm-0.2.3/amsdal_crm/models/common.py

@@ -0,0 +1,45 @@
+from typing import Any
+
+from pydantic.fields import Field
+
+
+class CustomFieldsMixin:
+    custom_fields: dict[str, Any] | None = Field(default=None, title='Custom Fields')
+
+    @classmethod
+    def custom_fields_cell_template(cls) -> str:
+        return 'JsonTemplate'
+
+    def pre_create(self) -> None:
+        self._validate_custom_fields()
+        super().pre_create()
+
+    async def apre_create(self) -> None:
+        await self._avalidate_custom_fields()
+        await super().apre_create()
+
+    def pre_update(self) -> None:
+        self._validate_custom_fields()
+        super().pre_update()
+
+    async def apre_update(self) -> None:
+        await self._avalidate_custom_fields()
+        await super().apre_update()
+
+    def _validate_custom_fields(self) -> None:
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = CustomFieldService.validate_custom_fields(
+                self.__class__.__name__,
+                self.custom_fields,
+            )
+
+    async def _avalidate_custom_fields(self) -> None:
+        if self.custom_fields:
+            from amsdal_crm.services.custom_field_service import CustomFieldService
+
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields(
+                self.__class__.__name__,
+                self.custom_fields,
+            )

{amsdal_crm-0.2.1 → amsdal_crm-0.2.3}/amsdal_crm/models/deal.py

@@ -1,7 +1,6 @@
 """Deal Model."""
 
 import datetime as _dt
-from typing import Any
 from typing import ClassVar
 from typing import Literal
 
@@ -14,13 +13,15 @@ from amsdal_utils.models.data_models.reference import Reference
 from amsdal_utils.models.enums import ModuleType
 from pydantic.fields import Field
 
+from models.common import CustomFieldsMixin
+
 
 class DealManager(Manager):
     def get_queryset(self) -> 'DealManager':
         return super().get_queryset().select_related('stage')
 
 
-class Deal(TimestampMixin, Model):
+class Deal(CustomFieldsMixin, TimestampMixin, Model):
     """Deal (Sales Opportunity) model.
 
     Represents a sales opportunity linked to an account and contact,
@@ -50,9 +51,6 @@ class Deal(TimestampMixin, Model):
     # Status tracking
     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')
-
     @property
     def display_name(self) -> str:
         """Return display name for the deal."""
@@ -90,34 +88,12 @@ class Deal(TimestampMixin, Model):
 
         return False
 
-    def pre_create(self) -> None:
-        """Hook called before creating deal."""
-        if self.custom_fields:
-            from amsdal_crm.services.custom_field_service import CustomFieldService
-
-            self.custom_fields = CustomFieldService.validate_custom_fields('Deal', self.custom_fields)
-        super().pre_create()
-
-    async def apre_create(self) -> None:
-        """Async hook called before creating deal."""
-        if self.custom_fields:
-            from amsdal_crm.services.custom_field_service import CustomFieldService
-
-            self.custom_fields = await CustomFieldService.avalidate_custom_fields('Deal', self.custom_fields)
-        await super().apre_create()
-
     def pre_update(self) -> None:
         """Hook called before updating deal.
 
         Automatically syncs is_closed and is_won status with stage,
         and sets closed_date when deal is closed.
         """
-        # Validate custom fields first
-        if self.custom_fields:
-            from amsdal_crm.services.custom_field_service import CustomFieldService
-
-            self.custom_fields = CustomFieldService.validate_custom_fields('Deal', self.custom_fields)
-
         # Load stage if it's a reference and sync closed status
         from amsdal_models.classes.helpers.reference_loader import ReferenceLoader
 
@@ -142,14 +118,7 @@ class Deal(TimestampMixin, Model):
 
         Automatically syncs is_closed and is_won status with stage,
         and sets closed_date when deal is closed.
-        """
-        # 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('Deal', self.custom_fields)
-
-        # Load stage if it's a reference and sync closed status
+        """  # Load stage if it's a reference and sync closed status
 
         stage = await self.stage
         if stage.status == 'open':

amsdal_crm-0.2.3/amsdal_crm/models/entity.py

@@ -0,0 +1,122 @@
+"""Account Model."""
+
+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
+
+from models.common import CustomFieldsMixin
+
+
+class Entity(CustomFieldsMixin, 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')
+
+    @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 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(CustomFieldsMixin, TimestampMixin, Model):
+    __module_type__: ClassVar[ModuleType] = ModuleType.CONTRIB
+
+    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')
+
+
+class EntityIdentifier(CustomFieldsMixin, TimestampMixin, Model):
+    __module_type__: ClassVar[ModuleType] = ModuleType.CONTRIB
+
+    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')
+
+
+class EntityContactPoint(CustomFieldsMixin, TimestampMixin, Model):
+    __module_type__: ClassVar[ModuleType] = ModuleType.CONTRIB
+
+    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')
+
+
+class EntityAddress(CustomFieldsMixin, TimestampMixin, Model):
+    __module_type__: ClassVar[ModuleType] = ModuleType.CONTRIB
+
+    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')

{amsdal_crm-0.2.1 → amsdal_crm-0.2.3}/pyproject.toml

@@ -8,6 +8,11 @@ include = [
   "amsdal_crm/py.typed",
 ]
 
+
+[tool.pyright]
+venvPath = "."
+venv = ".venv"
+
 [project]
 name = "amsdal_crm"
 dynamic = ["version"]