amsdal_crm 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

amsdal_crm/__about__.py

@@ -1 +1 @@
-__version__ = '0.1.2'
+__version__ = '0.1.4'

amsdal_crm/lifecycle/consumer.py

@@ -50,7 +50,7 @@ class DealWonNotificationConsumer(LifecycleConsumer):
         pass
 
 
-def _custom_field_def_to_control(field_def: Any) -> dict[str, Any]:
+def _custom_field_def_to_control(field_def: Any, values: dict[str, Any]) -> dict[str, Any]:
     """Convert a CustomFieldDefinition to a frontend control config.
 
     Args:
@@ -82,6 +82,9 @@ def _custom_field_def_to_control(field_def: Any) -> dict[str, Any]:
         if field_def.choices:
             control['options'] = [{'label': choice, 'value': choice} for choice in field_def.choices]
 
+    if values and field_def.field_name in values:
+        control['value'] = values[field_def.field_name]
+
     return control
 
 
@@ -98,9 +101,6 @@ def _add_custom_fields_to_control(control: dict[str, Any], custom_field_controls
     if 'controls' not in control:
         control['controls'] = []
 
-    if 'control' in control:
-        control.pop('control', None)
-
     # Find the custom_fields control and update it, or append custom fields at the end
     custom_fields_control = None
     for ctrl in control.get('controls', []):
@@ -112,6 +112,8 @@ def _add_custom_fields_to_control(control: dict[str, Any], custom_field_controls
         # Update the custom_fields control to be a group with nested controls
         custom_fields_control['type'] = 'group'
         custom_fields_control['controls'] = custom_field_controls
+        if 'control' in custom_fields_control:
+            custom_fields_control.pop('control', None)
     else:
         # Add custom fields as a new group at the end
         control['controls'].append(
@@ -124,6 +126,30 @@ def _add_custom_fields_to_control(control: dict[str, Any], custom_field_controls
         )
 
 
+def get_values_from_response(response: dict[str, Any] | list[dict[str, Any]]) -> dict[str, Any]:
+    """
+    Extracts values from a response dictionary or list of dictionaries.
+
+    This function processes a response to extract the relevant values. It checks if the response
+    is a dictionary containing a 'rows' key and processes the rows to find the appropriate values.
+    If the response is not in the expected format, it returns an empty dictionary.
+
+    Args:
+        response (dict[str, Any] | list[dict[str, Any]]): The response to extract values from.
+
+    Returns:
+        dict[str, Any]: A dictionary containing the extracted values.
+    """
+    if not isinstance(response, dict) or 'rows' not in response or not response['rows']:
+        return {}
+
+    for row in response['rows']:
+        if '_metadata' in row and row['_metadata'].get('next_version') is None:
+            return row
+
+    return response['rows'][0]
+
+
 class CustomAttributesFrontendConfigConsumer(LifecycleConsumer):
     """Consumer that propagates custom attributes into frontend config.
 
@@ -152,6 +178,8 @@ class CustomAttributesFrontendConfigConsumer(LifecycleConsumer):
         if not isinstance(response, dict) or 'control' not in response:
             return
 
