fix: move paginator to different files add count queryset for counting

admin/app/general/form.tsx

@@ -9,9 +9,8 @@ import { IInstance, IInstanceAdmin } from "@plane/types";
 import { Button, Input, TOAST_TYPE, ToggleSwitch, setToast } from "@plane/ui";
 // components
 import { ControllerInput } from "@/components/common";
-import { useInstance } from "@/hooks/store";
-import { IntercomConfig } from "./intercom";
 // hooks
+import { useInstance } from "@/hooks/store";
 
 export interface IGeneralConfigurationForm {
   instance: IInstance;
@@ -21,13 +20,11 @@ export interface IGeneralConfigurationForm {
 export const GeneralConfigurationForm: FC<IGeneralConfigurationForm> = observer((props) => {
   const { instance, instanceAdmins } = props;
   // hooks
-  const { instanceConfigurations, updateInstanceInfo, updateInstanceConfigurations } = useInstance();
-
+  const { updateInstanceInfo } = useInstance();
   // form data
   const {
     handleSubmit,
     control,
-    watch,
     formState: { errors, isSubmitting },
   } = useForm<Partial<IInstance>>({
     defaultValues: {
@@ -39,16 +36,7 @@ export const GeneralConfigurationForm: FC<IGeneralConfigurationForm> = observer(
   const onSubmit = async (formData: Partial<IInstance>) => {
     const payload: Partial<IInstance> = { ...formData };
 
-    // update the intercom configuration
-    const isIntercomEnabled =
-      instanceConfigurations?.find((config) => config.key === "IS_INTERCOM_ENABLED")?.value === "1";
-    if (!payload.is_telemetry_enabled && isIntercomEnabled) {
-      try {
-        await updateInstanceConfigurations({ IS_INTERCOM_ENABLED: "0" });
-      } catch (error) {
-        console.error(error);
-      }
-    }
+    console.log("payload", payload);
 
     await updateInstanceInfo(payload)
       .then(() =>
@@ -86,7 +74,6 @@ export const GeneralConfigurationForm: FC<IGeneralConfigurationForm> = observer(
               value={instanceAdmins[0]?.user_detail?.email ?? ""}
               placeholder="Admin email"
               className="w-full cursor-not-allowed !text-custom-text-400"
-              autoComplete="on"
               disabled
             />
           </div>
@@ -106,8 +93,7 @@ export const GeneralConfigurationForm: FC<IGeneralConfigurationForm> = observer(
       </div>
 
       <div className="space-y-3">
-        <div className="text-lg font-medium">Chat + telemetry</div>
-        <IntercomConfig isTelemetryEnabled={watch("is_telemetry_enabled") ?? false} />
+        <div className="text-lg font-medium">Telemetry</div>
         <div className="flex items-center gap-14 px-4 py-3 border border-custom-border-200 rounded">
           <div className="grow flex items-center gap-4">
             <div className="shrink-0">

admin/app/general/intercom.tsx

@@ -1,82 +0,0 @@
-"use client";
-
-import { FC, useState } from "react";
-import { observer } from "mobx-react";
-import useSWR from "swr";
-import { MessageSquare } from "lucide-react";
-import { IFormattedInstanceConfiguration } from "@plane/types";
-import { ToggleSwitch } from "@plane/ui";
-// hooks
-import { useInstance } from "@/hooks/store";
-
-type TIntercomConfig = {
-  isTelemetryEnabled: boolean;
-};
-
-export const IntercomConfig: FC<TIntercomConfig> = observer((props) => {
-  const { isTelemetryEnabled } = props;
-  // hooks
-  const { instanceConfigurations, updateInstanceConfigurations, fetchInstanceConfigurations } = useInstance();
-  // states
-  const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
-
-  // derived values
-  const isIntercomEnabled = isTelemetryEnabled
-    ? instanceConfigurations
-      ? instanceConfigurations?.find((config) => config.key === "IS_INTERCOM_ENABLED")?.value === "1"
-        ? true
-        : false
-      : undefined
-    : false;
-
-  const { isLoading } = useSWR(isTelemetryEnabled ? "INSTANCE_CONFIGURATIONS" : null, () =>
-    isTelemetryEnabled ? fetchInstanceConfigurations() : null
-  );
-
-  const initialLoader = isLoading && isIntercomEnabled === undefined;
-
-  const submitInstanceConfigurations = async (payload: Partial<IFormattedInstanceConfiguration>) => {
-    try {
-      await updateInstanceConfigurations(payload);
-    } catch (error) {
-      console.error(error);
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
-
-  const enableIntercomConfig = () => {
-    submitInstanceConfigurations({ IS_INTERCOM_ENABLED: isIntercomEnabled ? "0" : "1" });
-  };
-
-  return (
-    <>
-      <div className="flex items-center gap-14 px-4 py-3 border border-custom-border-200 rounded">
-        <div className="grow flex items-center gap-4">
-          <div className="shrink-0">
-            <div className="flex items-center justify-center w-10 h-10 bg-custom-background-80 rounded-full">
-              <MessageSquare className="w-6 h-6 text-custom-text-300/80 p-0.5" />
-            </div>
-          </div>
-
-          <div className="grow">
-            <div className="text-sm font-medium text-custom-text-100 leading-5">Talk to Plane</div>
-            <div className="text-xs font-normal text-custom-text-300 leading-5">
-              Let your members chat with us via Intercom or another service. Toggling Telemetry off turns this off
-              automatically.
-            </div>
-          </div>
-
-          <div className="ml-auto">
-            <ToggleSwitch
-              value={isIntercomEnabled ? true : false}
-              onChange={enableIntercomConfig}
-              size="sm"
-              disabled={!isTelemetryEnabled || isSubmitting || initialLoader}
-            />
-          </div>
-        </div>
-      </div>
-    </>
-  );
-});

admin/app/general/page.tsx

@@ -7,7 +7,7 @@ import { GeneralConfigurationForm } from "./form";
 
 function GeneralPage() {
   const { instance, instanceAdmins } = useInstance();
-
+  console.log("instance", instance);
   return (
     <>
       <div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">

admin/core/components/admin-sidebar/help-section.tsx

@@ -96,7 +96,7 @@ export const HelpSection: FC = observer(() => {
           leaveTo="transform opacity-0 scale-95"
         >
           <div
-            className={`absolute bottom-2 min-w-[10rem] z-[15] ${
+            className={`absolute bottom-2 min-w-[10rem] ${
               isSidebarCollapsed ? "left-full" : "-left-[75px]"
             } divide-y divide-custom-border-200 whitespace-nowrap rounded bg-custom-background-100 p-1 shadow-custom-shadow-xs`}
             ref={helpOptionsRef}

admin/core/components/instance/setup-form.tsx

@@ -174,7 +174,6 @@ export const InstanceSetupForm: FC = (props) => {
                 placeholder="Wilber"
                 value={formData.first_name}
                 onChange={(e) => handleFormChange("first_name", e.target.value)}
-                autoComplete="on"
                 autoFocus
               />
             </div>
@@ -191,7 +190,6 @@ export const InstanceSetupForm: FC = (props) => {
                 placeholder="Wright"
                 value={formData.last_name}
                 onChange={(e) => handleFormChange("last_name", e.target.value)}
-                autoComplete="on"
               />
             </div>
           </div>
@@ -210,7 +208,6 @@ export const InstanceSetupForm: FC = (props) => {
               value={formData.email}
               onChange={(e) => handleFormChange("email", e.target.value)}
               hasError={errorData.type && errorData.type === EErrorCodes.INVALID_EMAIL ? true : false}
-              autoComplete="on"
             />
             {errorData.type && errorData.type === EErrorCodes.INVALID_EMAIL && errorData.message && (
               <p className="px-1 text-xs text-red-500">{errorData.message}</p>
@@ -250,7 +247,6 @@ export const InstanceSetupForm: FC = (props) => {
                 hasError={errorData.type && errorData.type === EErrorCodes.INVALID_PASSWORD ? true : false}
                 onFocus={() => setIsPasswordInputFocused(true)}
                 onBlur={() => setIsPasswordInputFocused(false)}
-                autoComplete="on"
               />
               {showPassword.password ? (
                 <button

admin/core/components/login/sign-in-form.tsx

@@ -57,6 +57,8 @@ export const InstanceSignInForm: FC = (props) => {
   const handleFormChange = (key: keyof TFormData, value: string | boolean) =>
     setFormData((prev) => ({ ...prev, [key]: value }));
 
+  console.log("csrfToken", csrfToken);
+
   useEffect(() => {
     if (csrfToken === undefined)
       authService.requestCSRFToken().then((data) => data?.csrf_token && setCsrfToken(data.csrf_token));
@@ -127,7 +129,6 @@ export const InstanceSignInForm: FC = (props) => {
               placeholder="[email protected]"
               value={formData.email}
               onChange={(e) => handleFormChange("email", e.target.value)}
-              autoComplete="on"
               autoFocus
             />
           </div>
@@ -146,7 +147,6 @@ export const InstanceSignInForm: FC = (props) => {
                 placeholder="Enter your password"
                 value={formData.password}
                 onChange={(e) => handleFormChange("password", e.target.value)}
-                autoComplete="on"
               />
               {showPassword ? (
                 <button

apiserver/.env.example

@@ -50,6 +50,3 @@ GUNICORN_WORKERS=2
 ADMIN_BASE_URL=
 SPACE_BASE_URL=
 APP_BASE_URL=
-
-# Hard delete files after days
-HARD_DELETE_AFTER_DAYS=

apiserver/plane/api/serializers/cycle.py

@@ -40,7 +40,6 @@ class CycleSerializer(BaseSerializer):
             "workspace",
             "project",
             "owned_by",
-            "deleted_at",
         ]
 
 

apiserver/plane/api/serializers/issue.py

@@ -53,7 +53,9 @@ class IssueSerializer(BaseSerializer):
             "id",
             "workspace",
             "project",
+            "created_by",
             "updated_by",
+            "created_at",
             "updated_at",
         ]
         exclude = [
@@ -269,7 +271,6 @@ class LabelSerializer(BaseSerializer):
             "updated_by",
             "created_at",
             "updated_at",
-            "deleted_at",
         ]
 
 
@@ -338,7 +339,9 @@ class IssueAttachmentSerializer(BaseSerializer):
             "workspace",
             "project",
             "issue",
+            "created_by",
             "updated_by",
+            "created_at",
             "updated_at",
         ]
 

apiserver/plane/api/serializers/module.py

@@ -39,7 +39,6 @@ class ModuleSerializer(BaseSerializer):
             "updated_by",
             "created_at",
             "updated_at",
-            "deleted_at",
         ]
 
     def to_representation(self, instance):

apiserver/plane/api/serializers/project.py

@@ -31,7 +31,6 @@ class ProjectSerializer(BaseSerializer):
             "updated_at",
             "created_by",
             "updated_by",
-            "deleted_at",
         ]
 
     def validate(self, data):

apiserver/plane/api/serializers/state.py

@@ -23,7 +23,6 @@ class StateSerializer(BaseSerializer):
             "updated_at",
             "workspace",
             "project",
-            "deleted_at",
         ]
 
 

apiserver/plane/api/urls/__init__.py

@@ -4,7 +4,6 @@ from .issue import urlpatterns as issue_patterns
 from .cycle import urlpatterns as cycle_patterns
 from .module import urlpatterns as module_patterns
 from .inbox import urlpatterns as inbox_patterns
-from .member import urlpatterns as member_patterns
 
 urlpatterns = [
     *project_patterns,
@@ -13,5 +12,4 @@ urlpatterns = [
     *cycle_patterns,
     *module_patterns,
     *inbox_patterns,
-    *member_patterns,
 ]

apiserver/plane/api/urls/issue.py

@@ -7,7 +7,6 @@ from plane.api.views import (
     IssueCommentAPIEndpoint,
     IssueActivityAPIEndpoint,
     WorkspaceIssueAPIEndpoint,
-    IssueAttachmentEndpoint,
 )
 
 urlpatterns = [
@@ -66,9 +65,4 @@ urlpatterns = [
         IssueActivityAPIEndpoint.as_view(),
         name="activity",
     ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-attachments/",
-        IssueAttachmentEndpoint.as_view(),
-        name="attachment",
-    ),
 ]

apiserver/plane/api/urls/member.py

@@ -1,13 +0,0 @@
-from django.urls import path
-
-from plane.api.views import (
-    ProjectMemberAPIEndpoint,
-)
-
-urlpatterns = [
-    path(
-        "workspaces/<str:slug>/projects/<str:project_id>/members/",
-        ProjectMemberAPIEndpoint.as_view(),
-        name="users",
-    ),
-]

apiserver/plane/api/views/__init__.py

@@ -9,7 +9,6 @@ from .issue import (
     IssueLinkAPIEndpoint,
     IssueCommentAPIEndpoint,
     IssueActivityAPIEndpoint,
-    IssueAttachmentEndpoint,
 )
 
 from .cycle import (
@@ -25,7 +24,4 @@ from .module import (
     ModuleArchiveUnarchiveAPIEndpoint,
 )
 
-from .member import ProjectMemberAPIEndpoint
-
 from .inbox import InboxIssueAPIEndpoint
-

apiserver/plane/api/views/cycle.py

@@ -34,8 +34,6 @@ from plane.db.models import (
     Project,
     IssueAttachment,
     IssueLink,
-    ProjectMember,
-    UserFavorite,
 )
 from plane.utils.analytics_plot import burndown_plot
 
@@ -365,28 +363,14 @@ class CycleAPIEndpoint(BaseAPIView):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
     def delete(self, request, slug, project_id, pk):
-        cycle = Cycle.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
-        if cycle.owned_by_id != request.user.id and (
-            not ProjectMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role=20,
-                project_id=project_id,
-                is_active=True,
-            ).exists()
-        ):
-            return Response(
-                {"error": "Only admin or creator can delete the cycle"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
         cycle_issues = list(
             CycleIssue.objects.filter(
                 cycle_id=self.kwargs.get("pk")
             ).values_list("issue", flat=True)
         )
+        cycle = Cycle.objects.get(
+            workspace__slug=slug, project_id=project_id, pk=pk
+        )
 
         issue_activity.delay(
             type="cycle.activity.deleted",
@@ -405,20 +389,11 @@ class CycleAPIEndpoint(BaseAPIView):
         )
         # Delete the cycle
         cycle.delete()
-        # Delete the cycle issues
-        CycleIssue.objects.filter(
-            cycle_id=self.kwargs.get("pk"),
-        ).delete()
-        # Delete the user favorite cycle
-        UserFavorite.objects.filter(
-            entity_type="cycle",
-            entity_identifier=pk,
-            project_id=project_id,
-        ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
 class CycleArchiveUnarchiveAPIEndpoint(BaseAPIView):
+
     permission_classes = [
         ProjectEntityPermission,
     ]
@@ -672,63 +647,72 @@ class CycleIssueAPIEndpoint(BaseAPIView):
             workspace__slug=slug, project_id=project_id, pk=cycle_id
         )
 
-        # Get all CycleIssues already created
-        cycle_issues = list(
-            CycleIssue.objects.filter(
-                ~Q(cycle_id=cycle_id), issue_id__in=issues
-            )
-        )
-
-        existing_issues = [
-            str(cycle_issue.issue_id)
-            for cycle_issue in cycle_issues
-            if str(cycle_issue.issue_id) in issues
-        ]
-        new_issues = list(set(issues) - set(existing_issues))
-
-        # New issues to create
-        created_records = CycleIssue.objects.bulk_create(
-            [
-                CycleIssue(
-                    project_id=project_id,
-                    workspace_id=cycle.workspace_id,
-                    cycle_id=cycle_id,
-                    issue_id=issue,
-                )
-                for issue in new_issues
-            ],
-            ignore_conflicts=True,
-            batch_size=10,
-        )
-
-        # Updated Issues
-        updated_records = []
-        update_cycle_issue_activity = []
-        # Iterate over each cycle_issue in cycle_issues
-        for cycle_issue in cycle_issues:
-            old_cycle_id = cycle_issue.cycle_id
-            # Update the cycle_issue's cycle_id
-            cycle_issue.cycle_id = cycle_id
-            # Add the modified cycle_issue to the records_to_update list
-            updated_records.append(cycle_issue)
-            # Record the update activity
-            update_cycle_issue_activity.append(
+        if (
+            cycle.end_date is not None
+            and cycle.end_date < timezone.now().date()
+        ):
+            return Response(
                 {
-                    "old_cycle_id": str(old_cycle_id),
-                    "new_cycle_id": str(cycle_id),
-                    "issue_id": str(cycle_issue.issue_id),
-                }
+                    "error": "The Cycle has already been completed so no new issues can be added"
+                },
+                status=status.HTTP_400_BAD_REQUEST,
             )
 
-        # Update the cycle issues
+        issues = Issue.objects.filter(
+            pk__in=issues, workspace__slug=slug, project_id=project_id
+        ).values_list("id", flat=True)
+
+        # Get all CycleIssues already created
+        cycle_issues = list(CycleIssue.objects.filter(issue_id__in=issues))
+        update_cycle_issue_activity = []
+        record_to_create = []
+        records_to_update = []
+
+        for issue in issues:
+            cycle_issue = [
+                cycle_issue
+                for cycle_issue in cycle_issues
+                if str(cycle_issue.issue_id) in issues
+            ]
+            # Update only when cycle changes
+            if len(cycle_issue):
+                if cycle_issue[0].cycle_id != cycle_id:
+                    update_cycle_issue_activity.append(
+                        {
+                            "old_cycle_id": str(cycle_issue[0].cycle_id),
+                            "new_cycle_id": str(cycle_id),
+                            "issue_id": str(cycle_issue[0].issue_id),
+                        }
+                    )
+                    cycle_issue[0].cycle_id = cycle_id
+                    records_to_update.append(cycle_issue[0])
+            else:
+                record_to_create.append(
+                    CycleIssue(
+                        project_id=project_id,
+                        workspace=cycle.workspace,
+                        created_by=request.user,
+                        updated_by=request.user,
+                        cycle=cycle,
+                        issue_id=issue,
+                    )
+                )
+
+        CycleIssue.objects.bulk_create(
+            record_to_create,
+            batch_size=10,
+            ignore_conflicts=True,
+        )
         CycleIssue.objects.bulk_update(
-            updated_records, ["cycle_id"], batch_size=100
+            records_to_update,
+            ["cycle"],
+            batch_size=10,
         )
 
         # Capture Issue Activity
         issue_activity.delay(
             type="cycle.activity.created",
-            requested_data=json.dumps({"cycles_list": issues}),
+            requested_data=json.dumps({"cycles_list": str(issues)}),
             actor_id=str(self.request.user.id),
             issue_id=None,
             project_id=str(self.kwargs.get("project_id", None)),
@@ -736,14 +720,13 @@ class CycleIssueAPIEndpoint(BaseAPIView):
                 {
                     "updated_cycle_issues": update_cycle_issue_activity,
                     "created_cycle_issues": serializers.serialize(
-                        "json", created_records
+                        "json", record_to_create
                     ),
                 }
             ),
             epoch=int(timezone.now().timestamp()),
-            notification=True,
-            origin=request.META.get("HTTP_ORIGIN"),
         )
+
         # Return all Cycle Issues
         return Response(
             CycleIssueSerializer(self.get_queryset(), many=True).data,

apiserver/plane/api/views/inbox.py

@@ -3,11 +3,8 @@ import json
 
 # Django improts
 from django.core.serializers.json import DjangoJSONEncoder
+from django.db.models import Q
 from django.utils import timezone
-from django.db.models import Q, Value, UUIDField
-from django.db.models.functions import Coalesce
-from django.contrib.postgres.aggregates import ArrayAgg
-from django.contrib.postgres.fields import ArrayField
 
 # Third party imports
 from rest_framework import status
@@ -227,27 +224,8 @@ class InboxIssueAPIEndpoint(BaseAPIView):
         issue_data = request.data.pop("issue", False)
 
         if bool(issue_data):
-            issue = Issue.objects.annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=~Q(labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=~Q(assignees__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            ).get(
-                pk=issue_id,
-                workspace__slug=slug,
-                project_id=project_id,
+            issue = Issue.objects.get(
+                pk=issue_id, workspace__slug=slug, project_id=project_id
             )
             # Only allow guests and viewers to edit name and description
             if project_member.role <= 10:
@@ -390,26 +368,29 @@ class InboxIssueAPIEndpoint(BaseAPIView):
             inbox_id=inbox.id,
         )
 
+        # Get the project member
+        project_member = ProjectMember.objects.get(
+            workspace__slug=slug,
+            project_id=project_id,
+            member=request.user,
+            is_active=True,
+        )
+
+        # Check the inbox issue created
+        if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
+            request.user.id
+        ):
+            return Response(
+                {"error": "You cannot delete inbox issue"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
         # Check the issue status
         if inbox_issue.status in [-2, -1, 0, 2]:
             # Delete the issue also
-            issue = Issue.objects.filter(
+            Issue.objects.filter(
                 workspace__slug=slug, project_id=project_id, pk=issue_id
-            ).first()
-            if issue.created_by_id != request.user.id and (
-                not ProjectMember.objects.filter(
-                    workspace__slug=slug,
-                    member=request.user,
-                    role=20,
-                    project_id=project_id,
-                    is_active=True,
-                ).exists()
-            ):
-                return Response(
-                    {"error": "Only admin or creator can delete the issue"},
-                    status=status.HTTP_403_FORBIDDEN,
-                )
-            issue.delete()
+            ).delete()
 
         inbox_issue.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/api/views/issue.py

@@ -22,11 +22,9 @@ from django.utils import timezone
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
-from rest_framework.parsers import MultiPartParser, FormParser
 
 # Module imports
 from plane.api.serializers import (
-    IssueAttachmentSerializer,
     IssueActivitySerializer,
     IssueCommentSerializer,
     IssueLinkSerializer,
@@ -151,25 +149,6 @@ class IssueAPIEndpoint(BaseAPIView):
         ).distinct()
 
     def get(self, request, slug, project_id, pk=None):
-        external_id = request.GET.get("external_id")
-        external_source = request.GET.get("external_source")
-
-        if external_id and external_source:
-            issue = Issue.objects.get(
-                external_id=external_id,
-                external_source=external_source,
-                workspace__slug=slug,
-                project_id=project_id,
-            )
-            return Response(
-                IssueSerializer(
-                    issue,
-                    fields=self.fields,
-                    expand=self.expand,
-                ).data,
-                status=status.HTTP_200_OK,
-            )
-
         if pk:
             issue = Issue.issue_objects.annotate(
                 sub_issues_count=Issue.issue_objects.filter(
@@ -328,17 +307,6 @@ class IssueAPIEndpoint(BaseAPIView):
                 )
 
             serializer.save()
-            # Refetch the issue
-            issue = Issue.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                pk=serializer.data["id"],
-            ).first()
-            issue.created_at = request.data.get("created_at", timezone.now())
-            issue.created_by_id = request.data.get(
-                "created_by", request.user.id
-            )
-            issue.save(update_fields=["created_at", "created_by"])
 
             # Track the issue
             issue_activity.delay(
@@ -411,19 +379,6 @@ class IssueAPIEndpoint(BaseAPIView):
         issue = Issue.objects.get(
             workspace__slug=slug, project_id=project_id, pk=pk
         )
-        if issue.created_by_id != request.user.id and (
-            not ProjectMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role=20,
-                project_id=project_id,
-                is_active=True,
-            ).exists()
-        ):
-            return Response(
-                {"error": "Only admin or creator can delete the issue"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
         current_instance = json.dumps(
             IssueSerializer(issue).data, cls=DjangoJSONEncoder
         )
@@ -632,20 +587,14 @@ class IssueLinkAPIEndpoint(BaseAPIView):
                 project_id=project_id,
                 issue_id=issue_id,
             )
-
-            link = IssueLink.objects.get(pk=serializer.data["id"])
-            link.created_by_id = request.data.get(
-                "created_by", request.user.id
-            )
-            link.save(update_fields=["created_by"])
             issue_activity.delay(
                 type="link.activity.created",
                 requested_data=json.dumps(
                     serializer.data, cls=DjangoJSONEncoder
                 ),
+                actor_id=str(self.request.user.id),
                 issue_id=str(self.kwargs.get("issue_id")),
                 project_id=str(self.kwargs.get("project_id")),
-                actor_id=str(link.created_by_id),
                 current_instance=None,
                 epoch=int(timezone.now().timestamp()),
             )
@@ -799,24 +748,12 @@ class IssueCommentAPIEndpoint(BaseAPIView):
                 issue_id=issue_id,
                 actor=request.user,
             )
-            issue_comment = IssueComment.objects.get(
-                pk=serializer.data.get("id")
-            )
-            # Update the created_at and the created_by and save the comment
-            issue_comment.created_at = request.data.get(
-                "created_at", timezone.now()
-            )
-            issue_comment.created_by_id = request.data.get(
-                "created_by", request.user.id
-            )
-            issue_comment.save(update_fields=["created_at", "created_by"])
-
             issue_activity.delay(
                 type="comment.activity.created",
                 requested_data=json.dumps(
                     serializer.data, cls=DjangoJSONEncoder
                 ),
-                actor_id=str(issue_comment.created_by_id),
+                actor_id=str(self.request.user.id),
                 issue_id=str(self.kwargs.get("issue_id")),
                 project_id=str(self.kwargs.get("project_id")),
                 current_instance=None,
@@ -937,83 +874,3 @@ class IssueActivityAPIEndpoint(BaseAPIView):
                 expand=self.expand,
             ).data,
         )
-
-
-class IssueAttachmentEndpoint(BaseAPIView):
-    serializer_class = IssueAttachmentSerializer
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-    model = IssueAttachment
-    parser_classes = (MultiPartParser, FormParser)
-
-    def post(self, request, slug, project_id, issue_id):
-        serializer = IssueAttachmentSerializer(data=request.data)
-        if (
-            request.data.get("external_id")
-            and request.data.get("external_source")
-            and IssueAttachment.objects.filter(
-                project_id=project_id,
-                workspace__slug=slug,
-                issue_id=issue_id,
-                external_source=request.data.get("external_source"),
-                external_id=request.data.get("external_id"),
-            ).exists()
-        ):
-            issue_attachment = IssueAttachment.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                external_id=request.data.get("external_id"),
-                external_source=request.data.get("external_source"),
-            ).first()
-            return Response(
-                {
-                    "error": "Issue attachment with the same external id and external source already exists",
-                    "id": str(issue_attachment.id),
-                },
-                status=status.HTTP_409_CONFLICT,
-            )
-
-        if serializer.is_valid():
-            serializer.save(project_id=project_id, issue_id=issue_id)
-            issue_activity.delay(
-                type="attachment.activity.created",
-                requested_data=None,
-                actor_id=str(self.request.user.id),
-                issue_id=str(self.kwargs.get("issue_id", None)),
-                project_id=str(self.kwargs.get("project_id", None)),
-                current_instance=json.dumps(
-                    serializer.data,
-                    cls=DjangoJSONEncoder,
-                ),
-                epoch=int(timezone.now().timestamp()),
-                notification=True,
-                origin=request.META.get("HTTP_ORIGIN"),
-            )
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    def delete(self, request, slug, project_id, issue_id, pk):
-        issue_attachment = IssueAttachment.objects.get(pk=pk)
-        issue_attachment.asset.delete(save=False)
-        issue_attachment.delete()
-        issue_activity.delay(
-            type="attachment.activity.deleted",
-            requested_data=None,
-            actor_id=str(self.request.user.id),
-            issue_id=str(self.kwargs.get("issue_id", None)),
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=None,
-            epoch=int(timezone.now().timestamp()),
-            notification=True,
-            origin=request.META.get("HTTP_ORIGIN"),
-        )
-
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-    def get(self, request, slug, project_id, issue_id):
-        issue_attachments = IssueAttachment.objects.filter(
-            issue_id=issue_id, workspace__slug=slug, project_id=project_id
-        )
-        serializer = IssueAttachmentSerializer(issue_attachments, many=True)
-        return Response(serializer.data, status=status.HTTP_200_OK)

apiserver/plane/api/views/member.py

@@ -1,153 +0,0 @@
-# Python imports
-import uuid
-
-# Django imports
-from django.contrib.auth.hashers import make_password
-from django.core.validators import validate_email
-from django.core.exceptions import ValidationError
-
-# Third Party imports
-from rest_framework.response import Response
-from rest_framework import status
-
-# Module imports
-from .base import BaseAPIView
-from plane.api.serializers import UserLiteSerializer
-from plane.db.models import (
-    User,
-    Workspace,
-    Project,
-    WorkspaceMember,
-    ProjectMember,
-)
-
-from plane.app.permissions import (
-    ProjectMemberPermission,
-)
-
-
-# API endpoint to get and insert users inside the workspace
-class ProjectMemberAPIEndpoint(BaseAPIView):
-    permission_classes = [
-        ProjectMemberPermission,
-    ]
-
-    # Get all the users that are present inside the workspace
-    def get(self, request, slug, project_id):
-        # Check if the workspace exists
-        if not Workspace.objects.filter(slug=slug).exists():
-            return Response(
-                {"error": "Provided workspace does not exist"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        # Get the workspace members that are present inside the workspace
-        project_members = ProjectMember.objects.filter(
-            project_id=project_id, workspace__slug=slug
-        ).values_list("member_id", flat=True)
-
-        # Get all the users that are present inside the workspace
-        users = UserLiteSerializer(
-            User.objects.filter(
-                id__in=project_members,
-            ),
-            many=True,
-        ).data
-
-        return Response(users, status=status.HTTP_200_OK)
-
-    # Insert a new user inside the workspace, and assign the user to the project
-    def post(self, request, slug, project_id):
-        # Check if user with email already exists, and send bad request if it's
-        # not present, check for workspace and valid project mandat
-        # ------------------- Validation -------------------
-        if (
-            request.data.get("email") is None
-            or request.data.get("display_name") is None
-        ):
-            return Response(
-                {
-                    "error": "Expected email, display_name, workspace_slug, project_id, one or more of the fields are missing."
-                },
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        email = request.data.get("email")
-
-        try:
-            validate_email(email)
-        except ValidationError:
-            return Response(
-                {"error": "Invalid email provided"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        workspace = Workspace.objects.filter(slug=slug).first()
-        project = Project.objects.filter(pk=project_id).first()
-
-        if not all([workspace, project]):
-            return Response(
-                {"error": "Provided workspace or project does not exist"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        # Check if user exists
-        user = User.objects.filter(email=email).first()
-        workspace_member = None
-        project_member = None
-
-        if user:
-            # Check if user is part of the workspace
-            workspace_member = WorkspaceMember.objects.filter(
-                workspace=workspace, member=user
-            ).first()
-            if workspace_member:
-                # Check if user is part of the project
-                project_member = ProjectMember.objects.filter(
-                    project=project, member=user
-                ).first()
-                if project_member:
-                    return Response(
-                        {
-                            "error": "User is already part of the workspace and project"
-                        },
-                        status=status.HTTP_400_BAD_REQUEST,
-                    )
-
-        # If user does not exist, create the user
-        if not user:
-            user = User.objects.create(
-                email=email,
-                display_name=request.data.get("display_name"),
-                first_name=request.data.get("first_name", ""),
-                last_name=request.data.get("last_name", ""),
-                username=uuid.uuid4().hex,
-                password=make_password(uuid.uuid4().hex),
-                is_password_autoset=True,
-                is_active=False,
-            )
-            user.save()
-
-        # Create a workspace member for the user if not already a member
-        if not workspace_member:
-            workspace_member = WorkspaceMember.objects.create(
-                workspace=workspace,
-                member=user,
-                role=request.data.get("role", 10),
-            )
-            workspace_member.save()
-
-        # Create a project member for the user if not already a member
-        if not project_member:
-            project_member = ProjectMember.objects.create(
-                project=project,
-                member=user,
-                role=request.data.get("role", 10),
-            )
-            project_member.save()
-
-        # Serialize the user and return the response
-        user_data = UserLiteSerializer(user).data
-
-        return Response(user_data, status=status.HTTP_201_CREATED)
-

apiserver/plane/api/views/module.py

@@ -27,8 +27,6 @@ from plane.db.models import (
     ModuleIssue,
     ModuleLink,
     Project,
-    ProjectMember,
-    UserFavorite,
 )
 
 from .base import BaseAPIView
@@ -267,20 +265,6 @@ class ModuleAPIEndpoint(BaseAPIView):
         module = Module.objects.get(
             workspace__slug=slug, project_id=project_id, pk=pk
         )
-        if module.created_by_id != request.user.id and (
-            not ProjectMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role=20,
-                project_id=project_id,
-                is_active=True,
-            ).exists()
-        ):
-            return Response(
-                {"error": "Only admin or creator can delete the module"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
         module_issues = list(
             ModuleIssue.objects.filter(module_id=pk).values_list(
                 "issue", flat=True
@@ -302,17 +286,6 @@ class ModuleAPIEndpoint(BaseAPIView):
             epoch=int(timezone.now().timestamp()),
         )
         module.delete()
-        # Delete the module issues
-        ModuleIssue.objects.filter(
-            module=pk,
-            project_id=project_id,
-        ).delete()
-        # Delete the user favorite module
-        UserFavorite.objects.filter(
-            entity_type="module",
-            entity_identifier=pk,
-            project_id=project_id,
-        ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

apiserver/plane/api/views/project.py

@@ -26,7 +26,6 @@ from plane.db.models import (
     ProjectMember,
     State,
     Workspace,
-    UserFavorite,
 )
 from plane.bgtasks.webhook_task import model_activity
 from .base import BaseAPIView
@@ -357,12 +356,6 @@ class ProjectAPIEndpoint(BaseAPIView):
 
     def delete(self, request, slug, pk):
         project = Project.objects.get(pk=pk, workspace__slug=slug)
-        # Delete the user favorite cycle
-        UserFavorite.objects.filter(
-            entity_type="project",
-            entity_identifier=pk,
-            project_id=pk,
-        ).delete()
         project.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 

apiserver/plane/app/serializers/__init__.py

@@ -121,5 +121,3 @@ from .exporter import ExporterHistorySerializer
 from .webhook import WebhookSerializer, WebhookLogSerializer
 
 from .dashboard import DashboardSerializer, WidgetSerializer
-
-from .favorite import UserFavoriteSerializer

apiserver/plane/app/serializers/favorite.py

@@ -1,101 +0,0 @@
-from rest_framework import serializers
-
-from plane.db.models import (
-    UserFavorite,
-    Cycle,
-    Module,
-    Issue,
-    IssueView,
-    Page,
-    Project,
-)
-
-
-class ProjectFavoriteLiteSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = Project
-        fields = ["id", "name", "logo_props"]
-
-
-class PageFavoriteLiteSerializer(serializers.ModelSerializer):
-    project_id = serializers.SerializerMethodField()
-
-    class Meta:
-        model = Page
-        fields = ["id", "name", "logo_props", "project_id"]
-
-    def get_project_id(self, obj):
-        project = (
-            obj.projects.first()
-        )  # This gets the first project related to the Page
-        return project.id if project else None
-
-
-class CycleFavoriteLiteSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = Cycle
-        fields = ["id", "name", "logo_props", "project_id"]
-
-
-class ModuleFavoriteLiteSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = Module
-        fields = ["id", "name", "logo_props", "project_id"]
-
-
-class ViewFavoriteSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = IssueView
-        fields = ["id", "name", "logo_props", "project_id"]
-
-
-def get_entity_model_and_serializer(entity_type):
-    entity_map = {
-        "cycle": (Cycle, CycleFavoriteLiteSerializer),
-        "issue": (Issue, None),
-        "module": (Module, ModuleFavoriteLiteSerializer),
-        "view": (IssueView, ViewFavoriteSerializer),
-        "page": (Page, PageFavoriteLiteSerializer),
-        "project": (Project, ProjectFavoriteLiteSerializer),
-        "folder": (None, None),
-    }
-    return entity_map.get(entity_type, (None, None))
-
-
-class UserFavoriteSerializer(serializers.ModelSerializer):
-    entity_data = serializers.SerializerMethodField()
-
-    class Meta:
-        model = UserFavorite
-        fields = [
-            "id",
-            "entity_type",
-            "entity_identifier",
-            "entity_data",
-            "name",
-            "is_folder",
-            "sequence",
-            "parent",
-            "workspace_id",
-            "project_id",
-        ]
-        read_only_fields = ["workspace", "created_by", "updated_by"]
-
-    def get_entity_data(self, obj):
-        entity_type = obj.entity_type
-        entity_identifier = obj.entity_identifier
-
-        entity_model, entity_serializer = get_entity_model_and_serializer(
-            entity_type
-        )
-        if entity_model and entity_serializer:
-            try:
-                entity = entity_model.objects.get(pk=entity_identifier)
-                return entity_serializer(entity).data
-            except entity_model.DoesNotExist:
-                return None
-        return None

apiserver/plane/app/serializers/issue.py

@@ -533,7 +533,6 @@ class IssueReactionSerializer(BaseSerializer):
             "project",
             "issue",
             "actor",
-            "deleted_at"
         ]
 
 
@@ -552,7 +551,7 @@ class CommentReactionSerializer(BaseSerializer):
     class Meta:
         model = CommentReaction
         fields = "__all__"
-        read_only_fields = ["workspace", "project", "comment", "actor", "deleted_at"]
+        read_only_fields = ["workspace", "project", "comment", "actor"]
 
 
 class IssueVoteSerializer(BaseSerializer):

apiserver/plane/app/serializers/module.py

@@ -39,7 +39,6 @@ class ModuleWriteSerializer(BaseSerializer):
             "created_at",
             "updated_at",
             "archived_at",
-            "deleted_at",
         ]
 
     def to_representation(self, instance):

apiserver/plane/app/serializers/project.py

@@ -28,7 +28,6 @@ class ProjectSerializer(BaseSerializer):
         fields = "__all__"
         read_only_fields = [
             "workspace",
-            "deleted_at",
         ]
 
     def create(self, validated_data):

apiserver/plane/app/urls/api.py

@@ -1,5 +1,5 @@
 from django.urls import path
-from plane.app.views import ApiTokenEndpoint, ServiceApiTokenEndpoint
+from plane.app.views import ApiTokenEndpoint
 
 urlpatterns = [
     # API Tokens
@@ -13,10 +13,5 @@ urlpatterns = [
         ApiTokenEndpoint.as_view(),
         name="api-tokens",
     ),
-    path(
-        "workspaces/<str:slug>/service-api-tokens/",
-        ServiceApiTokenEndpoint.as_view(),
-        name="service-api-tokens",
-    ),
     ## End API Tokens
 ]

apiserver/plane/app/urls/workspace.py

@@ -25,8 +25,6 @@ from plane.app.views import (
     ExportWorkspaceUserActivityEndpoint,
     WorkspaceModulesEndpoint,
     WorkspaceCyclesEndpoint,
-    WorkspaceFavoriteEndpoint,
-    WorkspaceFavoriteGroupEndpoint,
 )
 
 
@@ -239,19 +237,4 @@ urlpatterns = [
         WorkspaceCyclesEndpoint.as_view(),
         name="workspace-cycles",
     ),
-    path(
-        "workspaces/<str:slug>/user-favorites/",
-        WorkspaceFavoriteEndpoint.as_view(),
-        name="workspace-user-favorites",
-    ),
-    path(
-        "workspaces/<str:slug>/user-favorites/<uuid:favorite_id>/",
-        WorkspaceFavoriteEndpoint.as_view(),
-        name="workspace-user-favorites",
-    ),
-    path(
-        "workspaces/<str:slug>/user-favorites/<uuid:favorite_id>/group/",
-        WorkspaceFavoriteGroupEndpoint.as_view(),
-        name="workspace-user-favorites-groups",
-    ),
 ]

apiserver/plane/app/views/__init__.py

@@ -40,11 +40,6 @@ from .workspace.base import (
     ExportWorkspaceUserActivityEndpoint,
 )
 
-from .workspace.favorite import (
-    WorkspaceFavoriteEndpoint,
-    WorkspaceFavoriteGroupEndpoint,
-)
-
 from .workspace.member import (
     WorkSpaceMemberViewSet,
     TeamMemberViewSet,
@@ -174,10 +169,8 @@ from .module.archive import (
     ModuleArchiveUnarchiveEndpoint,
 )
 
-from .api import (
-    ApiTokenEndpoint,
-    ServiceApiTokenEndpoint,
-)
+from .api import ApiTokenEndpoint
+
 
 from .page.base import (
     PageViewSet,

apiserver/plane/app/views/api.py

@@ -45,7 +45,7 @@ class ApiTokenEndpoint(BaseAPIView):
     def get(self, request, slug, pk=None):
         if pk is None:
             api_tokens = APIToken.objects.filter(
-                user=request.user, workspace__slug=slug, is_service=False
+                user=request.user, workspace__slug=slug
             )
             serializer = APITokenReadSerializer(api_tokens, many=True)
             return Response(serializer.data, status=status.HTTP_200_OK)
@@ -61,7 +61,6 @@ class ApiTokenEndpoint(BaseAPIView):
             workspace__slug=slug,
             user=request.user,
             pk=pk,
-            is_service=False,
         )
         api_token.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
@@ -79,44 +78,3 @@ class ApiTokenEndpoint(BaseAPIView):
             serializer.save()
             return Response(serializer.data, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-
-class ServiceApiTokenEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceOwnerPermission,
-    ]
-
-    def post(self, request, slug):
-        workspace = Workspace.objects.get(slug=slug)
-
-        api_token = APIToken.objects.filter(
-            workspace=workspace,
-            is_service=True,
-        ).first()
-
-        if api_token:
-            return Response(
-                {
-                    "token": str(api_token.token),
-                },
-                status=status.HTTP_200_OK,
-            )
-        else:
-            # Check the user type
-            user_type = 1 if request.user.is_bot else 0
-
-            api_token = APIToken.objects.create(
-                label=str(uuid4().hex),
-                description="Service Token",
-                user=request.user,
-                workspace=workspace,
-                user_type=user_type,
-                is_service=True,
-            )
-            return Response(
-                {
-                    "token": str(api_token.token),
-                },
-                status=status.HTTP_201_CREATED,
-            )
-

apiserver/plane/app/views/cycle/archive.py

@@ -14,18 +14,21 @@ from django.db.models import (
     UUIDField,
     Value,
     When,
-    Subquery,
-    Sum,
-    FloatField,
 )
-from django.db.models.functions import Coalesce, Cast
+from django.db.models.functions import Coalesce
 from django.utils import timezone
 
 # Third party imports
 from rest_framework import status
 from rest_framework.response import Response
 from plane.app.permissions import ProjectEntityPermission
-from plane.db.models import Cycle, UserFavorite, Issue, Label, User, Project
+from plane.db.models import (
+    Cycle,
+    UserFavorite,
+    Issue,
+    Label,
+    User,
+)
 from plane.utils.analytics_plot import burndown_plot
 
 # Module imports
@@ -46,89 +49,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
             project_id=self.kwargs.get("project_id"),
             workspace__slug=self.kwargs.get("slug"),
         )
-        backlog_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="backlog",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                backlog_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("backlog_estimate_point")[:1]
-        )
-        unstarted_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="unstarted",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                unstarted_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("unstarted_estimate_point")[:1]
-        )
-        started_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="started",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                started_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("started_estimate_point")[:1]
-        )
-        cancelled_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="cancelled",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                cancelled_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("cancelled_estimate_point")[:1]
-        )
-        completed_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="completed",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                completed_estimate_points=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("completed_estimate_points")[:1]
-        )
-        total_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                issue_cycle__cycle_id=OuterRef("pk"),
-            )
-            .values("issue_cycle__cycle_id")
-            .annotate(
-                total_estimate_points=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("total_estimate_points")[:1]
-        )
         return (
             Cycle.objects.filter(workspace__slug=self.kwargs.get("slug"))
             .filter(project_id=self.kwargs.get("project_id"))
@@ -252,42 +172,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                     Value([], output_field=ArrayField(UUIDField())),
                 )
             )
-            .annotate(
-                backlog_estimate_points=Coalesce(
-                    Subquery(backlog_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                unstarted_estimate_points=Coalesce(
-                    Subquery(unstarted_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                started_estimate_points=Coalesce(
-                    Subquery(started_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                cancelled_estimate_points=Coalesce(
-                    Subquery(cancelled_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                completed_estimate_points=Coalesce(
-                    Subquery(completed_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                total_estimate_points=Coalesce(
-                    Subquery(total_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
             .order_by("-is_favorite", "name")
             .distinct()
         )
@@ -295,7 +179,17 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
     def get(self, request, slug, project_id, pk=None):
         if pk is None:
             queryset = (
-                self.get_queryset().values(
+                self.get_queryset()
+                .annotate(
+                    total_issues=Count(
+                        "issue_cycle",
+                        filter=Q(
+                            issue_cycle__issue__archived_at__isnull=True,
+                            issue_cycle__issue__is_draft=False,
+                        ),
+                    )
+                )
+                .values(
                     # necessary fields
                     "id",
                     "workspace_id",
@@ -361,10 +255,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                     "external_id",
                     "progress_snapshot",
                     "sub_issues",
-                    "logo_props",
                     # meta fields
-                    "completed_estimate_points",
-                    "total_estimate_points",
                     "is_favorite",
                     "total_issues",
                     "cancelled_issues",
@@ -374,114 +265,17 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                     "backlog_issues",
                     "assignee_ids",
                     "status",
-                    "created_by",
-                    "archived_at",
                 )
                 .first()
             )
             queryset = queryset.first()
 
-            estimate_type = Project.objects.filter(
-                workspace__slug=slug,
-                pk=project_id,
-                estimate__isnull=False,
-                estimate__type="points",
-            ).exists()
-
-            data["estimate_distribution"] = {}
-            if estimate_type:
-                assignee_distribution = (
-                    Issue.issue_objects.filter(
-                        issue_cycle__cycle_id=pk,
-                        workspace__slug=slug,
-                        project_id=project_id,
-                    )
-                    .annotate(display_name=F("assignees__display_name"))
-                    .annotate(assignee_id=F("assignees__id"))
-                    .annotate(avatar=F("assignees__avatar"))
-                    .values("display_name", "assignee_id", "avatar")
-                    .annotate(
-                        total_estimates=Sum(
-                            Cast("estimate_point__value", FloatField())
-                        )
-                    )
-                    .annotate(
-                        completed_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
-                            filter=Q(
-                                completed_at__isnull=False,
-                                archived_at__isnull=True,
-                                is_draft=False,
-                            ),
-                        )
-                    )
-                    .annotate(
-                        pending_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
-                            filter=Q(
-                                completed_at__isnull=True,
-                                archived_at__isnull=True,
-                                is_draft=False,
-                            ),
-                        )
-                    )
-                    .order_by("display_name")
+            if data is None:
+                return Response(
+                    {"error": "Cycle does not exist"},
+                    status=status.HTTP_400_BAD_REQUEST,
                 )
 
-                label_distribution = (
-                    Issue.issue_objects.filter(
-                        issue_cycle__cycle_id=pk,
-                        workspace__slug=slug,
-                        project_id=project_id,
-                    )
-                    .annotate(label_name=F("labels__name"))
-                    .annotate(color=F("labels__color"))
-                    .annotate(label_id=F("labels__id"))
-                    .values("label_name", "color", "label_id")
-                    .annotate(
-                        total_estimates=Sum(
-                            Cast("estimate_point__value", FloatField())
-                        )
-                    )
-                    .annotate(
-                        completed_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
-                            filter=Q(
-                                completed_at__isnull=False,
-                                archived_at__isnull=True,
-                                is_draft=False,
-                            ),
-                        )
-                    )
-                    .annotate(
-                        pending_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
-                            filter=Q(
-                                completed_at__isnull=True,
-                                archived_at__isnull=True,
-                                is_draft=False,
-                            ),
-                        )
-                    )
-                    .order_by("label_name")
-                )
-                data["estimate_distribution"] = {
-                    "assignees": assignee_distribution,
-                    "labels": label_distribution,
-                    "completion_chart": {},
-                }
-
-                if data["start_date"] and data["end_date"]:
-                    data["estimate_distribution"]["completion_chart"] = (
-                        burndown_plot(
-                            queryset=queryset,
-                            slug=slug,
-                            project_id=project_id,
-                            plot_type="points",
-                            cycle_id=pk,
-                        )
-                    )
-
             # Assignee Distribution
             assignee_distribution = (
                 Issue.issue_objects.filter(
@@ -504,10 +298,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                 .annotate(
                     total_issues=Count(
                         "id",
-                        filter=Q(
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
+                        filter=Q(archived_at__isnull=True, is_draft=False),
                     ),
                 )
                 .annotate(
@@ -547,10 +338,7 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                 .annotate(
                     total_issues=Count(
                         "id",
-                        filter=Q(
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
+                        filter=Q(archived_at__isnull=True, is_draft=False),
                     ),
                 )
                 .annotate(

apiserver/plane/app/views/cycle/base.py

@@ -47,7 +47,6 @@ from plane.db.models import (
     Label,
     User,
     Project,
-    ProjectMember,
 )
 from plane.utils.analytics_plot import burndown_plot
 
@@ -385,7 +384,7 @@ class CycleViewSet(BaseViewSet):
                 data[0]["estimate_distribution"] = {}
                 if estimate_type:
                     assignee_distribution = (
-                        Issue.issue_objects.filter(
+                        Issue.objects.filter(
                             issue_cycle__cycle_id=data[0]["id"],
                             workspace__slug=slug,
                             project_id=project_id,
@@ -423,7 +422,7 @@ class CycleViewSet(BaseViewSet):
                     )
 
                     label_distribution = (
-                        Issue.issue_objects.filter(
+                        Issue.objects.filter(
                             issue_cycle__cycle_id=data[0]["id"],
                             workspace__slug=slug,
                             project_id=project_id,
@@ -477,7 +476,7 @@ class CycleViewSet(BaseViewSet):
                         )
 
                 assignee_distribution = (
-                    Issue.issue_objects.filter(
+                    Issue.objects.filter(
                         issue_cycle__cycle_id=data[0]["id"],
                         workspace__slug=slug,
                         project_id=project_id,
@@ -519,7 +518,7 @@ class CycleViewSet(BaseViewSet):
                 )
 
                 label_distribution = (
-                    Issue.issue_objects.filter(
+                    Issue.objects.filter(
                         issue_cycle__cycle_id=data[0]["id"],
                         workspace__slug=slug,
                         project_id=project_id,
@@ -834,7 +833,7 @@ class CycleViewSet(BaseViewSet):
         data["estimate_distribution"] = {}
         if estimate_type:
             assignee_distribution = (
-                Issue.issue_objects.filter(
+                Issue.objects.filter(
                     issue_cycle__cycle_id=pk,
                     workspace__slug=slug,
                     project_id=project_id,
@@ -872,7 +871,7 @@ class CycleViewSet(BaseViewSet):
             )
 
             label_distribution = (
-                Issue.issue_objects.filter(
+                Issue.objects.filter(
                     issue_cycle__cycle_id=pk,
                     workspace__slug=slug,
                     project_id=project_id,
@@ -927,7 +926,7 @@ class CycleViewSet(BaseViewSet):
 
         # Assignee Distribution
         assignee_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                 issue_cycle__cycle_id=pk,
                 workspace__slug=slug,
                 project_id=project_id,
@@ -978,7 +977,7 @@ class CycleViewSet(BaseViewSet):
 
         # Label Distribution
         label_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                 issue_cycle__cycle_id=pk,
                 workspace__slug=slug,
                 project_id=project_id,
@@ -1040,28 +1039,14 @@ class CycleViewSet(BaseViewSet):
         )
 
     def destroy(self, request, slug, project_id, pk):
-        cycle = Cycle.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
-        if cycle.owned_by_id != request.user.id and not (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role=20,
-                project_id=project_id,
-                is_active=True,
-            ).exists()
-        ):
-            return Response(
-                {"error": "Only admin or owner can delete the cycle"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
         cycle_issues = list(
             CycleIssue.objects.filter(
                 cycle_id=self.kwargs.get("pk")
             ).values_list("issue", flat=True)
         )
+        cycle = Cycle.objects.get(
+            workspace__slug=slug, project_id=project_id, pk=pk
+        )
 
         issue_activity.delay(
             type="cycle.activity.deleted",
@@ -1082,17 +1067,6 @@ class CycleViewSet(BaseViewSet):
         )
         # Delete the cycle
         cycle.delete()
-        # Delete the cycle issues
-        CycleIssue.objects.filter(
-            cycle_id=self.kwargs.get("pk"),
-        ).delete()
-        # Delete the user favorite cycle
-        UserFavorite.objects.filter(
-            user=request.user,
-            entity_type="cycle",
-            entity_identifier=pk,
-            project_id=project_id,
-        ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -1161,7 +1135,7 @@ class CycleFavoriteViewSet(BaseViewSet):
             workspace__slug=slug,
             entity_identifier=cycle_id,
         )
-        cycle_favorite.delete(soft=False)
+        cycle_favorite.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

apiserver/plane/app/views/cycle/issue.py

@@ -20,7 +20,6 @@ from rest_framework.response import Response
 from plane.app.permissions import (
     ProjectEntityPermission,
 )
-
 # Module imports
 from .. import BaseViewSet
 from plane.app.serializers import (
@@ -46,6 +45,7 @@ from plane.utils.paginator import (
     SubGroupedOffsetPaginator,
 )
 
+# Module imports
 
 class CycleIssueViewSet(BaseViewSet):
     serializer_class = CycleIssueSerializer
@@ -334,7 +334,7 @@ class CycleIssueViewSet(BaseViewSet):
         return Response({"message": "success"}, status=status.HTTP_201_CREATED)
 
     def destroy(self, request, slug, project_id, cycle_id, issue_id):
-        cycle_issue = CycleIssue.objects.filter(
+        cycle_issue = CycleIssue.objects.get(
             issue_id=issue_id,
             workspace__slug=slug,
             project_id=project_id,

apiserver/plane/app/views/exporter/base.py

@@ -41,7 +41,6 @@ class ExportIssuesEndpoint(BaseAPIView):
                 project=project_ids,
                 initiated_by=request.user,
                 provider=provider,
-                type="issue_exports",
             )
 
             issue_export_task.delay(
@@ -66,8 +65,7 @@ class ExportIssuesEndpoint(BaseAPIView):
 
     def get(self, request, slug):
         exporter_history = ExporterHistory.objects.filter(
-            workspace__slug=slug,
-            type="issue_exports",
+            workspace__slug=slug
         ).select_related("workspace", "initiated_by")
 
         if request.GET.get("per_page", False) and request.GET.get(

apiserver/plane/app/views/inbox/base.py

@@ -160,8 +160,7 @@ class InboxIssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "issue_module__module_id",
                         distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True)
-                        & Q(issue_module__module__archived_at__isnull=True),
+                        filter=~Q(issue_module__module_id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -554,27 +553,28 @@ class InboxIssueViewSet(BaseViewSet):
             project_id=project_id,
             inbox_id=inbox_id,
         )
+        # Get the project member
+        project_member = ProjectMember.objects.get(
+            workspace__slug=slug,
+            project_id=project_id,
+            member=request.user,
+            is_active=True,
+        )
+
+        if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
+            request.user.id
+        ):
+            return Response(
+                {"error": "You cannot delete inbox issue"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
 
         # Check the issue status
         if inbox_issue.status in [-2, -1, 0, 2]:
             # Delete the issue also
-            issue = Issue.objects.filter(
+            Issue.objects.filter(
                 workspace__slug=slug, project_id=project_id, pk=issue_id
-            ).first()
-            if issue.created_by_id != request.user.id and (
-                not ProjectMember.objects.filter(
-                    workspace__slug=slug,
-                    member=request.user,
-                    role=20,
-                    project_id=project_id,
-                    is_active=True,
-                ).exists()
-            ):
-                return Response(
-                    {"error": "Only admin or creator can delete the issue"},
-                    status=status.HTTP_403_FORBIDDEN,
-                )
-            issue.delete()
+            ).delete()
 
         inbox_issue.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/views/issue/archive.py

@@ -66,7 +66,6 @@ class IssueArchiveViewSet(BaseViewSet):
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
             )
-            .filter(deleted_at__isnull=True)
             .filter(archived_at__isnull=False)
             .filter(project_id=self.kwargs.get("project_id"))
             .filter(workspace__slug=self.kwargs.get("slug"))

apiserver/plane/app/views/issue/attachment.py

@@ -14,7 +14,7 @@ from rest_framework.parsers import MultiPartParser, FormParser
 from .. import BaseAPIView
 from plane.app.serializers import IssueAttachmentSerializer
 from plane.app.permissions import ProjectEntityPermission
-from plane.db.models import IssueAttachment, ProjectMember
+from plane.db.models import IssueAttachment
 from plane.bgtasks.issue_activites_task import issue_activity
 
 
@@ -49,19 +49,6 @@ class IssueAttachmentEndpoint(BaseAPIView):
 
     def delete(self, request, slug, project_id, issue_id, pk):
         issue_attachment = IssueAttachment.objects.get(pk=pk)
-        if issue_attachment.created_by_id != request.user.id and (
-            not ProjectMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role=20,
-                project_id=project_id,
-                is_active=True,
-            ).exists()
-        ):
-            return Response(
-                {"error": "Only admin or creator can delete the attachment"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
         issue_attachment.asset.delete(save=False)
         issue_attachment.delete()
         issue_activity.delay(

apiserver/plane/app/views/issue/base.py

@@ -44,7 +44,6 @@ from plane.db.models import (
     IssueReaction,
     IssueSubscriber,
     Project,
-    ProjectMember,
 )
 from plane.utils.grouper import (
     issue_group_values,
@@ -64,6 +63,7 @@ from plane.utils.user_timezone_converter import user_timezone_converter
 
 
 class IssueListEndpoint(BaseAPIView):
+
     permission_classes = [
         ProjectEntityPermission,
     ]
@@ -165,7 +165,6 @@ class IssueListEndpoint(BaseAPIView):
                 "link_count",
                 "is_draft",
                 "archived_at",
-                "deleted_at",
             )
             datetime_fields = ["created_at", "updated_at"]
             issues = user_timezone_converter(
@@ -290,13 +289,9 @@ class IssueViewSet(BaseViewSet):
                         ),
                         group_by_field_name=group_by,
                         sub_group_by_field_name=sub_group_by,
-                        count_filter=Q(
-                            Q(issue_inbox__status=1)
-                            | Q(issue_inbox__status=-1)
-                            | Q(issue_inbox__status=2)
-                            | Q(issue_inbox__isnull=True),
-                            archived_at__isnull=True,
-                            is_draft=False,
+                        count_queryset=Issue.issue_objects.filter(
+                            workspace__slug=slug,
+                            project_id=project_id,
                         ),
                     )
             else:
@@ -305,6 +300,10 @@ class IssueViewSet(BaseViewSet):
                     request=request,
                     order_by=order_by_param,
                     queryset=issue_queryset,
+                    count_queryset=Issue.issue_objects.filter(
+                        workspace__slug=slug,
+                        project_id=project_id,
+                    ),
                     on_results=lambda issues: issue_on_results(
                         group_by=group_by,
                         issues=issues,
@@ -318,20 +317,16 @@ class IssueViewSet(BaseViewSet):
                         filters=filters,
                     ),
                     group_by_field_name=group_by,
-                    count_filter=Q(
-                        Q(issue_inbox__status=1)
-                        | Q(issue_inbox__status=-1)
-                        | Q(issue_inbox__status=2)
-                        | Q(issue_inbox__isnull=True),
-                        archived_at__isnull=True,
-                        is_draft=False,
-                    ),
                 )
         else:
             return self.paginate(
                 order_by=order_by_param,
                 request=request,
                 queryset=issue_queryset,
+                count_queryset=Issue.issue_objects.filter(
+                    workspace__slug=slug,
+                    project_id=project_id,
+                ),
                 on_results=lambda issues: issue_on_results(
                     group_by=group_by, issues=issues, sub_group_by=sub_group_by
                 ),
@@ -400,7 +395,6 @@ class IssueViewSet(BaseViewSet):
                     "link_count",
                     "is_draft",
                     "archived_at",
-                    "deleted_at",
                 )
                 .first()
             )
@@ -437,8 +431,7 @@ class IssueViewSet(BaseViewSet):
                     ArrayAgg(
                         "issue_module__module_id",
                         distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True)
-                        & Q(issue_module__module__archived_at__isnull=True),
+                        filter=~Q(issue_module__module_id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -552,20 +545,6 @@ class IssueViewSet(BaseViewSet):
         issue = Issue.objects.get(
             workspace__slug=slug, project_id=project_id, pk=pk
         )
-        if issue.created_by_id != request.user.id and (
-            not ProjectMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role=20,
-                project_id=project_id,
-                is_active=True,
-            ).exists()
-        ):
-            return Response(
-                {"error": "Only admin or creator can delete the issue"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
         issue.delete()
         issue_activity.delay(
             type="issue.activity.deleted",
@@ -619,18 +598,6 @@ class BulkDeleteIssuesEndpoint(BaseAPIView):
     ]
 
     def delete(self, request, slug, project_id):
-        if ProjectMember.objects.filter(
-            workspace__slug=slug,
-            member=request.user,
-            role__in=[15, 10, 5],
-            project_id=project_id,
-            is_active=True,
-        ).exists():
-            return Response(
-                {"error": "Only admin can perform this action"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
         issue_ids = request.data.get("issue_ids", [])
 
         if not len(issue_ids):

apiserver/plane/app/views/issue/draft.py

@@ -40,7 +40,6 @@ from plane.db.models import (
     IssueReaction,
     IssueSubscriber,
     Project,
-    ProjectMember,
 )
 from plane.utils.grouper import (
     issue_group_values,
@@ -68,7 +67,6 @@ class IssueDraftViewSet(BaseViewSet):
             Issue.objects.filter(project_id=self.kwargs.get("project_id"))
             .filter(workspace__slug=self.kwargs.get("slug"))
             .filter(is_draft=True)
-            .filter(deleted_at__isnull=True)
             .select_related("workspace", "project", "state", "parent")
             .prefetch_related("assignees", "labels", "issue_module__module")
             .annotate(cycle_id=F("issue_cycle__cycle_id"))
@@ -382,19 +380,6 @@ class IssueDraftViewSet(BaseViewSet):
         issue = Issue.objects.get(
             workspace__slug=slug, project_id=project_id, pk=pk
         )
-        if issue.created_by_id != request.user.id and (
-            not ProjectMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role=20,
-                project_id=project_id,
-                is_active=True,
-            ).exists()
-        ):
-            return Response(
-                {"error": "Only admin or creator can delete the issue"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
         issue.delete()
         issue_activity.delay(
             type="issue_draft.activity.deleted",

apiserver/plane/app/views/issue/relation.py

@@ -37,6 +37,24 @@ class IssueRelationViewSet(BaseViewSet):
         ProjectEntityPermission,
     ]
 
+    def get_queryset(self):
+        return self.filter_queryset(
+            super()
+            .get_queryset()
+            .filter(workspace__slug=self.kwargs.get("slug"))
+            .filter(project_id=self.kwargs.get("project_id"))
+            .filter(issue_id=self.kwargs.get("issue_id"))
+            .filter(
+                project__project_projectmember__member=self.request.user,
+                project__project_projectmember__is_active=True,
+                project__archived_at__isnull=True,
+            )
+            .select_related("project")
+            .select_related("workspace")
+            .select_related("issue")
+            .distinct()
+        )
+
     def list(self, request, slug, project_id, issue_id):
         issue_relations = (
             IssueRelation.objects.filter(
@@ -80,8 +98,11 @@ class IssueRelationViewSet(BaseViewSet):
         ).values_list("issue_id", flat=True)
 
         queryset = (
-            Issue.issue_objects
-            .filter(workspace__slug=slug)
+            Issue.issue_objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+            )
+            .filter(workspace__slug=self.kwargs.get("slug"))
             .select_related("workspace", "project", "state", "parent")
             .prefetch_related("assignees", "labels", "issue_module__module")
             .annotate(cycle_id=F("issue_cycle__cycle_id"))

apiserver/plane/app/views/module/archive.py

@@ -12,8 +12,7 @@ from django.db.models import (
     Subquery,
     UUIDField,
     Value,
-    Sum,
-    FloatField,
+    Sum
 )
 from django.db.models.functions import Coalesce, Cast
 from django.utils import timezone
@@ -45,8 +44,8 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
     def get_queryset(self):
         favorite_subquery = UserFavorite.objects.filter(
             user=self.request.user,
-            entity_type="module",
             entity_identifier=OuterRef("pk"),
+            entity_type="module",
             project_id=self.kwargs.get("project_id"),
             workspace__slug=self.kwargs.get("slug"),
         )
@@ -103,93 +102,8 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
             .annotate(cnt=Count("pk"))
             .values("cnt")
         )
-        completed_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="completed",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(
-                completed_estimate_points=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("completed_estimate_points")[:1]
-        )
-
-        total_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(
-                total_estimate_points=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("total_estimate_points")[:1]
-        )
-        backlog_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="backlog",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(
-                backlog_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("backlog_estimate_point")[:1]
-        )
-        unstarted_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="unstarted",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(
-                unstarted_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("unstarted_estimate_point")[:1]
-        )
-        started_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="started",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(
-                started_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("started_estimate_point")[:1]
-        )
-        cancelled_estimate_point = (
-            Issue.issue_objects.filter(
-                estimate_point__estimate__type="points",
-                state__group="cancelled",
-                issue_module__module_id=OuterRef("pk"),
-            )
-            .values("issue_module__module_id")
-            .annotate(
-                cancelled_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
-                )
-            )
-            .values("cancelled_estimate_point")[:1]
-        )
         return (
             Module.objects.filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(project_id=self.kwargs.get("project_id"))
             .filter(archived_at__isnull=False)
             .annotate(is_favorite=Exists(favorite_subquery))
             .select_related("workspace", "project", "lead")
@@ -238,42 +152,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                     Value(0, output_field=IntegerField()),
                 )
             )
-            .annotate(
-                backlog_estimate_points=Coalesce(
-                    Subquery(backlog_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                unstarted_estimate_points=Coalesce(
-                    Subquery(unstarted_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                started_estimate_points=Coalesce(
-                    Subquery(started_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                cancelled_estimate_points=Coalesce(
-                    Subquery(cancelled_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                completed_estimate_points=Coalesce(
-                    Subquery(completed_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
-            .annotate(
-                total_estimate_points=Coalesce(
-                    Subquery(total_estimate_point),
-                    Value(0, output_field=FloatField()),
-                ),
-            )
             .annotate(
                 member_ids=Coalesce(
                     ArrayAgg(
@@ -354,7 +232,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
             data["estimate_distribution"] = {}
 
             if estimate_type:
-                assignee_distribution = (
+                label_distribution = (
                     Issue.issue_objects.filter(
                         issue_module__module_id=pk,
                         workspace__slug=slug,
@@ -374,12 +252,12 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                     )
                     .annotate(
                         total_estimates=Sum(
-                            Cast("estimate_point__value", FloatField())
+                            Cast("estimate_point__value", IntegerField())
                         ),
                     )
                     .annotate(
                         completed_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
+                            Cast("estimate_point__value", IntegerField()),
                             filter=Q(
                                 completed_at__isnull=False,
                                 archived_at__isnull=True,
@@ -389,7 +267,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                     )
                     .annotate(
                         pending_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
+                            Cast("estimate_point__value", IntegerField()),
                             filter=Q(
                                 completed_at__isnull=True,
                                 archived_at__isnull=True,
@@ -400,7 +278,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                     .order_by("first_name", "last_name")
                 )
 
-                label_distribution = (
+                assignee_distribution = (
                     Issue.issue_objects.filter(
                         issue_module__module_id=pk,
                         workspace__slug=slug,
@@ -412,12 +290,12 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                     .values("label_name", "color", "label_id")
                     .annotate(
                         total_estimates=Sum(
-                            Cast("estimate_point__value", FloatField())
+                            Cast("estimate_point__value", IntegerField())
                         ),
                     )
                     .annotate(
                         completed_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
+                            Cast("estimate_point__value", IntegerField()),
                             filter=Q(
                                 completed_at__isnull=False,
                                 archived_at__isnull=True,
@@ -427,7 +305,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                     )
                     .annotate(
                         pending_estimates=Sum(
-                            Cast("estimate_point__value", FloatField()),
+                            Cast("estimate_point__value", IntegerField()),
                             filter=Q(
                                 completed_at__isnull=True,
                                 archived_at__isnull=True,
@@ -437,8 +315,8 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                     )
                     .order_by("label_name")
                 )
-                data["estimate_distribution"]["assignees"] = assignee_distribution
-                data["estimate_distribution"]["labels"] = label_distribution
+                data["estimate_distribution"]["assignee"] = assignee_distribution
+                data["estimate_distribution"]["label"] = label_distribution
 
                 if modules and modules.start_date and modules.target_date:
                     data["estimate_distribution"]["completion_chart"] = (
@@ -450,7 +328,6 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                             module_id=pk,
                         )
                     )
-
             assignee_distribution = (
                 Issue.issue_objects.filter(
                     issue_module__module_id=pk,
@@ -476,7 +353,7 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                             archived_at__isnull=True,
                             is_draft=False,
                         ),
-                    ),
+                    )
                 )
                 .annotate(
                     completed_issues=Count(
@@ -548,6 +425,8 @@ class ModuleArchiveUnarchiveEndpoint(BaseAPIView):
                 "labels": label_distribution,
                 "completion_chart": {},
             }
+
+            # Fetch the modules
             if modules and modules.start_date and modules.target_date:
                 data["distribution"]["completion_chart"] = burndown_plot(
                     queryset=modules,

apiserver/plane/app/views/module/base.py

@@ -48,7 +48,6 @@ from plane.db.models import (
     ModuleLink,
     ModuleUserProperties,
     Project,
-    ProjectMember,
 )
 from plane.utils.analytics_plot import burndown_plot
 from plane.utils.user_timezone_converter import user_timezone_converter
@@ -444,12 +443,6 @@ class ModuleViewSet(BaseViewSet):
             )
         )
 
-        if not queryset.exists():
-            return Response(
-                {"error": "Module not found"},
-                status=status.HTTP_404_NOT_FOUND,
-            )
-
         estimate_type = Project.objects.filter(
             workspace__slug=slug,
             pk=project_id,
@@ -561,7 +554,7 @@ class ModuleViewSet(BaseViewSet):
                 )
 
         assignee_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                 issue_module__module_id=pk,
                 workspace__slug=slug,
                 project_id=project_id,
@@ -611,7 +604,7 @@ class ModuleViewSet(BaseViewSet):
         )
 
         label_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                 issue_module__module_id=pk,
                 workspace__slug=slug,
                 project_id=project_id,
@@ -744,21 +737,6 @@ class ModuleViewSet(BaseViewSet):
         module = Module.objects.get(
             workspace__slug=slug, project_id=project_id, pk=pk
         )
-
-        if module.created_by_id != request.user.id and (
-            not ProjectMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role=20,
-                project_id=project_id,
-                is_active=True,
-            ).exists()
-        ):
-            return Response(
-                {"error": "Only admin or creator can delete the module"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
         module_issues = list(
             ModuleIssue.objects.filter(module_id=pk).values_list(
                 "issue", flat=True
@@ -779,18 +757,6 @@ class ModuleViewSet(BaseViewSet):
             for issue in module_issues
         ]
         module.delete()
-        # Delete the module issues
-        ModuleIssue.objects.filter(
-            module=pk,
-            project_id=project_id,
-        ).delete()
-        # Delete the user favorite module
-        UserFavorite.objects.filter(
-            user=request.user,
-            entity_type="module",
-            entity_identifier=pk,
-            project_id=project_id,
-        ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -854,7 +820,7 @@ class ModuleFavoriteViewSet(BaseViewSet):
             entity_type="module",
             entity_identifier=module_id,
         )
-        module_favorite.delete(soft=False)
+        module_favorite.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

apiserver/plane/app/views/module/issue.py

@@ -250,6 +250,7 @@ class ModuleIssueViewSet(BaseViewSet):
         removed_modules = request.data.get("removed_modules", [])
         project = Project.objects.get(pk=project_id)
 
+
         if modules:
             _ = ModuleIssue.objects.bulk_create(
                 [
@@ -283,7 +284,7 @@ class ModuleIssueViewSet(BaseViewSet):
             ]
 
         for module_id in removed_modules:
-            module_issue = ModuleIssue.objects.filter(
+            module_issue = ModuleIssue.objects.get(
                 workspace__slug=slug,
                 project_id=project_id,
                 module_id=module_id,
@@ -296,7 +297,7 @@ class ModuleIssueViewSet(BaseViewSet):
                 issue_id=str(issue_id),
                 project_id=str(project_id),
                 current_instance=json.dumps(
-                    {"module_name": module_issue.first().module.name}
+                    {"module_name": module_issue.module.name}
                 ),
                 epoch=int(timezone.now().timestamp()),
                 notification=True,
@@ -307,7 +308,7 @@ class ModuleIssueViewSet(BaseViewSet):
         return Response({"message": "success"}, status=status.HTTP_201_CREATED)
 
     def destroy(self, request, slug, project_id, module_id, issue_id):
-        module_issue = ModuleIssue.objects.filter(
+        module_issue = ModuleIssue.objects.get(
             workspace__slug=slug,
             project_id=project_id,
             module_id=module_id,
@@ -320,7 +321,7 @@ class ModuleIssueViewSet(BaseViewSet):
             issue_id=str(issue_id),
             project_id=str(project_id),
             current_instance=json.dumps(
-                {"module_name": module_issue.first().module.name}
+                {"module_name": module_issue.module.name}
             ),
             epoch=int(timezone.now().timestamp()),
             notification=True,

apiserver/plane/app/views/page/base.py

@@ -333,39 +333,33 @@ class PageViewSet(BaseViewSet):
             pk=pk, workspace__slug=slug, projects__id=project_id
         )
 
+        # only the owner and admin can delete the page
+        if (
+            ProjectMember.objects.filter(
+                project_id=project_id,
+                member=request.user,
+                is_active=True,
+                role__gt=20,
+            ).exists()
+            or request.user.id != page.owned_by_id
+        ):
+            return Response(
+                {"error": "Only the owner and admin can delete the page"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
         if page.archived_at is None:
             return Response(
                 {"error": "The page should be archived before deleting"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        if page.owned_by_id != request.user.id and (
-            not ProjectMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role=20,
-                project_id=project_id,
-                is_active=True,
-            ).exists()
-        ):
-            return Response(
-                {"error": "Only admin or owner can delete the page"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
         # remove parent from all the children
         _ = Page.objects.filter(
             parent_id=pk, projects__id=project_id, workspace__slug=slug
         ).update(parent=None)
 
         page.delete()
-        # Delete the user favorite page
-        UserFavorite.objects.filter(
-            project=project_id,
-            workspace__slug=slug,
-            entity_identifier=pk,
-            entity_type="page",
-        ).delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
@@ -393,7 +387,7 @@ class PageFavoriteViewSet(BaseViewSet):
             entity_identifier=pk,
             entity_type="page",
         )
-        page_favorite.delete(soft=False)
+        page_favorite.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

apiserver/plane/app/views/project/base.py

@@ -599,7 +599,7 @@ class ProjectFavoritesViewSet(BaseViewSet):
             user=request.user,
             workspace__slug=slug,
         )
-        project_favorite.delete(soft=False)
+        project_favorite.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 

apiserver/plane/app/views/search/issue.py

@@ -52,14 +52,8 @@ class IssueSearchEndpoint(BaseAPIView):
             issue = Issue.issue_objects.get(pk=issue_id)
             issues = issues.filter(
                 ~Q(pk=issue_id),
-                ~Q(
-                    issue_related__issue=issue,
-                    issue_related__deleted_at__isnull=True,
-                ),
-                ~Q(
-                    issue_relation__related_issue=issue,
-                    issue_related__deleted_at__isnull=True,
-                ),
+                ~Q(issue_related__issue=issue),
+                ~Q(issue_relation__related_issue=issue),
             )
         if sub_issue == "true" and issue_id:
             issue = Issue.issue_objects.get(pk=issue_id)

apiserver/plane/app/views/view/base.py

@@ -116,20 +116,6 @@ class WorkspaceViewViewSet(BaseViewSet):
             pk=pk,
             workspace__slug=slug,
         )
-        if not (
-            WorkspaceMember.objects.filter(
-                workspace__slug=slug,
-                member=request.user,
-                role=20,
-                is_active=True,
-            ).exists()
-            and workspace_view.owned_by_id != request.user.id
-        ):
-            return Response(
-                {"error": "You do not have permission to delete this view"},
-                status=status.HTTP_403_FORBIDDEN,
-            )
-
         workspace_member = WorkspaceMember.objects.filter(
             workspace__slug=slug,
             member=request.user,
@@ -141,13 +127,6 @@ class WorkspaceViewViewSet(BaseViewSet):
             or workspace_view.owned_by == request.user
         ):
             workspace_view.delete()
-            # Delete the user favorite view
-            UserFavorite.objects.filter(
-                workspace__slug=slug,
-                entity_identifier=pk,
-                project__isnull=True,
-                entity_type="view",
-            ).delete()
         else:
             return Response(
                 {"error": "Only admin or owner can delete the view"},
@@ -223,8 +202,7 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
                     ArrayAgg(
                         "issue_module__module_id",
                         distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True)
-                        & Q(issue_module__module__archived_at__isnull=True),
+                        filter=~Q(issue_module__module_id__isnull=True),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
                 ),
@@ -434,24 +412,15 @@ class IssueViewViewSet(BaseViewSet):
             project_id=project_id,
             workspace__slug=slug,
         )
-        if (
-            ProjectMember.objects.filter(
-                workspace__slug=slug,
-                project_id=project_id,
-                member=request.user,
-                role=20,
-                is_active=True,
-            ).exists()
-            or project_view.owned_by_id == request.user.id
-        ):
+        project_member = ProjectMember.objects.filter(
+            workspace__slug=slug,
+            project_id=project_id,
+            member=request.user,
+            role=20,
+            is_active=True,
+        )
+        if project_member.exists() or project_view.owned_by == request.user:
             project_view.delete()
-            # Delete the user favorite view
-            UserFavorite.objects.filter(
-                project_id=project_id,
-                workspace__slug=slug,
-                entity_identifier=pk,
-                entity_type="view",
-            ).delete()
         else:
             return Response(
                 {"error": "Only admin or owner can delete the view"},
@@ -489,5 +458,5 @@ class IssueViewFavoriteViewSet(BaseViewSet):
             entity_type="view",
             entity_identifier=view_id,
         )
-        view_favorite.delete(soft=False)
+        view_favorite.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)

apiserver/plane/app/views/workspace/favorite.py

@@ -1,88 +0,0 @@
-# Third party modules
-from rest_framework import status
-from rest_framework.response import Response
-
-# Django modules
-from django.db.models import Q
-
-# Module imports
-from plane.app.views.base import BaseAPIView
-from plane.db.models import UserFavorite, Workspace
-from plane.app.serializers import UserFavoriteSerializer
-from plane.app.permissions import WorkspaceEntityPermission
-
-
-class WorkspaceFavoriteEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceEntityPermission,
-    ]
-
-    def get(self, request, slug):
-        # the second filter is to check if the user is a member of the project
-        favorites = UserFavorite.objects.filter(
-            user=request.user,
-            workspace__slug=slug,
-            parent__isnull=True,
-        ).filter(
-            Q(project__isnull=True)
-            | (
-                Q(project__isnull=False)
-                & Q(project__project_projectmember__member=request.user)
-                & Q(project__project_projectmember__is_active=True)
-            )
-        )
-        serializer = UserFavoriteSerializer(favorites, many=True)
-        return Response(serializer.data, status=status.HTTP_200_OK)
-
-    def post(self, request, slug):
-        workspace = Workspace.objects.get(slug=slug)
-        serializer = UserFavoriteSerializer(data=request.data)
-        if serializer.is_valid():
-            serializer.save(
-                user_id=request.user.id,
-                workspace=workspace,
-                project_id=request.data.get("project_id", None),
-            )
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    def patch(self, request, slug, favorite_id):
-        favorite = UserFavorite.objects.get(
-            user=request.user, workspace__slug=slug, pk=favorite_id
-        )
-        serializer = UserFavoriteSerializer(
-            favorite, data=request.data, partial=True
-        )
-        if serializer.is_valid():
-            serializer.save()
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    def delete(self, request, slug, favorite_id):
-        favorite = UserFavorite.objects.get(
-            user=request.user, workspace__slug=slug, pk=favorite_id
-        )
-        favorite.delete(soft=False)
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-
-class WorkspaceFavoriteGroupEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceEntityPermission,
-    ]
-
-    def get(self, request, slug, favorite_id):
-        favorites = UserFavorite.objects.filter(
-            user=request.user,
-            workspace__slug=slug,
-            parent_id=favorite_id,
-        ).filter(
-            Q(project__isnull=True)
-            | (
-                Q(project__isnull=False)
-                & Q(project__project_projectmember__member=request.user)
-                & Q(project__project_projectmember__is_active=True)
-            )
-        )
-        serializer = UserFavoriteSerializer(favorites, many=True)
-        return Response(serializer.data, status=status.HTTP_200_OK)

apiserver/plane/authentication/adapter/oauth.py

@@ -100,8 +100,10 @@ class OauthAdapter(Adapter):
         account, created = Account.objects.update_or_create(
             user=user,
             provider=self.provider,
-            provider_account_id=self.user_data.get("user").get("provider_id"),
             defaults={
+                "provider_account_id": self.user_data.get("user").get(
+                    "provider_id"
+                ),
                 "access_token": self.token_data.get("access_token"),
                 "refresh_token": self.token_data.get("refresh_token", None),
                 "access_token_expired_at": self.token_data.get(

apiserver/plane/authentication/views/app/magic.py

@@ -29,7 +29,6 @@ from plane.authentication.adapter.error import (
     AuthenticationException,
     AUTHENTICATION_ERROR_CODES,
 )
-from plane.authentication.rate_limit import AuthenticationThrottle
 
 
 class MagicGenerateEndpoint(APIView):
@@ -38,10 +37,6 @@ class MagicGenerateEndpoint(APIView):
         AllowAny,
     ]
 
-    throttle_classes = [
-        AuthenticationThrottle,
-    ]
-
     def post(self, request):
         # Check if instance is configured
         instance = Instance.objects.first()

apiserver/plane/bgtasks/deletion_task.py

@@ -1,161 +0,0 @@
-# Django imports
-from django.utils import timezone
-from django.apps import apps
-from django.conf import settings
-from django.core.exceptions import ObjectDoesNotExist
-
-# Third party imports
-from celery import shared_task
-
-
-@shared_task
-def soft_delete_related_objects(
-    app_label, model_name, instance_pk, using=None
-):
-    model_class = apps.get_model(app_label, model_name)
-    instance = model_class.all_objects.get(pk=instance_pk)
-    related_fields = instance._meta.get_fields()
-    for field in related_fields:
-        if field.one_to_many or field.one_to_one:
-            try:
-                if field.one_to_many:
-                    related_objects = getattr(instance, field.name).all()
-                elif field.one_to_one:
-                    related_object = getattr(instance, field.name)
-                    related_objects = (
-                        [related_object] if related_object is not None else []
-                    )
-                for obj in related_objects:
-                    if obj:
-                        obj.deleted_at = timezone.now()
-                        obj.save(using=using)
-            except ObjectDoesNotExist:
-                pass
-
-
-# @shared_task
-def restore_related_objects(app_label, model_name, instance_pk, using=None):
-    pass
-
-
-@shared_task
-def hard_delete():
-
-    from plane.db.models import (
-        Workspace,
-        Project,
-        Cycle,
-        Module,
-        Issue,
-        Page,
-        IssueView,
-        Label,
-        State,
-        IssueActivity,
-        IssueComment,
-        IssueLink,
-        IssueReaction,
-        UserFavorite,
-        ModuleIssue,
-        CycleIssue,
-        Estimate,
-        EstimatePoint,
-    )
-
-    days = settings.HARD_DELETE_AFTER_DAYS
-    # check delete workspace
-    _ = Workspace.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    # check delete project
-    _ = Project.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    # check delete cycle
-    _ = Cycle.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    # check delete module
-    _ = Module.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    # check delete issue
-    _ = Issue.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    # check delete page
-    _ = Page.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    # check delete view
-    _ = IssueView.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    # check delete label
-    _ = Label.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    # check delete state
-    _ = State.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    _ = IssueActivity.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    _ = IssueComment.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    _ = IssueLink.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    _ = IssueReaction.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    _ = UserFavorite.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    _ = ModuleIssue.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    _ = CycleIssue.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    _ = Estimate.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    _ = EstimatePoint.all_objects.filter(
-        deleted_at__lt=timezone.now() - timezone.timedelta(days=days)
-    ).delete()
-
-    # at last, check for every thing which ever is left and delete it
-    # Get all Django models
-    all_models = apps.get_models()
-
-    # Iterate through all models
-    for model in all_models:
-        # Check if the model has a 'deleted_at' field
-        if hasattr(model, "deleted_at"):
-            # Get all instances where 'deleted_at' is greater than 30 days ago
-            _ = model.all_objects.filter(
-                deleted_at__lt=timezone.now()
-                - timezone.timedelta(days=days)
-            ).delete()
-
-    return

apiserver/plane/bgtasks/issue_activites_task.py

@@ -582,19 +582,17 @@ def create_issue_activity(
     issue_activities,
     epoch,
 ):
-    issue = Issue.objects.get(pk=issue_id)
-    issue_activity = IssueActivity.objects.create(
-        issue_id=issue_id,
-        project_id=project_id,
-        workspace_id=workspace_id,
-        comment="created the issue",
-        verb="created",
-        actor_id=actor_id,
-        epoch=epoch,
+    issue_activities.append(
+        IssueActivity(
+            issue_id=issue_id,
+            project_id=project_id,
+            workspace_id=workspace_id,
+            comment="created the issue",
+            verb="created",
+            actor_id=actor_id,
+            epoch=epoch,
+        )
     )
-    issue_activity.created_at = issue.created_at
-    issue_activity.actor_id = issue.created_by_id
-    issue_activity.save(update_fields=["created_at", "actor_id"])
     requested_data = (
         json.loads(requested_data) if requested_data is not None else None
     )
@@ -672,7 +670,6 @@ def delete_issue_activity(
         IssueActivity(
             project_id=project_id,
             workspace_id=workspace_id,
-            issue_id=issue_id,
             comment="deleted the issue",
             verb="deleted",
             actor_id=actor_id,
@@ -880,6 +877,7 @@ def delete_cycle_issue_activity(
     cycle_name = requested_data.get("cycle_name", "")
     cycle = Cycle.objects.filter(pk=cycle_id).first()
     issues = requested_data.get("issues")
+
     for issue in issues:
         current_issue = Issue.objects.filter(pk=issue).first()
         if issue:
@@ -1719,16 +1717,12 @@ def issue_activity(
                     event=(
                         "issue_comment"
                         if activity.field == "comment"
-                        else "inbox_issue"
-                        if inbox
-                        else "issue"
+                        else "inbox_issue" if inbox else "issue"
                     ),
                     event_id=(
                         activity.issue_comment_id
                         if activity.field == "comment"
-                        else inbox
-                        if inbox
-                        else activity.issue_id
+                        else inbox if inbox else activity.issue_id
                     ),
                     verb=activity.verb,
                     field=(

apiserver/plane/bgtasks/notification_task.py

@@ -221,6 +221,7 @@ def notifications(
             else None
         )
         if type not in [
+            "issue.activity.deleted",
             "cycle.activity.created",
             "cycle.activity.deleted",
             "module.activity.created",

apiserver/plane/celery.py

@@ -36,10 +36,6 @@ app.conf.beat_schedule = {
         "task": "plane.bgtasks.api_logs_task.delete_api_logs",
         "schedule": crontab(hour=0, minute=0),
     },
-    "check-every-day-to-delete-hard-delete": {
-        "task": "plane.bgtasks.deletion_task.hard_delete",
-        "schedule": crontab(hour=0, minute=0),
-    },
 }
 
 # Load task modules from all registered Django app configs.

apiserver/plane/db/management/commands/clear_cache.py

@@ -6,23 +6,8 @@ from django.core.management import BaseCommand
 class Command(BaseCommand):
     help = "Clear Cache before starting the server to remove stale values"
 
-    def add_arguments(self, parser):
-        # Positional argument
-        parser.add_argument(
-            "--key", type=str, nargs="?", help="Key to clear cache"
-        )
-
     def handle(self, *args, **options):
         try:
-            if options["key"]:
-                cache.delete(options["key"])
-                self.stdout.write(
-                    self.style.SUCCESS(
-                        f"Cache Cleared for key: {options['key']}"
-                    )
-                )
-                return
-
             cache.clear()
             self.stdout.write(self.style.SUCCESS("Cache Cleared"))
             return

apiserver/plane/db/migrations/0072_issueattachment_external_id_and_more.py

@@ -1,145 +0,0 @@
-# Generated by Django 4.2.14 on 2024-07-22 13:22
-from django.db import migrations, models
-from django.conf import settings
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("db", "0071_rename_issueproperty_issueuserproperty_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="issueattachment",
-            name="external_id",
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.AddField(
-            model_name="issueattachment",
-            name="external_source",
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-        migrations.CreateModel(
-            name="UserRecentVisit",
-            fields=[
-                (
-                    "created_at",
-                    models.DateTimeField(
-                        auto_now_add=True, verbose_name="Created At"
-                    ),
-                ),
-                (
-                    "updated_at",
-                    models.DateTimeField(
-                        auto_now=True, verbose_name="Last Modified At"
-                    ),
-                ),
-                (
-                    "id",
-                    models.UUIDField(
-                        db_index=True,
-                        default=uuid.uuid4,
-                        editable=False,
-                        primary_key=True,
-                        serialize=False,
-                        unique=True,
-                    ),
-                ),
-                ("entity_identifier", models.UUIDField(null=True)),
-                (
-                    "entity_name",
-                    models.CharField(
-                        choices=[
-                            ("VIEW", "View"),
-                            ("PAGE", "Page"),
-                            ("ISSUE", "Issue"),
-                            ("CYCLE", "Cycle"),
-                            ("MODULE", "Module"),
-                            ("PROJECT", "Project"),
-                        ],
-                        max_length=30,
-                    ),
-                ),
-                ("visited_at", models.DateTimeField(auto_now=True)),
-                (
-                    "created_by",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="%(class)s_created_by",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Created By",
-                    ),
-                ),
-                (
-                    "project",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="project_%(class)s",
-                        to="db.project",
-                    ),
-                ),
-                (
-                    "updated_by",
-                    models.ForeignKey(
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="%(class)s_updated_by",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="Last Modified By",
-                    ),
-                ),
-                (
-                    "user",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="user_recent_visit",
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-                (
-                    "workspace",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="workspace_%(class)s",
-                        to="db.workspace",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "User Recent Visit",
-                "verbose_name_plural": "User Recent Visits",
-                "db_table": "user_recent_visits",
-                "ordering": ("-created_at",),
-            },
-        ),
-        migrations.RemoveField(
-            model_name="project",
-            name="start_date",
-        ),
-        migrations.RemoveField(
-            model_name="project",
-            name="target_date",
-        ),
-        migrations.AlterField(
-            model_name="issuesequence",
-            name="sequence",
-            field=models.PositiveBigIntegerField(db_index=True, default=1),
-        ),
-        migrations.AlterField(
-            model_name="project",
-            name="identifier",
-            field=models.CharField(
-                db_index=True, max_length=12, verbose_name="Project Identifier"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="projectidentifier",
-            name="name",
-            field=models.CharField(db_index=True, max_length=12),
-        ),
-    ]

apiserver/plane/db/mixins.py

@@ -1,9 +1,7 @@
+# Python imports
+
 # Django imports
 from django.db import models
-from django.utils import timezone
-
-# Module imports
-from plane.bgtasks.deletion_task import soft_delete_related_objects
 
 
 class TimeAuditModel(models.Model):
@@ -43,45 +41,7 @@ class UserAuditModel(models.Model):
         abstract = True
 
 
-class SoftDeletionManager(models.Manager):
-    def get_queryset(self):
-        return super().get_queryset().filter(deleted_at__isnull=True)
-
-
-class SoftDeleteModel(models.Model):
-    """To soft delete records"""
-
-    deleted_at = models.DateTimeField(
-        verbose_name="Deleted At",
-        null=True,
-        blank=True,
-    )
-
-    objects = SoftDeletionManager()
-    all_objects = models.Manager()
-
-    class Meta:
-        abstract = True
-
-    def delete(self, using=None, soft=True, *args, **kwargs):
-        if soft:
-            # Soft delete the current instance
-            self.deleted_at = timezone.now()
-            self.save(using=using)
-
-            soft_delete_related_objects.delay(
-                self._meta.app_label,
-                self._meta.model_name,
-                self.pk,
-                using=using,
-            )
-
-        else:
-            # Perform hard delete if soft deletion is not enabled
-            return super().delete(using=using, *args, **kwargs)
-
-
-class AuditModel(TimeAuditModel, UserAuditModel, SoftDeleteModel):
+class AuditModel(TimeAuditModel, UserAuditModel):
     """To path when the record was created and last modified"""
 
     class Meta:

apiserver/plane/db/models/__init__.py

@@ -110,5 +110,3 @@ from .dashboard import Dashboard, DashboardWidget, Widget
 from .favorite import UserFavorite
 
 from .issue_type import IssueType
-
-from .recent_visit import UserRecentVisit

apiserver/plane/db/models/cycle.py

@@ -116,7 +116,6 @@ class CycleIssue(ProjectBaseModel):
         return f"{self.cycle}"
 
 
-# DEPRECATED TODO: - Remove in next release
 class CycleFavorite(ProjectBaseModel):
     """_summary_
     CycleFavorite (model): To store all the cycle favorite of the user
@@ -161,14 +160,7 @@ class CycleUserProperties(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["cycle", "user", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["cycle", "user"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="cycle_user_properties_unique_cycle_user_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["cycle", "user"]
         verbose_name = "Cycle User Property"
         verbose_name_plural = "Cycle User Properties"
         db_table = "cycle_user_properties"

apiserver/plane/db/models/dashboard.py

@@ -88,14 +88,7 @@ class DashboardWidget(BaseModel):
         return f"{self.dashboard.name} {self.widget.key}"
 
     class Meta:
-        unique_together = ("widget", "dashboard", "deleted_at")
-        constraints = [
-            models.UniqueConstraint(
-                fields=["widget", "dashboard"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="dashboard_widget_unique_widget_dashboard_when_deleted_at_null",
-            )
-        ]
+        unique_together = ("widget", "dashboard")
         verbose_name = "Dashboard Widget"
         verbose_name_plural = "Dashboard Widgets"
         db_table = "dashboard_widgets"

apiserver/plane/db/models/deploy_board.py

@@ -46,14 +46,7 @@ class DeployBoard(WorkspaceBaseModel):
         return f"{self.entity_identifier} <{self.entity_name}>"
 
     class Meta:
-        unique_together = ["entity_name", "entity_identifier", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["entity_name", "entity_identifier"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="deploy_board_unique_entity_name_entity_identifier_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["entity_name", "entity_identifier"]
         verbose_name = "Deploy Board"
         verbose_name_plural = "Deploy Boards"
         db_table = "deploy_boards"

apiserver/plane/db/models/estimate.py

@@ -1,7 +1,6 @@
 # Django imports
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from django.db.models import Q
 
 # Module imports
 from .project import ProjectBaseModel
@@ -20,14 +19,7 @@ class Estimate(ProjectBaseModel):
         return f"{self.name} <{self.project.name}>"
 
     class Meta:
-        unique_together = ["name", "project", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "project"],
-                condition=Q(deleted_at__isnull=True),
-                name="estimate_unique_name_project_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["name", "project"]
         verbose_name = "Estimate"
         verbose_name_plural = "Estimates"
         db_table = "estimates"

apiserver/plane/db/models/favorite.py

@@ -31,14 +31,7 @@ class UserFavorite(WorkspaceBaseModel):
     )
 
     class Meta:
-        unique_together = ["entity_type", "user", "entity_identifier", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["entity_type", "entity_identifier", "user"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="user_favorite_unique_entity_type_entity_identifier_user_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["entity_type", "user", "entity_identifier"]
         verbose_name = "User Favorite"
         verbose_name_plural = "User Favorites"
         db_table = "user_favorites"
@@ -46,14 +39,9 @@ class UserFavorite(WorkspaceBaseModel):
 
     def save(self, *args, **kwargs):
         if self._state.adding:
-            if self.project:
-                largest_sequence = UserFavorite.objects.filter(
-                    workspace=self.project.workspace
-                ).aggregate(largest=models.Max("sequence"))["largest"]
-            else:
-                largest_sequence = UserFavorite.objects.filter(
-                    workspace=self.workspace,
-                ).aggregate(largest=models.Max("sequence"))["largest"]
+            largest_sequence = UserFavorite.objects.filter(
+                workspace=self.project.workspace
+            ).aggregate(largest=models.Max("sequence"))["largest"]
             if largest_sequence is not None:
                 self.sequence = largest_sequence + 10000
 

apiserver/plane/db/models/inbox.py

@@ -19,14 +19,7 @@ class Inbox(ProjectBaseModel):
         return f"{self.name} <{self.project.name}>"
 
     class Meta:
-        unique_together = ["name", "project", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "project"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="inbox_unique_name_project_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["name", "project"]
         verbose_name = "Inbox"
         verbose_name_plural = "Inboxes"
         db_table = "inboxes"

apiserver/plane/db/models/issue.py

@@ -7,8 +7,9 @@ from django.contrib.postgres.fields import ArrayField
 from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models, transaction
+from django.db.models.signals import post_save
+from django.dispatch import receiver
 from django.utils import timezone
-from django.db.models import Q
 
 # Module imports
 from plane.utils.html_processor import strip_tags
@@ -90,7 +91,6 @@ class IssueManager(models.Manager):
                 | models.Q(issue_inbox__status=2)
                 | models.Q(issue_inbox__isnull=True)
             )
-            .filter(deleted_at__isnull=True)
             .filter(state__is_triage=False)
             .exclude(archived_at__isnull=False)
             .exclude(project__archived_at__isnull=False)
@@ -295,14 +295,7 @@ class IssueRelation(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["issue", "related_issue", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["issue", "related_issue"],
-                condition=Q(deleted_at__isnull=True),
-                name="issue_relation_unique_issue_related_issue_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["issue", "related_issue"]
         verbose_name = "Issue Relation"
         verbose_name_plural = "Issue Relations"
         db_table = "issue_relations"
@@ -323,14 +316,7 @@ class IssueMention(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["issue", "mention", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["issue", "mention"],
-                condition=Q(deleted_at__isnull=True),
-                name="issue_mention_unique_issue_mention_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["issue", "mention"]
         verbose_name = "Issue Mention"
         verbose_name_plural = "Issue Mentions"
         db_table = "issue_mentions"
@@ -351,14 +337,7 @@ class IssueAssignee(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["issue", "assignee", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["issue", "assignee"],
-                condition=Q(deleted_at__isnull=True),
-                name="issue_assignee_unique_issue_assignee_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["issue", "assignee"]
         verbose_name = "Issue Assignee"
         verbose_name_plural = "Issue Assignees"
         db_table = "issue_assignees"
@@ -407,8 +386,6 @@ class IssueAttachment(ProjectBaseModel):
     issue = models.ForeignKey(
         "db.Issue", on_delete=models.CASCADE, related_name="issue_attachment"
     )
-    external_source = models.CharField(max_length=255, null=True, blank=True)
-    external_id = models.CharField(max_length=255, blank=True, null=True)
 
     class Meta:
         verbose_name = "Issue Attachment"
@@ -533,14 +510,7 @@ class IssueUserProperty(ProjectBaseModel):
         verbose_name_plural = "Issue User Properties"
         db_table = "issue_user_properties"
         ordering = ("-created_at",)
-        unique_together = ["user", "project", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["user", "project"],
-                condition=Q(deleted_at__isnull=True),
-                name="issue_user_property_unique_user_project_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["user", "project"]
 
     def __str__(self):
         """Return properties status of the issue"""
@@ -563,14 +533,7 @@ class Label(ProjectBaseModel):
     external_id = models.CharField(max_length=255, blank=True, null=True)
 
     class Meta:
-        unique_together = ["name", "project", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "project"],
-                condition=Q(deleted_at__isnull=True),
-                name="label_unique_name_project_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["name", "project"]
         verbose_name = "Label"
         verbose_name_plural = "Labels"
         db_table = "labels"
@@ -615,9 +578,9 @@ class IssueSequence(ProjectBaseModel):
         Issue,
         on_delete=models.SET_NULL,
         related_name="issue_sequence",
-        null=True,  # This is set to null because we want to keep the sequence even if the issue is deleted
+        null=True,
     )
-    sequence = models.PositiveBigIntegerField(default=1, db_index=True)
+    sequence = models.PositiveBigIntegerField(default=1)
     deleted = models.BooleanField(default=False)
 
     class Meta:
@@ -638,14 +601,7 @@ class IssueSubscriber(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["issue", "subscriber", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["issue", "subscriber"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="issue_subscriber_unique_issue_subscriber_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["issue", "subscriber"]
         verbose_name = "Issue Subscriber"
         verbose_name_plural = "Issue Subscribers"
         db_table = "issue_subscribers"
@@ -667,14 +623,7 @@ class IssueReaction(ProjectBaseModel):
     reaction = models.CharField(max_length=20)
 
     class Meta:
-        unique_together = ["issue", "actor", "reaction", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["issue", "actor", "reaction"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="issue_reaction_unique_issue_actor_reaction_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["issue", "actor", "reaction"]
         verbose_name = "Issue Reaction"
         verbose_name_plural = "Issue Reactions"
         db_table = "issue_reactions"
@@ -698,14 +647,7 @@ class CommentReaction(ProjectBaseModel):
     reaction = models.CharField(max_length=20)
 
     class Meta:
-        unique_together = ["comment", "actor", "reaction", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["comment", "actor", "reaction"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="comment_reaction_unique_comment_actor_reaction_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["comment", "actor", "reaction"]
         verbose_name = "Comment Reaction"
         verbose_name_plural = "Comment Reactions"
         db_table = "comment_reactions"
@@ -736,14 +678,6 @@ class IssueVote(ProjectBaseModel):
         unique_together = [
             "issue",
             "actor",
-            "deleted_at",
-        ]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["issue", "actor"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="issue_vote_unique_issue_actor_when_deleted_at_null",
-            )
         ]
         verbose_name = "Issue Vote"
         verbose_name_plural = "Issue Votes"

apiserver/plane/db/models/issue_type.py

@@ -1,6 +1,5 @@
 # Django imports
 from django.db import models
-from django.db.models import Q
 
 # Module imports
 from .workspace import WorkspaceBaseModel
@@ -16,14 +15,7 @@ class IssueType(WorkspaceBaseModel):
     is_active = models.BooleanField(default=True)
 
     class Meta:
-        unique_together = ["project", "name", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "project"],
-                condition=Q(deleted_at__isnull=True),
-                name="issue_type_unique_name_project_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["project", "name"]
         verbose_name = "Issue Type"
         verbose_name_plural = "Issue Types"
         db_table = "issue_types"

apiserver/plane/db/models/module.py

@@ -1,7 +1,6 @@
 # Django imports
 from django.conf import settings
 from django.db import models
-from django.db.models import Q
 
 # Module imports
 from .project import ProjectBaseModel
@@ -97,14 +96,7 @@ class Module(ProjectBaseModel):
     logo_props = models.JSONField(default=dict)
 
     class Meta:
-        unique_together = ["name", "project", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=['name', 'project'],
-                condition=Q(deleted_at__isnull=True),
-                name='module_unique_name_project_when_deleted_at_null'
-            )
-        ]
+        unique_together = ["name", "project"]
         verbose_name = "Module"
         verbose_name_plural = "Modules"
         db_table = "modules"
@@ -130,14 +122,7 @@ class ModuleMember(ProjectBaseModel):
     member = models.ForeignKey("db.User", on_delete=models.CASCADE)
 
     class Meta:
-        unique_together = ["module", "member", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["module", "member"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="module_member_unique_module_member_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["module", "member"]
         verbose_name = "Module Member"
         verbose_name_plural = "Module Members"
         db_table = "module_members"
@@ -156,14 +141,7 @@ class ModuleIssue(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["issue", "module", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["issue", "module"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="module_issue_unique_issue_module_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["issue", "module"]
         verbose_name = "Module Issue"
         verbose_name_plural = "Module Issues"
         db_table = "module_issues"
@@ -191,7 +169,6 @@ class ModuleLink(ProjectBaseModel):
         return f"{self.module.name} {self.url}"
 
 
-# DEPRECATED TODO: - Remove in next release
 class ModuleFavorite(ProjectBaseModel):
     """_summary_
     ModuleFavorite (model): To store all the module favorite of the user
@@ -236,14 +213,7 @@ class ModuleUserProperties(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["module", "user", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["module", "user"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="module_user_properties_unique_module_user_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["module", "user"]
         verbose_name = "Module User Property"
         verbose_name_plural = "Module User Property"
         db_table = "module_user_properties"

apiserver/plane/db/models/page.py

@@ -119,7 +119,6 @@ class PageLog(BaseModel):
         return f"{self.page.name} {self.entity_name}"
 
 
-# DEPRECATED TODO: - Remove in next release
 class PageBlock(ProjectBaseModel):
     page = models.ForeignKey(
         "db.Page", on_delete=models.CASCADE, related_name="blocks"
@@ -176,7 +175,6 @@ class PageBlock(ProjectBaseModel):
         return f"{self.page.name} <{self.name}>"
 
 
-# DEPRECATED TODO: - Remove in next release
 class PageFavorite(ProjectBaseModel):
     user = models.ForeignKey(
         settings.AUTH_USER_MODEL,
@@ -234,14 +232,7 @@ class ProjectPage(BaseModel):
     )
 
     class Meta:
-        unique_together = ["project", "page", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["project", "page"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="project_page_unique_project_page_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["project", "page"]
         verbose_name = "Project Page"
         verbose_name_plural = "Project Pages"
         db_table = "project_pages"
@@ -263,14 +254,7 @@ class TeamPage(BaseModel):
     )
 
     class Meta:
-        unique_together = ["team", "page", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["team", "page"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="team_page_unique_team_page_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["team", "page"]
         verbose_name = "Team Page"
         verbose_name_plural = "Team Pages"
         db_table = "team_pages"

apiserver/plane/db/models/project.py

@@ -5,7 +5,6 @@ from uuid import uuid4
 from django.conf import settings
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from django.db.models import Q
 
 # Modeule imports
 from plane.db.mixins import AuditModel
@@ -73,7 +72,6 @@ class Project(BaseModel):
     identifier = models.CharField(
         max_length=12,
         verbose_name="Project Identifier",
-        db_index=True,
     )
     default_assignee = models.ForeignKey(
         settings.AUTH_USER_MODEL,
@@ -119,28 +117,16 @@ class Project(BaseModel):
         related_name="default_state",
     )
     archived_at = models.DateTimeField(null=True)
+    # Project start and target date
+    start_date = models.DateTimeField(null=True, blank=True)
+    target_date = models.DateTimeField(null=True, blank=True)
 
     def __str__(self):
         """Return name of the project"""
         return f"{self.name} <{self.workspace.name}>"
 
     class Meta:
-        unique_together = [
-            ["identifier", "workspace", "deleted_at"],
-            ["name", "workspace", "deleted_at"],
-        ]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["identifier", "workspace"],
-                condition=Q(deleted_at__isnull=True),
-                name="project_unique_identifier_workspace_when_deleted_at_null",
-            ),
-            models.UniqueConstraint(
-                fields=["name", "workspace"],
-                condition=Q(deleted_at__isnull=True),
-                name="project_unique_name_workspace_when_deleted_at_null",
-            ),
-        ]
+        unique_together = [["identifier", "workspace"], ["name", "workspace"]]
         verbose_name = "Project"
         verbose_name_plural = "Projects"
         db_table = "projects"
@@ -214,14 +200,7 @@ class ProjectMember(ProjectBaseModel):
         super(ProjectMember, self).save(*args, **kwargs)
 
     class Meta:
-        unique_together = ["project", "member", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["project", "member"],
-                condition=Q(deleted_at__isnull=True),
-                name="project_member_unique_project_member_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["project", "member"]
         verbose_name = "Project Member"
         verbose_name_plural = "Project Members"
         db_table = "project_members"
@@ -243,24 +222,16 @@ class ProjectIdentifier(AuditModel):
     project = models.OneToOneField(
         Project, on_delete=models.CASCADE, related_name="project_identifier"
     )
-    name = models.CharField(max_length=12, db_index=True)
+    name = models.CharField(max_length=12)
 
     class Meta:
-        unique_together = ["name", "workspace", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "workspace"],
-                condition=Q(deleted_at__isnull=True),
-                name="unique_name_workspace_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["name", "workspace"]
         verbose_name = "Project Identifier"
         verbose_name_plural = "Project Identifiers"
         db_table = "project_identifiers"
         ordering = ("-created_at",)
 
 
-# DEPRECATED TODO: - Remove in next release
 class ProjectFavorite(ProjectBaseModel):
     user = models.ForeignKey(
         settings.AUTH_USER_MODEL,
@@ -331,14 +302,7 @@ class ProjectPublicMember(ProjectBaseModel):
     )
 
     class Meta:
-        unique_together = ["project", "member", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["project", "member"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="project_public_member_unique_project_member_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["project", "member"]
         verbose_name = "Project Public Member"
         verbose_name_plural = "Project Public Members"
         db_table = "project_public_members"

apiserver/plane/db/models/recent_visit.py

@@ -1,38 +0,0 @@
-# Django imports
-from django.db import models
-from django.conf import settings
-
-# Module imports
-from .workspace import WorkspaceBaseModel
-
-
-class EntityNameEnum(models.TextChoices):
-    VIEW = "VIEW", "View"
-    PAGE = "PAGE", "Page"
-    ISSUE = "ISSUE", "Issue"
-    CYCLE = "CYCLE", "Cycle"
-    MODULE = "MODULE", "Module"
-    PROJECT = "PROJECT", "Project"
-
-
-class UserRecentVisit(WorkspaceBaseModel):
-    entity_identifier = models.UUIDField(null=True)
-    entity_name = models.CharField(
-        max_length=30,
-        choices=EntityNameEnum.choices,
-    )
-    user = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        on_delete=models.CASCADE,
-        related_name="user_recent_visit",
-    )
-    visited_at = models.DateTimeField(auto_now=True)
-
-    class Meta:
-        verbose_name = "User Recent Visit"
-        verbose_name_plural = "User Recent Visits"
-        db_table = "user_recent_visits"
-        ordering = ("-created_at",)
-
-    def __str__(self):
-        return f"{self.entity_name} {self.user.email}"

apiserver/plane/db/models/state.py

@@ -1,7 +1,6 @@
 # Django imports
 from django.db import models
 from django.template.defaultfilters import slugify
-from django.db.models import Q
 
 # Module imports
 from .project import ProjectBaseModel
@@ -37,14 +36,7 @@ class State(ProjectBaseModel):
         return f"{self.name} <{self.project.name}>"
 
     class Meta:
-        unique_together = ["name", "project", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "project"],
-                condition=Q(deleted_at__isnull=True),
-                name="state_unique_name_project_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["name", "project"]
         verbose_name = "State"
         verbose_name_plural = "States"
         db_table = "states"

apiserver/plane/db/models/view.py

@@ -52,6 +52,7 @@ def get_default_display_properties():
         "updated_on": True,
     }
 
+
 # DEPRECATED TODO: - Remove in next release
 class GlobalView(BaseModel):
     workspace = models.ForeignKey(
@@ -141,7 +142,6 @@ class IssueView(WorkspaceBaseModel):
         return f"{self.name} <{self.project.name}>"
 
 
-# DEPRECATED TODO: - Remove in next release
 class IssueViewFavorite(ProjectBaseModel):
     user = models.ForeignKey(
         settings.AUTH_USER_MODEL,

apiserver/plane/db/models/workspace.py

@@ -185,14 +185,7 @@ class WorkspaceMember(BaseModel):
     is_active = models.BooleanField(default=True)
 
     class Meta:
-        unique_together = ["workspace", "member", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["workspace", "member"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="workspace_member_unique_workspace_member_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["workspace", "member"]
         verbose_name = "Workspace Member"
         verbose_name_plural = "Workspace Members"
         db_table = "workspace_members"
@@ -217,14 +210,7 @@ class WorkspaceMemberInvite(BaseModel):
     role = models.PositiveSmallIntegerField(choices=ROLE_CHOICES, default=10)
 
     class Meta:
-        unique_together = ["email", "workspace", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["email", "workspace"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="workspace_member_invite_unique_email_workspace_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["email", "workspace"]
         verbose_name = "Workspace Member Invite"
         verbose_name_plural = "Workspace Member Invites"
         db_table = "workspace_member_invites"
@@ -254,14 +240,7 @@ class Team(BaseModel):
         return f"{self.name} <{self.workspace.name}>"
 
     class Meta:
-        unique_together = ["name", "workspace", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "workspace"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="team_unique_name_workspace_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["name", "workspace"]
         verbose_name = "Team"
         verbose_name_plural = "Teams"
         db_table = "teams"
@@ -285,14 +264,7 @@ class TeamMember(BaseModel):
         return self.team.name
 
     class Meta:
-        unique_together = ["team", "member", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["team", "member"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="team_member_unique_team_member_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["team", "member"]
         verbose_name = "Team Member"
         verbose_name_plural = "Team Members"
         db_table = "team_members"
@@ -315,14 +287,7 @@ class WorkspaceTheme(BaseModel):
         return str(self.name) + str(self.actor.email)
 
     class Meta:
-        unique_together = ["workspace", "name", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["workspace", "name"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="workspace_theme_unique_workspace_name_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["workspace", "name"]
         verbose_name = "Workspace Theme"
         verbose_name_plural = "Workspace Themes"
         db_table = "workspace_themes"
@@ -347,14 +312,7 @@ class WorkspaceUserProperties(BaseModel):
     )
 
     class Meta:
-        unique_together = ["workspace", "user", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["workspace", "user"],
-                condition=models.Q(deleted_at__isnull=True),
-                name="workspace_user_properties_unique_workspace_user_when_deleted_at_null",
-            )
-        ]
+        unique_together = ["workspace", "user"]
         verbose_name = "Workspace User Property"
         verbose_name_plural = "Workspace User Property"
         db_table = "workspace_user_properties"

apiserver/plane/license/api/serializers/instance.py

@@ -13,7 +13,6 @@ class InstanceSerializer(BaseSerializer):
         model = Instance
         exclude = [
             "license_key",
-            "user_count"
         ]
         read_only_fields = [
             "id",

apiserver/plane/license/api/views/instance.py

@@ -54,7 +54,6 @@ class InstanceEndpoint(BaseAPIView):
         data["is_activated"] = True
         # Get all the configuration
         (
-            ENABLE_SIGNUP,
             IS_GOOGLE_ENABLED,
             IS_GITHUB_ENABLED,
             GITHUB_APP_NAME,
@@ -67,14 +66,8 @@ class InstanceEndpoint(BaseAPIView):
             POSTHOG_HOST,
             UNSPLASH_ACCESS_KEY,
             OPENAI_API_KEY,
-            IS_INTERCOM_ENABLED,
-            INTERCOM_APP_ID,
         ) = get_configuration_value(
             [
-                {
-                    "key": "ENABLE_SIGNUP",
-                    "default": os.environ.get("ENABLE_SIGNUP", "0"),
-                },
                 {
                     "key": "IS_GOOGLE_ENABLED",
                     "default": os.environ.get("IS_GOOGLE_ENABLED", "0"),
@@ -123,21 +116,11 @@ class InstanceEndpoint(BaseAPIView):
                     "key": "OPENAI_API_KEY",
                     "default": os.environ.get("OPENAI_API_KEY", ""),
                 },
-                # Intercom settings
-                {
-                    "key": "IS_INTERCOM_ENABLED",
-                    "default": os.environ.get("IS_INTERCOM_ENABLED", "1"),
-                },
-                {
-                    "key": "INTERCOM_APP_ID",
-                    "default": os.environ.get("INTERCOM_APP_ID", ""),
-                },
             ]
         )
 
         data = {}
         # Authentication
-        data["enable_signup"] = ENABLE_SIGNUP == "1"
         data["is_google_enabled"] = IS_GOOGLE_ENABLED == "1"
         data["is_github_enabled"] = IS_GITHUB_ENABLED == "1"
         data["is_gitlab_enabled"] = IS_GITLAB_ENABLED == "1"
@@ -168,10 +151,6 @@ class InstanceEndpoint(BaseAPIView):
         # is smtp configured
         data["is_smtp_configured"] = bool(EMAIL_HOST)
 
-        # Intercom settings
-        data["is_intercom_enabled"] = IS_INTERCOM_ENABLED == "1"
-        data["intercom_app_id"] = INTERCOM_APP_ID
-
         # Base URL
         data["admin_base_url"] = settings.ADMIN_BASE_URL
         data["space_base_url"] = settings.SPACE_BASE_URL

apiserver/plane/license/management/commands/configure_instance.py

@@ -143,19 +143,6 @@ class Command(BaseCommand):
                 "category": "UNSPLASH",
                 "is_encrypted": True,
             },
-            # intercom settings
-            {
-                "key": "IS_INTERCOM_ENABLED",
-                "value": os.environ.get("IS_INTERCOM_ENABLED", "1"),
-                "category": "INTERCOM",
-                "is_encrypted": False,
-            },
-            {
-                "key": "INTERCOM_APP_ID",
-                "value": os.environ.get("INTERCOM_APP_ID", ""),
-                "category": "INTERCOM",
-                "is_encrypted": False,
-            },
         ]
 
         for item in config_keys:
@@ -278,11 +265,7 @@ class Command(BaseCommand):
                             ]
                         )
                     )
-                    if (
-                        bool(GITLAB_HOST)
-                        and bool(GITLAB_CLIENT_ID)
-                        and bool(GITLAB_CLIENT_SECRET)
-                    ):
+                    if bool(GITLAB_HOST) and bool(GITLAB_CLIENT_ID) and bool(GITLAB_CLIENT_SECRET):
                         value = "1"
                     else:
                         value = "0"

apiserver/plane/license/migrations/0004_changelog_deleted_at_instance_deleted_at_and_more.py

@@ -1,33 +0,0 @@
-# Generated by Django 4.2.11 on 2024-07-26 11:31
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('license', '0003_alter_changelog_title_alter_changelog_version_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='changelog',
-            name='deleted_at',
-            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
-        ),
-        migrations.AddField(
-            model_name='instance',
-            name='deleted_at',
-            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
-        ),
-        migrations.AddField(
-            model_name='instanceadmin',
-            name='deleted_at',
-            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
-        ),
-        migrations.AddField(
-            model_name='instanceconfiguration',
-            name='deleted_at',
-            field=models.DateTimeField(blank=True, null=True, verbose_name='Deleted At'),
-        ),
-    ]

apiserver/plane/settings/common.py

@@ -355,5 +355,3 @@ CSRF_FAILURE_VIEW = "plane.authentication.views.common.csrf_failure"
 ADMIN_BASE_URL = os.environ.get("ADMIN_BASE_URL", None)
 SPACE_BASE_URL = os.environ.get("SPACE_BASE_URL", None)
 APP_BASE_URL = os.environ.get("APP_BASE_URL")
-
-HARD_DELETE_AFTER_DAYS = int(os.environ.get("HARD_DELETE_AFTER_DAYS", 60))

apiserver/plane/space/urls/inbox.py

@@ -3,6 +3,7 @@ from django.urls import path
 
 from plane.space.views import (
     InboxIssuePublicViewSet,
+    IssueVotePublicViewSet,
     WorkspaceProjectDeployBoardEndpoint,
 )
 
@@ -29,6 +30,17 @@ urlpatterns = [
         ),
         name="inbox-issue",
     ),
+    path(
+        "anchor/<str:anchor>/issues/<uuid:issue_id>/votes/",
+        IssueVotePublicViewSet.as_view(
+            {
+                "get": "list",
+                "post": "create",
+                "delete": "destroy",
+            }
+        ),
+        name="issue-vote-project-board",
+    ),
     path(
         "workspaces/<str:slug>/project-boards/",
         WorkspaceProjectDeployBoardEndpoint.as_view(),

apiserver/plane/space/urls/issue.py

@@ -6,7 +6,6 @@ from plane.space.views import (
     IssueCommentPublicViewSet,
     IssueReactionPublicViewSet,
     CommentReactionPublicViewSet,
-    IssueVotePublicViewSet,
 )
 
 urlpatterns = [
@@ -74,15 +73,4 @@ urlpatterns = [
         ),
         name="comment-reactions-project-board",
     ),
-    path(
-        "anchor/<str:anchor>/issues/<uuid:issue_id>/votes/",
-        IssueVotePublicViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-                "delete": "destroy",
-            }
-        ),
-        name="issue-vote-project-board",
-    ),
 ]

apiserver/plane/space/views/issue.py

@@ -1,12 +1,9 @@
 # Python imports
 import json
-
-# Django imports
 from django.contrib.postgres.aggregates import ArrayAgg
 from django.contrib.postgres.fields import ArrayField
 from django.db.models.functions import Coalesce, JSONObject
 from django.core.serializers.json import DjangoJSONEncoder
-from django.utils import timezone
 from django.db.models import (
     Exists,
     F,
@@ -17,15 +14,15 @@ from django.db.models import (
     When,
     JSONField,
     Value,
-    OuterRef,
-    Func
 )
 
-# Third Party imports
-from rest_framework.response import Response
+# Django imports
+from django.utils import timezone
 from rest_framework import status
 from rest_framework.permissions import AllowAny, IsAuthenticated
 
+# Third Party imports
+from rest_framework.response import Response
 
 # Module imports
 from .base import BaseAPIView, BaseViewSet
@@ -46,6 +43,7 @@ from plane.utils.paginator import (
 from plane.app.serializers import (
     CommentReactionSerializer,
     IssueCommentSerializer,
+    IssuePublicSerializer,
     IssueReactionSerializer,
     IssueVoteSerializer,
 )
@@ -59,7 +57,6 @@ from plane.db.models import (
     DeployBoard,
     IssueVote,
     ProjectPublicMember,
-    IssueAttachment,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.issue_filters import issue_filters
@@ -105,28 +102,6 @@ class ProjectIssuesPublicEndpoint(BaseAPIView):
                 )
             )
             .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(
-                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
         ).distinct()
 
         issue_queryset = issue_queryset.filter(**filters)

apiserver/plane/space/views/project.py

@@ -69,7 +69,7 @@ class WorkspaceProjectAnchorEndpoint(BaseAPIView):
 
     def get(self, request, slug, project_id):
         project_deploy_board = DeployBoard.objects.get(
-            workspace__slug=slug, project_id=project_id, entity_name="project"
+            workspace__slug=slug, project_id=project_id
         )
         serializer = DeployBoardSerializer(project_deploy_board)
         return Response(serializer.data, status=status.HTTP_200_OK)

apiserver/plane/space/views/state.py

@@ -27,11 +27,14 @@ class ProjectStatesEndpoint(BaseAPIView):
                 status=status.HTTP_404_NOT_FOUND,
             )
 
-        states = State.objects.filter(
-            ~Q(name="Triage"),
-            workspace__slug=deploy_board.workspace.slug,
-            project_id=deploy_board.project_id,
-        ).values("name", "group", "color", "id", "sequence")
+        states = (
+            State.objects.filter(
+                ~Q(name="Triage"),
+                workspace__slug=deploy_board.workspace.slug,
+                project_id=deploy_board.project_id,
+            )
+            .values("name", "group", "color", "id")
+        )
 
         return Response(
             states,

apiserver/plane/utils/constants.py

@@ -27,9 +27,4 @@ RESTRICTED_WORKSPACE_SLUGS = [
     "channels",
     "upgrade",
     "billing",
-    "sign-in",
-    "sign-up",
-    "signin",
-    "signup",
-    "config",
 ]

apiserver/plane/utils/grouper.py

@@ -18,6 +18,7 @@ from plane.db.models import (
 
 
 def issue_queryset_grouper(queryset, group_by, sub_group_by):
+
     FIELD_MAPPER = {
         "label_ids": "labels__id",
         "assignee_ids": "assignees__id",
@@ -29,10 +30,7 @@ def issue_queryset_grouper(queryset, group_by, sub_group_by):
         "label_ids": ("labels__id", ~Q(labels__id__isnull=True)),
         "module_ids": (
             "issue_module__module_id",
-            (
-                ~Q(issue_module__module_id__isnull=True)
-                & Q(issue_module__module__archived_at__isnull=True)
-            ),
+            ~Q(issue_module__module_id__isnull=True),
         ),
     }
     default_annotations = {
@@ -53,6 +51,7 @@ def issue_queryset_grouper(queryset, group_by, sub_group_by):
 
 
 def issue_on_results(issues, group_by, sub_group_by):
+
     FIELD_MAPPER = {
         "labels__id": "label_ids",
         "assignees__id": "assignee_ids",

apiserver/plane/utils/issue_filters.py

@@ -23,42 +23,42 @@ def filter_valid_uuids(uuid_list):
 
 # Get the 2_weeks, 3_months
 def string_date_filter(
-    issue_filter, duration, subsequent, term, date_filter, offset
+    filter, duration, subsequent, term, date_filter, offset
 ):
     now = timezone.now().date()
     if term == "months":
         if subsequent == "after":
             if offset == "fromnow":
-                issue_filter[f"{date_filter}__gte"] = now + timedelta(
+                filter[f"{date_filter}__gte"] = now + timedelta(
                     days=duration * 30
                 )
             else:
-                issue_filter[f"{date_filter}__gte"] = now - timedelta(
+                filter[f"{date_filter}__gte"] = now - timedelta(
                     days=duration * 30
                 )
         else:
             if offset == "fromnow":
-                issue_filter[f"{date_filter}__lte"] = now + timedelta(
+                filter[f"{date_filter}__lte"] = now + timedelta(
                     days=duration * 30
                 )
             else:
-                issue_filter[f"{date_filter}__lte"] = now - timedelta(
+                filter[f"{date_filter}__lte"] = now - timedelta(
                     days=duration * 30
                 )
     if term == "weeks":
         if subsequent == "after":
             if offset == "fromnow":
-                issue_filter[f"{date_filter}__gte"] = now + timedelta(weeks=duration)
+                filter[f"{date_filter}__gte"] = now + timedelta(weeks=duration)
             else:
-                issue_filter[f"{date_filter}__gte"] = now - timedelta(weeks=duration)
+                filter[f"{date_filter}__gte"] = now - timedelta(weeks=duration)
         else:
             if offset == "fromnow":
-                issue_filter[f"{date_filter}__lte"] = now + timedelta(weeks=duration)
+                filter[f"{date_filter}__lte"] = now + timedelta(weeks=duration)
             else:
-                issue_filter[f"{date_filter}__lte"] = now - timedelta(weeks=duration)
+                filter[f"{date_filter}__lte"] = now - timedelta(weeks=duration)
 
 
-def date_filter(issue_filter, date_term, queries):
+def date_filter(filter, date_term, queries):
     """
     Handle all date filters
     """
@@ -71,7 +71,7 @@ def date_filter(issue_filter, date_term, queries):
                     if len(date_query) == 3:
                         digit, term = date_query[0].split("_")
                         string_date_filter(
-                            issue_filter=issue_filter,
+                            filter=filter,
                             duration=int(digit),
                             subsequent=date_query[1],
                             term=term,
@@ -80,32 +80,32 @@ def date_filter(issue_filter, date_term, queries):
                         )
                 else:
                     if "after" in date_query:
-                        issue_filter[f"{date_term}__gte"] = date_query[0]
+                        filter[f"{date_term}__gte"] = date_query[0]
                     else:
-                        issue_filter[f"{date_term}__lte"] = date_query[0]
+                        filter[f"{date_term}__lte"] = date_query[0]
             else:
-                issue_filter[f"{date_term}__contains"] = date_query[0]
+                filter[f"{date_term}__contains"] = date_query[0]
 
 
-def filter_state(params, issue_filter, method, prefix=""):
+def filter_state(params, filter, method, prefix=""):
     if method == "GET":
         states = [
             item for item in params.get("state").split(",") if item != "null"
         ]
         states = filter_valid_uuids(states)
         if len(states) and "" not in states:
-            issue_filter[f"{prefix}state__in"] = states
+            filter[f"{prefix}state__in"] = states
     else:
         if (
             params.get("state", None)
             and len(params.get("state"))
             and params.get("state") != "null"
         ):
-            issue_filter[f"{prefix}state__in"] = params.get("state")
-    return issue_filter
+            filter[f"{prefix}state__in"] = params.get("state")
+    return filter
 
 
-def filter_state_group(params, issue_filter, method, prefix=""):
+def filter_state_group(params, filter, method, prefix=""):
     if method == "GET":
         state_group = [
             item
@@ -113,18 +113,18 @@ def filter_state_group(params, issue_filter, method, prefix=""):
             if item != "null"
         ]
         if len(state_group) and "" not in state_group:
-            issue_filter[f"{prefix}state__group__in"] = state_group
+            filter[f"{prefix}state__group__in"] = state_group
     else:
         if (
             params.get("state_group", None)
             and len(params.get("state_group"))
             and params.get("state_group") != "null"
         ):
-            issue_filter[f"{prefix}state__group__in"] = params.get("state_group")
-    return issue_filter
+            filter[f"{prefix}state__group__in"] = params.get("state_group")
+    return filter
 
 
-def filter_estimate_point(params, issue_filter, method, prefix=""):
+def filter_estimate_point(params, filter, method, prefix=""):
     if method == "GET":
         estimate_points = [
             item
@@ -132,20 +132,20 @@ def filter_estimate_point(params, issue_filter, method, prefix=""):
             if item != "null"
         ]
         if len(estimate_points) and "" not in estimate_points:
-            issue_filter[f"{prefix}estimate_point__in"] = estimate_points
+            filter[f"{prefix}estimate_point__in"] = estimate_points
     else:
         if (
             params.get("estimate_point", None)
             and len(params.get("estimate_point"))
             and params.get("estimate_point") != "null"
         ):
-            issue_filter[f"{prefix}estimate_point__in"] = params.get(
+            filter[f"{prefix}estimate_point__in"] = params.get(
                 "estimate_point"
             )
-    return issue_filter
+    return filter
 
 
-def filter_priority(params, issue_filter, method, prefix=""):
+def filter_priority(params, filter, method, prefix=""):
     if method == "GET":
         priorities = [
             item
@@ -153,58 +153,58 @@ def filter_priority(params, issue_filter, method, prefix=""):
             if item != "null"
         ]
         if len(priorities) and "" not in priorities:
-            issue_filter[f"{prefix}priority__in"] = priorities
+            filter[f"{prefix}priority__in"] = priorities
     else:
         if (
             params.get("priority", None)
             and len(params.get("priority"))
             and params.get("priority") != "null"
         ):
-            issue_filter[f"{prefix}priority__in"] = params.get("priority")
-    return issue_filter
+            filter[f"{prefix}priority__in"] = params.get("priority")
+    return filter
 
 
-def filter_parent(params, issue_filter, method, prefix=""):
+def filter_parent(params, filter, method, prefix=""):
     if method == "GET":
         parents = [
             item for item in params.get("parent").split(",") if item != "null"
         ]
         if "None" in parents:
-            issue_filter[f"{prefix}parent__isnull"] = True
+            filter[f"{prefix}parent__isnull"] = True
         parents = filter_valid_uuids(parents)
         if len(parents) and "" not in parents:
-            issue_filter[f"{prefix}parent__in"] = parents
+            filter[f"{prefix}parent__in"] = parents
     else:
         if (
             params.get("parent", None)
             and len(params.get("parent"))
             and params.get("parent") != "null"
         ):
-            issue_filter[f"{prefix}parent__in"] = params.get("parent")
-    return issue_filter
+            filter[f"{prefix}parent__in"] = params.get("parent")
+    return filter
 
 
-def filter_labels(params, issue_filter, method, prefix=""):
+def filter_labels(params, filter, method, prefix=""):
     if method == "GET":
         labels = [
             item for item in params.get("labels").split(",") if item != "null"
         ]
         if "None" in labels:
-            issue_filter[f"{prefix}labels__isnull"] = True
+            filter[f"{prefix}labels__isnull"] = True
         labels = filter_valid_uuids(labels)
         if len(labels) and "" not in labels:
-            issue_filter[f"{prefix}labels__in"] = labels
+            filter[f"{prefix}labels__in"] = labels
     else:
         if (
             params.get("labels", None)
             and len(params.get("labels"))
             and params.get("labels") != "null"
         ):
-            issue_filter[f"{prefix}labels__in"] = params.get("labels")
-    return issue_filter
+            filter[f"{prefix}labels__in"] = params.get("labels")
+    return filter
 
 
-def filter_assignees(params, issue_filter, method, prefix=""):
+def filter_assignees(params, filter, method, prefix=""):
     if method == "GET":
         assignees = [
             item
@@ -212,21 +212,21 @@ def filter_assignees(params, issue_filter, method, prefix=""):
             if item != "null"
         ]
         if "None" in assignees:
-            issue_filter[f"{prefix}assignees__isnull"] = True
+            filter[f"{prefix}assignees__isnull"] = True
         assignees = filter_valid_uuids(assignees)
         if len(assignees) and "" not in assignees:
-            issue_filter[f"{prefix}assignees__in"] = assignees
+            filter[f"{prefix}assignees__in"] = assignees
     else:
         if (
             params.get("assignees", None)
             and len(params.get("assignees"))
             and params.get("assignees") != "null"
         ):
-            issue_filter[f"{prefix}assignees__in"] = params.get("assignees")
-    return issue_filter
+            filter[f"{prefix}assignees__in"] = params.get("assignees")
+    return filter
 
 
-def filter_mentions(params, issue_filter, method, prefix=""):
+def filter_mentions(params, filter, method, prefix=""):
     if method == "GET":
         mentions = [
             item
@@ -235,20 +235,20 @@ def filter_mentions(params, issue_filter, method, prefix=""):
         ]
         mentions = filter_valid_uuids(mentions)
         if len(mentions) and "" not in mentions:
-            issue_filter[f"{prefix}issue_mention__mention__id__in"] = mentions
+            filter[f"{prefix}issue_mention__mention__id__in"] = mentions
     else:
         if (
             params.get("mentions", None)
             and len(params.get("mentions"))
             and params.get("mentions") != "null"
         ):
-            issue_filter[f"{prefix}issue_mention__mention__id__in"] = params.get(
+            filter[f"{prefix}issue_mention__mention__id__in"] = params.get(
                 "mentions"
             )
-    return issue_filter
+    return filter
 
 
-def filter_created_by(params, issue_filter, method, prefix=""):
+def filter_created_by(params, filter, method, prefix=""):
     if method == "GET":
         created_bys = [
             item
@@ -256,100 +256,100 @@ def filter_created_by(params, issue_filter, method, prefix=""):
             if item != "null"
         ]
         if "None" in created_bys:
-            issue_filter[f"{prefix}created_by__isnull"] = True
+            filter[f"{prefix}created_by__isnull"] = True
         created_bys = filter_valid_uuids(created_bys)
         if len(created_bys) and "" not in created_bys:
-            issue_filter[f"{prefix}created_by__in"] = created_bys
+            filter[f"{prefix}created_by__in"] = created_bys
     else:
         if (
             params.get("created_by", None)
             and len(params.get("created_by"))
             and params.get("created_by") != "null"
         ):
-            issue_filter[f"{prefix}created_by__in"] = params.get("created_by")
-    return issue_filter
+            filter[f"{prefix}created_by__in"] = params.get("created_by")
+    return filter
 
 
-def filter_name(params, issue_filter, method, prefix=""):
+def filter_name(params, filter, method, prefix=""):
     if params.get("name", "") != "":
-        issue_filter[f"{prefix}name__icontains"] = params.get("name")
-    return issue_filter
+        filter[f"{prefix}name__icontains"] = params.get("name")
+    return filter
 
 
-def filter_created_at(params, issue_filter, method, prefix=""):
+def filter_created_at(params, filter, method, prefix=""):
     if method == "GET":
         created_ats = params.get("created_at").split(",")
         if len(created_ats) and "" not in created_ats:
             date_filter(
-                issue_filter=issue_filter,
+                filter=filter,
                 date_term=f"{prefix}created_at__date",
                 queries=created_ats,
             )
     else:
         if params.get("created_at", None) and len(params.get("created_at")):
             date_filter(
-                issue_filter=issue_filter,
+                filter=filter,
                 date_term=f"{prefix}created_at__date",
                 queries=params.get("created_at", []),
             )
-    return issue_filter
+    return filter
 
 
-def filter_updated_at(params, issue_filter, method, prefix=""):
+def filter_updated_at(params, filter, method, prefix=""):
     if method == "GET":
         updated_ats = params.get("updated_at").split(",")
         if len(updated_ats) and "" not in updated_ats:
             date_filter(
-                issue_filter=issue_filter,
+                filter=filter,
                 date_term=f"{prefix}created_at__date",
                 queries=updated_ats,
             )
     else:
         if params.get("updated_at", None) and len(params.get("updated_at")):
             date_filter(
-                issue_filter=issue_filter,
+                filter=filter,
                 date_term=f"{prefix}created_at__date",
                 queries=params.get("updated_at", []),
             )
-    return issue_filter
+    return filter
 
 
-def filter_start_date(params, issue_filter, method, prefix=""):
+def filter_start_date(params, filter, method, prefix=""):
     if method == "GET":
         start_dates = params.get("start_date").split(",")
         if len(start_dates) and "" not in start_dates:
             date_filter(
-                issue_filter=issue_filter,
+                filter=filter,
                 date_term=f"{prefix}start_date",
                 queries=start_dates,
             )
     else:
         if params.get("start_date", None) and len(params.get("start_date")):
-            issue_filter[f"{prefix}start_date"] = params.get("start_date")
-    return issue_filter
+            filter[f"{prefix}start_date"] = params.get("start_date")
+    return filter
 
 
-def filter_target_date(params, issue_filter, method, prefix=""):
+def filter_target_date(params, filter, method, prefix=""):
     if method == "GET":
         target_dates = params.get("target_date").split(",")
         if len(target_dates) and "" not in target_dates:
             date_filter(
-                issue_filter=issue_filter,
+                filter=filter,
                 date_term=f"{prefix}target_date",
                 queries=target_dates,
             )
     else:
         if params.get("target_date", None) and len(params.get("target_date")):
-            issue_filter[f"{prefix}target_date"] = params.get("target_date")
-    return issue_filter
+            filter[f"{prefix}target_date"] = params.get("target_date")
+    return filter
 
 
-def filter_completed_at(params, issue_filter, method, prefix=""):
+def filter_completed_at(params, filter, method, prefix=""):
     if method == "GET":
         completed_ats = params.get("completed_at").split(",")
         if len(completed_ats) and "" not in completed_ats:
             date_filter(
-                issue_filter=issue_filter,
+                filter=filter,
                 date_term=f"{prefix}completed_at__date",
                 queries=completed_ats,
             )
@@ -358,14 +358,14 @@ def filter_completed_at(params, issue_filter, method, prefix=""):
             params.get("completed_at")
         ):
             date_filter(
-                issue_filter=issue_filter,
+                filter=filter,
                 date_term=f"{prefix}completed_at__date",
                 queries=params.get("completed_at", []),
             )
-    return issue_filter
+    return filter
 
 
-def filter_issue_state_type(params, issue_filter, method, prefix=""):
+def filter_issue_state_type(params, filter, method, prefix=""):
     type = params.get("type", "all")
     group = ["backlog", "unstarted", "started", "completed", "cancelled"]
     if type == "backlog":
@@ -373,71 +373,71 @@ def filter_issue_state_type(params, issue_filter, method, prefix=""):
     if type == "active":
         group = ["unstarted", "started"]
 
-    issue_filter[f"{prefix}state__group__in"] = group
-    return issue_filter
+    filter[f"{prefix}state__group__in"] = group
+    return filter
 
 
-def filter_project(params, issue_filter, method, prefix=""):
+def filter_project(params, filter, method, prefix=""):
     if method == "GET":
         projects = [
             item for item in params.get("project").split(",") if item != "null"
         ]
         projects = filter_valid_uuids(projects)
         if len(projects) and "" not in projects:
-            issue_filter[f"{prefix}project__in"] = projects
+            filter[f"{prefix}project__in"] = projects
     else:
         if (
             params.get("project", None)
             and len(params.get("project"))
             and params.get("project") != "null"
         ):
-            issue_filter[f"{prefix}project__in"] = params.get("project")
-    return issue_filter
+            filter[f"{prefix}project__in"] = params.get("project")
+    return filter
 
 
-def filter_cycle(params, issue_filter, method, prefix=""):
+def filter_cycle(params, filter, method, prefix=""):
     if method == "GET":
         cycles = [
             item for item in params.get("cycle").split(",") if item != "null"
         ]
         if "None" in cycles:
-            issue_filter[f"{prefix}issue_cycle__cycle_id__isnull"] = True
+            filter[f"{prefix}issue_cycle__cycle_id__isnull"] = True
         cycles = filter_valid_uuids(cycles)
         if len(cycles) and "" not in cycles:
-            issue_filter[f"{prefix}issue_cycle__cycle_id__in"] = cycles
+            filter[f"{prefix}issue_cycle__cycle_id__in"] = cycles
     else:
         if (
             params.get("cycle", None)
             and len(params.get("cycle"))
             and params.get("cycle") != "null"
         ):
-            issue_filter[f"{prefix}issue_cycle__cycle_id__in"] = params.get("cycle")
-    return issue_filter
+            filter[f"{prefix}issue_cycle__cycle_id__in"] = params.get("cycle")
+    return filter
 
 
-def filter_module(params, issue_filter, method, prefix=""):
+def filter_module(params, filter, method, prefix=""):
     if method == "GET":
         modules = [
             item for item in params.get("module").split(",") if item != "null"
         ]
         if "None" in modules:
-            issue_filter[f"{prefix}issue_module__module_id__isnull"] = True
+            filter[f"{prefix}issue_module__module_id__isnull"] = True
         modules = filter_valid_uuids(modules)
         if len(modules) and "" not in modules:
-            issue_filter[f"{prefix}issue_module__module_id__in"] = modules
+            filter[f"{prefix}issue_module__module_id__in"] = modules
     else:
         if (
             params.get("module", None)
             and len(params.get("module"))
             and params.get("module") != "null"
         ):
-            issue_filter[f"{prefix}issue_module__module_id__in"] = params.get(
+            filter[f"{prefix}issue_module__module_id__in"] = params.get(
                 "module"
             )
-    return issue_filter
+    return filter
 
 
-def filter_inbox_status(params, issue_filter, method, prefix=""):
+def filter_inbox_status(params, filter, method, prefix=""):
     if method == "GET":
         status = [
             item
@@ -445,32 +445,32 @@ def filter_inbox_status(params, issue_filter, method, prefix=""):
             if item != "null"
         ]
         if len(status) and "" not in status:
-            issue_filter[f"{prefix}issue_inbox__status__in"] = status
+            filter[f"{prefix}issue_inbox__status__in"] = status
     else:
         if (
             params.get("inbox_status", None)
             and len(params.get("inbox_status"))
             and params.get("inbox_status") != "null"
         ):
-            issue_filter[f"{prefix}issue_inbox__status__in"] = params.get(
+            filter[f"{prefix}issue_inbox__status__in"] = params.get(
                 "inbox_status"
             )
-    return issue_filter
+    return filter
 
 
-def filter_sub_issue_toggle(params, issue_filter, method, prefix=""):
+def filter_sub_issue_toggle(params, filter, method, prefix=""):
     if method == "GET":
         sub_issue = params.get("sub_issue", "false")
         if sub_issue == "false":
-            issue_filter[f"{prefix}parent__isnull"] = True
+            filter[f"{prefix}parent__isnull"] = True
     else:
         sub_issue = params.get("sub_issue", "false")
         if sub_issue == "false":
-            issue_filter[f"{prefix}parent__isnull"] = True
-    return issue_filter
+            filter[f"{prefix}parent__isnull"] = True
+    return filter
 
 
-def filter_subscribed_issues(params, issue_filter, method, prefix=""):
+def filter_subscribed_issues(params, filter, method, prefix=""):
     if method == "GET":
         subscribers = [
             item
@@ -479,7 +479,7 @@ def filter_subscribed_issues(params, issue_filter, method, prefix=""):
         ]
         subscribers = filter_valid_uuids(subscribers)
         if len(subscribers) and "" not in subscribers:
-            issue_filter[f"{prefix}issue_subscribers__subscriber_id__in"] = (
+            filter[f"{prefix}issue_subscribers__subscriber_id__in"] = (
                 subscribers
             )
     else:
@@ -488,44 +488,22 @@ def filter_subscribed_issues(params, issue_filter, method, prefix=""):
             and len(params.get("subscriber"))
             and params.get("subscriber") != "null"
         ):
-            issue_filter[f"{prefix}issue_subscribers__subscriber_id__in"] = (
+            filter[f"{prefix}issue_subscribers__subscriber_id__in"] = (
                 params.get("subscriber")
             )
-    return issue_filter
+    return filter
 
 
-def filter_start_target_date_issues(params, issue_filter, method, prefix=""):
+def filter_start_target_date_issues(params, filter, method, prefix=""):
     start_target_date = params.get("start_target_date", "false")
     if start_target_date == "true":
-        issue_filter[f"{prefix}target_date__isnull"] = False
-        issue_filter[f"{prefix}start_date__isnull"] = False
-    return issue_filter
-
-
-def filter_logged_by(params, issue_filter, method, prefix=""):
-    if method == "GET":
-        logged_bys = [
-            item
-            for item in params.get("logged_by").split(",")
-            if item != "null"
-        ]
-        if "None" in logged_bys:
-            issue_filter[f"{prefix}logged_by__isnull"] = True
-        logged_bys = filter_valid_uuids(logged_bys)
-        if len(logged_bys) and "" not in logged_bys:
-            issue_filter[f"{prefix}logged_by__in"] = logged_bys
-    else:
-        if (
-            params.get("logged_by", None)
-            and len(params.get("logged_by"))
-            and params.get("logged_by") != "null"
-        ):
-            issue_filter[f"{prefix}logged_by__in"] = params.get("logged_by")
-    return issue_filter
+        filter[f"{prefix}target_date__isnull"] = False
+        filter[f"{prefix}start_date__isnull"] = False
+    return filter
 
 
 def issue_filters(query_params, method, prefix=""):
-    issue_filter = {}
+    filter = {}
 
     ISSUE_FILTER = {
         "state": filter_state,
@@ -537,7 +515,6 @@ def issue_filters(query_params, method, prefix=""):
         "assignees": filter_assignees,
         "mentions": filter_mentions,
         "created_by": filter_created_by,
-        "logged_by": filter_logged_by,
         "name": filter_name,
         "created_at": filter_created_at,
         "updated_at": filter_updated_at,
@@ -557,5 +534,5 @@ def issue_filters(query_params, method, prefix=""):
     for key, value in ISSUE_FILTER.items():
         if key in query_params:
             func = value
-            func(query_params, issue_filter, method, prefix)
-    return issue_filter
+            func(query_params, filter, method, prefix)
+    return filter

apiserver/plane/utils/paginator.py

@@ -14,313 +14,43 @@ from rest_framework.response import Response
 # Module imports
 
 
-class Cursor:
-    # The cursor value
-    def __init__(self, value, offset=0, is_prev=False, has_results=None):
-        self.value = value
-        self.offset = int(offset)
-        self.is_prev = bool(is_prev)
-        self.has_results = has_results
+class InitialGrouperPaginator(object):
+    """This class generate the initial grouping of the queryset"""
 
-    # Return the cursor value in string format
-    def __str__(self):
-        return f"{self.value}:{self.offset}:{int(self.is_prev)}"
-
-    # Return the cursor value
-    def __eq__(self, other):
-        return all(
-            getattr(self, attr) == getattr(other, attr)
-            for attr in ("value", "offset", "is_prev", "has_results")
-        )
-
-    # Return the representation of the cursor
-    def __repr__(self):
-        return f"{type(self).__name__,}: value={self.value} offset={self.offset}, is_prev={int(self.is_prev)}"
-
-    # Return if the cursor is true
-    def __bool__(self):
-        return bool(self.has_results)
-
-    @classmethod
-    def from_string(cls, value):
-        """Return the cursor value from string format"""
-        try:
-            bits = value.split(":")
-            if len(bits) != 3:
-                raise ValueError(
-                    "Cursor must be in the format 'value:offset:is_prev'"
-                )
-
-            value = float(bits[0]) if "." in bits[0] else int(bits[0])
-            return cls(value, int(bits[1]), bool(int(bits[2])))
-        except (TypeError, ValueError) as e:
-            raise ValueError(f"Invalid cursor format: {e}")
-
-
-class CursorResult(Sequence):
-    def __init__(self, results, next, prev, hits=None, max_hits=None):
-        self.results = results
-        self.next = next
-        self.prev = prev
-        self.hits = hits
-        self.max_hits = max_hits
-
-    def __len__(self):
-        # Return the length of the results
-        return len(self.results)
-
-    def __iter__(self):
-        # Return the iterator of the results
-        return iter(self.results)
-
-    def __getitem__(self, key):
-        # Return the results based on the key
-        return self.results[key]
-
-    def __repr__(self):
-        # Return the representation of the results
-        return f"<{type(self).__name__}: results={len(self.results)}>"
-
-
-MAX_LIMIT = 100
-
-
-class BadPaginationError(Exception):
-    pass
-
-
-class OffsetPaginator:
-    """
-    The Offset paginator using the offset and limit
-    with cursor controls
-    http://example.com/api/users/?cursor=10.0.0&per_page=10
-    cursor=limit,offset=page,
-    """
-
-    def __init__(
-        self,
-        queryset,
-        order_by=None,
-        max_limit=MAX_LIMIT,
-        max_offset=None,
-        on_results=None,
-    ):
-        # Key tuple and remove `-` if descending order by
-        self.key = (
-            order_by
-            if order_by is None or isinstance(order_by, (list, tuple, set))
-            else (order_by[1::] if order_by.startswith("-") else order_by,)
-        )
-        # Set desc to true when `-` exists in the order by
-        self.desc = True if order_by and order_by.startswith("-") else False
-        self.queryset = queryset
-        self.max_limit = max_limit
-        self.max_offset = max_offset
-        self.on_results = on_results
-
-    def get_result(self, limit=100, cursor=None):
-        # offset is page #
-        # value is page limit
-        if cursor is None:
-            cursor = Cursor(0, 0, 0)
-
-        # Get the min from limit and max limit
-        limit = min(limit, self.max_limit)
-
-        # queryset
-        queryset = self.queryset
-        if self.key:
-            queryset = queryset.order_by(
-                (
-                    F(*self.key).desc(nulls_last=True)
-                    if self.desc
-                    else F(*self.key).asc(nulls_last=True)
-                ),
-                "-created_at",
-            )
-        # The current page
-        page = cursor.offset
-        # The offset
-        offset = cursor.offset * cursor.value
-        stop = offset + (cursor.value or limit) + 1
-
-        if self.max_offset is not None and offset >= self.max_offset:
-            raise BadPaginationError("Pagination offset too large")
-        if offset < 0:
-            raise BadPaginationError("Pagination offset cannot be negative")
-
-        results = queryset[offset:stop]
-
-        if cursor.value != limit:
-            results = results[-(limit + 1) :]
-
-        # Adjust cursors based on the results for pagination
-        next_cursor = Cursor(limit, page + 1, False, results.count() > limit)
-        # If the page is greater than 0, then set the previous cursor
-        prev_cursor = Cursor(limit, page - 1, True, page > 0)
-
-        # Process the results
-        results = results[:limit]
-
-        # Process the results
-        if self.on_results:
-            results = self.on_results(results)
-
-        # Count the queryset
-        count = queryset.count()
-
-        # Optionally, calculate the total count and max_hits if needed
-        max_hits = math.ceil(count / limit)
-
-        # Return the cursor results
-        return CursorResult(
-            results=results,
-            next=next_cursor,
-            prev=prev_cursor,
-            hits=count,
-            max_hits=max_hits,
-        )
-
-    def process_results(self, results):
-        raise NotImplementedError
-
-
-class GroupedOffsetPaginator(OffsetPaginator):
-
-    # Field mappers - list m2m fields here
-    FIELD_MAPPER = {
-        "labels__id": "label_ids",
-        "assignees__id": "assignee_ids",
-        "issue_module__module_id": "module_ids",
-    }
+    max_limit = 50
 
     def __init__(
         self,
         queryset,
         group_by_field_name,
         group_by_fields,
-        count_filter,
-        *args,
-        **kwargs,
-    ):
-        # Initiate the parent class for all the parameters
-        super().__init__(queryset, *args, **kwargs)
-
+        count_queryset,
+        order_by=None,
+    ) -> None:
+        # Set the queryset
+        self.queryset = queryset
         # Set the group by field name
         self.group_by_field_name = group_by_field_name
         # Set the group by fields
         self.group_by_fields = group_by_fields
-        # Set the count filter - this are extra filters that need to be passed to calculate the counts with the filters
-        self.count_filter = count_filter
-
-    def get_result(self, limit=50, cursor=None):
-        # offset is page #
-        # value is page limit
-        if cursor is None:
-            cursor = Cursor(0, 0, 0)
-
-        limit = min(limit, self.max_limit)
-
-        # Adjust the initial offset and stop based on the cursor and limit
-        queryset = self.queryset
-
-        page = cursor.offset
-        offset = cursor.offset * cursor.value
-        stop = offset + (cursor.value or limit) + 1
-
-        # Check if the offset is greater than the max offset
-        if self.max_offset is not None and offset >= self.max_offset:
-            raise BadPaginationError("Pagination offset too large")
-
-        # Check if the offset is less than 0
-        if offset < 0:
-            raise BadPaginationError("Pagination offset cannot be negative")
-
-        # Compute the results
-        results = {}
-        # Create window for all the groups
-        queryset = queryset.annotate(
-            row_number=Window(
-                expression=RowNumber(),
-                partition_by=[F(self.group_by_field_name)],
-                order_by=(
-                    (
-                        F(*self.key).desc(
-                            nulls_last=True
-                        )  # order by desc if desc is set
-                        if self.desc
-                        else F(*self.key).asc(
-                            nulls_last=True
-                        )  # Order by asc if set
-                    ),
-                    F("created_at").desc(),
-                ),
-            )
-        )
-        # Filter the results by row number
-        results = queryset.filter(
-            row_number__gt=offset, row_number__lt=stop
-        ).order_by(
-            (
-                F(*self.key).desc(nulls_last=True)
-                if self.desc
-                else F(*self.key).asc(nulls_last=True)
-            ),
-            F("created_at").desc(),
-        )
-
-        # Adjust cursors based on the grouped results for pagination
-        next_cursor = Cursor(
-            limit,
-            page + 1,
-            False,
-            queryset.filter(row_number__gte=stop).exists(),
-        )
-
-        # Add previous cursors
-        prev_cursor = Cursor(
-            limit,
-            page - 1,
-            True,
-            page > 0,
-        )
-
-        # Count the queryset
-        count = queryset.count()
-
-        # Optionally, calculate the total count and max_hits if needed
-        # This might require adjustments based on specific use cases
-        if results:
-            max_hits = math.ceil(
-                queryset.values(self.group_by_field_name)
-                .annotate(
-                    count=Count(
-                        "id",
-                        filter=self.count_filter,
-                        distinct=True,
-                    )
-                )
-                .order_by("-count")[0]["count"]
-                / limit
-            )
-        else:
-            max_hits = 0
-        return CursorResult(
-            results=results,
-            next=next_cursor,
-            prev=prev_cursor,
-            hits=count,
-            max_hits=max_hits,
+        # Set the count queryset
+        self.count_queryset = count_queryset
+        # Set the key
+        self.desc = True if order_by and order_by.startswith("-") else False
+        # Key tuple and remove `-` if descending order by
+        self.key = (
+            order_by
+            if order_by is None or isinstance(order_by, (list, tuple, set))
+            else (order_by[1::] if order_by.startswith("-") else order_by,)
         )
 
     def __get_total_queryset(self):
         # Get total items for each group
         return (
-            self.queryset.values(self.group_by_field_name)
+            self.count_queryset.values(self.group_by_field_name)
             .annotate(
                 count=Count(
                     "id",
-                    filter=self.count_filter,
                     distinct=True,
                 )
             )
@@ -395,6 +125,7 @@ class GroupedOffsetPaginator(OffsetPaginator):
             for group_id, issues in grouped_by_field_name.items()
         }
 
+        # Return the processed results
         return processed_results
 
     def __query_grouper(self, results):
@@ -404,105 +135,37 @@ class GroupedOffsetPaginator(OffsetPaginator):
             group_value = str(result.get(self.group_by_field_name))
             if group_value in processed_results:
                 processed_results[str(group_value)]["results"].append(result)
+        # Return the processed results
         return processed_results
 
-    def process_results(self, results):
-        # Process results
-        if results:
-            if self.group_by_field_name in self.FIELD_MAPPER:
-                processed_results = self.__query_multi_grouper(results=results)
-            else:
-                processed_results = self.__query_grouper(results=results)
-        else:
-            processed_results = {}
-        return processed_results
-
-
-class SubGroupedOffsetPaginator(OffsetPaginator):
-    # Field mappers this are the fields that are m2m
-    FIELD_MAPPER = {
-        "labels__id": "label_ids",
-        "assignees__id": "assignee_ids",
-        "issue_module__module_id": "module_ids",
-    }
-
-    def __init__(
-        self,
-        queryset,
-        group_by_field_name,
-        sub_group_by_field_name,
-        group_by_fields,
-        sub_group_by_fields,
-        count_filter,
-        *args,
-        **kwargs,
-    ):
-        # Initiate the parent class for all the parameters
-        super().__init__(queryset, *args, **kwargs)
-
-        # Set the group by field name
-        self.group_by_field_name = group_by_field_name
-        self.group_by_fields = group_by_fields
-
-        # Set the sub group by field name
-        self.sub_group_by_field_name = sub_group_by_field_name
-        self.sub_group_by_fields = sub_group_by_fields
-
-        # Set the count filter - this are extra filters that need to be passed to calculate the counts with the filters
-        self.count_filter = count_filter
-
-    def get_result(self, limit=30, cursor=None):
-        # offset is page #
-        # value is page limit
-        if cursor is None:
-            cursor = Cursor(0, 0, 0)
-
-        # get the minimum value
+    # Get the results
+    def get_result(self, limit=50, is_multi_grouper=False, on_results=None):
+        # Get the min from limit and max limit
         limit = min(limit, self.max_limit)
-
-        # Adjust the initial offset and stop based on the cursor and limit
+        # Get the queryset
         queryset = self.queryset
-
-        # the current page
-        page = cursor.offset
-
-        # the offset
-        offset = cursor.offset * cursor.value
-
-        # the stop
-        stop = offset + (cursor.value or limit) + 1
-
-        if self.max_offset is not None and offset >= self.max_offset:
-            raise BadPaginationError("Pagination offset too large")
-        if offset < 0:
-            raise BadPaginationError("Pagination offset cannot be negative")
-
-        # Compute the results
-        results = {}
-
-        # Create windows for group and sub group field name
+        # Create window for all the groups
         queryset = queryset.annotate(
             row_number=Window(
                 expression=RowNumber(),
-                partition_by=[
-                    F(self.group_by_field_name),
-                    F(self.sub_group_by_field_name),
-                ],
+                partition_by=[F(self.group_by_field_name)],
                 order_by=(
                     (
-                        F(*self.key).desc(nulls_last=True)
+                        F(*self.key).desc(
+                            nulls_last=True
+                        )  # order by desc if desc is set
                         if self.desc
-                        else F(*self.key).asc(nulls_last=True)
+                        else F(*self.key).asc(
+                            nulls_last=True
+                        )  # Order by asc if set
                     ),
-                    "-created_at",
+                    F("created_at").desc(),
                 ),
             )
         )
 
-        # Filter the results
-        results = queryset.filter(
-            row_number__gt=offset, row_number__lt=stop
-        ).order_by(
+        # Filter the results by row number
+        results = queryset.filter(row_number__lt=limit + 1).order_by(
             (
                 F(*self.key).desc(nulls_last=True)
                 if self.desc
@@ -511,318 +174,24 @@ class SubGroupedOffsetPaginator(OffsetPaginator):
             F("created_at").desc(),
         )
 
-        # Adjust cursors based on the grouped results for pagination
-        next_cursor = Cursor(
-            limit,
-            page + 1,
-            False,
-            queryset.filter(row_number__gte=stop).exists(),
-        )
+        # Process the results
+        if on_results:
+            results = on_results(results)
 
-        # Add previous cursors
-        prev_cursor = Cursor(
-            limit,
-            page - 1,
-            True,
-            page > 0,
-        )
-
-        # Count the queryset
-        count = queryset.count()
-
-        # Optionally, calculate the total count and max_hits if needed
-        # This might require adjustments based on specific use cases
+        # Process results
         if results:
-            max_hits = math.ceil(
-                queryset.values(self.group_by_field_name)
-                .annotate(
-                    count=Count(
-                        "id",
-                        filter=self.count_filter,
-                        distinct=True,
-                    )
-                )
-                .order_by("-count")[0]["count"]
-                / limit
-            )
-        else:
-            max_hits = 0
-        return CursorResult(
-            results=results,
-            next=next_cursor,
-            prev=prev_cursor,
-            hits=count,
-            max_hits=max_hits,
-        )
-
-    def __get_group_total_queryset(self):
-        # Get group totals
-        return (
-            self.queryset.order_by(self.group_by_field_name)
-            .values(self.group_by_field_name)
-            .annotate(
-                count=Count(
-                    "id",
-                    filter=self.count_filter,
-                    distinct=True,
-                )
-            )
-            .distinct()
-        )
-
-    def __get_subgroup_total_queryset(self):
-        # Get subgroup totals
-        return (
-            self.queryset.values(
-                self.group_by_field_name, self.sub_group_by_field_name
-            )
-            .annotate(
-                count=Count("id", filter=self.count_filter, distinct=True)
-            )
-            .order_by()
-            .values(
-                self.group_by_field_name, self.sub_group_by_field_name, "count"
-            )
-        )
-
-    def __get_total_dict(self):
-        # Use the above to convert to dictionary of 2D objects
-        total_group_dict = {}
-        total_sub_group_dict = {}
-        for group in self.__get_group_total_queryset():
-            total_group_dict[str(group.get(self.group_by_field_name))] = (
-                total_group_dict.get(
-                    str(group.get(self.group_by_field_name)), 0
-                )
-                + (1 if group.get("count") == 0 else group.get("count"))
-            )
-
-        # Sub group total values
-        for item in self.__get_subgroup_total_queryset():
-            group = str(item[self.group_by_field_name])
-            subgroup = str(item[self.sub_group_by_field_name])
-            count = item["count"]
-
-            # Create a dictionary of group and sub group
-            if group not in total_sub_group_dict:
-                total_sub_group_dict[str(group)] = {}
-
-            # Create a dictionary of sub group
-            if subgroup not in total_sub_group_dict[group]:
-                total_sub_group_dict[str(group)][str(subgroup)] = {}
-
-            # Create a nested dictionary of group and sub group
-            total_sub_group_dict[group][subgroup] = count
-
-        return total_group_dict, total_sub_group_dict
-
-    def __get_field_dict(self):
-        # Create a field dictionary
-        total_group_dict, total_sub_group_dict = self.__get_total_dict()
-
-        # Create a dictionary of group and sub group
-        return {
-            str(group): {
-                "results": {
-                    str(sub_group): {
-                        "results": [],
-                        "total_results": total_sub_group_dict.get(
-                            str(group)
-                        ).get(str(sub_group), 0),
-                    }
-                    for sub_group in total_sub_group_dict.get(str(group), [])
-                },
-                "total_results": total_group_dict.get(str(group), 0),
-            }
-            for group in self.group_by_fields
-        }
-
-    def __query_multi_grouper(self, results):
-        # Multi grouper
-        processed_results = self.__get_field_dict()
-        # Preparing a dict to keep track of group IDs associated with each label ID
-        result_group_mapping = defaultdict(set)
-        result_sub_group_mapping = defaultdict(set)
-
-        # Iterate over results to fill the above dictionaries
-        if self.group_by_field_name in self.FIELD_MAPPER:
-            for result in results:
-                result_id = result["id"]
-                group_id = result[self.group_by_field_name]
-                result_group_mapping[str(result_id)].add(str(group_id))
-        # Use the same calculation for the sub group
-        if self.sub_group_by_field_name in self.FIELD_MAPPER:
-            for result in results:
-                result_id = result["id"]
-                sub_group_id = result[self.sub_group_by_field_name]
-                result_sub_group_mapping[str(result_id)].add(str(sub_group_id))
-
-        # Iterate over results
-        for result in results:
-            # Get the group value
-            group_value = str(result.get(self.group_by_field_name))
-            # Get the sub group value
-            sub_group_value = str(result.get(self.sub_group_by_field_name))
-            # Check if the group value is in the processed results
-            result_id = result["id"]
-
-            if (
-                group_value in processed_results
-                and sub_group_value
-                in processed_results[str(group_value)]["results"]
-            ):
-                if self.group_by_field_name in self.FIELD_MAPPER:
-                    # for multi grouper
-                    group_ids = list(result_group_mapping[str(result_id)])
-                    result[self.FIELD_MAPPER.get(self.group_by_field_name)] = (
-                        [] if "None" in group_ids else group_ids
-                    )
-                if self.sub_group_by_field_name in self.FIELD_MAPPER:
-                    sub_group_ids = list(
-                        result_sub_group_mapping[str(result_id)]
-                    )
-                    # for multi groups
-                    result[
-                        self.FIELD_MAPPER.get(self.sub_group_by_field_name)
-                    ] = ([] if "None" in sub_group_ids else sub_group_ids)
-                # If a result belongs to multiple groups, add it to each group
-                processed_results[str(group_value)]["results"][
-                    str(sub_group_value)
-                ]["results"].append(result)
-
-        return processed_results
-
-    def __query_grouper(self, results):
-        # Single grouper
-        processed_results = self.__get_field_dict()
-        for result in results:
-            group_value = str(result.get(self.group_by_field_name))
-            sub_group_value = str(result.get(self.sub_group_by_field_name))
-            processed_results[group_value]["results"][sub_group_value][
-                "results"
-            ].append(result)
-
-        return processed_results
-
-    def process_results(self, results):
-        if results:
-            if (
-                self.group_by_field_name in self.FIELD_MAPPER
-                or self.sub_group_by_field_name in self.FIELD_MAPPER
-            ):
-                # if the grouping is done through m2m then
+            # Check if the results are multi grouper
+            if is_multi_grouper:
                 processed_results = self.__query_multi_grouper(results=results)
             else:
-                # group it directly
                 processed_results = self.__query_grouper(results=results)
         else:
             processed_results = {}
-        return processed_results
 
-
-class BasePaginator:
-    """BasePaginator class can be inherited by any View to return a paginated view"""
-
-    # cursor query parameter name
-    cursor_name = "cursor"
-
-    # get the per page parameter from request
-    def get_per_page(self, request, default_per_page=100, max_per_page=100):
-        try:
-            per_page = int(request.GET.get("per_page", default_per_page))
-        except ValueError:
-            raise ParseError(detail="Invalid per_page parameter.")
-
-        max_per_page = max(max_per_page, default_per_page)
-        if per_page > max_per_page:
-            raise ParseError(
-                detail=f"Invalid per_page value. Cannot exceed {max_per_page}."
-            )
-
-        return per_page
-
-    def paginate(
-        self,
-        request,
-        on_results=None,
-        paginator=None,
-        paginator_cls=OffsetPaginator,
-        default_per_page=100,
-        max_per_page=100,
-        cursor_cls=Cursor,
-        extra_stats=None,
-        controller=None,
-        group_by_field_name=None,
-        group_by_fields=None,
-        sub_group_by_field_name=None,
-        sub_group_by_fields=None,
-        count_filter=None,
-        **paginator_kwargs,
-    ):
-        """Paginate the request"""
-        per_page = self.get_per_page(request, default_per_page, max_per_page)
-
-        # Convert the cursor value to integer and float from string
-        input_cursor = None
-        try:
-            input_cursor = cursor_cls.from_string(
-                request.GET.get(self.cursor_name, f"{per_page}:0:0"),
-            )
-        except ValueError:
-            raise ParseError(detail="Invalid cursor parameter.")
-
-        if not paginator:
-            if group_by_field_name:
-                paginator_kwargs["group_by_field_name"] = group_by_field_name
-                paginator_kwargs["group_by_fields"] = group_by_fields
-                paginator_kwargs["count_filter"] = count_filter
-
-                if sub_group_by_field_name:
-                    paginator_kwargs["sub_group_by_field_name"] = (
-                        sub_group_by_field_name
-                    )
-                    paginator_kwargs["sub_group_by_fields"] = (
-                        sub_group_by_fields
-                    )
-
-            paginator = paginator_cls(**paginator_kwargs)
-
-        try:
-            cursor_result = paginator.get_result(
-                limit=per_page, cursor=input_cursor
-            )
-        except BadPaginationError:
-            raise ParseError(detail="Error in parsing")
-
-        if on_results:
-            results = on_results(cursor_result.results)
-        else:
-            results = cursor_result.results
-
-        if group_by_field_name:
-            results = paginator.process_results(results=results)
-
-        # Add Manipulation functions to the response
-        if controller is not None:
-            results = controller(results)
-        else:
-            results = results
-
-        # Return the response
         response = Response(
             {
-                "grouped_by": group_by_field_name,
-                "sub_grouped_by": sub_group_by_field_name,
-                "total_count": (cursor_result.hits),
-                "next_cursor": str(cursor_result.next),
-                "prev_cursor": str(cursor_result.prev),
-                "next_page_results": cursor_result.next.has_results,
-                "prev_page_results": cursor_result.prev.has_results,
-                "count": cursor_result.__len__(),
-                "total_pages": cursor_result.max_hits,
-                "total_results": cursor_result.hits,
-                "extra_stats": extra_stats,
-                "results": results,
+                "results": processed_results,
+                "total_count": self.count_queryset.count(),
             }
         )
 

apiserver/plane/utils/paginator/__init__.py

@@ -0,0 +1,3 @@
+from .base import BasePaginator
+from .group_paginator import GroupedOffsetPaginator
+from .sub_group_paginator import SubGroupedOffsetPaginator

apiserver/plane/utils/paginator/base.py

@@ -0,0 +1,114 @@
+# Third party imports
+from rest_framework.exceptions import ParseError
+from rest_framework.response import Response
+
+# Module imports
+from .list_paginator import OffsetPaginator
+from .paginator_util import Cursor, BadPaginationError
+
+
+class BasePaginator:
+    """BasePaginator class can be inherited by any View to return a paginated view"""
+
+    # cursor query parameter name
+    cursor_name = "cursor"
+
+    # get the per page parameter from request
+    def get_per_page(self, request, default_per_page=100, max_per_page=100):
+        try:
+            per_page = int(request.GET.get("per_page", default_per_page))
+        except ValueError:
+            raise ParseError(detail="Invalid per_page parameter.")
+
+        max_per_page = max(max_per_page, default_per_page)
+        if per_page > max_per_page:
+            raise ParseError(
+                detail=f"Invalid per_page value. Cannot exceed {max_per_page}."
+            )
+
+        return per_page
+
+    def paginate(
+        self,
+        request,
+        on_results=None,
+        paginator=None,
+        paginator_cls=OffsetPaginator,
+        default_per_page=100,
+        max_per_page=100,
+        cursor_cls=Cursor,
+        extra_stats=None,
+        controller=None,
+        group_by_field_name=None,
+        group_by_fields=None,
+        sub_group_by_field_name=None,
+        sub_group_by_fields=None,
+        **paginator_kwargs,
+    ):
+        """Paginate the request"""
+        per_page = self.get_per_page(request, default_per_page, max_per_page)
+
+        # Convert the cursor value to integer and float from string
+        input_cursor = None
+        try:
+            input_cursor = cursor_cls.from_string(
+                request.GET.get(self.cursor_name, f"{per_page}:0:0"),
+            )
+        except ValueError:
+            raise ParseError(detail="Invalid cursor parameter.")
+
+        if not paginator:
+            if group_by_field_name:
+                paginator_kwargs["group_by_field_name"] = group_by_field_name
+                paginator_kwargs["group_by_fields"] = group_by_fields
+
+                if sub_group_by_field_name:
+                    paginator_kwargs["sub_group_by_field_name"] = (
+                        sub_group_by_field_name
+                    )
+                    paginator_kwargs["sub_group_by_fields"] = (
+                        sub_group_by_fields
+                    )
+
+            paginator = paginator_cls(**paginator_kwargs)
+
+        try:
+            cursor_result = paginator.get_result(
+                limit=per_page, cursor=input_cursor
+            )
+        except BadPaginationError:
+            raise ParseError(detail="Error in parsing")
+
+        if on_results:
+            results = on_results(cursor_result.results)
+        else:
+            results = cursor_result.results
+
+        if group_by_field_name:
+            results = paginator.process_results(results=results)
+
+        # Add Manipulation functions to the response
+        if controller is not None:
+            results = controller(results)
+        else:
+            results = results
+
+        # Return the response
+        response = Response(
+            {
+                "grouped_by": group_by_field_name,
+                "sub_grouped_by": sub_group_by_field_name,
+                "total_count": (cursor_result.hits),
+                "next_cursor": str(cursor_result.next),
+                "prev_cursor": str(cursor_result.prev),
+                "next_page_results": cursor_result.next.has_results,
+                "prev_page_results": cursor_result.prev.has_results,
+                "count": cursor_result.__len__(),
+                "total_pages": cursor_result.max_hits,
+                "total_results": cursor_result.hits,
+                "extra_stats": extra_stats,
+                "results": results,
+            }
+        )
+
+        return response

apiserver/plane/utils/paginator/group_paginator.py

@@ -0,0 +1,238 @@
+# Python imports
+import math
+from collections import defaultdict
+
+# Django imports
+from django.db.models import Count, F, Window
+from django.db.models.functions import RowNumber
+
+# Module imports
+from .list_paginator import OffsetPaginator
+from .paginator_util import Cursor, CursorResult, BadPaginationError
+
+
+class GroupedOffsetPaginator(OffsetPaginator):
+
+    # Field mappers - list m2m fields here
+    FIELD_MAPPER = {
+        "labels__id": "label_ids",
+        "assignees__id": "assignee_ids",
+        "issue_module__module_id": "module_ids",
+    }
+
+    def __init__(
+        self,
+        queryset,
+        group_by_field_name,
+        group_by_fields,
+        *args,
+        **kwargs,
+    ):
+        # Initiate the parent class for all the parameters
+        super().__init__(queryset, *args, **kwargs)
+        # Set the group by field name
+        self.group_by_field_name = group_by_field_name
+        # Set the group by fields
+        self.group_by_fields = group_by_fields
+
+    def get_result(self, limit=50, cursor=None):
+        # offset is page #
+        # value is page limit
+        if cursor is None:
+            cursor = Cursor(0, 0, 0)
+
+        limit = min(limit, self.max_limit)
+
+        # Adjust the initial offset and stop based on the cursor and limit
+        queryset = self.queryset
+
+        page = cursor.offset
+        offset = cursor.offset * cursor.value
+        stop = offset + (cursor.value or limit) + 1
+
+        # Check if the offset is greater than the max offset
+        if self.max_offset is not None and offset >= self.max_offset:
+            raise BadPaginationError("Pagination offset too large")
+
+        # Check if the offset is less than 0
+        if offset < 0:
+            raise BadPaginationError("Pagination offset cannot be negative")
+
+        # Compute the results
+        results = {}
+        # Create window for all the groups
+        queryset = queryset.annotate(
+            row_number=Window(
+                expression=RowNumber(),
+                partition_by=[F(self.group_by_field_name)],
+                order_by=(
+                    (
+                        F(*self.key).desc(
+                            nulls_last=True
+                        )  # order by desc if desc is set
+                        if self.desc
+                        else F(*self.key).asc(
+                            nulls_last=True
+                        )  # Order by asc if set
+                    ),
+                    F("created_at").desc(),
+                ),
+            )
+        )
+        # Filter the results by row number
+        results = queryset.filter(
+            row_number__gt=offset, row_number__lt=stop
+        ).order_by(
+            (
+                F(*self.key).desc(nulls_last=True)
+                if self.desc
+                else F(*self.key).asc(nulls_last=True)
+            ),
+            F("created_at").desc(),
+        )
+
+        # Adjust cursors based on the grouped results for pagination
+        next_cursor = Cursor(
+            limit,
+            page + 1,
+            False,
+            queryset.filter(row_number__gte=stop).exists(),
+        )
+
+        # Add previous cursors
+        prev_cursor = Cursor(
+            limit,
+            page - 1,
+            True,
+            page > 0,
+        )
+
+        # Count the queryset
+        count = self.count_queryset.count()
+
+        # Optionally, calculate the total count and max_hits if needed
+        # This might require adjustments based on specific use cases
+        if results:
+            max_hits = math.ceil(
+                self.count_queryset.values(self.group_by_field_name)
+                .annotate(
+                    count=Count(
+                        "id",
+                        distinct=True,
+                    )
+                )
+                .order_by("-count")[0]["count"]
+                / limit
+            )
+        else:
+            max_hits = 0
+        return CursorResult(
+            results=results,
+            next=next_cursor,
+            prev=prev_cursor,
+            hits=count,
+            max_hits=max_hits,
+        )
+
+    def __get_total_queryset(self):
+        # Get total items for each group
+        return (
+            self.count_queryset.values(self.group_by_field_name)
+            .annotate(
+                count=Count(
+                    "id",
+                    distinct=True,
+                )
+            )
+            .order_by()
+        )
+
+    def __get_total_dict(self):
+        # Convert the total into dictionary of keys as group name and value as the total
+        total_group_dict = {}
+        for group in self.__get_total_queryset():
+            total_group_dict[str(group.get(self.group_by_field_name))] = (
+                total_group_dict.get(
+                    str(group.get(self.group_by_field_name)), 0
+                )
+                + (1 if group.get("count") == 0 else group.get("count"))
+            )
+        return total_group_dict
+
+    def __get_field_dict(self):
+        # Create a field dictionary
+        total_group_dict = self.__get_total_dict()
+        return {
+            str(field): {
+                "results": [],
+                "total_results": total_group_dict.get(str(field), 0),
+            }
+            for field in self.group_by_fields
+        }
+
+    def __result_already_added(self, result, group):
+        # Check if the result is already added then add it
+        for existing_issue in group:
+            if existing_issue["id"] == result["id"]:
+                return True
+        return False
+
+    def __query_multi_grouper(self, results):
+        # Grouping for m2m values
+        total_group_dict = self.__get_total_dict()
+
+        # Preparing a dict to keep track of group IDs associated with each entity ID
+        result_group_mapping = defaultdict(set)
+        # Preparing a dict to group result by group ID
+        grouped_by_field_name = defaultdict(list)
+
+        # Iterate over results to fill the above dictionaries
+        for result in results:
+            result_id = result["id"]
+            group_id = result[self.group_by_field_name]
+            result_group_mapping[str(result_id)].add(str(group_id))
+
+        # Adding group_ids key to each issue and grouping by group_name
+        for result in results:
+            result_id = result["id"]
+            group_ids = list(result_group_mapping[str(result_id)])
+            result[self.FIELD_MAPPER.get(self.group_by_field_name)] = (
+                [] if "None" in group_ids else group_ids
+            )
+            # If a result belongs to multiple groups, add it to each group
+            for group_id in group_ids:
+                if not self.__result_already_added(
+                    result, grouped_by_field_name[group_id]
+                ):
+                    grouped_by_field_name[group_id].append(result)
+
+        # Convert grouped_by_field_name back to a list for each group
+        processed_results = {
+            str(group_id): {
+                "results": issues,
+                "total_results": total_group_dict.get(str(group_id)),
+            }
+            for group_id, issues in grouped_by_field_name.items()
+        }
+
+        return processed_results
+
+    def __query_grouper(self, results):
+        # Grouping for values that are not m2m
+        processed_results = self.__get_field_dict()
+        for result in results:
+            group_value = str(result.get(self.group_by_field_name))
+            if group_value in processed_results:
+                processed_results[str(group_value)]["results"].append(result)
+        return processed_results
+
+    def process_results(self, results):
+        # Process results
+        if results:
+            if self.group_by_field_name in self.FIELD_MAPPER:
+                processed_results = self.__query_multi_grouper(results=results)
+            else:
+                processed_results = self.__query_grouper(results=results)
+        else:
+            processed_results = {}
+        return processed_results

apiserver/plane/utils/paginator/list_paginator.py

@@ -0,0 +1,114 @@
+# Python imports
+import math
+
+# Django imports
+from django.db.models import F
+
+# Module imports
+from .paginator_util import Cursor, CursorResult, BadPaginationError, MAX_LIMIT
+
+
+class OffsetPaginator:
+    """
+    The Offset paginator using the offset and limit
+    with cursor controls
+    http://example.com/api/users/?cursor=10.0.0&per_page=10
+    cursor=limit,offset=page,
+    """
+
+    def __init__(
+        self,
+        queryset,
+        count_queryset,
+        order_by=None,
+        max_limit=MAX_LIMIT,
+        max_offset=None,
+        on_results=None,
+    ):
+        # Key tuple and remove `-` if descending order by
+        self.key = (
+            order_by
+            if order_by is None or isinstance(order_by, (list, tuple, set))
+            else (order_by[1::] if order_by.startswith("-") else order_by,)
+        )
+        # Set desc to true when `-` exists in the order by
+        self.desc = True if order_by and order_by.startswith("-") else False
+        # Set the queryset
+        self.queryset = queryset
+        # Set the max limit
+        self.max_limit = max_limit
+        # Set the max offset
+        self.max_offset = max_offset
+        # Set the on results
+        self.on_results = on_results
+        # Set the count queryset
+        self.count_queryset = count_queryset
+
+    def get_result(self, limit=100, cursor=None):
+        # offset is page #
+        # value is page limit
+        if cursor is None:
+            cursor = Cursor(0, 0, 0)
+
+        # Get the min from limit and max limit
+        limit = min(limit, self.max_limit)
+
+        # queryset
+        queryset = self.queryset
+        # Order the queryset
+        if self.key:
+            queryset = queryset.order_by(
+                (
+                    F(*self.key).desc(nulls_last=True)
+                    if self.desc
+                    else F(*self.key).asc(nulls_last=True)
+                ),
+                "-created_at",
+            )
+        # The current page
+        page = cursor.offset
+        # The offset
+        offset = cursor.offset * cursor.value
+        # The stop
+        stop = offset + (cursor.value or limit) + 1
+
+        if self.max_offset is not None and offset >= self.max_offset:
+            raise BadPaginationError("Pagination offset too large")
+        if offset < 0:
+            raise BadPaginationError("Pagination offset cannot be negative")
+
+        # Compute the results
+        results = queryset[offset:stop]
+
+        if cursor.value != limit:
+            results = results[-(limit + 1) :]
+
+        # Adjust cursors based on the results for pagination
+        next_cursor = Cursor(limit, page + 1, False, results.count() > limit)
+        # If the page is greater than 0, then set the previous cursor
+        prev_cursor = Cursor(limit, page - 1, True, page > 0)
+
+        # Process the results
+        results = results[:limit]
+
+        # Process the results
+        if self.on_results:
+            results = self.on_results(results)
+
+        # Count the queryset
+        count = self.count_queryset.count()
+
+        # Optionally, calculate the total count and max_hits if needed
+        max_hits = math.ceil(count / limit)
+
+        # Return the cursor results
+        return CursorResult(
+            results=results,
+            next=next_cursor,
+            prev=prev_cursor,
+            hits=count,
+            max_hits=max_hits,
+        )
+
+    def process_results(self, results):
+        raise NotImplementedError

apiserver/plane/utils/paginator/paginator_util.py

@@ -0,0 +1,77 @@
+# Python imports
+from collections.abc import Sequence
+
+
+MAX_LIMIT = 100
+
+
+class BadPaginationError(Exception):
+    pass
+
+
+class Cursor:
+    # The cursor value
+    def __init__(self, value, offset=0, is_prev=False, has_results=None):
+        self.value = value
+        self.offset = int(offset)
+        self.is_prev = bool(is_prev)
+        self.has_results = has_results
+
+    # Return the cursor value in string format
+    def __str__(self):
+        return f"{self.value}:{self.offset}:{int(self.is_prev)}"
+
+    # Return the cursor value
+    def __eq__(self, other):
+        return all(
+            getattr(self, attr) == getattr(other, attr)
+            for attr in ("value", "offset", "is_prev", "has_results")
+        )
+
+    # Return the representation of the cursor
+    def __repr__(self):
+        return f"{type(self).__name__,}: value={self.value} offset={self.offset}, is_prev={int(self.is_prev)}"
+
+    # Return if the cursor is true
+    def __bool__(self):
+        return bool(self.has_results)
+
+    @classmethod
+    def from_string(cls, value):
+        """Return the cursor value from string format"""
+        try:
+            bits = value.split(":")
+            if len(bits) != 3:
+                raise ValueError(
+                    "Cursor must be in the format 'value:offset:is_prev'"
+                )
+
+            value = float(bits[0]) if "." in bits[0] else int(bits[0])
+            return cls(value, int(bits[1]), bool(int(bits[2])))
+        except (TypeError, ValueError) as e:
+            raise ValueError(f"Invalid cursor format: {e}")
+
+
+class CursorResult(Sequence):
+    def __init__(self, results, next, prev, hits=None, max_hits=None):
+        self.results = results
+        self.next = next
+        self.prev = prev
+        self.hits = hits
+        self.max_hits = max_hits
+
+    def __len__(self):
+        # Return the length of the results
+        return len(self.results)
+
+    def __iter__(self):
+        # Return the iterator of the results
+        return iter(self.results)
+
+    def __getitem__(self, key):
+        # Return the results based on the key
+        return self.results[key]
+
+    def __repr__(self):
+        # Return the representation of the results
+        return f"<{type(self).__name__}: results={len(self.results)}>"

apiserver/plane/utils/paginator/sub_group_paginator.py

@@ -0,0 +1,310 @@
+# Python imports
+import math
+from collections import defaultdict
+
+# Django imports
+from django.db.models import Count, F, Window
+from django.db.models.functions import RowNumber
+
+# Module imports
+from .list_paginator import OffsetPaginator
+from .paginator_util import Cursor, CursorResult, BadPaginationError
+
+
+class SubGroupedOffsetPaginator(OffsetPaginator):
+    # Field mappers this are the fields that are m2m
+    FIELD_MAPPER = {
+        "labels__id": "label_ids",
+        "assignees__id": "assignee_ids",
+        "issue_module__module_id": "module_ids",
+    }
+
+    def __init__(
+        self,
+        queryset,
+        group_by_field_name,
+        sub_group_by_field_name,
+        group_by_fields,
+        sub_group_by_fields,
+        count_filter,
+        *args,
+        **kwargs,
+    ):
+        # Initiate the parent class for all the parameters
+        super().__init__(queryset, *args, **kwargs)
+
+        # Set the group by field name
+        self.group_by_field_name = group_by_field_name
+        self.group_by_fields = group_by_fields
+
+        # Set the sub group by field name
+        self.sub_group_by_field_name = sub_group_by_field_name
+        self.sub_group_by_fields = sub_group_by_fields
+
+    def get_result(self, limit=30, cursor=None):
+        # offset is page #
+        # value is page limit
+        if cursor is None:
+            cursor = Cursor(0, 0, 0)
+
+        # get the minimum value
+        limit = min(limit, self.max_limit)
+
+        # Adjust the initial offset and stop based on the cursor and limit
+        queryset = self.queryset
+
+        # the current page
+        page = cursor.offset
+
+        # the offset
+        offset = cursor.offset * cursor.value
+
+        # the stop
+        stop = offset + (cursor.value or limit) + 1
+
+        if self.max_offset is not None and offset >= self.max_offset:
+            raise BadPaginationError("Pagination offset too large")
+        if offset < 0:
+            raise BadPaginationError("Pagination offset cannot be negative")
+
+        # Compute the results
+        results = {}
+
+        # Create windows for group and sub group field name
+        queryset = queryset.annotate(
+            row_number=Window(
+                expression=RowNumber(),
+                partition_by=[
+                    F(self.group_by_field_name),
+                    F(self.sub_group_by_field_name),
+                ],
+                order_by=(
+                    (
+                        F(*self.key).desc(nulls_last=True)
+                        if self.desc
+                        else F(*self.key).asc(nulls_last=True)
+                    ),
+                    "-created_at",
+                ),
+            )
+        )
+
+        # Filter the results
+        results = queryset.filter(
+            row_number__gt=offset, row_number__lt=stop
+        ).order_by(
+            (
+                F(*self.key).desc(nulls_last=True)
+                if self.desc
+                else F(*self.key).asc(nulls_last=True)
+            ),
+            F("created_at").desc(),
+        )
+
+        # Adjust cursors based on the grouped results for pagination
+        next_cursor = Cursor(
+            limit,
+            page + 1,
+            False,
+            queryset.filter(row_number__gte=stop).exists(),
+        )
+
+        # Add previous cursors
+        prev_cursor = Cursor(
+            limit,
+            page - 1,
+            True,
+            page > 0,
+        )
+
+        # Count the queryset
+        count = self.count_queryset.count()
+
+        # Optionally, calculate the total count and max_hits if needed
+        # This might require adjustments based on specific use cases
+        if results:
+            max_hits = math.ceil(
+                self.count_queryset.values(self.group_by_field_name)
+                .annotate(
+                    count=Count(
+                        "id",
+                        filter=self.count_filter,
+                        distinct=True,
+                    )
+                )
+                .order_by("-count")[0]["count"]
+                / limit
+            )
+        else:
+            max_hits = 0
+        return CursorResult(
+            results=results,
+            next=next_cursor,
+            prev=prev_cursor,
+            hits=count,
+            max_hits=max_hits,
+        )
+
+    def __get_group_total_queryset(self):
+        # Get group totals
+        return (
+            self.count_queryset.order_by(self.group_by_field_name)
+            .values(self.group_by_field_name)
+            .annotate(
+                count=Count(
+                    "id",
+                    filter=self.count_filter,
+                    distinct=True,
+                )
+            )
+            .distinct()
+        )
+
+    def __get_subgroup_total_queryset(self):
+        # Get subgroup totals
+        return (
+            self.count_queryset.values(
+                self.group_by_field_name, self.sub_group_by_field_name
+            )
+            .annotate(
+                count=Count("id", filter=self.count_filter, distinct=True)
+            )
+            .order_by()
+            .values(
+                self.group_by_field_name, self.sub_group_by_field_name, "count"
+            )
+        )
+
+    def __get_total_dict(self):
+        # Use the above to convert to dictionary of 2D objects
+        total_group_dict = {}
+        total_sub_group_dict = {}
+        for group in self.__get_group_total_queryset():
+            total_group_dict[str(group.get(self.group_by_field_name))] = (
+                total_group_dict.get(
+                    str(group.get(self.group_by_field_name)), 0
+                )
+                + (1 if group.get("count") == 0 else group.get("count"))
+            )
+
+        # Sub group total values
+        for item in self.__get_subgroup_total_queryset():
+            group = str(item[self.group_by_field_name])
+            subgroup = str(item[self.sub_group_by_field_name])
+            count = item["count"]
+
+            # Create a dictionary of group and sub group
+            if group not in total_sub_group_dict:
+                total_sub_group_dict[str(group)] = {}
+
+            # Create a dictionary of sub group
+            if subgroup not in total_sub_group_dict[group]:
+                total_sub_group_dict[str(group)][str(subgroup)] = {}
+
+            # Create a nested dictionary of group and sub group
+            total_sub_group_dict[group][subgroup] = count
+
+        return total_group_dict, total_sub_group_dict
+
+    def __get_field_dict(self):
+        # Create a field dictionary
+        total_group_dict, total_sub_group_dict = self.__get_total_dict()
+
+        # Create a dictionary of group and sub group
+        return {
+            str(group): {
+                "results": {
+                    str(sub_group): {
+                        "results": [],
+                        "total_results": total_sub_group_dict.get(
+                            str(group)
+                        ).get(str(sub_group), 0),
+                    }
+                    for sub_group in total_sub_group_dict.get(str(group), [])
+                },
+                "total_results": total_group_dict.get(str(group), 0),
+            }
+            for group in self.group_by_fields
+        }
+
+    def __query_multi_grouper(self, results):
+        # Multi grouper
+        processed_results = self.__get_field_dict()
+        # Preparing a dict to keep track of group IDs associated with each label ID
+        result_group_mapping = defaultdict(set)
+        result_sub_group_mapping = defaultdict(set)
+
+        # Iterate over results to fill the above dictionaries
+        if self.group_by_field_name in self.FIELD_MAPPER:
+            for result in results:
+                result_id = result["id"]
+                group_id = result[self.group_by_field_name]
+                result_group_mapping[str(result_id)].add(str(group_id))
+        # Use the same calculation for the sub group
+        if self.sub_group_by_field_name in self.FIELD_MAPPER:
+            for result in results:
+                result_id = result["id"]
+                sub_group_id = result[self.sub_group_by_field_name]
+                result_sub_group_mapping[str(result_id)].add(str(sub_group_id))
+
+        # Iterate over results
+        for result in results:
+            # Get the group value
+            group_value = str(result.get(self.group_by_field_name))
+            # Get the sub group value
+            sub_group_value = str(result.get(self.sub_group_by_field_name))
+            # Check if the group value is in the processed results
+            result_id = result["id"]
+
+            if (
+                group_value in processed_results
+                and sub_group_value
+                in processed_results[str(group_value)]["results"]
+            ):
+                if self.group_by_field_name in self.FIELD_MAPPER:
+                    # for multi grouper
+                    group_ids = list(result_group_mapping[str(result_id)])
+                    result[self.FIELD_MAPPER.get(self.group_by_field_name)] = (
+                        [] if "None" in group_ids else group_ids
+                    )
+                if self.sub_group_by_field_name in self.FIELD_MAPPER:
+                    sub_group_ids = list(
+                        result_sub_group_mapping[str(result_id)]
+                    )
+                    # for multi groups
+                    result[
+                        self.FIELD_MAPPER.get(self.sub_group_by_field_name)
+                    ] = ([] if "None" in sub_group_ids else sub_group_ids)
+                # If a result belongs to multiple groups, add it to each group
+                processed_results[str(group_value)]["results"][
+                    str(sub_group_value)
+                ]["results"].append(result)
+
+        return processed_results
+
+    def __query_grouper(self, results):
+        # Single grouper
+        processed_results = self.__get_field_dict()
+        for result in results:
+            group_value = str(result.get(self.group_by_field_name))
+            sub_group_value = str(result.get(self.sub_group_by_field_name))
+            processed_results[group_value]["results"][sub_group_value][
+                "results"
+            ].append(result)
+
+        return processed_results
+
+    def process_results(self, results):
+        if results:
+            if (
+                self.group_by_field_name in self.FIELD_MAPPER
+                or self.sub_group_by_field_name in self.FIELD_MAPPER
+            ):
+                # if the grouping is done through m2m then
+                processed_results = self.__query_multi_grouper(results=results)
+            else:
+                # group it directly
+                processed_results = self.__query_grouper(results=results)
+        else:
+            processed_results = {}
+        return processed_results

apiserver/requirements/base.txt

@@ -1,7 +1,7 @@
 # base requirements
 
 # django
-Django==4.2.15
+Django==4.2.14
 # rest framework
 djangorestframework==3.15.2
 # postgres 

deploy/selfhost/README.md

@@ -10,7 +10,7 @@ Let's get started!
 
 <details>
   <summary>Option 1 - Using Cloud Server</summary>
-  <p>Best way to start is to create EC2 machine on AWS. It must have minimum of 2vCPU and 4GB RAM.</p>
+  <p>Best way to start is to create EC2 maching on AWS. It must of minimum t3.medium/t3a/medium</p>
   <p>Run the below command to install docker engine.</p>
 
 `curl -fsSL https://get.docker.com | sh -`
@@ -67,6 +67,23 @@ curl -fsSL -o setup.sh https://raw.githubusercontent.com/makeplane/plane/master/
 chmod +x setup.sh
 ```
 
+<details>
+    <summary>Downloading Preview Release</summary>
+
+```
+mkdir plane-selfhost
+
+cd plane-selfhost
+
+export RELEASE=preview
+
+curl -fsSL https://raw.githubusercontent.com/makeplane/plane/$BRANCH/deploy/selfhost/install.sh | sed  's@BRANCH=master@BRANCH='"$RELEASE"'@' > setup.sh
+
+chmod +x setup.sh
+```
+
+</details>
+
 ---
 
 ### Proceed with setup
@@ -97,7 +114,7 @@ This will create a create a folder `plane-app` or `plane-app-preview` (in case o
 - `docker-compose.yaml`
 - `plane.env`
 
-Again the `options [1-8]` will be popped up and this time hit `8` to exit.
+Again the `options [1-7]` will be popped up and this time hit `7` to exit.
 
 ---
 
@@ -219,7 +236,7 @@ Select a Action you want to perform:
 Action [2]: 5
 ```
 
-By choosing this, it will stop the services and then will download the latest `docker-compose.yaml` and `plane.env`.
+By choosing this, it will stop the services and then will download the latest `docker-compose.yaml` and `variables-upgrade.env`. Here system will not replace `.env` with the new one.
 
 You must expect the below message
 
@@ -227,7 +244,7 @@ You must expect the below message
 
 Once done, choose `8` to exit from prompt.
 
-> It is very important for you to validate the `plane.env` for the new changes.
+> It is very important for you to compare the 2 files `variables-upgrade.env` and `.env`. Copy the newly added variable from downloaded file to `.env` and set the expected values.
 
 Once done with making changes in `plane.env` file, jump on to `Start Server`
 
@@ -355,60 +372,8 @@ Backup completed successfully. Backup files are stored in /....../plane-app/back
 
 ---
 
-### Restore Data
 
-When you want to restore the previously backed-up data, follow the instructions below.
-
-1. Make sure that Plane-CE is installed, started, and then stopped. This ensures that the Docker volumes are created.
-
-1. Download the restore script using the command below. We suggest downloading it in the same folder as `setup.sh`.
-
-   ```bash
-   curl -fsSL -o restore.sh https://raw.githubusercontent.com/makeplane/plane/master/deploy/selfhost/restore.sh
-   chmod +x restore.sh
-   ```
-
-1. Execute the command below to restore your data.
-
-   ```bash
-   ./restore.sh <path to backup folder containing *.tar.gz files>
-   ```
-
-   As an example, for a backup folder `/opt/plane-selfhost/plane-app/backup/20240722-0914`, expect the response below:
-
-   ```bash
-   --------------------------------------------
-    ____  _                          ///////// 
-   |  _ \| | __ _ _ __   ___         ///////// 
-   | |_) | |/ _` | '_ \ / _ \   /////    ///// 
-   |  __/| | (_| | | | |  __/   /////    ///// 
-   |_|   |_|\__,_|_| |_|\___|        ////      
-                                    ////      
-   --------------------------------------------
-   Project management tool from the future
-   --------------------------------------------
-   Found /opt/plane-selfhost/plane-app/backup/20240722-0914/pgdata.tar.gz
-   .....Restoring plane-app_pgdata
-   .....Successfully restored volume plane-app_pgdata from pgdata.tar.gz
-
-   Found /opt/plane-selfhost/plane-app/backup/20240722-0914/redisdata.tar.gz
-   .....Restoring plane-app_redisdata
-   .....Successfully restored volume plane-app_redisdata from redisdata.tar.gz
-
-   Found /opt/plane-selfhost/plane-app/backup/20240722-0914/uploads.tar.gz
-   .....Restoring plane-app_uploads
-   .....Successfully restored volume plane-app_uploads from uploads.tar.gz
-
-
-   Restore completed successfully.
-   ```
-
-1. Start the Plane instance using `./setup.sh start`.
-
----
-
-<details>
-   <summary><h2>Upgrading from v0.13.2 to v0.14.x</h2></summary>
+## Upgrading from v0.13.2 to v0.14.x
 
 This is one time activity for users who are upgrading from v0.13.2 to v0.14.0
 
@@ -480,4 +445,3 @@ In case the suffixes are wrong or the mentioned volumes are not found, you will
 In case of successful migration, it will be a silent exit without error.
 
 Now its time to restart v0.14.0 setup.
-</details>

deploy/selfhost/build.yml

@@ -1,3 +1,5 @@
+version: "3.8"
+
 services:
   web:
     image: ${DOCKERHUB_USER:-local}/plane-frontend:${APP_RELEASE:-latest}

deploy/selfhost/docker-compose.yml

@@ -44,7 +44,7 @@ services:
     <<: *app-env
     image: ${DOCKERHUB_USER:-makeplane}/plane-frontend:${APP_RELEASE:-stable}
     platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
+    pull_policy: ${PULL_POLICY:-always}
     restart: unless-stopped
     command: node web/server.js web
     deploy:
@@ -57,7 +57,7 @@ services:
     <<: *app-env
     image: ${DOCKERHUB_USER:-makeplane}/plane-space:${APP_RELEASE:-stable}
     platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
+    pull_policy: ${PULL_POLICY:-always}
     restart: unless-stopped
     command: node space/server.js space
     deploy:
@@ -71,7 +71,7 @@ services:
     <<: *app-env
     image: ${DOCKERHUB_USER:-makeplane}/plane-admin:${APP_RELEASE:-stable}
     platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
+    pull_policy: ${PULL_POLICY:-always}
     restart: unless-stopped
     command: node admin/server.js admin
     deploy:
@@ -84,7 +84,7 @@ services:
     <<: *app-env
     image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
     platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
+    pull_policy: ${PULL_POLICY:-always}
     restart: unless-stopped
     command: ./bin/docker-entrypoint-api.sh
     deploy:
@@ -99,7 +99,7 @@ services:
     <<: *app-env
     image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
     platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
+    pull_policy: ${PULL_POLICY:-always}
     restart: unless-stopped
     command: ./bin/docker-entrypoint-worker.sh
     volumes:
@@ -113,7 +113,7 @@ services:
     <<: *app-env
     image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
     platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
+    pull_policy: ${PULL_POLICY:-always}
     restart: unless-stopped
     command: ./bin/docker-entrypoint-beat.sh
     volumes:
@@ -127,7 +127,7 @@ services:
     <<: *app-env
     image: ${DOCKERHUB_USER:-makeplane}/plane-backend:${APP_RELEASE:-stable}
     platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
+    pull_policy: ${PULL_POLICY:-always}
     restart: "no"
     command: ./bin/docker-entrypoint-migrator.sh
     volumes:
@@ -167,8 +167,7 @@ services:
     <<: *app-env
     image: ${DOCKERHUB_USER:-makeplane}/plane-proxy:${APP_RELEASE:-stable}
     platform: ${DOCKER_PLATFORM:-}
-    pull_policy: if_not_present
-    restart: unless-stopped
+    pull_policy: ${PULL_POLICY:-always}
     ports:
       - ${NGINX_PORT}:80
     depends_on:

deploy/selfhost/install.sh

@@ -1,27 +1,18 @@
 #!/bin/bash
 
-BRANCH=${BRANCH:-master}
+BRANCH=master
 SCRIPT_DIR=$PWD
 SERVICE_FOLDER=plane-app
 PLANE_INSTALL_DIR=$PWD/$SERVICE_FOLDER
-export APP_RELEASE="stable"
+export APP_RELEASE=$BRANCH
 export DOCKERHUB_USER=makeplane
-export PULL_POLICY=${PULL_POLICY:-if_not_present}
+export PULL_POLICY=always
+USE_GLOBAL_IMAGES=1
 
-CPU_ARCH=$(uname -m)
-OS_NAME=$(uname)
-UPPER_CPU_ARCH=$(tr '[:lower:]' '[:upper:]' <<< "$CPU_ARCH")
-
-mkdir -p $PLANE_INSTALL_DIR/archive
-DOCKER_FILE_PATH=$PLANE_INSTALL_DIR/docker-compose.yaml
-DOCKER_ENV_PATH=$PLANE_INSTALL_DIR/plane.env
-
-SED_PREFIX=()
-if [ "$OS_NAME" == "Darwin" ]; then
-  SED_PREFIX=("-i" "")
-else
-  SED_PREFIX=("-i")
-fi
+RED='\033[0;31m'
+YELLOW='\033[1;33m'
+GREEN='\033[0;32m'
+NC='\033[0m' # No Color
 
 function print_header() {
 clear
@@ -40,191 +31,65 @@ Project management tool from the future
 EOF
 }
 
-function spinner() {
-    local pid=$1
-    local delay=.5
-    local spinstr='|/-\'
-
-    if ! ps -p "$pid" > /dev/null; then  
-        echo "Invalid PID: $pid"  
-        return 1  
-    fi  
-    while ps -p "$pid" > /dev/null; do  
-        local temp=${spinstr#?}
-        printf " [%c]  " "$spinstr" >&2
-        local spinstr=$temp${spinstr%"$temp"}
-        sleep $delay
-        printf "\b\b\b\b\b\b" >&2
-    done
-    printf "    \b\b\b\b" >&2
-}
-
-function initialize(){
-    printf "Please wait while we check the availability of Docker images for the selected release ($APP_RELEASE) with ${UPPER_CPU_ARCH} support." >&2
-
-    if [ "$CUSTOM_BUILD" == "true" ]; then
+function buildLocalImage() {
+    if [ "$1" == "--force-build" ]; then
+        DO_BUILD="1"
+    elif [ "$1" == "--skip-build" ]; then
+        DO_BUILD="2"
+    else 
+        printf "\n" >&2
+        printf "${YELLOW}You are on ${CPU_ARCH} cpu architecture. ${NC}\n" >&2
+        printf "${YELLOW}Since the prebuilt ${CPU_ARCH} compatible docker images are not available for, we will be running the docker build on this system. ${NC} \n" >&2
+        printf "${YELLOW}This might take ${YELLOW}5-30 min based on your system's hardware configuration. \n ${NC} \n" >&2
+        printf "\n" >&2
+        printf "${GREEN}Select an option to proceed: ${NC}\n" >&2
+        printf "   1) Build Fresh Images \n" >&2
+        printf "   2) Skip Building Images \n" >&2
+        printf "   3) Exit \n" >&2
+        printf "\n" >&2
+        read -p "Select Option [1]: " DO_BUILD
+        until [[ -z "$DO_BUILD" || "$DO_BUILD" =~ ^[1-3]$ ]]; do
+            echo "$DO_BUILD: invalid selection." >&2
+            read -p "Select Option [1]: " DO_BUILD
+        done
         echo "" >&2
-        echo "" >&2
-        echo "${UPPER_CPU_ARCH} images are not available for selected release ($APP_RELEASE)." >&2
-        echo "build"
-        return 1
     fi
 
-    local IMAGE_NAME=makeplane/plane-proxy
-    local IMAGE_TAG=${APP_RELEASE}
-    docker manifest inspect "${IMAGE_NAME}:${IMAGE_TAG}" | grep -q "\"architecture\": \"${CPU_ARCH}\"" &
-    local pid=$!
-    spinner "$pid"
-    
-    echo "" >&2
+    if [ "$DO_BUILD" == "1" ] || [ "$DO_BUILD" == "" ];
+    then
+        REPO=https://github.com/makeplane/plane.git
+        CURR_DIR=$PWD
+        PLANE_TEMP_CODE_DIR=$(mktemp -d)
+        git clone $REPO $PLANE_TEMP_CODE_DIR  --branch $BRANCH --single-branch
 
-    wait "$pid"
+        cp $PLANE_TEMP_CODE_DIR/deploy/selfhost/build.yml $PLANE_TEMP_CODE_DIR/build.yml
 
-    if [ $? -eq 0 ]; then
-        echo "Plane supports ${CPU_ARCH}" >&2
-        echo "available"
-        return 0
-    else
-        echo "" >&2
-        echo "" >&2
-        echo "${UPPER_CPU_ARCH} images are not available for selected release ($APP_RELEASE)." >&2
-        echo "" >&2
-        echo "build"
-        return 1
-    fi
-}
-function getEnvValue() {
-    local key=$1
-    local file=$2
-
-    if [ -z "$key" ] || [ -z "$file" ]; then
-        echo "Invalid arguments supplied"
-        exit 1
-    fi
-
-    if [ -f "$file" ]; then
-        grep -q "^$key=" "$file"
-        if [ $? -eq 0 ]; then
-            local value
-            value=$(grep "^$key=" "$file" | cut -d'=' -f2)
-            echo "$value"
-        else
-            echo ""
+        cd $PLANE_TEMP_CODE_DIR
+        if [ "$BRANCH" == "master" ];
+        then
+            export APP_RELEASE=stable
         fi
-    fi
-}
-function updateEnvFile() {
-    local key=$1
-    local value=$2
-    local file=$3
 
-    if [ -z "$key" ] || [ -z "$value" ] || [ -z "$file" ]; then
-        echo "Invalid arguments supplied"
-        exit 1
-    fi
-
-    if [ -f "$file" ]; then
-        # check if key exists in the file
-        grep -q "^$key=" "$file"
-        if [ $? -ne 0 ]; then
-            echo "$key=$value" >> "$file"
-            return
-        else 
-            # if key exists, update the value
-            sed "${SED_PREFIX[@]}" "s/^$key=.*/$key=$value/g" "$file"
-        fi
+        /bin/bash -c "$COMPOSE_CMD -f build.yml build --no-cache"  >&2
+        # cd $CURR_DIR
+        # rm -rf $PLANE_TEMP_CODE_DIR
+        echo "build_completed"
+    elif [ "$DO_BUILD" == "2" ];
+    then
+        printf "${YELLOW}Build action skipped by you in lieu of using existing images. ${NC} \n" >&2
+        echo "build_skipped"
+    elif [ "$DO_BUILD" == "3" ];
+    then
+        echo "build_exited"
     else
-        echo "File not found: $file"
-        exit 1
+        printf "INVALID OPTION SUPPLIED" >&2
     fi
 }
-
-function updateCustomVariables(){
-    echo "Updating custom variables..." >&2
-    updateEnvFile "DOCKERHUB_USER" "$DOCKERHUB_USER" "$DOCKER_ENV_PATH"
-    updateEnvFile "APP_RELEASE" "$APP_RELEASE" "$DOCKER_ENV_PATH"
-    updateEnvFile "PULL_POLICY" "$PULL_POLICY" "$DOCKER_ENV_PATH"
-    updateEnvFile "CUSTOM_BUILD" "$CUSTOM_BUILD" "$DOCKER_ENV_PATH"
-    echo "Custom variables updated successfully" >&2
-}
-
-function syncEnvFile(){
-    echo "Syncing environment variables..." >&2
-    if [ -f "$PLANE_INSTALL_DIR/plane.env.bak" ]; then
-        updateCustomVariables
-        
-        # READ keys of plane.env and update the values from plane.env.bak
-        while IFS= read -r line
-        do
-            # ignore is the line is empty or starts with #
-            if [ -z "$line" ] || [[ $line == \#* ]]; then
-                continue
-            fi
-            key=$(echo "$line" | cut -d'=' -f1)
-            value=$(getEnvValue "$key" "$PLANE_INSTALL_DIR/plane.env.bak")
-            if [ -n "$value" ]; then
-                updateEnvFile "$key" "$value" "$DOCKER_ENV_PATH"
-            fi
-        done < "$DOCKER_ENV_PATH"
-    fi
-    echo "Environment variables synced successfully" >&2
-}
-
-function buildYourOwnImage(){
-    echo "Building images locally..."
-
-    export DOCKERHUB_USER="myplane"
-    export APP_RELEASE="local"
-    export PULL_POLICY="never"
-    CUSTOM_BUILD="true"
-
-    # checkout the code to ~/tmp/plane folder and build the images
-    local PLANE_TEMP_CODE_DIR=~/tmp/plane
-    rm -rf $PLANE_TEMP_CODE_DIR
-    mkdir -p $PLANE_TEMP_CODE_DIR
-    REPO=https://github.com/makeplane/plane.git
-    git clone "$REPO" "$PLANE_TEMP_CODE_DIR"  --branch "$BRANCH" --single-branch --depth 1
-
-    cp "$PLANE_TEMP_CODE_DIR/deploy/selfhost/build.yml" "$PLANE_TEMP_CODE_DIR/build.yml"
-
-    cd "$PLANE_TEMP_CODE_DIR" || exit
-
-    /bin/bash -c "$COMPOSE_CMD -f build.yml build --no-cache"  >&2
-    if [ $? -ne 0 ]; then
-        echo "Build failed. Exiting..."
-        exit 1
-    fi
-    echo "Build completed successfully"
-    echo ""
-    echo "You can now start the services by running the command: ./setup.sh start"
-    echo ""
-}
-
 function install() {
-    echo "Begin Installing Plane"
-    echo ""
-
-    local build_image=$(initialize)
-
-    if [ "$build_image" == "build" ]; then
-        # ask for confirmation to continue building the images
-        echo "Do you want to continue with building the Docker images locally?"
-        read -p "Continue? [y/N]: " confirm
-        if [[ ! "$confirm" =~ ^[Yy]$ ]]; then
-            echo "Exiting..."
-            exit 0
-        fi
-    fi
-
-    if [ "$build_image" == "build" ]; then
-        download "true"
-    else
-        download "false"
-    fi
+    echo "Installing Plane.........."
+    download
 }
-
 function download() {
-    local LOCAL_BUILD=$1
     cd $SCRIPT_DIR
     TS=$(date +%s)
     if [ -f "$PLANE_INSTALL_DIR/docker-compose.yaml" ]
@@ -237,48 +102,44 @@ function download() {
 
     if [ -f "$DOCKER_ENV_PATH" ];
     then
-        cp "$DOCKER_ENV_PATH" "$PLANE_INSTALL_DIR/archive/$TS.env"
-        cp "$DOCKER_ENV_PATH" "$PLANE_INSTALL_DIR/plane.env.bak"
+        cp $DOCKER_ENV_PATH $PLANE_INSTALL_DIR/archive/$TS.env
+    else
+        mv $PLANE_INSTALL_DIR/variables-upgrade.env $DOCKER_ENV_PATH
     fi
 
-    mv $PLANE_INSTALL_DIR/variables-upgrade.env $DOCKER_ENV_PATH
+    if [ "$BRANCH" != "master" ];
+    then
+        cp $PLANE_INSTALL_DIR/docker-compose.yaml $PLANE_INSTALL_DIR/temp.yaml 
+        sed -e 's@${APP_RELEASE:-stable}@'"$BRANCH"'@g' \
+            $PLANE_INSTALL_DIR/temp.yaml > $PLANE_INSTALL_DIR/docker-compose.yaml
 
-    syncEnvFile
+        rm $PLANE_INSTALL_DIR/temp.yaml
+    fi
 
-    if [ "$LOCAL_BUILD" == "true" ]; then
-        export DOCKERHUB_USER="myplane"
-        export APP_RELEASE="local"
-        export PULL_POLICY="never"
-        CUSTOM_BUILD="true"
+    if [ $USE_GLOBAL_IMAGES == 0 ]; then
+        local res=$(buildLocalImage)
+        # echo $res
 
-        buildYourOwnImage
-
-        if [ $? -ne 0 ]; then
-            echo ""
-            echo "Build failed. Exiting..."
-            exit 1
+        if [ "$res" == "build_exited" ];
+        then
+            echo
+            echo "Install action cancelled by you. Exiting now."
+            echo
+            exit 0
         fi
-        updateCustomVariables
     else
-        CUSTOM_BUILD="false"
-        updateCustomVariables
-        /bin/bash -c "$COMPOSE_CMD -f $DOCKER_FILE_PATH --env-file=$DOCKER_ENV_PATH pull --policy always"
-
-        if [ $? -ne 0 ]; then
-            echo ""
-            echo "Failed to pull the images. Exiting..."
-            exit 1
-        fi
+        /bin/bash -c "$COMPOSE_CMD -f $DOCKER_FILE_PATH --env-file=$DOCKER_ENV_PATH pull"
     fi
     
     echo ""
-    echo "Most recent version of Plane is now available for you to use"
+    echo "Most recent Stable version is now available for you to use"
     echo ""
-    echo "In case of 'Upgrade', please check the 'plane.env 'file for any new variables and update them accordingly"
+    echo "In case of Upgrade, your new setting file is availabe as 'variables-upgrade.env'. Please compare and set the required values in 'plane.env 'file."
     echo ""
+
 }
 function startServices() {
-    /bin/bash -c "$COMPOSE_CMD -f $DOCKER_FILE_PATH --env-file=$DOCKER_ENV_PATH up -d --pull if_not_present --quiet-pull"
+    /bin/bash -c "$COMPOSE_CMD -f $DOCKER_FILE_PATH --env-file=$DOCKER_ENV_PATH up -d --quiet-pull"
 
     local migrator_container_id=$(docker container ls -aq -f "name=$SERVICE_FOLDER-migrator")
     if [ -n "$migrator_container_id" ]; then
@@ -340,7 +201,7 @@ function upgrade() {
 
     echo
     echo "***** DOWNLOADING STABLE VERSION ****"
-    install
+    download
 
     echo "***** PLEASE VALIDATE AND START SERVICES ****"
 }
@@ -421,6 +282,7 @@ function viewLogs(){
         echo "INVALID SERVICE NAME SUPPLIED"
     fi
 }
+
 function backupSingleVolume() {
     backupFolder=$1
     selectedVolume=$2
@@ -437,6 +299,7 @@ function backupSingleVolume() {
         -v "$backupFolder":/backup \
         busybox sh -c 'tar -czf "/backup/${TAR_NAME}.tar.gz" /${TAR_NAME}'
 }
+
 function backupData() {
     local datetime=$(date +"%Y%m%d-%H%M")
     local BACKUP_FOLDER=$PLANE_INSTALL_DIR/backup/$datetime
@@ -466,7 +329,7 @@ function askForAction() {
     then
         echo
         echo "Select a Action you want to perform:"
-        echo "   1) Install"
+        echo "   1) Install (${CPU_ARCH})"
         echo "   2) Start"
         echo "   3) Stop"
         echo "   4) Restart"
@@ -488,31 +351,31 @@ function askForAction() {
         echo
     fi
 
-    if [ "$ACTION" == "1" ] || [ "$DEFAULT_ACTION" == "install" ];
+    if [ "$ACTION" == "1" ] || [ "$DEFAULT_ACTION" == "install" ]
     then
         install
-        # askForAction
-    elif [ "$ACTION" == "2" ] || [ "$DEFAULT_ACTION" == "start" ];
+        askForAction
+    elif [ "$ACTION" == "2" ] || [ "$DEFAULT_ACTION" == "start" ]
     then
         startServices
         # askForAction
-    elif [ "$ACTION" == "3" ] || [ "$DEFAULT_ACTION" == "stop" ];
+    elif [ "$ACTION" == "3" ] || [ "$DEFAULT_ACTION" == "stop" ]
     then
         stopServices
         # askForAction
-    elif [ "$ACTION" == "4" ] || [ "$DEFAULT_ACTION" == "restart" ];
+    elif [ "$ACTION" == "4" ] || [ "$DEFAULT_ACTION" == "restart" ]
     then
         restartServices
         # askForAction
-    elif [ "$ACTION" == "5" ]  || [ "$DEFAULT_ACTION" == "upgrade" ];
+    elif [ "$ACTION" == "5" ]  || [ "$DEFAULT_ACTION" == "upgrade" ]
     then
         upgrade
-        # askForAction
-    elif [ "$ACTION" == "6" ]  || [ "$DEFAULT_ACTION" == "logs" ];
-    then
-        viewLogs "$@"
         askForAction
-    elif [ "$ACTION" == "7" ]  || [ "$DEFAULT_ACTION" == "backup" ];
+    elif [ "$ACTION" == "6" ]  || [ "$DEFAULT_ACTION" == "logs" ]
+    then
+        viewLogs $@
+        askForAction
+    elif [ "$ACTION" == "7" ]  || [ "$DEFAULT_ACTION" == "backup" ]
     then
         backupData
     elif [ "$ACTION" == "8" ]
@@ -531,38 +394,48 @@ else
     COMPOSE_CMD="docker compose"
 fi
 
-if [ "$CPU_ARCH" == "x86_64" ] || [ "$CPU_ARCH" == "amd64" ]; then
-    CPU_ARCH="amd64"
-elif [ "$CPU_ARCH" == "aarch64" ] || [ "$CPU_ARCH" == "arm64" ]; then
-    CPU_ARCH="arm64"
+# CPU ARCHITECHTURE BASED SETTINGS
+CPU_ARCH=$(uname -m)
+if [[ $FORCE_CPU == "amd64" || $CPU_ARCH == "amd64" || $CPU_ARCH == "x86_64" || ( $BRANCH == "master" && ( $CPU_ARCH == "arm64" || $CPU_ARCH == "aarch64" ) ) ]]; 
+then
+    USE_GLOBAL_IMAGES=1
+    DOCKERHUB_USER=makeplane
+    PULL_POLICY=always
+else
+    USE_GLOBAL_IMAGES=0
+    DOCKERHUB_USER=myplane
+    PULL_POLICY=never
 fi
 
-if [ -f "$DOCKER_ENV_PATH" ]; then
-    DOCKERHUB_USER=$(getEnvValue "DOCKERHUB_USER" "$DOCKER_ENV_PATH")
-    APP_RELEASE=$(getEnvValue "APP_RELEASE" "$DOCKER_ENV_PATH")
-    PULL_POLICY=$(getEnvValue "PULL_POLICY" "$DOCKER_ENV_PATH")
-    CUSTOM_BUILD=$(getEnvValue "CUSTOM_BUILD" "$DOCKER_ENV_PATH")
+if [ "$BRANCH" == "master" ];
+then
+    export APP_RELEASE=stable
+fi
 
-    if [ -z "$DOCKERHUB_USER" ]; then
-        DOCKERHUB_USER=makeplane
-        updateEnvFile "DOCKERHUB_USER" "$DOCKERHUB_USER" "$DOCKER_ENV_PATH"
-    fi
+# REMOVE SPECIAL CHARACTERS FROM BRANCH NAME
+if [ "$BRANCH" != "master" ];
+then
+    SERVICE_FOLDER=plane-app-$(echo $BRANCH | sed -r 's@(\/|" "|\.)@-@g')
+    PLANE_INSTALL_DIR=$PWD/$SERVICE_FOLDER
+fi
+mkdir -p $PLANE_INSTALL_DIR/archive
 
-    if [ -z "$APP_RELEASE" ]; then
-        APP_RELEASE=stable
-        updateEnvFile "APP_RELEASE" "$APP_RELEASE" "$DOCKER_ENV_PATH"
-    fi
+DOCKER_FILE_PATH=$PLANE_INSTALL_DIR/docker-compose.yaml
+DOCKER_ENV_PATH=$PLANE_INSTALL_DIR/plane.env
 
-    if [ -z "$PULL_POLICY" ]; then
-        PULL_POLICY=if_not_present
-        updateEnvFile "PULL_POLICY" "$PULL_POLICY" "$DOCKER_ENV_PATH"
-    fi
-
-    if [ -z "$CUSTOM_BUILD" ]; then
-        CUSTOM_BUILD=false
-        updateEnvFile "CUSTOM_BUILD" "$CUSTOM_BUILD" "$DOCKER_ENV_PATH"
+# BACKWARD COMPATIBILITY
+OLD_DOCKER_ENV_PATH=$PLANE_INSTALL_DIR/.env
+if [ -f "$OLD_DOCKER_ENV_PATH" ];
+then
+    mv "$OLD_DOCKER_ENV_PATH" "$DOCKER_ENV_PATH"
+    OS_NAME=$(uname)
+    if [ "$OS_NAME" == "Darwin" ];
+    then
+        sed -i '' -e 's@APP_RELEASE=latest@APP_RELEASE=stable@' "$DOCKER_ENV_PATH" 
+    else
+        sed -i -e 's@APP_RELEASE=latest@APP_RELEASE=stable@' "$DOCKER_ENV_PATH" 
     fi
 fi
 
 print_header
-askForAction "$@"
+askForAction $@