dev: get issue_types

dev: add start date and target date to project
Merge branch 'preview' of github.com:makeplane/plane into feat-issue-type-page-versioning
2024-07-09 17:35:08 +05:30 · 2024-07-09 13:29:51 +05:30 · 2024-07-09 13:18:05 +05:30 · 2024-07-08 13:00:50 +05:30 · 2024-07-05 16:38:06 +05:30 · 2024-07-05 11:26:16 +05:30
781 changed files with 9760 additions and 19760 deletions
@@ -1,5 +1,6 @@
 # Environment Variables

+
 Environment variables are distributed in various files. Please refer them carefully.

 ## {PROJECT_FOLDER}/.env
@@ -8,13 +9,17 @@ File is available in the project root folder

 ```
 # Database Settings
-POSTGRES_USER="plane"
-POSTGRES_PASSWORD="plane"
-POSTGRES_DB="plane"
-PGDATA="/var/lib/postgresql/data"
+PGUSER="plane"
+PGPASSWORD="plane"
+PGHOST="plane-db"
+PGDATABASE="plane"
+DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}
+
 # Redis Settings
 REDIS_HOST="plane-redis"
 REDIS_PORT="6379"
+REDIS_URL="redis://${REDIS_HOST}:6379/"
+
 # AWS Settings
 AWS_REGION=""
 AWS_ACCESS_KEY_ID="access-key"
@@ -24,39 +29,63 @@ AWS_S3_ENDPOINT_URL="http://plane-minio:9000"
 AWS_S3_BUCKET_NAME="uploads"
 # Maximum file upload limit
 FILE_SIZE_LIMIT=5242880
+
 # GPT settings
 OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
 OPENAI_API_KEY="sk-" # deprecated
 GPT_ENGINE="gpt-3.5-turbo" # deprecated
-# Settings related to Docker
-DOCKERIZED=1  # deprecated
+
 # set to 1 If using the pre-configured minio setup
 USE_MINIO=1
+
 # Nginx Configuration
 NGINX_PORT=80
 ```

+
+
+## {PROJECT_FOLDER}/web/.env.example
+
+
+
+```
+# Public boards deploy URL
+NEXT_PUBLIC_DEPLOY_URL="http://localhost/spaces"
+```
+
 ## {PROJECT_FOLDER}/apiserver/.env

+
+
 ```
 # Backend
 # Debug value for api server use it as 0 for production use
 DEBUG=0
-CORS_ALLOWED_ORIGINS="http://localhost"
+
 # Error logs
 SENTRY_DSN=""
-SENTRY_ENVIRONMENT="development"
+
 # Database Settings
-POSTGRES_USER="plane"
-POSTGRES_PASSWORD="plane"
-POSTGRES_HOST="plane-db"
-POSTGRES_DB="plane"
-POSTGRES_PORT=5432
-DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
+PGUSER="plane"
+PGPASSWORD="plane"
+PGHOST="plane-db"
+PGDATABASE="plane"
+DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}
+
 # Redis Settings
 REDIS_HOST="plane-redis"
 REDIS_PORT="6379"
 REDIS_URL="redis://${REDIS_HOST}:6379/"
+
+# Email Settings
+EMAIL_HOST=""
+EMAIL_HOST_USER=""
+EMAIL_HOST_PASSWORD=""
+EMAIL_PORT=587
+EMAIL_FROM="Team Plane <team@mailer.plane.so>"
+EMAIL_USE_TLS="1"
+EMAIL_USE_SSL="0"
+
 # AWS Settings
 AWS_REGION=""
 AWS_ACCESS_KEY_ID="access-key"
@@ -66,25 +95,35 @@ AWS_S3_ENDPOINT_URL="http://plane-minio:9000"
 AWS_S3_BUCKET_NAME="uploads"
 # Maximum file upload limit
 FILE_SIZE_LIMIT=5242880
+
+# GPT settings
+OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
+OPENAI_API_KEY="sk-" # deprecated
+GPT_ENGINE="gpt-3.5-turbo" # deprecated
+
 # Settings related to Docker
-DOCKERIZED=1 # deprecated
+DOCKERIZED=1  # Deprecated
+
+# Github
+GITHUB_CLIENT_SECRET="" # For fetching release notes
+
 # set to 1 If using the pre-configured minio setup
 USE_MINIO=1
+
 # Nginx Configuration
 NGINX_PORT=80
-# Email redirections and minio domain settings
+
+
+# SignUps
+ENABLE_SIGNUP="1"
+
+# Email Redirection URL
 WEB_URL="http://localhost"
-# Gunicorn Workers
-GUNICORN_WORKERS=2
-# Base URLs
-ADMIN_BASE_URL=
-SPACE_BASE_URL=
-APP_BASE_URL=
-SECRET_KEY="gxoytl7dmnc1y37zahah820z5iq3iozu38cnfjtu3yaau9cd9z"
 ```

 ## Updates

+- The environment variable NEXT_PUBLIC_API_BASE_URL has been removed from both the web and space projects.
 - The naming convention for containers and images has been updated.
 - The plane-worker image will no longer be maintained, as it has been merged with plane-backend.
 - The Tiptap pro-extension dependency has been removed, eliminating the need for Tiptap API keys.
@@ -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">
@@ -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>
-    </>
-  );
-});
@@ -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">
@@ -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}
@@ -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
@@ -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="name@company.com"
              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
@@ -14,11 +14,10 @@
    "@headlessui/react": "^1.7.19",
    "@plane/types": "*",
    "@plane/ui": "*",
-    "@plane/constants": "*",
    "@tailwindcss/typography": "^0.5.9",
    "@types/lodash": "^4.17.0",
    "autoprefixer": "10.4.14",
-    "axios": "^1.7.4",
+    "axios": "^1.6.7",
    "js-cookie": "^3.0.5",
    "lodash": "^4.17.21",
    "lucide-react": "^0.356.0",
@@ -47,4 +46,4 @@
    "tsconfig": "*",
    "typescript": "^5.4.2"
  }
-}
+}
@@ -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=
@@ -40,44 +40,3 @@ class ApiKeyRateThrottle(SimpleRateThrottle):
            request.META["X-RateLimit-Reset"] = reset_time

        return allowed
-
-
-class ServiceTokenRateThrottle(SimpleRateThrottle):
-    scope = "service_token"
-    rate = "300/minute"
-
-    def get_cache_key(self, request, view):
-        # Retrieve the API key from the request header
-        api_key = request.headers.get("X-Api-Key")
-        if not api_key:
-            return None  # Allow the request if there's no API key
-
-        # Use the API key as part of the cache key
-        return f"{self.scope}:{api_key}"
-
-    def allow_request(self, request, view):
-        allowed = super().allow_request(request, view)
-
-        if allowed:
-            now = self.timer()
-            # Calculate the remaining limit and reset time
-            history = self.cache.get(self.key, [])
-
-            # Remove old histories
-            while history and history[-1] <= now - self.duration:
-                history.pop()
-
-            # Calculate the requests
-            num_requests = len(history)
-
-            # Check available requests
-            available = self.num_requests - num_requests
-
-            # Unix timestamp for when the rate limit will reset
-            reset_time = int(now + self.duration)
-
-            # Add headers
-            request.META["X-RateLimit-Remaining"] = max(0, available)
-            request.META["X-RateLimit-Reset"] = reset_time
-
-        return allowed
@@ -40,7 +40,6 @@ class CycleSerializer(BaseSerializer):
            "workspace",
            "project",
            "owned_by",
-            "deleted_at",
        ]


@@ -11,6 +11,7 @@ from rest_framework import serializers
 # Module imports
 from plane.db.models import (
    Issue,
+    IssueType,
    IssueActivity,
    IssueAssignee,
    IssueAttachment,
@@ -53,7 +54,9 @@ class IssueSerializer(BaseSerializer):
            "id",
            "workspace",
            "project",
+            "created_by",
            "updated_by",
+            "created_at",
            "updated_at",
        ]
        exclude = [
@@ -129,9 +132,11 @@ class IssueSerializer(BaseSerializer):
        workspace_id = self.context["workspace_id"]
        default_assignee_id = self.context["default_assignee_id"]

+        # Get the issue type from the project
+        issue_type = IssueType.objects.filter(project_id=project_id).first()
+
        issue = Issue.objects.create(
-            **validated_data,
-            project_id=project_id,
+            **validated_data, project_id=project_id, type=issue_type
        )

        # Issue Audit Users
@@ -269,7 +274,6 @@ class LabelSerializer(BaseSerializer):
            "updated_by",
            "created_at",
            "updated_at",
-            "deleted_at",
        ]


@@ -338,7 +342,9 @@ class IssueAttachmentSerializer(BaseSerializer):
            "workspace",
            "project",
            "issue",
