wbcrm 1.44.2__tar.gz → 1.44.4__tar.gz

{wbcrm-1.44.2 → wbcrm-1.44.4}/PKG-INFO

@@ -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 → wbcrm-1.44.4}/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-1.44.2 → wbcrm-1.44.4}/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-1.44.2 → wbcrm-1.44.4}/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-1.44.2 → wbcrm-1.44.4}/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-1.44.2 → wbcrm-1.44.4}/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-1.44.2 → wbcrm-1.44.4}/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",