wbcrm 1.44.2__py2.py3-none-any.whl → 1.44.4__py2.py3-none-any.whl

wbcrm/filters/accounts.py

@@ -32,6 +32,10 @@ class AccountFilter(wb_filters.FilterSet):
         method="filter_not_owner",
     )
 
+    status = wb_filters.MultipleChoiceFilter(
+        choices=Account.Status.choices, label="Status", default=[Account.Status.OPEN.value]
+    )
+
     def filter_not_owner(self, queryset, name, value):
         if value:
             return queryset.exclude(owner__in=value)
@@ -46,7 +50,6 @@ class AccountFilter(wb_filters.FilterSet):
         model = Account
         fields = {
             "reference_id": ["icontains"],
-            "status": ["exact"],
             "is_active": ["exact"],
             "parent": ["exact", "isnull"],
             "is_terminal_account": ["exact"],

wbcrm/models/accounts.py

@@ -25,7 +25,6 @@ from wbcore.metadata.configs.buttons import ActionButton
 from wbcore.models import WBModel
 from wbcore.signals import pre_merge
 from wbcore.utils.models import (
-    ActiveObjectManager,
     ComplexToStringMixin,
     DeleteToDisableMixin,
 )
@@ -67,14 +66,19 @@ class AccountDefaultQueryset(QuerySet):
         ).filter((Q(is_public=True) & Q(has_descending_roles=True)) | Q(has_direct_role=True))
 
 
-class AccountManager(ActiveObjectManager):
+class AccountManager(models.Manager):
     def get_queryset(self) -> AccountDefaultQueryset:
-        return AccountDefaultQueryset(self.model).filter(is_active=True)
+        return AccountDefaultQueryset(self.model)
 
     def filter_for_user(self, user: User, validity_date: date | None = None, strict: bool = False) -> QuerySet:
         return self.get_queryset().filter_for_user(user, validity_date=validity_date, strict=strict)
 
 
+class ActiveAccountManager(AccountManager):
+    def get_queryset(self):
+        return super().get_queryset().filter(is_active=True)
+
+
 class OpenAccountObjectManager(AccountManager):
     def get_queryset(self):
         return super().get_queryset().filter(status=Account.Status.OPEN, is_active=True)
@@ -261,6 +265,10 @@ class Account(ComplexToStringMixin, DeleteToDisableMixin, WBModel, MPTTModel):
         # else:
         #     self.is_terminal_account = False
         self.is_terminal_account = self.is_leaf_node()
+        if not self.is_active:
+            self.status = self.Status.CLOSE
+        if self.status == self.Status.CLOSE:
+            self.is_active = False
         super().save(*args, **kwargs)
         # self.children.update() TODO recompute str for all children
         # Account.objects.filter(id=self.id).update(computed_str=self.compute_str())
@@ -333,7 +341,8 @@ class Account(ComplexToStringMixin, DeleteToDisableMixin, WBModel, MPTTModel):
         verbose_name_plural = _("Accounts")
         permissions = [("administrate_account", "Administrate Account")]
 
-    objects = AccountManager()
+    objects = ActiveAccountManager()
+    all_objects = AccountManager()
     open_objects = OpenAccountObjectManager()
     tree_objects = TreeManager()
 