+            "created_by",
            "updated_by",
+            "created_at",
            "updated_at",
        ]

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

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

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


@@ -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,
 ]
@@ -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",
-    ),
 ]
@@ -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",
-    ),
-]
@@ -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
-
@@ -7,7 +7,6 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import IntegrityError
 from django.urls import resolve
 from django.utils import timezone
-from plane.db.models.api import APIToken
 from rest_framework import status
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
@@ -17,7 +16,7 @@ from rest_framework.views import APIView

 # Module imports
 from plane.api.middleware.api_authentication import APIKeyAuthentication
-from plane.api.rate_limit import ApiKeyRateThrottle, ServiceTokenRateThrottle
+from plane.api.rate_limit import ApiKeyRateThrottle
 from plane.utils.exception_logger import log_exception
 from plane.utils.paginator import BasePaginator

@@ -45,29 +44,15 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
        IsAuthenticated,
    ]

+    throttle_classes = [
+        ApiKeyRateThrottle,
+    ]
+
    def filter_queryset(self, queryset):
        for backend in list(self.filter_backends):
            queryset = backend().filter_queryset(self.request, queryset, self)
        return queryset

-    def get_throttles(self):
-        throttle_classes = []
-        api_key = self.request.headers.get("X-Api-Key")
-
-        if api_key:
-            service_token = APIToken.objects.filter(
-                token=api_key,
-                is_service=True,
-            ).first()
-
-            if service_token:
-                throttle_classes.append(ServiceTokenRateThrottle())
-                return throttle_classes
-
-        throttle_classes.append(ApiKeyRateThrottle())
-
-        return throttle_classes
-
    def handle_exception(self, exc):
        """
        Handle any exception that occurs, by returning an appropriate response,
@@ -167,4 +152,4 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
            for expand in self.request.GET.get("expand", "").split(",")
            if expand
        ]
-        return expand if expand else None
+        return expand if expand else None
@@ -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,
@@ -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
@@ -19,6 +16,7 @@ from plane.app.permissions import ProjectLitePermission
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
    Inbox,
+    IssueType,
    InboxIssue,
    Issue,
    Project,
@@ -144,6 +142,8 @@ class InboxIssueAPIEndpoint(BaseAPIView):
            color="#ff7700",
            is_triage=True,
        )
+        # Get the issue type
+        issue_type = IssueType.objects.filter(project_id=project_id).first()

        # create an issue
        issue = Issue.objects.create(
@@ -155,6 +155,7 @@ class InboxIssueAPIEndpoint(BaseAPIView):
            priority=request.data.get("issue", {}).get("priority", "none"),
            project_id=project_id,
            state=state,
+            type=issue_type,
        )

        # create an inbox issue
@@ -227,27 +228,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 +372,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)
@@ -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,
@@ -38,7 +36,7 @@ from plane.app.permissions import (
    ProjectLitePermission,
    ProjectMemberPermission,
 )
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
    Issue,
    IssueActivity,
@@ -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(
@@ -355,124 +323,6 @@ class IssueAPIEndpoint(BaseAPIView):
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    def put(self, request, slug, project_id):
-        # Get the entities required for putting the issue, external_id and
-        # external_source are must to identify the issue here
-        project = Project.objects.get(pk=project_id)
-        external_id = request.data.get("external_id")
-        external_source = request.data.get("external_source")
-
-        # If the external_id and source are present, we need to find the exact
-        # issue that needs to be updated with the provided external_id and
-        # external_source
-        if external_id and external_source:
-            try:
-                issue = Issue.objects.get(
-                    project_id=project_id,
-                    workspace__slug=slug,
-                    external_id=external_id,
-                    external_source=external_source,
-                )
-
-                # Get the current instance of the issue in order to track
-                # changes and dispatch the issue activity
-                current_instance = json.dumps(
-                    IssueSerializer(issue).data, cls=DjangoJSONEncoder
-                )
-
-                # Get the requested data, encode it as django object and pass it
-                # to serializer to validation
-                requested_data = json.dumps(
-                    self.request.data, cls=DjangoJSONEncoder
-                )
-                serializer = IssueSerializer(
-                    issue,
-                    data=request.data,
-                    context={
-                        "project_id": project_id,
-                        "workspace_id": project.workspace_id,
-                    },
-                    partial=True,
-                )
-                if serializer.is_valid():
-                    # If the serializer is valid, save the issue and dispatch
-                    # the update issue activity worker event.
-                    serializer.save()
-                    issue_activity.delay(
-                        type="issue.activity.updated",
-                        requested_data=requested_data,
-                        actor_id=str(request.user.id),
-                        issue_id=str(issue.id),
-                        project_id=str(project_id),
-                        current_instance=current_instance,
-                        epoch=int(timezone.now().timestamp()),
-                    )
-                    return Response(serializer.data, status=status.HTTP_200_OK)
-                return Response(
-                    # If the serializer is not valid, respond with 400 bad
-                    # request
-                    serializer.errors,
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-            except Issue.DoesNotExist:
-                # If the issue does not exist, a new record needs to be created
-                # for the requested data.
-                # Serialize the data with the context of the project and
-                # workspace
-                serializer = IssueSerializer(
-                    data=request.data,
-                    context={
-                        "project_id": project_id,
-                        "workspace_id": project.workspace_id,
-                        "default_assignee_id": project.default_assignee_id,
-                    },
-                )
-
-                # If the serializer is valid, save the issue and dispatch the
-                # issue activity worker event as created
-                if serializer.is_valid():
-                    serializer.save()
-                    # Refetch the issue
-                    issue = Issue.objects.filter(
-                        workspace__slug=slug,
-                        project_id=project_id,
-                        pk=serializer.data["id"],
-                    ).first()
-
-                    # If any of the created_at or created_by is present, update
-                    # the issue with the provided data, else return with the
-                    # default states given.
-                    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"])
-
-                    issue_activity.delay(
-                        type="issue.activity.created",
-                        requested_data=json.dumps(
-                            self.request.data, cls=DjangoJSONEncoder
-                        ),
-                        actor_id=str(request.user.id),
-                        issue_id=str(serializer.data.get("id", None)),
-                        project_id=str(project_id),
-                        current_instance=None,
-                        epoch=int(timezone.now().timestamp()),
-                    )
-                    return Response(
-                        serializer.data, status=status.HTTP_201_CREATED
-                    )
-                return Response(
-                    serializer.errors, status=status.HTTP_400_BAD_REQUEST
-                )
-        else:
-            return Response(
-                {"error": "external_id and external_source are required"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
    def patch(self, request, slug, project_id, pk=None):
        issue = Issue.objects.get(
            workspace__slug=slug, project_id=project_id, pk=pk
@@ -529,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
        )
@@ -750,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()),
            )
@@ -917,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,
@@ -1055,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)
@@ -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)
-
@@ -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)


@@ -19,14 +19,14 @@ from plane.app.permissions import ProjectBasePermission
 from plane.db.models import (
    Cycle,
    Inbox,
-    IssueUserProperty,
+    IssueProperty,
    Module,
    Project,
    DeployBoard,
    ProjectMember,
    State,
    Workspace,
-    UserFavorite,
+    IssueType,
 )
 from plane.bgtasks.webhook_task import model_activity
 from .base import BaseAPIView
@@ -166,7 +166,7 @@ class ProjectAPIEndpoint(BaseAPIView):
                    role=20,
                )
                # Also create the issue property for the user
-                _ = IssueUserProperty.objects.create(
+                _ = IssueProperty.objects.create(
                    project_id=serializer.data["id"],
                    user=request.user,
                )
@@ -180,7 +180,7 @@ class ProjectAPIEndpoint(BaseAPIView):
                        role=20,
                    )
                    # Also create the issue property for the user
-                    IssueUserProperty.objects.create(
+                    IssueProperty.objects.create(
                        project_id=serializer.data["id"],
                        user_id=serializer.data["project_lead"],
                    )
@@ -242,6 +242,13 @@ class ProjectAPIEndpoint(BaseAPIView):
                    .first()
                )

+                # Create the Issue Types
+                IssueType.objects.create(
+                    name="Task",
+                    description="A task that needs to be done",
+                    project_id=project.id,
+                )
+
                # Model activity
                model_activity.delay(
                    model_name="project",
@@ -357,12 +364,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)

@@ -50,7 +50,7 @@ from .issue import (
    IssueCreateSerializer,
    IssueActivitySerializer,
    IssueCommentSerializer,
-    IssueUserPropertySerializer,
+    IssuePropertySerializer,
    IssueAssigneeSerializer,
    LabelSerializer,
    IssueSerializer,
@@ -121,5 +121,3 @@ from .exporter import ExporterHistorySerializer
 from .webhook import WebhookSerializer, WebhookLogSerializer

 from .dashboard import DashboardSerializer, WidgetSerializer
-
-from .favorite import UserFavoriteSerializer
@@ -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
@@ -17,7 +17,7 @@ from plane.db.models import (
    Issue,
    IssueActivity,
    IssueComment,
-    IssueUserProperty,
+    IssueProperty,
    IssueAssignee,
    IssueSubscriber,
    IssueLabel,
@@ -33,6 +33,7 @@ from plane.db.models import (
    IssueVote,
    IssueRelation,
    State,
+    IssueType,
 )


@@ -135,10 +136,11 @@ class IssueCreateSerializer(BaseSerializer):
        workspace_id = self.context["workspace_id"]
        default_assignee_id = self.context["default_assignee_id"]

+        # Get Issue Type
+        issue_type = IssueType.objects.filter(project_id=project_id).first()
        # Create Issue
        issue = Issue.objects.create(
-            **validated_data,
-            project_id=project_id,
+            **validated_data, project_id=project_id, type=issue_type
        )

        # Issue Audit Users
@@ -252,9 +254,9 @@ class IssueActivitySerializer(BaseSerializer):
        fields = "__all__"


-class IssueUserPropertySerializer(BaseSerializer):
+class IssuePropertySerializer(BaseSerializer):
    class Meta:
-        model = IssueUserProperty
+        model = IssueProperty
        fields = "__all__"
        read_only_fields = [
            "user",
@@ -533,7 +535,6 @@ class IssueReactionSerializer(BaseSerializer):
            "project",
            "issue",
            "actor",
-            "deleted_at"
        ]


@@ -552,7 +553,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):
@@ -39,7 +39,6 @@ class ModuleWriteSerializer(BaseSerializer):
            "created_at",
            "updated_at",
            "archived_at",
-            "deleted_at",
        ]

    def to_representation(self, instance):
@@ -12,7 +12,6 @@ class NotificationSerializer(BaseSerializer):
        read_only=True, source="triggered_by"
    )
    is_inbox_issue = serializers.BooleanField(read_only=True)
-    is_mentioned_notification = serializers.BooleanField(read_only=True)

    class Meta:
        model = Notification
@@ -28,7 +28,6 @@ class ProjectSerializer(BaseSerializer):
        fields = "__all__"
        read_only_fields = [
            "workspace",
-            "deleted_at",
        ]

    def create(self, validated_data):
@@ -23,7 +23,7 @@ class IssueViewSerializer(DynamicBaseSerializer):
        ]

    def create(self, validated_data):
-        query_params = validated_data.get("filters", {})
+        query_params = validated_data.get("query_data", {})
        if bool(query_params):
            validated_data["query"] = issue_filters(query_params, "POST")
        else:
@@ -31,7 +31,7 @@ class IssueViewSerializer(DynamicBaseSerializer):
        return IssueView.objects.create(**validated_data)

    def update(self, instance, validated_data):
-        query_params = validated_data.get("filters", {})
+        query_params = validated_data.get("query_data", {})
        if bool(query_params):
            validated_data["query"] = issue_filters(query_params, "POST")
        else:
@@ -1,4 +1,3 @@
-from .ai import urlpatterns as ai_urls
 from .analytic import urlpatterns as analytic_urls
 from .api import urlpatterns as api_urls
 from .asset import urlpatterns as asset_urls
@@ -20,7 +19,6 @@ from .webhook import urlpatterns as webhook_urls
 from .workspace import urlpatterns as workspace_urls

 urlpatterns = [
-    *ai_urls,
    *analytic_urls,
    *asset_urls,
    *cycle_urls,
@@ -1,12 +0,0 @@
-from django.urls import path
-
-
-from plane.app.views import AskAIEndpoint
-
-urlpatterns = [
-    path(
-        "workspaces/<str:slug>/ask-AI/",
-        AskAIEndpoint.as_view(),
-        name="askAI",
-    ),
-]
@@ -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
 ]
@@ -2,11 +2,23 @@ from django.urls import path


 from plane.app.views import UnsplashEndpoint
+from plane.app.views import GPTIntegrationEndpoint, WorkspaceGPTIntegrationEndpoint
+

 urlpatterns = [
    path(
        "unsplash/",
        UnsplashEndpoint.as_view(),
        name="unsplash",
-    )
+    ),
+    path(
+        "workspaces/<str:slug>/projects/<uuid:project_id>/ai-assistant/",
+        GPTIntegrationEndpoint.as_view(),
+        name="importer",
+    ),
+   path(
+        "workspaces/<str:slug>/ai-assistant/",
+        WorkspaceGPTIntegrationEndpoint.as_view(),
+        name="importer",
+    ),
 ]
@@ -233,13 +233,13 @@ urlpatterns = [
        name="project-issue-comment-reactions",
    ),
    ## End Comment Reactions
-    ## IssueUserProperty
+    ## IssueProperty
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/user-properties/",
        IssueUserDisplayPropertyEndpoint.as_view(),
        name="project-issue-display-properties",
    ),
-    ## IssueUserProperty End
+    ## IssueProperty End
    ## Issue Archives
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/archived-issues/",
@@ -66,16 +66,6 @@ urlpatterns = [
        ),
        name="project-pages-lock-unlock",
    ),
-    # private and public page
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/access/",
-        PageViewSet.as_view(
-            {
-                "post": "access",
-            }
-        ),
-        name="project-pages-access",
-    ),
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:pk>/transactions/",
        PageLogEndpoint.as_view(),
@@ -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",
-    ),
 ]
@@ -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,
@@ -191,10 +184,12 @@ from .page.version import PageVersionEndpoint
 from .search.base import GlobalSearchEndpoint
 from .search.issue import IssueSearchEndpoint

-from .external.base import UnsplashEndpoint
-
-from .ai.base import AskAIEndpoint

+from .external.base import (
+    GPTIntegrationEndpoint,
+    UnsplashEndpoint,
+    WorkspaceGPTIntegrationEndpoint,
+)
 from .estimate.base import (
    ProjectEstimatePointEndpoint,
    BulkEstimatePointEndpoint,
@@ -1,109 +0,0 @@
-# Python imports
-import os
-from enum import Enum
-
-
-# Third party imports
-from openai import OpenAI
-from rest_framework.response import Response
-from rest_framework import status
-
-# Django imports
-
-# Module imports
-from ..base import BaseAPIView
-from plane.app.permissions import (
-    WorkspaceEntityPermission,
-)
-from plane.license.utils.instance_value import get_configuration_value
-
-
-class Task(Enum):
-    ASK_AI = "ASK_AI"
-
-
-class AskAIEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceEntityPermission,
-    ]
-
-    def get_system_prompt(self, task):
-        if task == Task.ASK_AI.value:
-            return (
-                True,
-                """
-                You are an advanced AI assistant designed to provide optimal responses by integrating given context with your broad knowledge base. Your primary objectives are:
-
-                1. Thoroughly analyze and understand the provided context, which may include context, specific questions, code snippets, or any relevant information.
-                2. Treat the given context as a critical input, using it to inform and guide your response.
-                3. Leverage your extensive knowledge to complement and enhance your understanding of the context and to provide comprehensive, accurate answers.
-                4. Seamlessly blend insights from the given context with your general knowledge, ensuring a cohesive and informative response.
-                5. Adapt your response style and depth based on the nature of the context and the question asked.
-                6. When dealing with code or technical context, provide explanations or solutions that are directly relevant and technically sound.
-                7. Maintain clarity and conciseness in your responses while ensuring they are complete and informative.
-                8. Use appropriate HTML tags for formatting only when it enhances readability or structure of the response.
-                9. Respect privacy and avoid sensationalism when addressing sensitive topics.
-
-                Your goal is to deliver the most relevant, accurate, and helpful response possible, considering both the provided content and your broader understanding.
-                """,
-            )
-        else:
-            return False, {
-                "error": "Invalid task. Please provide a correct task name."
-            }
-
-    def post(self, request, slug):
-        task = request.data.get("task", "ASK_AI")
-        context = request.data.get("text_input", "")
-        user_prompt = request.data.get("query", "")
-
-        if not context or not user_prompt:
-            return Response(
-                {"error": "Query and Text input are required"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        OPENAI_API_KEY, GPT_ENGINE = get_configuration_value(
-            [
-                {
-                    "key": "OPENAI_API_KEY",
-                    "default": os.environ.get("OPENAI_API_KEY", None),
-                },
-                {
-                    "key": "GPT_ENGINE",
-                    "default": os.environ.get("GPT_ENGINE", "gpt-3.5-turbo"),
-                },
-            ]
-        )
-
-        if not OPENAI_API_KEY or not GPT_ENGINE:
-            return Response(
-                {"error": "OpenAI API key and engine are required"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        client = OpenAI(api_key=OPENAI_API_KEY)
-
-        processed, system_prompt = self.get_system_prompt(task)
-        if not processed:
-            return Response(system_prompt, status=status.HTTP_400_BAD_REQUEST)
-
-        try:
-            completion = client.chat.completions.create(
-                model=GPT_ENGINE,
-                messages=[
-                    {"role": "system", "content": system_prompt},
-                    {
-                        "role": "user",
-                        "content": f"Context:\n\n{context}\n\nQuestion: {user_prompt}",
-                    },
-                ],
-                temperature=0.1,
-            )
-            response = completion.choices[0].message.content.strip()
-            return Response({"response": response}, status=status.HTTP_200_OK)
-        except Exception as e:
-            return Response(
-                {"error": f"An error occurred: {str(e)}"},
-                status=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            )
@@ -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,
-            )
-
@@ -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(
@@ -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,
@@ -646,8 +645,6 @@ class CycleViewSet(BaseViewSet):
                        "progress_snapshot",
                        "logo_props",
                        # meta fields
-                        "completed_estimate_points",
-                        "total_estimate_points",
                        "is_favorite",
                        "cancelled_issues",
                        "total_issues",
@@ -657,7 +654,6 @@ class CycleViewSet(BaseViewSet):
                        "backlog_issues",
                        "assignee_ids",
                        "status",
-                        "created_by",
                    )
                    .first()
                )
@@ -743,8 +739,6 @@ class CycleViewSet(BaseViewSet):
                "progress_snapshot",
                "logo_props",
                # meta fields
-                "completed_estimate_points",
-                "total_estimate_points",
                "is_favorite",
                "total_issues",
                "cancelled_issues",
@@ -754,7 +748,6 @@ class CycleViewSet(BaseViewSet):
                "backlog_issues",
                "assignee_ids",
                "status",
-                "created_by",
            ).first()

            # Send the model activity
@@ -807,8 +800,6 @@ class CycleViewSet(BaseViewSet):
                "sub_issues",
                "logo_props",
                # meta fields
-                "completed_estimate_points",
-                "total_estimate_points",
                "is_favorite",
                "total_issues",
                "cancelled_issues",
@@ -834,7 +825,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 +863,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 +918,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 +969,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 +1031,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 +1059,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 +1127,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)


@@ -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,
@@ -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(
@@ -2,8 +2,8 @@
 import requests
 import os

-
 # Third party imports
+from openai import OpenAI
 from rest_framework.response import Response
 from rest_framework import status

@@ -11,9 +11,136 @@ from rest_framework import status

 # Module imports
 from ..base import BaseAPIView
+from plane.app.permissions import ProjectEntityPermission, WorkspaceEntityPermission
+from plane.db.models import Workspace, Project
+from plane.app.serializers import (
+    ProjectLiteSerializer,
+    WorkspaceLiteSerializer,
+)
 from plane.license.utils.instance_value import get_configuration_value


+class GPTIntegrationEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    def post(self, request, slug, project_id):
+        OPENAI_API_KEY, GPT_ENGINE = get_configuration_value(
+            [
+                {
+                    "key": "OPENAI_API_KEY",
+                    "default": os.environ.get("OPENAI_API_KEY", None),
+                },
+                {
+                    "key": "GPT_ENGINE",
+                    "default": os.environ.get("GPT_ENGINE", "gpt-3.5-turbo"),
+                },
+            ]
+        )
+
+        # Get the configuration value
+        # Check the keys
+        if not OPENAI_API_KEY or not GPT_ENGINE:
+            return Response(
+                {"error": "OpenAI API key and engine is required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        prompt = request.data.get("prompt", False)
+        task = request.data.get("task", False)
+
+        if not task:
+            return Response(
+                {"error": "Task is required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        final_text = task + "\n" + prompt
+
+        client = OpenAI(
+            api_key=OPENAI_API_KEY,
+        )
+
+        response = client.chat.completions.create(
+            model=GPT_ENGINE,
+            messages=[{"role": "user", "content": final_text}],
+        )
+
+        workspace = Workspace.objects.get(slug=slug)
+        project = Project.objects.get(pk=project_id)
+
+        text = response.choices[0].message.content.strip()
+        text_html = text.replace("\n", "<br/>")
+        return Response(
+            {
+                "response": text,
+                "response_html": text_html,
+                "project_detail": ProjectLiteSerializer(project).data,
+                "workspace_detail": WorkspaceLiteSerializer(workspace).data,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+
+class WorkspaceGPTIntegrationEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkspaceEntityPermission,
+    ]
+
+    def post(self, request, slug):
+        OPENAI_API_KEY, GPT_ENGINE = get_configuration_value(
+            [
+                {
+                    "key": "OPENAI_API_KEY",
+                    "default": os.environ.get("OPENAI_API_KEY", None),
+                },
+                {
+                    "key": "GPT_ENGINE",
+                    "default": os.environ.get("GPT_ENGINE", "gpt-3.5-turbo"),
+                },
+            ]
+        )
+
+        # Get the configuration value
+        # Check the keys
+        if not OPENAI_API_KEY or not GPT_ENGINE:
+            return Response(
+                {"error": "OpenAI API key and engine is required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        prompt = request.data.get("prompt", False)
+        task = request.data.get("task", False)
+
+        if not task:
+            return Response(
+                {"error": "Task is required"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
+        final_text = task + "\n" + prompt
+
+        client = OpenAI(
+            api_key=OPENAI_API_KEY,
+        )
+
+        response = client.chat.completions.create(
+            model=GPT_ENGINE,
+            messages=[{"role": "user", "content": final_text}],
+        )
+
+        text = response.choices[0].message.content.strip()
+        text_html = text.replace("\n", "<br/>")
+        return Response(
+            {
+                "response": text,
+                "response_html": text_html,
+            },
+            status=status.HTTP_200_OK,
+        )
+
+
 class UnsplashEndpoint(BaseAPIView):
    def get(self, request):
        (UNSPLASH_ACCESS_KEY,) = get_configuration_value(
@@ -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)
@@ -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"))
@@ -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(
@@ -32,7 +32,7 @@ from plane.app.permissions import (
 from plane.app.serializers import (
    IssueCreateSerializer,
    IssueDetailSerializer,
-    IssueUserPropertySerializer,
+    IssuePropertySerializer,
    IssueSerializer,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
@@ -40,11 +40,10 @@ from plane.db.models import (
    Issue,
    IssueAttachment,
    IssueLink,
-    IssueUserProperty,
+    IssueProperty,
    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(
@@ -400,7 +399,6 @@ class IssueViewSet(BaseViewSet):
                    "link_count",
                    "is_draft",
                    "archived_at",
-                    "deleted_at",
                )
                .first()
            )
@@ -437,8 +435,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())),
                ),
@@ -484,38 +481,7 @@ class IssueViewSet(BaseViewSet):
        return Response(serializer.data, status=status.HTTP_200_OK)

    def partial_update(self, request, slug, project_id, pk=None):
-        issue = (
-            self.get_queryset()
-            .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)
-                        & Q(assignees__member_project__is_active=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                module_ids=Coalesce(
-                    ArrayAgg(
-                        "issue_module__module_id",
-                        distinct=True,
-                        filter=~Q(issue_module__module_id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            )
-            .filter(pk=pk)
-            .first()
-        )
+        issue = self.get_queryset().filter(pk=pk).first()

        if not issue:
            return Response(
@@ -552,20 +518,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",
@@ -587,7 +539,7 @@ class IssueUserDisplayPropertyEndpoint(BaseAPIView):
    ]

    def patch(self, request, slug, project_id):
-        issue_property = IssueUserProperty.objects.get(
+        issue_property = IssueProperty.objects.get(
            user=request.user,
            project_id=project_id,
        )
@@ -602,14 +554,14 @@ class IssueUserDisplayPropertyEndpoint(BaseAPIView):
            "display_properties", issue_property.display_properties
        )
        issue_property.save()
-        serializer = IssueUserPropertySerializer(issue_property)
+        serializer = IssuePropertySerializer(issue_property)
        return Response(serializer.data, status=status.HTTP_201_CREATED)

    def get(self, request, slug, project_id):
-        issue_property, _ = IssueUserProperty.objects.get_or_create(
+        issue_property, _ = IssueProperty.objects.get_or_create(
            user=request.user, project_id=project_id
        )
-        serializer = IssueUserPropertySerializer(issue_property)
+        serializer = IssuePropertySerializer(issue_property)
        return Response(serializer.data, status=status.HTTP_200_OK)


@@ -619,18 +571,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):
@@ -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",
@@ -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"))
@@ -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,
@@ -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)


@@ -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,
@@ -1,5 +1,5 @@
 # Django imports
-from django.db.models import Exists, OuterRef, Q, Case, When, BooleanField
+from django.db.models import Exists, OuterRef, Q
 from django.utils import timezone

 # Third party imports
@@ -60,13 +60,6 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
            )
            .filter(entity_name="issue")
            .annotate(is_inbox_issue=Exists(inbox_issue))
-            .annotate(
-                is_mentioned_notification=Case(
-                    When(sender__icontains="mentioned", then=True),
-                    default=False,
-                    output_field=BooleanField(),
-                )
-            )
            .select_related("workspace", "project", "triggered_by", "receiver")
            .order_by("snoozed_till", "-created_at")
        )
@@ -245,28 +245,6 @@ class PageViewSet(BaseViewSet):

        return Response(status=status.HTTP_204_NO_CONTENT)

-    def access(self, request, slug, project_id, pk):
-        access = request.data.get("access", 0)
-        page = Page.objects.filter(
-            pk=pk, workspace__slug=slug, projects__id=project_id
-        ).first()
-
-        # Only update access if the page owner is the requesting user
-        if (
-            page.access != request.data.get("access", page.access)
-            and page.owned_by_id != request.user.id
-        ):
-            return Response(
-                {
-                    "error": "Access cannot be updated since this page is owned by someone else"
-                },
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        page.access = access
-        page.save()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
    def list(self, request, slug, project_id):
        queryset = self.get_queryset()
        pages = PageSerializer(queryset, many=True).data
@@ -333,39 +311,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 +365,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)


@@ -498,12 +470,6 @@ class PagesDescriptionViewSet(BaseViewSet):
            .first()
        )

-        if page is None:
-            return Response(
-                {"error": "Page not found"},
-                status=404,
-            )
-
        if page.is_locked:
            return Response(
                {"error": "Page is locked"},
@@ -39,7 +39,7 @@ from plane.db.models import (
    Cycle,
    Inbox,
    DeployBoard,
-    IssueUserProperty,
+    IssueProperty,
    Issue,
    Module,
    Project,
@@ -47,6 +47,7 @@ from plane.db.models import (
    ProjectMember,
    State,
    Workspace,
+    IssueType,
 )
 from plane.utils.cache import cache_response
 from plane.bgtasks.webhook_task import model_activity
@@ -266,7 +267,7 @@ class ProjectViewSet(BaseViewSet):
                    role=20,
                )
                # Also create the issue property for the user
-                _ = IssueUserProperty.objects.create(
+                _ = IssueProperty.objects.create(
                    project_id=serializer.data["id"],
                    user=request.user,
                )
@@ -280,7 +281,7 @@ class ProjectViewSet(BaseViewSet):
                        role=20,
                    )
                    # Also create the issue property for the user
-                    IssueUserProperty.objects.create(
+                    IssueProperty.objects.create(
                        project_id=serializer.data["id"],
                        user_id=serializer.data["project_lead"],
                    )
@@ -342,7 +343,13 @@ class ProjectViewSet(BaseViewSet):
                    .first()
                )

-                # Create the model activity
+                # Create the issue type
+                IssueType.objects.create(
+                    name="Task",
+                    description="A task that needs to be done",
+                    project_id=project.id,
+                )
+
                model_activity.delay(
                    model_name="project",
                    model_id=str(project.id),
@@ -599,7 +606,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)


@@ -25,7 +25,7 @@ from plane.db.models import (
    ProjectMemberInvite,
    User,
    WorkspaceMember,
-    IssueUserProperty,
+    IssueProperty,
 )


@@ -179,9 +179,9 @@ class UserProjectInvitationsViewset(BaseViewSet):
            ignore_conflicts=True,
        )

-        IssueUserProperty.objects.bulk_create(
+        IssueProperty.objects.bulk_create(
            [
-                IssueUserProperty(
+                IssueProperty(
                    project_id=project_id,
                    user=request.user,
                    workspace=workspace,
@@ -22,7 +22,7 @@ from plane.db.models import (
    ProjectMember,
    Workspace,
    TeamMember,
-    IssueUserProperty,
+    IssueProperty,
 )
 from plane.bgtasks.project_add_user_email_task import project_add_user_email
 from plane.utils.host import base_host
@@ -136,7 +136,7 @@ class ProjectMemberViewSet(BaseViewSet):
            )
            # Create a new issue property
            bulk_issue_props.append(
-                IssueUserProperty(
+                IssueProperty(
                    user_id=member.get("member_id"),
                    project_id=project_id,
                    workspace_id=project.workspace_id,
@@ -150,7 +150,7 @@ class ProjectMemberViewSet(BaseViewSet):
            ignore_conflicts=True,
        )

-        _ = IssueUserProperty.objects.bulk_create(
+        _ = IssueProperty.objects.bulk_create(
            bulk_issue_props, batch_size=10, ignore_conflicts=True
        )

@@ -323,7 +323,7 @@ class AddTeamToProjectEndpoint(BaseAPIView):
                )
            )
            issue_props.append(
-                IssueUserProperty(
+                IssueProperty(
                    project_id=project_id,
                    user_id=member,
                    workspace=workspace,
@@ -335,7 +335,7 @@ class AddTeamToProjectEndpoint(BaseAPIView):
            project_members, batch_size=10, ignore_conflicts=True
        )

-        _ = IssueUserProperty.objects.bulk_create(
+        _ = IssueProperty.objects.bulk_create(
            issue_props, batch_size=10, ignore_conflicts=True
        )

@@ -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)
@@ -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)
@@ -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)
@@ -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(
@@ -3,7 +3,7 @@ from plane.db.models import Profile, Workspace, WorkspaceMemberInvite

 def get_redirection_path(user):
    # Handle redirections
-    profile, _ = Profile.objects.get_or_create(user=user)
+    profile = Profile.objects.get(user=user)

    # Redirect to onboarding if the user is not onboarded yet
    if not profile.is_onboarded:
@@ -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()
@@ -125,7 +120,7 @@ class MagicSignInEndpoint(View):
                callback=post_user_auth_workflow,
            )
            user = provider.authenticate()
-            profile, _ = Profile.objects.get_or_create(user=user)
+            profile = Profile.objects.get(user=user)
            # Login the user and record his device info
            user_login(request=request, user=user, is_app=True)
            if user.is_password_autoset and profile.is_onboarded:
@@ -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
@@ -21,6 +21,7 @@ from plane.db.models import (
    Cycle,
    Module,
    Issue,
+    IssueType,
    IssueSequence,
    IssueAssignee,
    IssueLabel,
@@ -336,6 +337,12 @@ def create_issues(workspace, project, user_id, issue_count):
        65535 if largest_sort_order is None else largest_sort_order + 10000
    )

+    issue_type = IssueType.objects.create(
+        name="Task",
+        description="A task that needs to be completed.",
+        project=project,
+    )
+
    for _ in range(0, issue_count):
        start_date = [None, fake.date_this_year()][random.randint(0, 1)]
        end_date = (
@@ -364,6 +371,7 @@ def create_issues(workspace, project, user_id, issue_count):
                    random.randint(0, 4)
                ],
                created_by_id=creators[random.randint(0, len(creators) - 1)],
+                type=issue_type,
            )
        )

@@ -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:
@@ -1393,7 +1391,6 @@ def create_issue_relation_activity(
                    workspace_id=workspace_id,
                    comment=f"added {requested_data.get('relation_type')} relation",
                    old_identifier=related_issue,
-                    epoch=epoch,
                )
            )
            issue = Issue.objects.get(pk=issue_id)
@@ -1719,16 +1716,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=(
@@ -221,6 +221,7 @@ def notifications(
            else None
        )
        if type not in [
+            "issue.activity.deleted",
            "cycle.activity.created",
            "cycle.activity.deleted",
            "module.activity.created",
@@ -30,7 +30,7 @@ def page_version(
            workspace_id=page.workspace_id,
            description_html=page.description_html,
            description_binary=page.description_binary,
-            owned_by_id=user_id,
+            ownned_by_id=user_id,
            last_saved_at=page.updated_at,
        )

@@ -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.
@@ -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
@@ -161,7 +161,7 @@ class Migration(migrations.Migration):
            options={
                "verbose_name": "Workspace User Property",
                "verbose_name_plural": "Workspace User Property",
-                "db_table": "workspace_user_properties",
+                "db_table": "Workspace_user_properties",
                "ordering": ("-created_at",),
                "unique_together": {("workspace", "user")},
            },
@@ -1,106 +0,0 @@
-# Generated by Django 4.2.11 on 2024-07-10 13:59
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-import uuid
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0069_alter_account_provider_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='apitoken',
-            name='is_service',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name='exporterhistory',
-            name='filters',
-            field=models.JSONField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='exporterhistory',
-            name='name',
-            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Exporter Name'),
-        ),
-        migrations.AddField(
-            model_name='exporterhistory',
-            name='type',
-            field=models.CharField(choices=[('issue_exports', 'Issue Exports'), ('issue_worklogs', 'Issue Worklogs')], default='issue_exports', max_length=50),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='is_time_tracking_enabled',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='start_date',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='project',
-            name='target_date',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-        migrations.CreateModel(
-            name='PageVersion',
-            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)),
-                ('last_saved_at', models.DateTimeField(default=django.utils.timezone.now)),
-                ('description_binary', models.BinaryField(null=True)),
-                ('description_html', models.TextField(blank=True, default='<p></p>')),
-                ('description_stripped', models.TextField(blank=True, null=True)),
-                ('description_json', models.JSONField(blank=True, default=dict)),
-                ('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')),
-                ('owned_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='page_versions', to=settings.AUTH_USER_MODEL)),
-                ('page', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='page_versions', to='db.page')),
-                ('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')),
-                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='page_versions', to='db.workspace')),
-            ],
-            options={
-                'verbose_name': 'Page Version',
-                'verbose_name_plural': 'Page Versions',
-                'db_table': 'page_versions',
-                'ordering': ('-created_at',),
-            },
-        ),
-        migrations.CreateModel(
-            name='IssueType',
-            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)),
-                ('name', models.CharField(max_length=255)),
-                ('description', models.TextField(blank=True)),
-                ('logo_props', models.JSONField(default=dict)),
-                ('sort_order', models.FloatField(default=65535)),
-                ('is_default', models.BooleanField(default=True)),
-                ('weight', models.PositiveIntegerField(default=0)),
-                ('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')),
-                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_%(class)s', to='db.workspace')),
-            ],
-            options={
-                'verbose_name': 'Issue Type',
-                'verbose_name_plural': 'Issue Types',
-                'db_table': 'issue_types',
-                'ordering': ('sort_order',),
-                'unique_together': {('project', 'name')},
-            },
-        ),
-        migrations.AddField(
-            model_name='issue',
-            name='type',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='issue_type', to='db.issuetype'),
-        ),
-    ]
@@ -0,0 +1,275 @@
+# Generated by Django 4.2.11 on 2024-07-01 06:10
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+def create_issue_types(apps, schema_editor):
+    Project = apps.get_model("db", "Project")
+    Issue = apps.get_model("db", "Issue")
+    IssueType = apps.get_model("db", "IssueType")
+    # Create the issue types for all projects
+    IssueType.objects.bulk_create(
+        [
+            IssueType(
+                name="Task",
+                description="A task that needs to be completed.",
+                project_id=project["id"],
+                workspace_id=project["workspace_id"],
+            )
+            for project in Project.objects.values("id", "workspace_id")
+        ],
+        batch_size=1000,
+    )
+    # Update the issue type for all existing issues
+    issue_types = {
+        str(issue_type["project_id"]): str(issue_type["id"])
+        for issue_type in IssueType.objects.values("id", "project_id")
+    }
+    # Update the issue type for all existing issues
+    bulk_issues = []
+    for issue in Issue.objects.all():
+        issue.type_id = issue_types[str(issue.project_id)]
+        bulk_issues.append(issue)
+
+    # Update the issue type for all existing issues
+    Issue.objects.bulk_update(bulk_issues, ["type_id"], batch_size=1000)
+
+
+def create_page_versions(apps, schema_editor):
+    Page = apps.get_model("db", "Page")
+    PageVersion = apps.get_model("db", "PageVersion")
+    # Create the page versions for all pages
+    PageVersion.objects.bulk_create(
+        [
+            PageVersion(
+                page_id=page["id"],
+                workspace_id=page["workspace_id"],
+                description_html=page["description_html"],
+                description_binary=page["description_binary"],
+                description_stripped=page["description_stripped"],
+                ownned_by_id=page["owned_by_id"],
+                last_saved_at=page["updated_at"],
+            )
+            for page in Page.objects.values(
+                "id",
+                "workspace_id",
+                "description_html",
+                "description_binary",
+                "description_stripped",
+                "owned_by_id",
+                "updated_at",
+            )
+        ],
+        batch_size=1000,
+    )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("db", "0069_alter_account_provider_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="IssueType",
+            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,
+                    ),
+                ),
+                ("name", models.CharField(max_length=255)),
+                ("description", models.TextField(blank=True)),
+                ("logo_props", models.JSONField(default=dict)),
+                ("sort_order", models.FloatField(default=65535)),
+                (
+                    "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",
+                    ),
+                ),
+                (
+                    "workspace",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="workspace_%(class)s",
+                        to="db.workspace",
+                    ),
+                ),
+                (
+                    "is_default",
+                    models.BooleanField(default=True),
+                ),
+            ],
+            options={
+                "verbose_name": "Issue Type",
+                "verbose_name_plural": "Issue Types",
+                "db_table": "issue_types",
+                "ordering": ("sort_order",),
+            },
+        ),
+        migrations.AddField(
+            model_name="issue",
+            name="type",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="issue_type",
+                to="db.issuetype",
+            ),
+        ),
+        migrations.AddField(
+            model_name="apitoken",
+            name="is_service",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.RunPython(create_issue_types),
+        migrations.CreateModel(
+            name="PageVersion",
+            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,
+                    ),
+                ),
+                (
+                    "last_saved_at",
+                    models.DateTimeField(default=django.utils.timezone.now),
+                ),
+                ("description_binary", models.BinaryField(null=True)),
+                (
+                    "description_html",
+                    models.TextField(blank=True, default="<p></p>"),
+                ),
+                (
+                    "description_stripped",
+                    models.TextField(blank=True, null=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",
+                    ),
+                ),
+                (
+                    "ownned_by",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="page_versions",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "page",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="page_versions",
+                        to="db.page",
+                    ),
+                ),
+                (
+                    "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",
+                    ),
+                ),
+                (
+                    "workspace",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="page_versions",
+                        to="db.workspace",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Page Version",
+                "verbose_name_plural": "Page Versions",
+                "db_table": "page_versions",
+                "ordering": ("-created_at",),
+            },
+        ),
+        migrations.AddField(
+            model_name="project",
+            name="start_date",
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="project",
+            name="target_date",
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.RunPython(create_page_versions),
+    ]
@@ -1,44 +0,0 @@
-# Generated by Django 4.2.11 on 2024-07-15 06:07
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("db", "0070_apitoken_is_service_exporterhistory_filters_and_more"),
-    ]
-
-    operations = [
-        migrations.RenameModel(
-            old_name="IssueProperty",
-            new_name="IssueUserProperty",
-        ),
-        migrations.AlterModelOptions(
-            name="issueuserproperty",
-            options={
-                "ordering": ("-created_at",),
-                "verbose_name": "Issue User Property",
-                "verbose_name_plural": "Issue User Properties",
-            },
-        ),
-        migrations.AlterModelTable(
-            name="issueuserproperty",
-            table="issue_user_properties",
-        ),
-        migrations.AddField(
-            model_name="issuetype",
-            name="is_active",
-            field=models.BooleanField(default=True),
-        ),
-        migrations.AddField(
-            model_name="project",
-            name="is_issue_type_enabled",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AlterField(
-            model_name="issuetype",
-            name="is_default",
-            field=models.BooleanField(default=False),
-        ),
-    ]
@@ -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),
-        ),
-    ]
@@ -1,203 +0,0 @@
-# Generated by Django 4.2.11 on 2024-08-13 16:21
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import uuid
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("db", "0073_alter_commentreaction_unique_together_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="deployboard",
-            name="is_activity_enabled",
-            field=models.BooleanField(default=True),
-        ),
-        migrations.AddField(
-            model_name="fileasset",
-            name="is_archived",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AlterField(
-            model_name="userfavorite",
-            name="sequence",
-            field=models.FloatField(default=65535),
-        ),
-        migrations.CreateModel(
-            name="ProjectIssueType",
-            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"
-                    ),
-                ),
-                (
-                    "deleted_at",
-                    models.DateTimeField(
-                        blank=True, null=True, verbose_name="Deleted At"
-                    ),
-                ),
-                (
-                    "id",
-                    models.UUIDField(
-                        db_index=True,
-                        default=uuid.uuid4,
-                        editable=False,
-                        primary_key=True,
-                        serialize=False,
-                        unique=True,
-                    ),
-                ),
-                ("level", models.PositiveIntegerField(default=0)),
-                ("is_default", models.BooleanField(default=False)),
-            ],
-            options={
-                "verbose_name": "Project Issue Type",
-                "verbose_name_plural": "Project Issue Types",
-                "db_table": "project_issue_types",
-                "ordering": ("project", "issue_type"),
-            },
-        ),
-        migrations.AlterModelOptions(
-            name="issuetype",
-            options={
-                "verbose_name": "Issue Type",
-                "verbose_name_plural": "Issue Types",
-            },
-        ),
-        migrations.RemoveConstraint(
-            model_name="issuetype",
-            name="issue_type_unique_name_project_when_deleted_at_null",
-        ),
-        migrations.AlterUniqueTogether(
-            name="issuetype",
-            unique_together=set(),
-        ),
-        migrations.AlterField(
-            model_name="issuetype",
-            name="workspace",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="issue_types",
-                to="db.workspace",
-            ),
-        ),
-        migrations.AlterUniqueTogether(
-            name="issuetype",
-            unique_together={("workspace", "name", "deleted_at")},
-        ),
-        migrations.AddConstraint(
-            model_name="issuetype",
-            constraint=models.UniqueConstraint(
-                condition=models.Q(("deleted_at__isnull", True)),
-                fields=("name", "workspace"),
-                name="issue_type_unique_name_workspace_when_deleted_at_null",
-            ),
-        ),
-        migrations.AddField(
-            model_name="projectissuetype",
-            name="created_by",
-            field=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",
-            ),
-        ),
-        migrations.AddField(
-            model_name="projectissuetype",
-            name="issue_type",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="project_issue_types",
-                to="db.issuetype",
-            ),
-        ),
-        migrations.AddField(
-            model_name="projectissuetype",
-            name="project",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="project_%(class)s",
-                to="db.project",
-            ),
-        ),
-        migrations.AddField(
-            model_name="projectissuetype",
-            name="updated_by",
-            field=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",
-            ),
-        ),
-        migrations.AddField(
-            model_name="projectissuetype",
-            name="workspace",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="workspace_%(class)s",
-                to="db.workspace",
-            ),
-        ),
-        migrations.RemoveField(
-            model_name="issuetype",
-            name="is_default",
-        ),
-        migrations.RemoveField(
-            model_name="issuetype",
-            name="project",
-        ),
-        migrations.RemoveField(
-            model_name="issuetype",
-            name="sort_order",
-        ),
-        migrations.RemoveField(
-            model_name="issuetype",
-            name="weight",
-        ),
-        migrations.AddConstraint(
-            model_name="projectissuetype",
-            constraint=models.UniqueConstraint(
-                condition=models.Q(("deleted_at__isnull", True)),
-                fields=("project", "issue_type"),
-                name="project_issue_type_unique_project_issue_type_when_deleted_at_null",
-            ),
-        ),
-        migrations.AlterUniqueTogether(
-            name="projectissuetype",
-            unique_together={("project", "issue_type", "deleted_at")},
-        ),
-        migrations.AddField(
-            model_name="issuetype",
-            name="is_default",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name="issuetype",
-            name="level",
-            field=models.PositiveIntegerField(default=0),
-        ),
-        migrations.AlterUniqueTogether(
-            name="issuetype",
-            unique_together=set(),
-        ),
-        migrations.RemoveConstraint(
-            model_name="issuetype",
-            name="issue_type_unique_name_workspace_when_deleted_at_null",
-        ),
-    ]
@@ -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:
@@ -29,7 +29,7 @@ from .issue import (
    IssueLabel,
    IssueLink,
    IssueMention,
-    IssueUserProperty,
+    IssueProperty,
    IssueReaction,
    IssueRelation,
    IssueSequence,
@@ -110,5 +110,3 @@ from .dashboard import Dashboard, DashboardWidget, Widget
 from .favorite import UserFavorite

 from .issue_type import IssueType
-
-from .recent_visit import UserRecentVisit
@@ -42,7 +42,6 @@ class FileAsset(BaseModel):
        related_name="assets",
    )
    is_deleted = models.BooleanField(default=False)
-    is_archived = models.BooleanField(default=False)

    class Meta:
        verbose_name = "File Asset"
@@ -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"
@@ -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"
@@ -40,21 +40,13 @@ class DeployBoard(WorkspaceBaseModel):
    )
    is_votes_enabled = models.BooleanField(default=False)
    view_props = models.JSONField(default=dict)
-    is_activity_enabled = models.BooleanField(default=True)

    def __str__(self):
        """Return name of the deploy board"""
        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"
@@ -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"
@@ -18,17 +18,6 @@ def generate_token():


 class ExporterHistory(BaseModel):
-    name = models.CharField(
-        max_length=255, verbose_name="Exporter Name", null=True, blank=True
-    )
-    type = models.CharField(
-        max_length=50,
-        default="issue_exports",
-        choices=(
-            ("issue_exports", "Issue Exports"),
-            ("issue_worklogs", "Issue Worklogs"),
-        ),
-    )
    workspace = models.ForeignKey(
        "db.WorkSpace",
        on_delete=models.CASCADE,
@@ -66,7 +55,6 @@ class ExporterHistory(BaseModel):
        on_delete=models.CASCADE,
        related_name="workspace_exporters",
    )
-    filters = models.JSONField(blank=True, null=True)

    class Meta:
        verbose_name = "Exporter"
@@ -21,7 +21,7 @@ class UserFavorite(WorkspaceBaseModel):
    entity_identifier = models.UUIDField(null=True, blank=True)
    name = models.CharField(max_length=255, blank=True, null=True)
    is_folder = models.BooleanField(default=False)
-    sequence = models.FloatField(default=65535)
+    sequence = models.IntegerField(default=65535)
    parent = models.ForeignKey(
        "self",
        on_delete=models.CASCADE,
@@ -31,19 +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"
@@ -51,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

@@ -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"
@@ -6,9 +6,10 @@ from django.conf import settings
 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 import models
+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)
@@ -182,6 +182,7 @@ class Issue(ProjectBaseModel):
        ordering = ("-created_at",)

    def save(self, *args, **kwargs):
+        # This means that the model isn't saved to the database yet
        if self.state is None:
            try:
                from plane.db.models import State
@@ -191,6 +192,7 @@ class Issue(ProjectBaseModel):
                    project=self.project,
                    default=True,
                ).first()
+                # if there is no default state assign any random state
                if default_state is None:
                    random_state = State.objects.filter(
                        ~models.Q(is_triage=True), project=self.project
@@ -204,6 +206,7 @@ class Issue(ProjectBaseModel):
            try:
                from plane.db.models import State

+                # Check if the current issue state group is completed or not
                if self.state.group == "completed":
                    self.completed_at = timezone.now()
                else:
@@ -212,44 +215,30 @@ class Issue(ProjectBaseModel):
                pass

        if self._state.adding:
-            with transaction.atomic():
-                last_sequence = (
-                    IssueSequence.objects.filter(project=self.project)
-                    .select_for_update()
-                    .aggregate(largest=models.Max("sequence"))["largest"]
-                )
-                self.sequence_id = last_sequence + 1 if last_sequence else 1
-                # Strip the html tags using html parser
-                self.description_stripped = (
-                    None
-                    if (
-                        self.description_html == ""
-                        or self.description_html is None
-                    )
-                    else strip_tags(self.description_html)
-                )
-                largest_sort_order = Issue.objects.filter(
-                    project=self.project, state=self.state
-                ).aggregate(largest=models.Max("sort_order"))["largest"]
-                if largest_sort_order is not None:
-                    self.sort_order = largest_sort_order + 10000
+            # Get the maximum display_id value from the database
+            last_id = IssueSequence.objects.filter(
+                project=self.project
+            ).aggregate(largest=models.Max("sequence"))["largest"]
+            # aggregate can return None! Check it first.
+            # If it isn't none, just use the last ID specified (which should be the greatest) and add one to it
+            if last_id:
+                self.sequence_id = last_id + 1
+            else:
+                self.sequence_id = 1

-                super(Issue, self).save(*args, **kwargs)
+            largest_sort_order = Issue.objects.filter(
+                project=self.project, state=self.state
+            ).aggregate(largest=models.Max("sort_order"))["largest"]
+            if largest_sort_order is not None:
+                self.sort_order = largest_sort_order + 10000

-                IssueSequence.objects.create(
-                    issue=self, sequence=self.sequence_id, project=self.project
-                )
-        else:
-            # Strip the html tags using html parser
-            self.description_stripped = (
-                None
-                if (
-                    self.description_html == ""
-                    or self.description_html is None
-                )
-                else strip_tags(self.description_html)
-            )
-            super(Issue, self).save(*args, **kwargs)
+        # Strip the html tags using html parser
+        self.description_stripped = (
+            None
+            if (self.description_html == "" or self.description_html is None)
+            else strip_tags(self.description_html)
+        )
+        super(Issue, self).save(*args, **kwargs)

    def __str__(self):
        """Return name of the issue"""
@@ -295,14 +284,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 +305,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 +326,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 +375,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"
@@ -516,7 +482,7 @@ class IssueComment(ProjectBaseModel):
        return str(self.issue)


-class IssueUserProperty(ProjectBaseModel):
+class IssueProperty(ProjectBaseModel):
    user = models.ForeignKey(
        settings.AUTH_USER_MODEL,
        on_delete=models.CASCADE,
@@ -529,18 +495,11 @@ class IssueUserProperty(ProjectBaseModel):
    )

    class Meta:
-        verbose_name = "Issue User Property"
-        verbose_name_plural = "Issue User Properties"
-        db_table = "issue_user_properties"
+        verbose_name = "Issue Property"
+        verbose_name_plural = "Issue Properties"
+        db_table = "issue_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 +522,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 +567,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 +590,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 +612,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 +636,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 +667,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"
@@ -752,3 +675,14 @@ class IssueVote(ProjectBaseModel):

    def __str__(self):
        return f"{self.issue.name} {self.actor.email}"
+
+
+# TODO: Find a better method to save the model
+@receiver(post_save, sender=Issue)
+def create_issue_sequence(sender, instance, created, **kwargs):
+    if created:
+        IssueSequence.objects.create(
+            issue=instance,
+            sequence=instance.sequence_id,
+            project=instance.project,
+        )
@@ -1,56 +1,34 @@
 # Django imports
 from django.db import models
-from django.db.models import Q

 # Module imports
-from .project import ProjectBaseModel
-from .base import BaseModel
+from .workspace import WorkspaceBaseModel


-class IssueType(BaseModel):
-    workspace = models.ForeignKey(
-        "db.Workspace",
-        related_name="issue_types",
-        on_delete=models.CASCADE,
-    )
+class IssueType(WorkspaceBaseModel):
    name = models.CharField(max_length=255)
    description = models.TextField(blank=True)
    logo_props = models.JSONField(default=dict)
-    is_default = models.BooleanField(default=False)
-    is_active = models.BooleanField(default=True)
-    level = models.PositiveIntegerField(default=0)
+    sort_order = models.FloatField(default=65535)
+    is_default = models.BooleanField(default=True)

    class Meta:
        verbose_name = "Issue Type"
        verbose_name_plural = "Issue Types"
        db_table = "issue_types"
+        ordering = ("sort_order",)

    def __str__(self):
        return self.name

-
-class ProjectIssueType(ProjectBaseModel):
-    issue_type = models.ForeignKey(
-        "db.IssueType",
-        related_name="project_issue_types",
-        on_delete=models.CASCADE,
-    )
-    level = models.PositiveIntegerField(default=0)
-    is_default = models.BooleanField(default=False)
-
-    class Meta:
-        unique_together = ["project", "issue_type", "deleted_at"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["project", "issue_type"],
-                condition=Q(deleted_at__isnull=True),
-                name="project_issue_type_unique_project_issue_type_when_deleted_at_null",
-            )
-        ]
-        verbose_name = "Project Issue Type"
-        verbose_name_plural = "Project Issue Types"
-        db_table = "project_issue_types"
-        ordering = ("project", "issue_type")
-
-    def __str__(self):
-        return f"{self.project} - {self.issue_type}"
+    def save(self, *args, **kwargs):
+        # If we are adding a new issue type, we need to set the sort order
+        if self._state.adding:
+            # Get the largest sort order for the project
+            largest_sort_order = IssueType.objects.filter(
+                project=self.project
+            ).aggregate(largest=models.Max("sort_order"))["largest"]
+            # If there are issue types, set the sort order to the largest + 10000
+            if largest_sort_order is not None:
+                self.sort_order = largest_sort_order + 10000
+        super(IssueType, self).save(*args, **kwargs)
@@ -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"
@@ -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"
@@ -289,7 +273,7 @@ class PageVersion(BaseModel):
        related_name="page_versions",
    )
    last_saved_at = models.DateTimeField(default=timezone.now)
-    owned_by = models.ForeignKey(
+    ownned_by = models.ForeignKey(
        settings.AUTH_USER_MODEL,
        on_delete=models.CASCADE,
        related_name="page_versions",
@@ -297,7 +281,6 @@ class PageVersion(BaseModel):
    description_binary = models.BinaryField(null=True)
    description_html = models.TextField(blank=True, default="<p></p>")
    description_stripped = models.TextField(blank=True, null=True)
-    description_json = models.JSONField(default=dict, blank=True)

    class Meta:
        verbose_name = "Page Version"
@@ -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,
@@ -96,8 +94,6 @@ class Project(BaseModel):
    issue_views_view = models.BooleanField(default=True)
    page_view = models.BooleanField(default=True)
    inbox_view = models.BooleanField(default=False)
-    is_time_tracking_enabled = models.BooleanField(default=False)
-    is_issue_type_enabled = models.BooleanField(default=False)
    cover_image = models.URLField(blank=True, null=True, max_length=800)
    estimate = models.ForeignKey(
        "db.Estimate",
@@ -119,28 +115,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 +198,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 +220,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 +300,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"
@@ -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}"
@@ -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"
@@ -6,7 +6,6 @@ from django.db import models
 from .base import BaseModel
 from .project import ProjectBaseModel
 from .workspace import WorkspaceBaseModel
-from plane.utils.issue_filters import issue_filters


 def get_default_filters():
@@ -52,6 +51,7 @@ def get_default_display_properties():
        "updated_on": True,
    }

+
 # DEPRECATED TODO: - Remove in next release
 class GlobalView(BaseModel):
    workspace = models.ForeignKey(
@@ -116,32 +116,11 @@ class IssueView(WorkspaceBaseModel):
        db_table = "issue_views"
        ordering = ("-created_at",)

-    def save(self, *args, **kwargs):
-        query_params = self.filters
-        self.query = (
-            issue_filters(query_params, "POST") if query_params else {}
-        )
-
-        if self._state.adding:
-            if self.project:
-                largest_sort_order = IssueView.objects.filter(
-                    project=self.project
-                ).aggregate(largest=models.Max("sort_order"))["largest"]
-            else:
-                largest_sort_order = IssueView.objects.filter(
-                    workspace=self.workspace, project__isnull=True
-                ).aggregate(largest=models.Max("sort_order"))["largest"]
-            if largest_sort_order is not None:
-                self.sort_order = largest_sort_order + 10000
-
-        super(IssueView, self).save(*args, **kwargs)
-
    def __str__(self):
        """Return name of the View"""
        return f"{self.name} <{self.project.name}>"


-# DEPRECATED TODO: - Remove in next release
 class IssueViewFavorite(ProjectBaseModel):
    user = models.ForeignKey(
        settings.AUTH_USER_MODEL,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
pablohashescobar	19b04d3073	dev: get issue_types	2024-07-09 17:35:08 +05:30
pablohashescobar	cafa80e08e	dev: add start date and target date to project	2024-07-09 13:29:51 +05:30
pablohashescobar	013cba8e29	Merge branch 'preview' of github.com:makeplane/plane into feat-issue-type-page-versioning	2024-07-09 13:18:05 +05:30
pablohashescobar	efcd96ee8c	Merge branch 'preview' of github.com:makeplane/plane into feat-issue-type-page-versioning	2024-07-08 13:00:50 +05:30
pablohashescobar	4609adf6cc	dev: add is_default value in issue type	2024-07-05 16:38:06 +05:30
pablohashescobar	5f1cc70938	Merge branch 'preview' of github.com:makeplane/plane into feat-issue-type-page-versioning	2024-07-05 11:26:16 +05:30
pablohashescobar	67cc0365bc	Merge branch 'preview' of github.com:makeplane/plane into feat-issue-type-page-versioning	2024-07-02 20:15:17 +05:30
pablohashescobar	01ec930a25	dev: create page version endpoints	2024-07-01 20:03:09 +05:30
pablohashescobar	9f59aea470	dev: add page versioning migrations	2024-07-01 14:50:15 +05:30
pablohashescobar	c097cb9581	dev: create page version	2024-07-01 13:49:17 +05:30
pablohashescobar	8824d21405	dev: fix migration for issue types	2024-07-01 11:46:46 +05:30
pablohashescobar	b6b282bb2a	dev: fix save	2024-06-30 20:08:48 +05:30
pablohashescobar	791ddfcf13	dev: create issue types and add back migration for existing issues	2024-06-30 19:56:20 +05:30