github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

dev: removed double issue count (#4008)

Browse Source
This commit is contained in:
Bavisetti Narayan 2024-03-20 19:59:31 +05:30 committed by GitHub
parent 6ab8588afb
commit 180f1d74e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apiserver/plane/api/views/module.py
View File

@ -67,6 +67,7 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
), ),
) )
.annotate( .annotate(
@ -77,6 +78,7 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -87,6 +89,7 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -97,6 +100,7 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -107,6 +111,7 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -117,6 +122,7 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.order_by(self.kwargs.get("order_by", "-created_at")) .order_by(self.kwargs.get("order_by", "-created_at"))
@ -486,6 +492,7 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
), ),
) )
.annotate( .annotate(
@ -496,6 +503,7 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -506,6 +514,7 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -516,6 +525,7 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -526,6 +536,7 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -536,6 +547,7 @@ class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.order_by(self.kwargs.get("order_by", "-created_at")) .order_by(self.kwargs.get("order_by", "-created_at"))

5
apiserver/plane/app/views/cycle/base.py
View File

@ -107,6 +107,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -117,6 +118,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -127,6 +129,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -137,6 +140,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -147,6 +151,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
issue_cycle__issue__archived_at__isnull=True, issue_cycle__issue__archived_at__isnull=True,
issue_cycle__issue__is_draft=False, issue_cycle__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(

12
apiserver/plane/app/views/module/base.py
View File

@ -86,6 +86,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
), ),
) )
.annotate( .annotate(
@ -96,6 +97,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -106,6 +108,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -116,6 +119,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -126,6 +130,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -136,6 +141,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -517,6 +523,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
), ),
) )
.annotate( .annotate(
@ -527,6 +534,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -537,6 +545,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -547,6 +556,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -557,6 +567,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -567,6 +578,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(

6
apiserver/plane/app/views/workspace/module.py
View File

@ -45,6 +45,7 @@ class WorkspaceModulesEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
), ),
) )
.annotate( .annotate(
@ -55,6 +56,7 @@ class WorkspaceModulesEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -65,6 +67,7 @@ class WorkspaceModulesEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -75,6 +78,7 @@ class WorkspaceModulesEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -85,6 +89,7 @@ class WorkspaceModulesEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.annotate( .annotate(
@ -95,6 +100,7 @@ class WorkspaceModulesEndpoint(BaseAPIView):
issue_module__issue__archived_at__isnull=True, issue_module__issue__archived_at__isnull=True,
issue_module__issue__is_draft=False, issue_module__issue__is_draft=False,
), ),
distinct=True,
) )
) )
.order_by(self.kwargs.get("order_by", "-created_at")) .order_by(self.kwargs.get("order_by", "-created_at"))