django-spire 0.16.6__py3-none-any.whl → 0.16.7__py3-none-any.whl

django_spire/consts.py

@@ -1,4 +1,4 @@
-__VERSION__ = '0.16.6'
+__VERSION__ = '0.16.7'
 
 
 AI_CHAT_WORKFLOW_SENDER_SETTINGS_NAME = 'AI_CHAT_WORKFLOW_NAME'

django_spire/knowledge/collection/querysets.py

@@ -2,8 +2,10 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from django.core.handlers.wsgi import WSGIRequest
 from django.db.models import Count, Q
 
+from django_spire.auth.controller.controller import AppAuthController
 from django_spire.contrib.ordering.querysets import OrderingQuerySetMixin
 from django_spire.history.querysets import HistoryQuerySet
 
@@ -26,10 +28,31 @@ class CollectionQuerySet(HistoryQuerySet, OrderingQuerySetMixin):
     def childless(self) -> QuerySet[Collection]:
         return self.annotate(child_count=Count('child')).filter(child_count=0)
 
+    def exclude_children(self, collection: Collection) -> QuerySet[Collection]:
+        descendant_ids = set()
+        current_level_ids = [collection.id]
+
+        while current_level_ids:
+            children = self.filter(parent_id__in=current_level_ids)
+            child_ids = list(children.values_list('id', flat=True))
+
+            if not child_ids:
+                break
+
+            descendant_ids.update(child_ids)
+            current_level_ids = child_ids
+
+        return self.exclude(id__in=descendant_ids)
+
     def parentless(self) -> QuerySet[Collection]:
         return self.filter(parent_id__isnull=True)
 
-    def user_has_access(self, user: AuthUser) -> QuerySet[Collection]:
+    def request_user_has_access(self, request: WSGIRequest) -> QuerySet[Collection]:
+        user = request.user
+
+        if user.is_superuser or AppAuthController('knowledge', request).can_access_all_collections():
+            return self.all()
+
         direct_access = self.filter(group__auth_group__user=user)
         accessible_ids = set(direct_access.values_list('id', flat=True))
 

django_spire/knowledge/collection/services/transformation_service.py

@@ -7,7 +7,6 @@ from django.contrib.sites.models import Site
 from django.db.models import Prefetch
 from django.urls import reverse
 
-from django_spire.auth.controller.controller import AppAuthController
 from django_spire.contrib.service import BaseDjangoModelService
 
 from typing import TYPE_CHECKING
@@ -21,27 +20,20 @@ class CollectionTransformationService(BaseDjangoModelService['Collection']):
     obj: Collection
 
     def to_hierarchy_json(self, request: WSGIRequest) -> str:
-        user = request.user
-
         collections = (
             self.obj_class.objects
             .active()
+            .request_user_has_access(request)
             .select_related('parent')
         )
 
-        if not (
-                user.is_superuser or
-                AppAuthController('knowledge', request).can_access_all_collections()
-        ):
-            collections = collections.user_has_access(user=user)
-
         entry_queryset = (
             collections.model._meta.fields_map.get('entry')
             .related_model
             .objects
             .active()
             .has_current_version()
-            .user_has_access(user=user)
+            .user_has_access(user=request.user)
             .select_related('current_version__author')
             .order_by('order')
         )

django_spire/knowledge/collection/views/form_views.py