@@ -585,7 +594,8 @@ def handle_user_deactivation(sender, instance, substitute_profile=None, **kwargs
         for validity in profile_role.validity_set.all():
             if validity.timespan.upper >= deactivation_date:  # type: ignore
                 validity.timespan = DateRange(
-                    validity.timespan.lower, max([deactivation_date, validity.timespan.lower])  # type: ignore
+                    validity.timespan.lower,
+                    max([deactivation_date, validity.timespan.lower]),  # type: ignore
                 )
                 validity.save()
                 if substitute_profile and validity.timespan.lower <= deactivation_date:  # type: ignore

wbcrm/serializers/accounts.py

@@ -16,6 +16,9 @@ class AccountRoleTypeRepresentationSerializer(wb_serializers.RepresentationSeria
 class AccountRepresentationSerializer(wb_serializers.RepresentationSerializer):
     _detail = wb_serializers.HyperlinkField(reverse_name="wbcrm:account-detail")
 
+    def get_filter_params(self, request):
+        return {"is_active": True}
+
     class Meta:
         model = Account
         fields = ("id", "computed_str", "_detail")

wbcrm/tests/accounts/test_models.py

@@ -17,6 +17,18 @@ class TestAccountModel:
     def test_init(self, account):
         assert account.id is not None
 
+    def test_close_account_set_inactive(self, account):
+        assert account.is_active
+        account.status = Account.Status.CLOSE
+        account.save()
+        assert not account.is_active
+
+    def test_disable_account_set_status_close(self, account):
+        assert account.status == Account.Status.OPEN
+        account.delete()
+        assert not account.is_active
+        assert account.status == Account.Status.CLOSE
+
     def test_account_with_owner_create_account_role(self, account_factory, entry_factory):
         customer = entry_factory.create()
         account = account_factory.create(owner=customer)

wbcrm/viewsets/accounts.py

@@ -44,14 +44,14 @@ class AccountRepresentationViewSet(AccountPermissionMixin, viewsets.Representati
     filterset_class = AccountFilter
 
     serializer_class = AccountRepresentationSerializer
-    queryset = Account.objects.all()
+    queryset = Account.all_objects.all()
     ordering = ["title"]
 
 
 class AccountModelViewSet(MergeMixin, AccountPermissionMixin, viewsets.ModelViewSet):
     serializer_class = AccountModelSerializer
     filterset_class = AccountFilter
-    queryset = Account.objects.select_related("owner", "parent").annotate(
+    queryset = Account.all_objects.select_related("owner", "parent").annotate(
         has_children=Exists(Account.objects.filter(parent=OuterRef("pk"))),
         _group_key=Case(When(has_children=True, then=F("id")), default=None, output_field=IntegerField()),
     )

wbcrm/viewsets/display/accounts.py

@@ -15,6 +15,7 @@ class AccountDisplayConfig(DisplayViewConfig):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
         return dp.ListDisplay(
             fields=[
+                dp.Field(key="status", label="Status"),
                 dp.Field(
                     key="owner",
                     label="Owner",
@@ -22,7 +23,6 @@ class AccountDisplayConfig(DisplayViewConfig):
                 dp.Field(key="reference_id", label="Reference ID"),
                 dp.Field(key="is_terminal_account", label="Terminal Account"),
                 dp.Field(key="is_public", label="Public"),
-                dp.Field(key="is_active", label="Active"),
                 dp.Field(
                     key="llm",
                     label="LLM Analysis",

{wbcrm-1.44.2.dist-info → wbcrm-1.44.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbcrm
-Version: 1.44.2
+Version: 1.44.4
 Summary: A workbench module that contains all the functionality related to a customer relationship management.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: django-eventtools==1.*

{wbcrm-1.44.2.dist-info → wbcrm-1.44.4.dist-info}/RECORD

@@ -19,7 +19,7 @@ wbcrm/factories/activities.py,sha256=hr7i7hUOgPclAwB8v5Z1t7tYkCCXIRr4TbJAUuxj1CA
 wbcrm/factories/groups.py,sha256=2iCMCSPGsMYHGjqfNUcX3gK3AzMivxzJfpw_P0F8QFs,620
 wbcrm/factories/products.py,sha256=mQ2WHo4jDheppSyQBPGktnTeTp52j0BN0pggPBsAzYE,243
 wbcrm/filters/__init__.py,sha256=ZX47xCq18N_FTvvFCk2mIlFoValKFaTcxw9xv8qdn0E,305
-wbcrm/filters/accounts.py,sha256=RPW7qkuc6bxF9RHeknntMgWOr9tlUhBKqTMMtO1gmTI,2217
+wbcrm/filters/accounts.py,sha256=SeVwNJlNmbVgyZFyXBUFiVxQqmuJ578-EVdNwWJ4DIc,2329
 wbcrm/filters/activities.py,sha256=zPYPGcMr7wneBgU6ldLBoqE1hLGxUjQZlDKdVqJTNc8,7782
 wbcrm/filters/groups.py,sha256=KcjyimEoJ7LB_KIRyTIsiNneVWf5ud9CvSqJasffud0,623
 wbcrm/filters/products.py,sha256=gCiL4MVsaLZgLhyLeclWsBdKLRoYS-C7tL52_VWtfKE,1203
@@ -46,7 +46,7 @@ wbcrm/migrations/0016_auto_20241205_1015.py,sha256=E82BmOegfyJmmmaKemL_bT2OEVywi
 wbcrm/migrations/0017_event.py,sha256=PzhAVAa2z4itzctQBz-6i__aRDh3TDe029F8leE34W0,1422
 wbcrm/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbcrm/models/__init__.py,sha256=23U2eBeZStYgUKSGfi3q88JtfqfbNTk7MbnLEAGw1gk,287
-wbcrm/models/accounts.py,sha256=jUJth33rvm_dv6UFRuelLpfXGrOQFTCyrY7hnNNd97s,25130
+wbcrm/models/accounts.py,sha256=fKSSUsA6saN4HA9SyXzjmjlpsRmNW1jNs7EYD-4PtGE,25429
 wbcrm/models/activities.py,sha256=EP9yv9dP5ZNUXUrgRVEtRZXsbnMiNXbD1elxq5uYyoM,53909
 wbcrm/models/events.py,sha256=jUHArKuZlPzMXpzwrtxM0fI6POF2-ETybtphjPQxqqA,393
 wbcrm/models/groups.py,sha256=T4ikoRw6BNWL5oeHDITsGt0KJWibm3OMYppwnkBliMM,4300
@@ -56,7 +56,7 @@ wbcrm/models/llm/activity_summaries.py,sha256=8dJP_aDVoakanbOnj_jYnSpeqX8b7JYtU1
 wbcrm/models/llm/analyze_relationship.py,sha256=Po6nE9GrlwKZtL471fsWySJYDqRZGW20cLAQTdiqFGk,2346
 wbcrm/report/activity_report.py,sha256=AzSfiWne--CG4C4jpcODJtqegxcALCqxvOs9jeD4EB8,4835
 wbcrm/serializers/__init__.py,sha256=qKwo5e-Ix-Iow1RRdKFC0uZQmuSHzc8DIypIhi_E8HI,726
-wbcrm/serializers/accounts.py,sha256=pt9tu8a7P0TO9h4zMBoS1jEfdlqcQ0IaiM1S9sOT13A,4915
+wbcrm/serializers/accounts.py,sha256=5YJD3vsHJEXB8eBjAmrXDRRDV4O46Z56wl_8Xgl77gU,4993
 wbcrm/serializers/activities.py,sha256=BSxMbvOLrKOBTS98vbzjTodKNWEd_qYv4sfdfSCiUZE,21846
 wbcrm/serializers/groups.py,sha256=YqiHGiytbD1lIuSUEBk4CwlwipAFs_uh2V9DZG7JukQ,783
 wbcrm/serializers/products.py,sha256=PCyUAAdcl98CDSyGtH8orE0t1gM5exfW6E4E43Mm1I0,2001
@@ -91,7 +91,7 @@ wbcrm/synchronization/activity/backends/google/tasks.py,sha256=vQ-_z6koyAQd6kjp3
 wbcrm/synchronization/activity/backends/google/typing_informations.py,sha256=7fDaQEok0kzm_5_vrRrMiakFAh2O3j4G09XWPwYSK1I,2655
 wbcrm/synchronization/activity/backends/google/utils.py,sha256=glDYCtbQDnTrge2mpVM-GICebneaa_I9KZwCgFkwRMA,11572
 wbcrm/synchronization/activity/backends/google/request_utils/__init__.py,sha256=FQ8XwEEPtUR-DKHBgiNJQXHPduUNcJM9YiTSEH5LXmQ,530
-wbcrm/synchronization/activity/backends/google/request_utils/external_to_internal/create.py,sha256=VyAg2iftSO_hyQthX6dtL299cogIFWsmrhE_xOwZQbs,3622
+wbcrm/synchronization/activity/backends/google/request_utils/external_to_internal/creat,sha256=VyAg2iftSO_hyQthX6dtL299cogIFWsmrhE_xOwZQbs,3622
 wbcrm/synchronization/activity/backends/google/request_utils/external_to_internal/delete.py,sha256=AvhoJx-vzf2RlHtDPwXy4LXQtxSGaTWQXLiHlmlFCtE,3700
 wbcrm/synchronization/activity/backends/google/request_utils/external_to_internal/update.py,sha256=4AWhTV-Rdtp4RVijULw7JlIr7ewYVLWv4s6SBb4OKuI,7810
 wbcrm/synchronization/activity/backends/google/request_utils/internal_to_external/update.py,sha256=XqEfqrLzELrxhCCovP_qvL1FECeiqxhV6caVZHfwRvk,8990
@@ -130,13 +130,13 @@ wbcrm/tests/test_tasks.py,sha256=rVlRa1LNvgPdKDJ3B7SGed7kC5bPFybAYwLwxNp-NHI,418
 wbcrm/tests/test_viewsets.py,sha256=IjTgeuYMcIjO1HF0p6tHWNSHRyOGQm7niivzwDu8ERo,50232
 wbcrm/tests/tests.py,sha256=8K8FaLYBB5GUUBjix9W-Lrq6odNeZuMgfSfA7msJEpQ,4801
 wbcrm/tests/accounts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbcrm/tests/accounts/test_models.py,sha256=YmtEG7s-BC5i_E6xSjsjV1qE5-roIxDtmD6Lp1i6qxE,17959
+wbcrm/tests/accounts/test_models.py,sha256=u0ENs2cXS4Ffev2-JCdMtWpSuzXFXvD_iDS6gqpViJM,18387
 wbcrm/tests/accounts/test_viewsets.py,sha256=bMWftVBcttcQEMu6R6Wx-NYmokAxPYZ6UIj461qu2zA,3661
 wbcrm/tests/e2e/__init__.py,sha256=-6vGUXo06yKKvpNRO0Jy1eocIXblvn4-wWpTFuCNqRI,79
 wbcrm/tests/e2e/e2e_wbcrm_utility.py,sha256=on3jthFT1fJtKcdiaW6rTQNctkhHmsfdlmzaEl4JUU4,3313
 wbcrm/tests/e2e/test_e2e.py,sha256=diugvEYNpeT3GY3kHaaWolZ4gofTDOQv6JX6YKVzR8A,16519
 wbcrm/viewsets/__init__.py,sha256=aoi2Hry7C6CixqV7ZIVrVPSjrcRcdRkE3zBmm1Va1Qo,668
-wbcrm/viewsets/accounts.py,sha256=tDXcpYD_gd1RhC3cugAu87Sfd63AdfxRl6Sekj4fziA,4449
+wbcrm/viewsets/accounts.py,sha256=KJUixdg6iVLI9RVKb8IXiA_d9dBVMQpZM7fDap7CwTY,4457
 wbcrm/viewsets/activities.py,sha256=7RxNRMZUkWwAGscXR4hThRe8CY6zXJn9OKvP2JjCo0A,12868
 wbcrm/viewsets/groups.py,sha256=5-ZqTSnd9Lve-RbN5WRluXOYLHHxkZSvjqC6nhAhsNw,1413
 wbcrm/viewsets/mixins.py,sha256=kpwFjiTuh3vwmIv1Fe8c9DsaPsO4yUQuTvPOttnn7Rg,1112
@@ -147,7 +147,7 @@ wbcrm/viewsets/buttons/accounts.py,sha256=8r07RQ5l-MZQO3yY-NT5D18nJs_lMVweYi28lH
 wbcrm/viewsets/buttons/activities.py,sha256=82HUR6G2UnzDkAMx6aViH254xZmvzawgYTQR0B-_sd8,3875
 wbcrm/viewsets/buttons/signals.py,sha256=DbY78n1T_zqs16DW5x_5gsFyd-GUN1KrExWLUvT5-YI,729
 wbcrm/viewsets/display/__init__.py,sha256=Ryjs6DW42eFHuh3_uW91blo0pgfR07dCDeZzOU12mNM,357
-wbcrm/viewsets/display/accounts.py,sha256=wbtwEJN2RA2RAXEQ04FzFKJsTX7PNgut8f8_q44Xsxs,4666
+wbcrm/viewsets/display/accounts.py,sha256=9YcLcOIqj1xd-sO3xbbLzamATVY26nn_FDtcbQxfRsk,4663
 wbcrm/viewsets/display/activities.py,sha256=QLGlJDBfRbZ8zd-xlcZygiquh6KxwbI2LS7l3No6dsA,18652
 wbcrm/viewsets/display/groups.py,sha256=fwmqaWrGWS6GwCi2PkjH9dbgwx5uf8pebXrjDB5tIeQ,785
 wbcrm/viewsets/display/products.py,sha256=D5AmkE4HqZPcablhBmnQRpgCjKMD45vCaKjoAAnvY20,3988
@@ -170,6 +170,6 @@ wbcrm/viewsets/titles/products.py,sha256=cFAK5zljjybabk2U0KzPT2PVfV5vmO_UlJd6QlI
 wbcrm/viewsets/titles/utils.py,sha256=IaHQTmEG2OwIHS1bRv7sjuT950wefUJNi3yvPdrpNEs,1144
 wbcrm/workflows/__init__.py,sha256=biwXXPkVJugT9Vc1cwbInAUY8EnVmOauxdPz7e_2w_A,32
 wbcrm/workflows/assignee_methods.py,sha256=L7ymErtcpFgXdTMTj_lDOVJqsLAGLNT6qMlrkHGuXWM,999
-wbcrm-1.44.2.dist-info/METADATA,sha256=r2IrwXCKw2ZDzQ785p8Zkhd9igtC63T70ZHLj67eNl0,450
-wbcrm-1.44.2.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbcrm-1.44.2.dist-info/RECORD,,
+wbcrm-1.44.4.dist-info/METADATA,sha256=hyrozN0EsGVgWvhUUKX_L19vSFMNILPlXkIfjGg8cCU,450
+wbcrm-1.44.4.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbcrm-1.44.4.dist-info/RECORD,,