+        values = get_values_from_response(response)
+
         custom_field_defs = list(
             CustomFieldDefinition.objects.filter(
                 entity_type=class_name,
@@ -166,7 +194,9 @@ class CustomAttributesFrontendConfigConsumer(LifecycleConsumer):
         # Sort by display_order
         custom_field_defs.sort(key=lambda x: x.display_order)
 
-        custom_field_controls = [_custom_field_def_to_control(field_def) for field_def in custom_field_defs]
+        custom_field_controls = [
+            _custom_field_def_to_control(field_def, values=values) for field_def in custom_field_defs
+        ]
 
         _add_custom_fields_to_control(response['control'], custom_field_controls)
 
@@ -191,6 +221,8 @@ class CustomAttributesFrontendConfigConsumer(LifecycleConsumer):
         if not isinstance(response, dict) or 'control' not in response:
             return
 
+        values = get_values_from_response(response)
+
         custom_field_defs = list(
             await CustomFieldDefinition.objects.filter(
                 entity_type=class_name,
@@ -205,7 +237,9 @@ class CustomAttributesFrontendConfigConsumer(LifecycleConsumer):
         # Sort by display_order
         custom_field_defs.sort(key=lambda x: x.display_order)
 
-        custom_field_controls = [_custom_field_def_to_control(field_def) for field_def in custom_field_defs]
+        custom_field_controls = [
+            _custom_field_def_to_control(field_def, values=values) for field_def in custom_field_defs
+        ]
 
         _add_custom_fields_to_control(response['control'], custom_field_controls)
 

amsdal_crm/models/account.py

@@ -89,7 +89,7 @@ class Account(TimestampMixin, Model):
         if self.custom_fields:
             from amsdal_crm.services.custom_field_service import CustomFieldService
 
-            self.custom_fields = CustomFieldService.validate_custom_fields('Account', self.custom_fields)
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields('Account', self.custom_fields)
         await super().apre_create()
 
     def pre_update(self) -> None:
@@ -109,7 +109,7 @@ class Account(TimestampMixin, Model):
         if self.custom_fields:
             from amsdal_crm.services.custom_field_service import CustomFieldService
 
-            self.custom_fields = CustomFieldService.validate_custom_fields('Account', self.custom_fields)
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields('Account', self.custom_fields)
 
         # Call parent to handle timestamps
         await super().apre_update()
@@ -124,4 +124,4 @@ class Account(TimestampMixin, Model):
         """Async hook called after updating account."""
         from amsdal_crm.services.workflow_service import WorkflowService
 
-        WorkflowService.execute_rules('Account', 'update', self)
+        await WorkflowService.aexecute_rules('Account', 'update', self)

amsdal_crm/models/contact.py

@@ -89,7 +89,7 @@ class Contact(TimestampMixin, Model):
         if self.custom_fields:
             from amsdal_crm.services.custom_field_service import CustomFieldService
 
-            self.custom_fields = CustomFieldService.validate_custom_fields('Contact', self.custom_fields)
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields('Contact', self.custom_fields)
         await super().apre_create()
 
     def pre_update(self) -> None:
@@ -109,7 +109,7 @@ class Contact(TimestampMixin, Model):
         if self.custom_fields:
             from amsdal_crm.services.custom_field_service import CustomFieldService
 
-            self.custom_fields = CustomFieldService.validate_custom_fields('Contact', self.custom_fields)
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields('Contact', self.custom_fields)
 
         # Call parent to handle timestamps
         await super().apre_update()
@@ -124,7 +124,7 @@ class Contact(TimestampMixin, Model):
         """Async hook called after updating contact."""
         from amsdal_crm.services.workflow_service import WorkflowService
 
-        WorkflowService.execute_rules('Contact', 'update', self)
+        await WorkflowService.aexecute_rules('Contact', 'update', self)
 
 
 from amsdal_crm.models.account import Account

amsdal_crm/models/deal.py

@@ -99,7 +99,7 @@ class Deal(TimestampMixin, Model):
         if self.custom_fields:
             from amsdal_crm.services.custom_field_service import CustomFieldService
 
-            self.custom_fields = CustomFieldService.validate_custom_fields('Deal', self.custom_fields)
+            self.custom_fields = await CustomFieldService.avalidate_custom_fields('Deal', self.custom_fields)
         await super().apre_create()
 
     def pre_update(self) -> None:
@@ -137,7 +137,7 @@ class Deal(TimestampMixin, Model):
         if self.custom_fields:
             from amsdal_crm.services.custom_field_service import CustomFieldService
 
-            self.custom_fields = CustomFieldService.validate_custom_fields('Deal', self.custom_fields)
+            self.custom_fields = await CustomFieldService.avalidate_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

{amsdal_crm-0.1.2.dist-info → amsdal_crm-0.1.4.dist-info}/METADATA

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

{amsdal_crm-0.1.2.dist-info → amsdal_crm-0.1.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 amsdal_crm/Third-Party Materials - AMSDAL Dependencies - License Notices.md,sha256=ML7PqsHrTMNNZn8E_rA-LzDCAafMSxMcrmSg8YOi-wo,113896
-amsdal_crm/__about__.py,sha256=mdp2CftfqYbdKtP-eWv1z7rAUycYv6X1ntXSMUf8Kss,22
+amsdal_crm/__about__.py,sha256=aBEbDvx4LMg8A1TJJR6dEHu8rQODVin528hLS_EDvuA,22
 amsdal_crm/__init__.py,sha256=b4wxJYesA5Ctk1IrAvlw64i_0EU3SiK1Tw6sUYakd18,303
 amsdal_crm/app.py,sha256=JLvueh_2KURQLDWMQlq4Z6gAFsqBDTRf6pK095ehp14,1373
 amsdal_crm/constants.py,sha256=5Ga7q9zEKcQZnAoKv_SE_7w8WxvhPFkM9gY9NruOEaA,347
@@ -9,15 +9,15 @@ amsdal_crm/fixtures/__init__.py,sha256=1tDNXZhcbZBd4tX3lTKKlom1NUg1TX2aa2IbymWO9
 amsdal_crm/fixtures/permissions.py,sha256=cYA-gWkKQdoN79GymQVHtT0GyFXMzaskwp13Ietp9wE,1107
 amsdal_crm/fixtures/pipelines.py,sha256=ZCLmgrA700Sl7Oy7l4IQ8FbIbC1378OkcJTrZe5701o,2064
 amsdal_crm/lifecycle/__init__.py,sha256=B8nw19lEIr7U15Lnu6jh7yzZwF9LWWh4-p3X63sAicQ,31
-amsdal_crm/lifecycle/consumer.py,sha256=2xNiFb4Xz0Xsa_1wL5HosKkb4kDMuYOhCd643qEYqCA,7306
+amsdal_crm/lifecycle/consumer.py,sha256=YKBkQjaqW7Vz8s3oJrIG9_7i65IVkz-qvDJrZsiEIBQ,8585
 amsdal_crm/migrations/0000_initial.py,sha256=8XjM-sbrNKJfcyGE_K2ITW4fOz7gmUxWH_NbX48o4XI,57028
 amsdal_crm/models/__init__.py,sha256=DSuGeLKPNL_EUGohWtrH6Eof6Nk--dHyZpfqbGWmYIY,1350
-amsdal_crm/models/account.py,sha256=b9JguizB-eM1BkDar4nGhayZ-icdfIsQp5cdB4sVZaQ,4897
+amsdal_crm/models/account.py,sha256=prb8Tl0nYyObTeql1fLX1cVRszauzPRSN7xv-H26hRg,4918
 amsdal_crm/models/activity.py,sha256=UtO1--oSPfrQCfQwWfIlEkjdXuaRG9znesPrGe1JqGM,4775
 amsdal_crm/models/attachment.py,sha256=CzS8sUMw0_8T_a4Ey6uzrSdEc12Fki5FbrFRXrsTExk,1525
-amsdal_crm/models/contact.py,sha256=J_ULPcM947AjRI35UCXWa_CAXK7HDgijXmcIlN2UdSI,4903
+amsdal_crm/models/contact.py,sha256=xOTl8zUIEm2_Tk-CQxGAjzR_iuLA7Q_aKmJZAMXZ1F0,4924
 amsdal_crm/models/custom_field_definition.py,sha256=Z0k_QR6rZ1hWkg4Wn-w8Rn9GSIgpOg_moUYRsmRPZQI,1666
-amsdal_crm/models/deal.py,sha256=ECG5Jd1zy286YJFGfxKDlJjUPW9PhLEvvL3kIeGttws,6434
+amsdal_crm/models/deal.py,sha256=kEmS_nkicWKhZO1PbeAJLYbAffdo6LU8Nm5xDQDOwkA,6448
 amsdal_crm/models/pipeline.py,sha256=DXJh5MbCCRctEHhDfxef5RxFWSKN0D4v6UK75q5ssL8,925
 amsdal_crm/models/stage.py,sha256=Ch4O1Aj2LtBhGpDN7MqY4iNRPrEQig0q6QtEU5cp4hA,1608
 amsdal_crm/models/workflow_rule.py,sha256=cnIEaX-hWcRYvN5gR4uPt7Cirr8sPPdJibZapD8VRpY,1547
@@ -27,6 +27,6 @@ amsdal_crm/services/custom_field_service.py,sha256=rqTlzcmjc-tqc3nuo2m0cMFdMgo1l
 amsdal_crm/services/deal_service.py,sha256=ZF7cAc6r10xgXZ8D8Oy3hnE-6GgAXq8fuG_Y4QerRGw,4839
 amsdal_crm/services/email_service.py,sha256=kung83otZAzm5MjezbWFP_Bp9CJ2NXLlDdjMX9MvNIc,3788
 amsdal_crm/services/workflow_service.py,sha256=oKOFJrwnMZxAiHuScs63tZxL801z-6ryrUuPMC7OXlE,7036
-amsdal_crm-0.1.2.dist-info/METADATA,sha256=bkg5fEm_Mr2pPj0ScM1kS0XySZ5Akc6PIO_K2JNnOog,1596
-amsdal_crm-0.1.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-amsdal_crm-0.1.2.dist-info/RECORD,,
+amsdal_crm-0.1.4.dist-info/METADATA,sha256=zgbJjsDrMjYICcwj0l4sVmQvQ074u6MONMuCXJRDuCA,1596
+amsdal_crm-0.1.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+amsdal_crm-0.1.4.dist-info/RECORD,,