@@ -31,7 +31,13 @@ def form_view(
     dg.glue_query_set(
         request,
         unique_name='collections',
-        target=Collection.objects.active().user_has_access(request.user),
+        target=(
+            Collection.objects
+            .active()
+            .request_user_has_access(request)
+            .exclude(pk=collection.pk)
+            .exclude_children(collection=collection)
+        ),
         fields=['name']
     )
     dg.glue_query_set(

django_spire/knowledge/entry/views/json_views.py

@@ -41,7 +41,7 @@ def reorder_view(request: WSGIRequest) -> JsonResponse:
         destination_objects=(
             collection.entries
             .has_current_version()
-            .user_has_access(user=request.user)
+            .request_user_has_access(user=request.user)
             .active()
         ),
         position=order,

{django_spire-0.16.6.dist-info → django_spire-0.16.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-spire
-Version: 0.16.6
+Version: 0.16.7
 Summary: A project for Django Spire
 Author-email: Brayden Carlson <braydenc@stratusadv.com>, Nathan Johnson <nathanj@stratusadv.com>
 License: Copyright (c) 2024 Stratus Advanced Technologies and Contributors.
@@ -46,7 +46,7 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: crispy-bootstrap5==2024.10
-Requires-Dist: dandy>=0.18.0
+Requires-Dist: dandy==0.20.0
 Requires-Dist: django>=5.1.8
 Requires-Dist: django-crispy-forms==2.3
 Requires-Dist: django-glue>=0.8.1

{django_spire-0.16.6.dist-info → django_spire-0.16.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 django_spire/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/conf.py,sha256=EYC1hXqYqheYrb_b6Q93LrSgNl91JV633E4N5j-KGTo,1012
-django_spire/consts.py,sha256=b-ZLKW2TfJ9usKaHkyvoGYTqBCMCxBJ4TbeFRowbO2Q,390
+django_spire/consts.py,sha256=03xGzuHfxFzwqmJw9psV6y5rGeae223LllbKCunKROI,390
 django_spire/exceptions.py,sha256=L5ndRO5ftMmh0pHkO2z_NG3LSGZviJ-dDHNT73SzTNw,48
 django_spire/settings.py,sha256=NBDa_kZozESTz2UfHgy2PzhBqj54eIrjZsUsWqDgI0g,735
 django_spire/urls.py,sha256=mKeZszb5U4iIGqddMb5Tt5fRC72U2wABEOi6mvOfEBU,656
@@ -716,7 +716,7 @@ django_spire/knowledge/collection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 django_spire/knowledge/collection/admin.py,sha256=7Ykw1zDBzMuoO4OfyszsOXWmVvtof4ooXseplTmqa-E,677
 django_spire/knowledge/collection/forms.py,sha256=4zMzdonUjYEK7GW-3m0DDimG19zm9ji89j0FVFIg6W0,202
 django_spire/knowledge/collection/models.py,sha256=eArUPJu9bnFMixnfogQiA-TSbnz2NGoaJbmR4tJU3Mw,1625
-django_spire/knowledge/collection/querysets.py,sha256=bmLCqlRMkZ_9GOzNUiRanuxTIjiIXeQ8tiXMvXvsk-8,1717
+django_spire/knowledge/collection/querysets.py,sha256=EJM-LqOeFmaPZQkTcHAYp4qu1nuEXu36BH0-cJ339II,2532
 django_spire/knowledge/collection/seeding/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/knowledge/collection/seeding/seed.py,sha256=DVTYx8gt4zQQ1UpeOfMq5G1PWGdeENaw-XdA7DtjRUg,267
 django_spire/knowledge/collection/seeding/seeder.py,sha256=l8qDxIPYMlc8hntpVtb3BpvlPXr3XLemxOdnl8B16fo,1531
@@ -725,7 +725,7 @@ django_spire/knowledge/collection/services/factory_service.py,sha256=92DLZODSRPF
 django_spire/knowledge/collection/services/ordering_service.py,sha256=vTkSdt1lVT4VxSK3GhZibj8FPDDy5butwPkVzqmm07g,1243
 django_spire/knowledge/collection/services/processor_service.py,sha256=3ArKBndoL3HEvH_1EBqfiw7AnbFYZ0WmBgcPV8BHdLQ,911
 django_spire/knowledge/collection/services/service.py,sha256=Vg9ZPWlCxZ_43fkudvBUBZfd7L7A8_vKlBA9dIHUNas,1709
-django_spire/knowledge/collection/services/transformation_service.py,sha256=dfjl5xm_N1CrAMBShNxMs351plwaN_eTfcWXZHy0cek,3648
+django_spire/knowledge/collection/services/transformation_service.py,sha256=AZVKA7RCFkoT3Iey0PmeZPZEb3Q6GUJTEG1MVPhFlLg,3387
 django_spire/knowledge/collection/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/knowledge/collection/tests/factories.py,sha256=rQfLX9kz72X-ne6i_IDWXoQMlAnyrxrReuOFM01bC2Q,393
 django_spire/knowledge/collection/tests/test_services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -739,7 +739,7 @@ django_spire/knowledge/collection/urls/form_urls.py,sha256=zOAbLQXw-POh9F7lzxAFW
 django_spire/knowledge/collection/urls/json_urls.py,sha256=XZp5wt8m9x38Uuy1dhegqZ4qlJLZK2EgJsLltx97o0Q,195
 django_spire/knowledge/collection/urls/page_urls.py,sha256=zvcqS6zE_OZd_Ah1nMIIbMOzYkIYJ-BQbCMXijeDj7E,324
 django_spire/knowledge/collection/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-django_spire/knowledge/collection/views/form_views.py,sha256=FoVC9IjD-3nLemw9ai5pIyKFdsBN04mmP1DkDN7d034,2460
+django_spire/knowledge/collection/views/form_views.py,sha256=QA-z-iDhtJTAQlPxrQP6KdQl-M8W01NG2TK_EwEo4d8,2605
 django_spire/knowledge/collection/views/json_views.py,sha256=JvTciCngT_dc_7JlTlAcc1zD5aaFelqLL67kc0e6JmU,994
 django_spire/knowledge/collection/views/page_views.py,sha256=Vbi87b0xSCrXQULAReK2SY-8HVvDT7Y83zAM6nVYwNM,2566
 django_spire/knowledge/entry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -836,7 +836,7 @@ django_spire/knowledge/entry/version/views/page_views.py,sha256=QtwI2CM0dcSkKApX
 django_spire/knowledge/entry/version/views/redirect_views.py,sha256=VCtgwXIzzpYx7vufDQB4G04cDoX_ceH_KL-yZ7WxGSg,718
 django_spire/knowledge/entry/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/knowledge/entry/views/form_views.py,sha256=X0S8tQsONjuK46Y4F-a0blB1KydoJ34q8kIzJdQxmo8,4461
-django_spire/knowledge/entry/views/json_views.py,sha256=UqfKcJZ908y2UmKBBF0PoQj1-a6liQBbEt4RD7dwEeI,1761
+django_spire/knowledge/entry/views/json_views.py,sha256=-9Ug9cBbIsAZa7RStGErNfg_ANiyYiBnwyjRoTIS30s,1769
 django_spire/knowledge/entry/views/page_views.py,sha256=fsS4G58o1ZsFG2JlGgjUYhWAMY22C3FjmWCXh5JFZXs,914
 django_spire/knowledge/entry/views/template_views.py,sha256=U3pqndOpPQlC2zJBKcOIM4IUXK870FH_Wpna5imIkm0,1782
 django_spire/knowledge/intelligence/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1040,8 +1040,8 @@ django_spire/theme/urls/page_urls.py,sha256=S8nkKkgbhG3XHI3uMUL-piOjXIrRkuY2UlM_
 django_spire/theme/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 django_spire/theme/views/json_views.py,sha256=W1khC2K_EMbEzAFmMxC_P76_MFnkRH4-eVdodrRfAhw,1904
 django_spire/theme/views/page_views.py,sha256=pHr8iekjtR99xs7w1taj35HEo133Svq1dvDD0y0VL1c,3933
-django_spire-0.16.6.dist-info/licenses/LICENSE.md,sha256=tlTbOtgKoy-xAQpUk9gPeh9O4oRXCOzoWdW3jJz0wnA,1091
-django_spire-0.16.6.dist-info/METADATA,sha256=SgNlsugbwqiRdETA-JSmu4l8643rKabhbRLFbuBHpbo,4762
-django_spire-0.16.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_spire-0.16.6.dist-info/top_level.txt,sha256=xf3QV1e--ONkVpgMDQE9iqjQ1Vg4--_6C8wmO-KxPHQ,13
-django_spire-0.16.6.dist-info/RECORD,,
+django_spire-0.16.7.dist-info/licenses/LICENSE.md,sha256=tlTbOtgKoy-xAQpUk9gPeh9O4oRXCOzoWdW3jJz0wnA,1091
+django_spire-0.16.7.dist-info/METADATA,sha256=8Ayxzp8tKoMl85LD1o2-_PRhiPowfXKmUXghi5z-0dA,4762
+django_spire-0.16.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_spire-0.16.7.dist-info/top_level.txt,sha256=xf3QV1e--ONkVpgMDQE9iqjQ1Vg4--_6C8wmO-KxPHQ,13
+django_spire-0.16.7.dist-info/RECORD,,