ФУНКЦИИ - МЕЖПРОЕКТНАЯ КОММУНИКАЦИЯ: guest-доступ Operational Core

plane-src/apps/api/plane/app/views/issue/base.py

@@ -33,6 +33,10 @@ from rest_framework.response import Response
 
 # Module imports
 from plane.app.permissions import ROLE, allow_permission
+from plane.app.nodedc_access import (
+    nodedc_guest_read_all_issues_enabled,
+    should_limit_guest_to_own_issues,
+)
 from plane.app.realtime.issue_events import publish_issue_event_on_commit
 from plane.app.serializers import (
     IssueCreateSerializer,
@@ -333,7 +337,7 @@ class IssueViewSet(BaseViewSet):
                 role=5,
                 is_active=True,
             ).exists()
-            and not project.guest_view_all_features
+            and should_limit_guest_to_own_issues(project)
         ):
             issue_queryset = issue_queryset.filter(created_by=request.user)
             filtered_issue_queryset = filtered_issue_queryset.filter(created_by=request.user)
@@ -641,7 +645,7 @@ class IssueViewSet(BaseViewSet):
                 role=5,
                 is_active=True,
             ).exists()
-            and not project.guest_view_all_features
+            and should_limit_guest_to_own_issues(project)
             and not issue.created_by == request.user
         ):
             return Response(
@@ -972,7 +976,7 @@ class IssuePaginatedViewSet(BaseViewSet):
             role=5,
             is_active=True,
         )
-        if project_member.exists() and not project.guest_view_all_features:
+        if project_member.exists() and should_limit_guest_to_own_issues(project):
             base_queryset = base_queryset.filter(created_by=request.user)
             queryset = queryset.filter(created_by=request.user)
 
@@ -1093,8 +1097,17 @@ class IssueDetailEndpoint(BaseAPIView):
     def get(self, request, slug, project_id):
         filters = issue_filters(request.query_params, "GET")
 
-        # check for the project member role, if the role is 5 then check for the guest_view_all_features
-        #  if it is true then show all the issues else show only the issues created by the user
+        guest_read_filter = Q(
+            project__project_projectmember__member=self.request.user,
+            project__project_projectmember__is_active=True,
+            project__project_projectmember__role=ROLE.GUEST.value,
+        )
+        if not nodedc_guest_read_all_issues_enabled():
+            guest_read_filter = guest_read_filter & (
+                Q(project__guest_view_all_features=True)
+                | Q(project__guest_view_all_features=False, created_by=self.request.user)
+            )
+
         permission_subquery = (
             Issue.issue_objects.filter(workspace__slug=slug, project_id=project_id, id=OuterRef("id"))
             .filter(
@@ -1103,19 +1116,7 @@ class IssueDetailEndpoint(BaseAPIView):
                     project__project_projectmember__is_active=True,
                     project__project_projectmember__role__gt=ROLE.GUEST.value,
                 )
-                | Q(
-                    project__project_projectmember__member=self.request.user,
-                    project__project_projectmember__is_active=True,
-                    project__project_projectmember__role=ROLE.GUEST.value,
-                    project__guest_view_all_features=True,
-                )
-                | Q(
-                    project__project_projectmember__member=self.request.user,
-                    project__project_projectmember__is_active=True,
-                    project__project_projectmember__role=ROLE.GUEST.value,
-                    project__guest_view_all_features=False,
-                    created_by=self.request.user,
-                )
+                | guest_read_filter
             )
             .values("id")
         )
@@ -1418,7 +1419,7 @@ class IssueDetailIdentifierEndpoint(BaseAPIView):
                 role=5,
                 is_active=True,
             ).exists()
-            and not project.guest_view_all_features
+            and should_limit_guest_to_own_issues(project)
             and not issue.created_by == request.user
         ):
             return Response(