override methods used for typeError

fix issue changes done in Peek overview to reflect in the issue boards
2024-07-03 18:49:49 +05:30 · 2024-07-02 15:48:54 +05:30
1081 changed files with 13185 additions and 29509 deletions
@@ -2,7 +2,7 @@ name: Bug report
 description: Create a bug report to help us improve Plane
 title: "[bug]: "
 labels: [🐛bug]
-assignees: [vihar, pushya22]
+assignees: [srinivaspendem, pushya22]
 body:
 - type: markdown
  attributes:
@@ -2,7 +2,7 @@ name: Feature request
 description: Suggest a feature to improve Plane
 title: "[feature]: "
 labels: [✨feature]
-assignees: [vihar, pushya22]
+assignees: [srinivaspendem, pushya22]
 body:
 - type: markdown
  attributes:
@@ -2,11 +2,6 @@ name: Build AIO Base Image

 on:
  workflow_dispatch:
-    inputs:
-      base_tag_name:
-        description: 'Base Tag Name'
-        required: false
-        default: ''

 env:
  TARGET_BRANCH: ${{ github.ref_name }}
@@ -27,29 +22,27 @@ jobs:
      - id: set_env_variables
        name: Set Environment Variables
        run: |
-          echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT
-
-          if [ "${{ github.event.inputs.base_tag_name }}" != "" ]; then
-            echo "IMAGE_TAG=${{ github.event.inputs.base_tag_name }}" >> $GITHUB_OUTPUT
-          elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            echo "IMAGE_TAG=latest" >> $GITHUB_OUTPUT
-          elif [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then
-              echo "IMAGE_TAG=preview" >> $GITHUB_OUTPUT
-          else
-            echo "IMAGE_TAG=develop" >> $GITHUB_OUTPUT
-          fi
-
-
          if [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
            echo "BUILDX_DRIVER=cloud" >> $GITHUB_OUTPUT
            echo "BUILDX_VERSION=lab:latest" >> $GITHUB_OUTPUT
            echo "BUILDX_PLATFORMS=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
            echo "BUILDX_ENDPOINT=makeplane/plane-dev" >> $GITHUB_OUTPUT
+            echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT
+
+            echo "IMAGE_TAG=latest" >> $GITHUB_OUTPUT
          else
            echo "BUILDX_DRIVER=docker-container" >> $GITHUB_OUTPUT
            echo "BUILDX_VERSION=latest" >> $GITHUB_OUTPUT
            echo "BUILDX_PLATFORMS=linux/amd64" >> $GITHUB_OUTPUT
            echo "BUILDX_ENDPOINT=" >> $GITHUB_OUTPUT
+
+            if [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then
+              echo "TARGET_BRANCH=preview" >> $GITHUB_OUTPUT
+              echo "IMAGE_TAG=preview" >> $GITHUB_OUTPUT
+            else
+              echo "TARGET_BRANCH=develop" >> $GITHUB_OUTPUT
+              echo "IMAGE_TAG=develop" >> $GITHUB_OUTPUT
+            fi
          fi

      - id: checkout_files
@@ -61,6 +54,7 @@ jobs:
    needs: [base_build_setup]
    env:
      BASE_IMG_TAG: makeplane/plane-aio-base:full-${{ needs.base_build_setup.outputs.image_tag }}
+      TARGET_BRANCH: ${{ needs.base_build_setup.outputs.gh_branch_name }}
      BUILDX_DRIVER: ${{ needs.base_build_setup.outputs.gh_buildx_driver }}
      BUILDX_VERSION: ${{ needs.base_build_setup.outputs.gh_buildx_version }}
      BUILDX_PLATFORMS: ${{ needs.base_build_setup.outputs.gh_buildx_platforms }}
@@ -102,6 +96,7 @@ jobs:
    needs: [base_build_setup]
    env:
      BASE_IMG_TAG: makeplane/plane-aio-base:slim-${{ needs.base_build_setup.outputs.image_tag }}
+      TARGET_BRANCH: ${{ needs.base_build_setup.outputs.gh_branch_name }}
      BUILDX_DRIVER: ${{ needs.base_build_setup.outputs.gh_buildx_driver }}
      BUILDX_VERSION: ${{ needs.base_build_setup.outputs.gh_buildx_version }}
      BUILDX_PLATFORMS: ${{ needs.base_build_setup.outputs.gh_buildx_platforms }}
@@ -13,10 +13,6 @@ on:
        type: boolean
        required: false
        default: false
-      base_tag_name:
-        description: 'Base Tag Name'
-        required: false
-        default: ''
  release:
    types: [released, prereleased]

@@ -31,7 +27,6 @@ jobs:
    runs-on: ubuntu-latest
    outputs:
      gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }}
-      flat_branch_name: ${{ steps.set_env_variables.outputs.FLAT_BRANCH_NAME }}
      gh_buildx_driver: ${{ steps.set_env_variables.outputs.BUILDX_DRIVER }}
      gh_buildx_version: ${{ steps.set_env_variables.outputs.BUILDX_VERSION }}
      gh_buildx_platforms: ${{ steps.set_env_variables.outputs.BUILDX_PLATFORMS }}
@@ -57,9 +52,7 @@ jobs:
            echo "BUILDX_PLATFORMS=linux/amd64" >> $GITHUB_OUTPUT
            echo "BUILDX_ENDPOINT=" >> $GITHUB_OUTPUT

-            if [ "${{ github.event_name}}" == "workflow_dispatch" ] && [ "${{ github.event.inputs.base_tag_name }}" != "" ]; then
-              echo "AIO_BASE_TAG=${{ github.event.inputs.base_tag_name }}" >> $GITHUB_OUTPUT
-            elif [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then
+            if [ "${{ env.TARGET_BRANCH }}" == "preview" ]; then
              echo "AIO_BASE_TAG=preview" >> $GITHUB_OUTPUT
            else
              echo "AIO_BASE_TAG=develop" >> $GITHUB_OUTPUT
@@ -79,9 +72,6 @@ jobs:
            echo "DO_SLIM_BUILD=false" >> $GITHUB_OUTPUT
          fi

-          FLAT_BRANCH_NAME=$(echo "${{ env.TARGET_BRANCH }}" | sed 's/[^a-zA-Z0-9]/-/g')
-          echo "FLAT_BRANCH_NAME=$FLAT_BRANCH_NAME" >> $GITHUB_OUTPUT
-
      - id: checkout_files
        name: Checkout Files
        uses: actions/checkout@v4
@@ -93,7 +83,7 @@ jobs:
    env:
      BUILD_TYPE: full
      AIO_BASE_TAG: ${{ needs.branch_build_setup.outputs.aio_base_tag }}
-      AIO_IMAGE_TAGS: makeplane/plane-aio:full-${{ needs.branch_build_setup.outputs.flat_branch_name }}
+      AIO_IMAGE_TAGS: makeplane/plane-aio:full-${{ needs.branch_build_setup.outputs.gh_branch_name }}
      TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
      BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
      BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
@@ -136,7 +126,7 @@ jobs:
          tags: ${{ env.AIO_IMAGE_TAGS }}
          push: true
          build-args: |
-            BASE_TAG=${{ env.AIO_BASE_TAG }}
+            BUILD_TAG=${{ env.AIO_BASE_TAG }}
            BUILD_TYPE=${{env.BUILD_TYPE}}
          cache-from: type=gha
          cache-to: type=gha,mode=max
@@ -153,7 +143,7 @@ jobs:
    env:
      BUILD_TYPE: slim
      AIO_BASE_TAG: ${{ needs.branch_build_setup.outputs.aio_base_tag }}
-      AIO_IMAGE_TAGS: makeplane/plane-aio:slim-${{ needs.branch_build_setup.outputs.flat_branch_name }}
+      AIO_IMAGE_TAGS: makeplane/plane-aio:slim-${{ needs.branch_build_setup.outputs.gh_branch_name }}
      TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
      BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
      BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
@@ -196,7 +186,7 @@ jobs:
          tags: ${{ env.AIO_IMAGE_TAGS }}
          push: true
          build-args: |
-            BASE_TAG=${{ env.AIO_BASE_TAG }}
+            BUILD_TAG=${{ env.AIO_BASE_TAG }}
            BUILD_TYPE=${{env.BUILD_TYPE}}
          cache-from: type=gha
          cache-to: type=gha,mode=max
@@ -2,11 +2,6 @@ name: Feature Preview

 on:
  workflow_dispatch:
-    inputs:
-      base_tag_name:
-        description: 'Base Tag Name'
-        required: false
-        default: 'preview'

 env:
  TARGET_BRANCH: ${{ github.ref_name }}
@@ -34,12 +29,7 @@ jobs:
          echo "BUILDX_VERSION=latest" >> $GITHUB_OUTPUT
          echo "BUILDX_PLATFORMS=linux/amd64" >> $GITHUB_OUTPUT
          echo "BUILDX_ENDPOINT=" >> $GITHUB_OUTPUT
-
-          if [ "${{ github.event.inputs.base_tag_name }}" != "" ]; then
-            echo "AIO_BASE_TAG=${{ github.event.inputs.base_tag_name }}" >> $GITHUB_OUTPUT
-          else
-            echo "AIO_BASE_TAG=develop" >> $GITHUB_OUTPUT
-          fi
+          echo "AIO_BASE_TAG=develop" >> $GITHUB_OUTPUT

          echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT

@@ -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">
@@ -13,7 +13,7 @@ import { AuthenticationMethodCard } from "@/components/authentication";
 import { UpgradeButton } from "@/components/common/upgrade-button";
 import { getBaseAuthenticationModes } from "@/helpers/authentication.helper";
 // images
-import OIDCLogo from "@/public/logos/oidc-logo.svg";
+import OIDCLogo from "@/public/logos/oidc-logo.png";
 import SAMLLogo from "@/public/logos/saml-logo.svg";

 export type TAuthenticationModeProps = {
@@ -32,7 +32,7 @@ export const getAuthenticationModes: (props: TGetBaseAuthenticationModeProps) =>
      key: "oidc",
      name: "OIDC",
      description: "Authenticate your users via the OpenID Connect protocol.",
-      icon: <Image src={OIDCLogo} height={22} width={22} alt="OIDC Logo" />,
+      icon: <Image src={OIDCLogo} height={20} width={20} alt="OIDC Logo" />,
      config: <UpgradeButton />,
      unavailable: true,
    },
@@ -40,7 +40,7 @@ export const getAuthenticationModes: (props: TGetBaseAuthenticationModeProps) =>
      key: "saml",
      name: "SAML",
      description: "Authenticate your users via the Security Assertion Markup Language protocol.",
-      icon: <Image src={SAMLLogo} height={22} width={22} alt="SAML Logo" className="pl-0.5" />,
+      icon: <Image src={SAMLLogo} height={24} width={24} alt="SAML Logo" className="pb-0.5 pl-0.5" />,
      config: <UpgradeButton />,
      unavailable: true,
    },
@@ -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
@@ -1,6 +1,6 @@
 {
  "name": "admin",
-  "version": "0.22.0",
+  "version": "0.21.0",
  "private": true,
  "scripts": {
    "dev": "turbo run develop",
@@ -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"
  }
-}
+}
@@ -1,11 +0,0 @@
-<svg width="92" height="84" viewBox="0 0 92 84" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_3695_11896)">
-<path d="M83.0398 32.6876C74.2901 27.2397 62.0735 23.8553 48.7013 23.8553C21.7918 23.8553 0 37.3101 0 53.9016C0 69.0898 18.1598 81.554 41.685 83.7001V74.9504C25.8364 72.9693 13.95 64.3022 13.95 53.9016C13.95 42.0977 29.4684 32.44 48.7013 32.44C58.2765 32.44 66.9436 34.8338 73.217 38.7134L64.3022 44.2439H92.1197V27.0746L83.0398 32.6876Z" fill="#CCCCCC"/>
-<path d="M41.6846 8.99736V74.9504V83.7002L55.6346 74.9504V0L41.6846 8.99736Z" fill="#FF6200"/>
-</g>
-<defs>
-<clipPath id="clip0_3695_11896">
-<rect width="92" height="84" fill="white"/>
-</clipPath>
-</defs>
-</svg>
@@ -1,17 +1,16 @@
-<svg width="700" height="650" viewBox="0 0 700 650" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_3262_5767)">
-<mask id="mask0_3262_5767" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="700" height="650">
-<path d="M700 0H0V650H700V0Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_3262_5767)">
-<path d="M337.682 0L360.832 20.5C377.982 35.7 395.182 50.85 412.132 66.25C521.982 166 614.982 278.25 684.982 407.45C688.582 414.05 691.832 420.85 695.082 427.6L699.982 437.75L694.582 440.6L690.532 434.85L680.032 419.9L672.682 409.2C621.732 335.25 570.682 261.2 500.582 201.95C479.373 183.995 455.969 168.807 430.932 156.75C380.232 132.5 335.132 142.2 296.432 182C259.632 219.85 240.532 266.85 223.282 314.65C221.032 320.8 218.682 326.9 216.332 333L212.232 343.75L203.632 341C208.632 323.6 213.232 306.1 217.832 288.55C228.332 248.8 238.832 209.05 253.432 170.75C268.932 129.95 288.532 90.6 308.082 51.25C316.532 34.2 324.982 17.15 333.082 0H337.682Z" fill="#C22E33"/>
-<path d="M372.382 491.1C291.082 529.6 94.3829 569.3 1.08287 559.1C-14.1671 478.8 135.482 102.5 208.982 45.5L204.232 56.4C202.115 61.531 199.813 66.5842 197.332 71.55L194.032 78C156.032 151.1 118.082 224.3 98.6329 304.5C91.6287 332.124 87.8038 360.458 87.2328 388.95C86.7328 455.95 128.432 501.55 198.082 504.4C231.582 505.75 265.432 502.25 299.232 498.7C313.932 497.2 328.582 495.65 343.232 494.5C348.632 494.1 353.932 493.45 360.832 492.55L372.382 491.15V491.1Z" fill="#C22E33"/>
-<path d="M141.233 639.05C118.983 640.75 96.733 642.45 74.583 644.45C279.433 663.95 476.083 630.6 670.083 562.25C606.833 450.75 521.583 362.7 422.483 286.15C423.783 291.05 426.683 294.6 429.533 298.1L431.933 301.1C440.433 312.4 449.333 323.5 458.283 334.6C478.733 360.05 499.183 385.5 514.583 413.5C553.483 484.5 532.383 545.9 456.183 578.3C406.083 599.65 351.333 614.2 297.183 622.9C245.683 631.1 193.433 635.05 141.233 639.05Z" fill="#C22E33"/>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="none">
+
+<g fill="#C22E33">
+
+<path d="M7.754 2l.463.41c.343.304.687.607 1.026.915C11.44 5.32 13.3 7.565 14.7 10.149c.072.132.137.268.202.403l.098.203-.108.057-.081-.115-.21-.299-.147-.214c-1.019-1.479-2.04-2.96-3.442-4.145a6.563 6.563 0 00-1.393-.904c-1.014-.485-1.916-.291-2.69.505-.736.757-1.118 1.697-1.463 2.653-.045.123-.092.245-.139.367l-.082.215-.172-.055c.1-.348.192-.698.284-1.049.21-.795.42-1.59.712-2.356.31-.816.702-1.603 1.093-2.39.169-.341.338-.682.5-1.025h.092z"/>
+
+<path d="M8.448 11.822c-1.626.77-5.56 1.564-7.426 1.36C.717 11.576 3.71 4.05 5.18 2.91l-.095.218a4.638 4.638 0 01-.138.303l-.066.129c-.76 1.462-1.519 2.926-1.908 4.53a7.482 7.482 0 00-.228 1.689c-.01 1.34.824 2.252 2.217 2.309.67.027 1.347-.043 2.023-.114.294-.03.587-.061.88-.084.108-.008.214-.021.352-.039l.231-.028z"/>
+
+<path d="M3.825 14.781c-.445.034-.89.068-1.333.108 4.097.39 8.03-.277 11.91-1.644-1.265-2.23-2.97-3.991-4.952-5.522.026.098.084.169.141.239l.048.06c.17.226.348.448.527.67.409.509.818 1.018 1.126 1.578.778 1.42.356 2.648-1.168 3.296-1.002.427-2.097.718-3.18.892-1.03.164-2.075.243-3.119.323z"/>
+
 </g>
-</g>
-<defs>
-<clipPath id="clip0_3262_5767">
-<rect width="700" height="650" fill="white"/>
-</clipPath>
-</defs>
-</svg>
+
+</svg>
@@ -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=60
@@ -1,4 +1,4 @@
-FROM python:3.12.5-alpine AS backend
+FROM python:3.11.1-alpine3.17 AS backend

 # set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
@@ -7,23 +7,23 @@ ENV PIP_DISABLE_PIP_VERSION_CHECK=1

 WORKDIR /code

-RUN apk add --no-cache \
-    "libpq" \
-    "libxslt" \
-    "nodejs-current" \
-    "xmlsec"
+RUN apk --no-cache add \
+    "libpq~=15" \
+    "libxslt~=1.1" \
+    "nodejs-current~=19" \
+    "xmlsec~=1.2"

 COPY requirements.txt ./
 COPY requirements ./requirements
 RUN apk add --no-cache libffi-dev
 RUN apk add --no-cache --virtual .build-deps \
    "bash~=5.2" \
-    "g++" \
-    "gcc" \
-    "cargo" \
-    "git" \
-    "make" \
-    "postgresql-dev" \
+    "g++~=12.2" \
+    "gcc~=12.2" \
+    "cargo~=1.64" \
+    "git~=2" \
+    "make~=4.3" \
+    "postgresql13-dev~=13" \
    "libc-dev" \
    "linux-headers" \
    && \
@@ -1,4 +1,4 @@
-FROM python:3.12.5-alpine AS backend
+FROM python:3.11.1-alpine3.17 AS backend

 # set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
@@ -7,18 +7,18 @@ ENV PIP_DISABLE_PIP_VERSION_CHECK=1

 RUN apk --no-cache add \
    "bash~=5.2" \
-    "libpq" \
-    "libxslt" \
-    "nodejs-current" \
-    "xmlsec" \
+    "libpq~=15" \
+    "libxslt~=1.1" \
+    "nodejs-current~=19" \
+    "xmlsec~=1.2" \
    "libffi-dev" \
    "bash~=5.2" \
-    "g++" \
-    "gcc" \
-    "cargo" \
-    "git" \
-    "make" \
-    "postgresql-dev" \
+    "g++~=12.2" \
+    "gcc~=12.2" \
+    "cargo~=1.64" \
+    "git~=2" \
+    "make~=4.3" \
+    "postgresql13-dev~=13" \
    "libc-dev" \
    "linux-headers"

@@ -32,3 +32,4 @@ python manage.py create_bucket
 python manage.py clear_cache

 python manage.py runserver 0.0.0.0:8000 --settings=plane.settings.local
+
@@ -1,4 +1,4 @@
 {
  "name": "plane-api",
-  "version": "0.22.0"
+  "version": "0.21.0"
 }
@@ -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
@@ -13,9 +13,9 @@ class CycleSerializer(BaseSerializer):
    started_issues = serializers.IntegerField(read_only=True)
    unstarted_issues = serializers.IntegerField(read_only=True)
    backlog_issues = serializers.IntegerField(read_only=True)
-    total_estimates = serializers.FloatField(read_only=True)
-    completed_estimates = serializers.FloatField(read_only=True)
-    started_estimates = serializers.FloatField(read_only=True)
+    total_estimates = serializers.IntegerField(read_only=True)
+    completed_estimates = serializers.IntegerField(read_only=True)
+    started_estimates = serializers.IntegerField(read_only=True)

    def validate(self, data):
        if (
@@ -40,7 +40,6 @@ class CycleSerializer(BaseSerializer):
            "workspace",
            "project",
            "owned_by",
-            "deleted_at",
        ]


@@ -11,7 +11,6 @@ from rest_framework import serializers
 # Module imports
 from plane.db.models import (
    Issue,
-    IssueType,
    IssueActivity,
    IssueAssignee,
    IssueAttachment,
@@ -47,12 +46,6 @@ class IssueSerializer(BaseSerializer):
        write_only=True,
        required=False,
    )
-    type_id = serializers.PrimaryKeyRelatedField(
-        source="type",
-        queryset=IssueType.objects.all(),
-        required=False,
-        allow_null=True,
-    )

    class Meta:
        model = Issue
@@ -60,7 +53,9 @@ class IssueSerializer(BaseSerializer):
            "id",
            "workspace",
            "project",
+            "created_by",
            "updated_by",
+            "created_at",
            "updated_at",
        ]
        exclude = [
@@ -136,20 +131,7 @@ class IssueSerializer(BaseSerializer):
        workspace_id = self.context["workspace_id"]
        default_assignee_id = self.context["default_assignee_id"]

-        issue_type = validated_data.pop("type", None)
-
-        if not issue_type:
-            # Get default issue type
-            issue_type = IssueType.objects.filter(
-                project_issue_types__project_id=project_id, is_default=True
-            ).first()
-            issue_type = issue_type
-
-        issue = Issue.objects.create(
-            **validated_data,
-            project_id=project_id,
-            type=issue_type,
-        )
+        issue = Issue.objects.create(**validated_data, project_id=project_id)

        # Issue Audit Users
        created_by_id = issue.created_by_id
@@ -286,7 +268,6 @@ class LabelSerializer(BaseSerializer):
            "updated_by",
            "created_at",
            "updated_at",
-            "deleted_at",
        ]


@@ -331,14 +312,10 @@ class IssueLinkSerializer(BaseSerializer):
        return IssueLink.objects.create(**validated_data)

    def update(self, instance, validated_data):
-        if (
-            IssueLink.objects.filter(
-                url=validated_data.get("url"),
-                issue_id=instance.issue_id,
-            )
-            .exclude(pk=instance.id)
-            .exists()
-        ):
+        if IssueLink.objects.filter(
+            url=validated_data.get("url"),
+            issue_id=instance.issue_id,
+        ).exclude(pk=instance.id).exists():
            raise serializers.ValidationError(
                {"error": "URL already exists for this Issue"}
            )
@@ -355,7 +332,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
@@ -12,7 +12,7 @@ from django.db.models import (
    OuterRef,
    Q,
    Sum,
-    FloatField,
+    IntegerField,
 )
 from django.db.models.functions import Cast

@@ -26,7 +26,7 @@ from plane.api.serializers import (
    CycleSerializer,
 )
 from plane.app.permissions import ProjectEntityPermission
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
    Cycle,
    CycleIssue,
@@ -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,
@@ -884,12 +867,12 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
                .values("display_name", "assignee_id", "avatar")
                .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,
@@ -899,7 +882,7 @@ class TransferCycleIssueAPIEndpoint(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,
@@ -938,12 +921,12 @@ class TransferCycleIssueAPIEndpoint(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,
@@ -953,7 +936,7 @@ class TransferCycleIssueAPIEndpoint(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,
@@ -1157,38 +1140,12 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
        )

        updated_cycles = []
-        update_cycle_issue_activity = []
        for cycle_issue in cycle_issues:
            cycle_issue.cycle_id = new_cycle_id
            updated_cycles.append(cycle_issue)
-            update_cycle_issue_activity.append(
-                {
-                    "old_cycle_id": str(cycle_id),
-                    "new_cycle_id": str(new_cycle_id),
-                    "issue_id": str(cycle_issue.issue_id),
-                }
-            )

        cycle_issues = CycleIssue.objects.bulk_update(
            updated_cycles, ["cycle_id"], batch_size=100
        )

-        # Capture Issue Activity
-        issue_activity.delay(
-            type="cycle.activity.created",
-            requested_data=json.dumps({"cycles_list": []}),
-            actor_id=str(self.request.user.id),
-            issue_id=None,
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=json.dumps(
-                {
-                    "updated_cycle_issues": update_cycle_issue_activity,
-                    "created_cycle_issues": "[]",
-                }
-            ),
-            epoch=int(timezone.now().timestamp()),
-            notification=True,
-            origin=request.META.get("HTTP_ORIGIN"),
-        )
-
        return Response({"message": "Success"}, status=status.HTTP_200_OK)
@@ -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
@@ -16,7 +13,7 @@ from rest_framework.response import Response
 # Module imports
 from plane.api.serializers import InboxIssueSerializer, IssueSerializer
 from plane.app.permissions import ProjectLitePermission
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
    Inbox,
    InboxIssue,
@@ -152,7 +149,7 @@ class InboxIssueAPIEndpoint(BaseAPIView):
            description_html=request.data.get("issue", {}).get(
                "description_html", "<p></p>"
            ),
-            priority=request.data.get("issue", {}).get("priority", "none"),
+            priority=request.data.get("issue", {}).get("priority", "low"),
            project_id=project_id,
            state=state,
        )
@@ -227,27 +224,8 @@ class InboxIssueAPIEndpoint(BaseAPIView):
        issue_data = request.data.pop("issue", False)

        if bool(issue_data):
-            issue = Issue.objects.annotate(
-                label_ids=Coalesce(
-                    ArrayAgg(
-                        "labels__id",
-                        distinct=True,
-                        filter=~Q(labels__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-                assignee_ids=Coalesce(
-                    ArrayAgg(
-                        "assignees__id",
-                        distinct=True,
-                        filter=~Q(assignees__id__isnull=True),
-                    ),
-                    Value([], output_field=ArrayField(UUIDField())),
-                ),
-            ).get(
-                pk=issue_id,
-                workspace__slug=slug,
-                project_id=project_id,
+            issue = Issue.objects.get(
+                pk=issue_id, workspace__slug=slug, project_id=project_id
            )
            # Only allow guests and viewers to edit name and description
            if project_member.role <= 10:
@@ -390,26 +368,29 @@ class InboxIssueAPIEndpoint(BaseAPIView):
            inbox_id=inbox.id,
        )

+        # Get the project member
+        project_member = ProjectMember.objects.get(
+            workspace__slug=slug,
+            project_id=project_id,
+            member=request.user,
+            is_active=True,
+        )
+
+        # Check the inbox issue created
+        if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
+            request.user.id
+        ):
+            return Response(
+                {"error": "You cannot delete inbox issue"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
        # Check the issue status
        if inbox_issue.status in [-2, -1, 0, 2]:
            # Delete the issue also
-            issue = Issue.objects.filter(
+            Issue.objects.filter(
                workspace__slug=slug, project_id=project_id, pk=issue_id
-            ).first()
-            if issue.created_by_id != request.user.id and (
-                not ProjectMember.objects.filter(
-                    workspace__slug=slug,
-                    member=request.user,
-                    role=20,
-                    project_id=project_id,
-                    is_active=True,
-                ).exists()
-            ):
-                return Response(
-                    {"error": "Only admin or creator can delete the issue"},
-                    status=status.HTTP_403_FORBIDDEN,
-                )
-            issue.delete()
+            ).delete()

        inbox_issue.delete()
        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -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)
-
@@ -18,7 +18,7 @@ from plane.api.serializers import (
    ModuleSerializer,
 )
 from plane.app.permissions import ProjectEntityPermission
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
    Issue,
    IssueAttachment,
@@ -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)


@@ -520,6 +493,7 @@ class ModuleIssueAPIEndpoint(BaseAPIView):


 class ModuleArchiveUnarchiveAPIEndpoint(BaseAPIView):
+
    permission_classes = [
        ProjectEntityPermission,
    ]
@@ -19,14 +19,13 @@ from plane.app.permissions import ProjectBasePermission
 from plane.db.models import (
    Cycle,
    Inbox,
-    IssueUserProperty,
+    IssueProperty,
    Module,
    Project,
    DeployBoard,
    ProjectMember,
    State,
    Workspace,
-    UserFavorite,
 )
 from plane.bgtasks.webhook_task import model_activity
 from .base import BaseAPIView
@@ -166,7 +165,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 +179,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"],
                    )
@@ -241,7 +240,6 @@ class ProjectAPIEndpoint(BaseAPIView):
                    .filter(pk=serializer.data["id"])
                    .first()
                )
-
                # Model activity
                model_activity.delay(
                    model_name="project",
@@ -357,12 +355,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)

@@ -12,4 +12,3 @@ from .project import (
    ProjectMemberPermission,
    ProjectLitePermission,
 )
-from .base import allow_permission, ROLE
@@ -1,61 +0,0 @@
-from plane.db.models import WorkspaceMember, ProjectMember
-from functools import wraps
-from rest_framework.response import Response
-from rest_framework import status
-
-from enum import Enum
-
-class ROLE(Enum):
-    ADMIN = 20
-    MEMBER = 15
-    VIEWER = 10
-    GUEST = 5
-
-
-def allow_permission(allowed_roles, level="PROJECT", creator=False, model=None):
-    def decorator(view_func):
-        @wraps(view_func)
-        def _wrapped_view(instance, request, *args, **kwargs):
-
-            # Check for creator if required
-            if creator and model:
-                obj = model.objects.filter(
-                    id=kwargs["pk"], created_by=request.user
-                ).exists()
-                if obj:
-                    return view_func(instance, request, *args, **kwargs)
-
-            # Convert allowed_roles to their values if they are enum members
-            allowed_role_values = [
-                role.value if isinstance(role, ROLE) else role
-                for role in allowed_roles
-            ]
-
-            # Check role permissions
-            if level == "WORKSPACE":
-                if WorkspaceMember.objects.filter(
-                    member=request.user,
-                    workspace__slug=kwargs["slug"],
-                    role__in=allowed_role_values,
-                    is_active=True,
-                ).exists():
-                    return view_func(instance, request, *args, **kwargs)
-            else:
-                if ProjectMember.objects.filter(
-                    member=request.user,
-                    workspace__slug=kwargs["slug"],
-                    project_id=kwargs["project_id"],
-                    role__in=allowed_role_values,
-                    is_active=True,
-                ).exists():
-                    return view_func(instance, request, *args, **kwargs)
-
-            # Return permission denied if no conditions are met
-            return Response(
-                {"error": "You don't have the required permissions."},
-                status=status.HTTP_401_UNAUTHORIZED,
-            )
-
-        return _wrapped_view
-
-    return decorator
@@ -50,7 +50,7 @@ from .issue import (
    IssueCreateSerializer,
    IssueActivitySerializer,
    IssueCommentSerializer,
-    IssueUserPropertySerializer,
+    IssuePropertySerializer,
    IssueAssigneeSerializer,
    LabelSerializer,
    IssueSerializer,
@@ -91,7 +91,6 @@ from .page import (
    PageLogSerializer,
    SubPageSerializer,
    PageDetailSerializer,
-    PageVersionSerializer,
 )

 from .estimate import (
@@ -121,5 +120,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,
@@ -135,11 +135,7 @@ class IssueCreateSerializer(BaseSerializer):
        workspace_id = self.context["workspace_id"]
        default_assignee_id = self.context["default_assignee_id"]

-        # Create Issue
-        issue = Issue.objects.create(
-            **validated_data,
-            project_id=project_id,
-        )
+        issue = Issue.objects.create(**validated_data, project_id=project_id)

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


-class IssueUserPropertySerializer(BaseSerializer):
+class IssuePropertySerializer(BaseSerializer):
    class Meta:
-        model = IssueUserProperty
+        model = IssueProperty
        fields = "__all__"
        read_only_fields = [
            "user",
@@ -463,14 +459,10 @@ class IssueLinkSerializer(BaseSerializer):
        return IssueLink.objects.create(**validated_data)

    def update(self, instance, validated_data):
-        if (
-            IssueLink.objects.filter(
-                url=validated_data.get("url"),
-                issue_id=instance.issue_id,
-            )
-            .exclude(pk=instance.id)
-            .exists()
-        ):
+        if IssueLink.objects.filter(
+            url=validated_data.get("url"),
+            issue_id=instance.issue_id,
+        ).exclude(pk=instance.id).exists():
            raise serializers.ValidationError(
                {"error": "URL already exists for this Issue"}
            )
@@ -517,7 +509,7 @@ class IssueAttachmentLiteSerializer(DynamicBaseSerializer):
            "attributes",
            "issue_id",
            "updated_at",
-            "updated_by",
+            "updated_by_id",
        ]
        read_only_fields = fields

@@ -533,7 +525,6 @@ class IssueReactionSerializer(BaseSerializer):
            "project",
            "issue",
            "actor",
-            "deleted_at"
        ]


@@ -552,7 +543,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):
@@ -178,8 +177,8 @@ class ModuleSerializer(DynamicBaseSerializer):
    started_issues = serializers.IntegerField(read_only=True)
    unstarted_issues = serializers.IntegerField(read_only=True)
    backlog_issues = serializers.IntegerField(read_only=True)
-    total_estimate_points = serializers.FloatField(read_only=True)
-    completed_estimate_points = serializers.FloatField(read_only=True)
+    total_estimate_points = serializers.IntegerField(read_only=True)
+    completed_estimate_points = serializers.IntegerField(read_only=True)

    class Meta:
        model = Module
@@ -223,10 +222,10 @@ class ModuleSerializer(DynamicBaseSerializer):
 class ModuleDetailSerializer(ModuleSerializer):
    link_module = ModuleLinkSerializer(read_only=True, many=True)
    sub_issues = serializers.IntegerField(read_only=True)
-    backlog_estimate_points = serializers.FloatField(read_only=True)
-    unstarted_estimate_points = serializers.FloatField(read_only=True)
-    started_estimate_points = serializers.FloatField(read_only=True)
-    cancelled_estimate_points = serializers.FloatField(read_only=True)
+    backlog_estimate_points = serializers.IntegerField(read_only=True)
+    unstarted_estimate_points = serializers.IntegerField(read_only=True)
+    started_estimate_points = serializers.IntegerField(read_only=True)
+    cancelled_estimate_points = serializers.IntegerField(read_only=True)

    class Meta(ModuleSerializer.Meta):
        fields = ModuleSerializer.Meta.fields + ["link_module", "sub_issues", "backlog_estimate_points", "unstarted_estimate_points", "started_estimate_points", "cancelled_estimate_points"]
@@ -3,16 +3,11 @@ from .base import BaseSerializer
 from .user import UserLiteSerializer
 from plane.db.models import Notification, UserNotificationPreference

-# Third Party imports
-from rest_framework import serializers
-

 class NotificationSerializer(BaseSerializer):
    triggered_by_details = UserLiteSerializer(
        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
@@ -10,7 +10,6 @@ from plane.db.models import (
    Label,
    ProjectPage,
    Project,
-    PageVersion,
 )


@@ -162,13 +161,3 @@ class PageLogSerializer(BaseSerializer):
            "workspace",
            "page",
        ]
-
-
-class PageVersionSerializer(BaseSerializer):
-    class Meta:
-        model = PageVersion
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "page",
-        ]
@@ -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:
@@ -15,7 +15,6 @@ from plane.db.models import (
    WorkspaceTheme,
    WorkspaceUserProperties,
 )
-from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS


 class WorkSpaceSerializer(DynamicBaseSerializer):
@@ -23,11 +22,22 @@ class WorkSpaceSerializer(DynamicBaseSerializer):
    total_members = serializers.IntegerField(read_only=True)
    total_issues = serializers.IntegerField(read_only=True)

-    def validate_slug(self, value):
-        # Check if the slug is restricted
-        if value in RESTRICTED_WORKSPACE_SLUGS:
-            raise serializers.ValidationError("Slug is not valid")
-        return value
+    def validated(self, data):
+        if data.get("slug") in [
+            "404",
+            "accounts",
+            "api",
+            "create-workspace",
+            "god-mode",
+            "installations",
+            "invitations",
+            "onboarding",
+            "profile",
+            "spaces",
+            "workspace-invitations",
+            "password",
+        ]:
+            raise serializers.ValidationError({"slug": "Slug is not valid"})

    class Meta:
        model = Workspace
@@ -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
 ]
@@ -40,7 +40,7 @@ urlpatterns = [
        name="inbox-issue",
    ),
    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/<uuid:pk>/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/inbox-issues/<uuid:issue_id>/",
        InboxIssueViewSet.as_view(
            {
                "get": "retrieve",
@@ -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/",
@@ -7,7 +7,6 @@ from plane.app.views import (
    PageLogEndpoint,
    SubPagesEndpoint,
    PagesDescriptionViewSet,
-    PageVersionEndpoint,
 )


@@ -66,16 +65,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(),
@@ -101,14 +90,4 @@ urlpatterns = [
        ),
        name="page-description",
    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/versions/",
-        PageVersionEndpoint.as_view(),
-        name="page-versions",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/versions/<uuid:pk>/",
-        PageVersionEndpoint.as_view(),
-        name="page-versions",
-    ),
 ]
@@ -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,
@@ -186,7 +179,6 @@ from .page.base import (
    SubPagesEndpoint,
    PagesDescriptionViewSet,
 )
-from .page.version import PageVersionEndpoint

 from .search.base import GlobalSearchEndpoint
 from .search.issue import IssueSearchEndpoint
@@ -7,22 +7,22 @@ from django.utils import timezone
 from rest_framework import status
 from rest_framework.response import Response

-# Module imports
 from plane.app.permissions import WorkSpaceAdminPermission
 from plane.app.serializers import AnalyticViewSerializer
+
+# Module imports
 from plane.app.views.base import BaseAPIView, BaseViewSet
 from plane.bgtasks.analytic_plot_export import analytic_export_task
 from plane.db.models import AnalyticView, Issue, Workspace
 from plane.utils.analytics_plot import build_graph_plot
 from plane.utils.issue_filters import issue_filters
-from plane.app.permissions import allow_permission, ROLE


 class AnalyticsEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkSpaceAdminPermission,
+    ]

-    @allow_permission(
-        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], level="WORKSPACE"
-    )
    def get(self, request, slug):
        x_axis = request.GET.get("x_axis", False)
        y_axis = request.GET.get("y_axis", False)
@@ -201,10 +201,10 @@ class AnalyticViewViewset(BaseViewSet):


 class SavedAnalyticEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkSpaceAdminPermission,
+    ]

-    @allow_permission(
-        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], level="WORKSPACE"
-    )
    def get(self, request, slug, analytic_id):
        analytic_view = AnalyticView.objects.get(
            pk=analytic_id, workspace__slug=slug
@@ -234,10 +234,10 @@ class SavedAnalyticEndpoint(BaseAPIView):


 class ExportAnalyticsEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkSpaceAdminPermission,
+    ]

-    @allow_permission(
-        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], level="WORKSPACE"
-    )
    def post(self, request, slug):
        x_axis = request.data.get("x_axis", False)
        y_axis = request.data.get("y_axis", False)
@@ -301,10 +301,10 @@ class ExportAnalyticsEndpoint(BaseAPIView):


 class DefaultAnalyticsEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkSpaceAdminPermission,
+    ]

-    @allow_permission(
-        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST], level="WORKSPACE"
-    )
    def get(self, request, slug):
        filters = issue_filters(request.GET, "GET")
        base_issues = Issue.issue_objects.filter(
@@ -380,10 +380,12 @@ class DefaultAnalyticsEndpoint(BaseAPIView):
            .order_by("-count")
        )

-        open_estimate_sum = open_issues_queryset.aggregate(sum=Sum("point"))[
+        open_estimate_sum = open_issues_queryset.aggregate(
+            sum=Sum("point")
+        )["sum"]
+        total_estimate_sum = base_issues.aggregate(sum=Sum("point"))[
            "sum"
        ]
-        total_estimate_sum = base_issues.aggregate(sum=Sum("point"))["sum"]

        return Response(
            {
@@ -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 allow_permission, ROLE
-from plane.db.models import Cycle, UserFavorite, Issue, Label, User, Project
+from plane.app.permissions import ProjectEntityPermission
+from plane.db.models import (
+    Cycle,
+    UserFavorite,
+    Issue,
+    Label,
+    User,
+)
 from plane.utils.analytics_plot import burndown_plot

 # Module imports
@@ -34,6 +37,10 @@ from .. import BaseAPIView

 class CycleArchiveUnarchiveEndpoint(BaseAPIView):

+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
    def get_queryset(self):
        favorite_subquery = UserFavorite.objects.filter(
            user=self.request.user,
@@ -42,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"))
@@ -248,51 +172,24 @@ 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()
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
    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",
@@ -358,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",
@@ -371,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(
@@ -501,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(
@@ -544,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(
@@ -593,7 +384,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
                status=status.HTTP_200_OK,
            )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def post(self, request, slug, project_id, cycle_id):
        cycle = Cycle.objects.get(
            pk=cycle_id, project_id=project_id, workspace__slug=slug
@@ -612,7 +402,6 @@ class CycleArchiveUnarchiveEndpoint(BaseAPIView):
            status=status.HTTP_200_OK,
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def delete(self, request, slug, project_id, cycle_id):
        cycle = Cycle.objects.get(
            pk=cycle_id, project_id=project_id, workspace__slug=slug
@@ -19,7 +19,7 @@ from django.db.models import (
    When,
    Subquery,
    Sum,
-    FloatField,
+    IntegerField,
 )
 from django.db.models.functions import Coalesce, Cast
 from django.utils import timezone
@@ -29,14 +29,15 @@ from django.core.serializers.json import DjangoJSONEncoder
 from rest_framework import status
 from rest_framework.response import Response
 from plane.app.permissions import (
-    allow_permission, ROLE
+    ProjectEntityPermission,
+    ProjectLitePermission,
 )
 from plane.app.serializers import (
    CycleSerializer,
    CycleUserPropertiesSerializer,
    CycleWriteSerializer,
 )
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
    Cycle,
    CycleIssue,
@@ -46,7 +47,6 @@ from plane.db.models import (
    Label,
    User,
    Project,
-    ProjectMember,
 )
 from plane.utils.analytics_plot import burndown_plot

@@ -59,6 +59,15 @@ class CycleViewSet(BaseViewSet):
    serializer_class = CycleSerializer
    model = Cycle
    webhook_event = "cycle"
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
+    def perform_create(self, serializer):
+        serializer.save(
+            project_id=self.kwargs.get("project_id"),
+            owned_by=self.request.user,
+        )

    def get_queryset(self):
        favorite_subquery = UserFavorite.objects.filter(
@@ -77,7 +86,7 @@ class CycleViewSet(BaseViewSet):
            .values("issue_cycle__cycle_id")
            .annotate(
                backlog_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                )
            )
            .values("backlog_estimate_point")[:1]
@@ -91,7 +100,7 @@ class CycleViewSet(BaseViewSet):
            .values("issue_cycle__cycle_id")
            .annotate(
                unstarted_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                )
            )
            .values("unstarted_estimate_point")[:1]
@@ -105,7 +114,7 @@ class CycleViewSet(BaseViewSet):
            .values("issue_cycle__cycle_id")
            .annotate(
                started_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                )
            )
            .values("started_estimate_point")[:1]
@@ -119,7 +128,7 @@ class CycleViewSet(BaseViewSet):
            .values("issue_cycle__cycle_id")
            .annotate(
                cancelled_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                )
            )
            .values("cancelled_estimate_point")[:1]
@@ -133,7 +142,7 @@ class CycleViewSet(BaseViewSet):
            .values("issue_cycle__cycle_id")
            .annotate(
                completed_estimate_points=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                )
            )
            .values("completed_estimate_points")[:1]
@@ -146,7 +155,7 @@ class CycleViewSet(BaseViewSet):
            .values("issue_cycle__cycle_id")
            .annotate(
                total_estimate_points=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                )
            )
            .values("total_estimate_points")[:1]
@@ -278,44 +287,43 @@ class CycleViewSet(BaseViewSet):
            .annotate(
                backlog_estimate_points=Coalesce(
                    Subquery(backlog_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                ),
            )
            .annotate(
                unstarted_estimate_points=Coalesce(
                    Subquery(unstarted_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                ),
            )
            .annotate(
                started_estimate_points=Coalesce(
                    Subquery(started_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                ),
            )
            .annotate(
                cancelled_estimate_points=Coalesce(
                    Subquery(cancelled_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                ),
            )
            .annotate(
                completed_estimate_points=Coalesce(
                    Subquery(completed_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                ),
            )
            .annotate(
                total_estimate_points=Coalesce(
                    Subquery(total_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                ),
            )
            .order_by("-is_favorite", "name")
            .distinct()
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
    def list(self, request, slug, project_id):
        queryset = self.get_queryset().filter(archived_at__isnull=True)
        cycle_view = request.GET.get("cycle_view", "all")
@@ -376,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,
@@ -387,12 +395,12 @@ class CycleViewSet(BaseViewSet):
                        .values("display_name", "assignee_id", "avatar")
                        .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,
@@ -402,7 +410,7 @@ class CycleViewSet(BaseViewSet):
                        )
                        .annotate(
                            pending_estimates=Sum(
-                                Cast("estimate_point__value", FloatField()),
+                                Cast("estimate_point__value", IntegerField()),
                                filter=Q(
                                    completed_at__isnull=True,
                                    archived_at__isnull=True,
@@ -414,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,
@@ -425,12 +433,12 @@ class CycleViewSet(BaseViewSet):
                        .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,
@@ -440,7 +448,7 @@ class CycleViewSet(BaseViewSet):
                        )
                        .annotate(
                            pending_estimates=Sum(
-                                Cast("estimate_point__value", FloatField()),
+                                Cast("estimate_point__value", IntegerField()),
                                filter=Q(
                                    completed_at__isnull=True,
                                    archived_at__isnull=True,
@@ -457,18 +465,18 @@ class CycleViewSet(BaseViewSet):
                    }

                    if data[0]["start_date"] and data[0]["end_date"]:
-                        data[0]["estimate_distribution"][
-                            "completion_chart"
-                        ] = burndown_plot(
-                            queryset=queryset.first(),
-                            slug=slug,
-                            project_id=project_id,
-                            plot_type="points",
-                            cycle_id=data[0]["id"],
+                        data[0]["estimate_distribution"]["completion_chart"] = (
+                            burndown_plot(
+                                queryset=queryset.first(),
+                                slug=slug,
+                                project_id=project_id,
+                                plot_type="points",
+                                cycle_id=data[0]["id"],
+                            )
                        )

                assignee_distribution = (
-                    Issue.issue_objects.filter(
+                    Issue.objects.filter(
                        issue_cycle__cycle_id=data[0]["id"],
                        workspace__slug=slug,
                        project_id=project_id,
@@ -510,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,
@@ -602,7 +610,6 @@ class CycleViewSet(BaseViewSet):
        )
        return Response(data, status=status.HTTP_200_OK)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def create(self, request, slug, project_id):
        if (
            request.data.get("start_date", None) is None
@@ -638,8 +645,6 @@ class CycleViewSet(BaseViewSet):
                        "progress_snapshot",
                        "logo_props",
                        # meta fields
-                        "completed_estimate_points",
-                        "total_estimate_points",
                        "is_favorite",
                        "cancelled_issues",
                        "total_issues",
@@ -649,7 +654,6 @@ class CycleViewSet(BaseViewSet):
                        "backlog_issues",
                        "assignee_ids",
                        "status",
-                        "created_by",
                    )
                    .first()
                )
@@ -676,7 +680,6 @@ class CycleViewSet(BaseViewSet):
                status=status.HTTP_400_BAD_REQUEST,
            )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def partial_update(self, request, slug, project_id, pk):
        queryset = self.get_queryset().filter(
            workspace__slug=slug, project_id=project_id, pk=pk
@@ -736,8 +739,6 @@ class CycleViewSet(BaseViewSet):
                "progress_snapshot",
                "logo_props",
                # meta fields
-                "completed_estimate_points",
-                "total_estimate_points",
                "is_favorite",
                "total_issues",
                "cancelled_issues",
@@ -747,7 +748,6 @@ class CycleViewSet(BaseViewSet):
                "backlog_issues",
                "assignee_ids",
                "status",
-                "created_by",
            ).first()

            # Send the model activity
@@ -764,7 +764,6 @@ class CycleViewSet(BaseViewSet):
            return Response(cycle, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
    def retrieve(self, request, slug, project_id, pk):
        queryset = (
            self.get_queryset().filter(archived_at__isnull=True).filter(pk=pk)
@@ -801,8 +800,6 @@ class CycleViewSet(BaseViewSet):
                "sub_issues",
                "logo_props",
                # meta fields
-                "completed_estimate_points",
-                "total_estimate_points",
                "is_favorite",
                "total_issues",
                "cancelled_issues",
@@ -828,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,
@@ -839,12 +836,12 @@ class CycleViewSet(BaseViewSet):
                .values("display_name", "assignee_id", "avatar")
                .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,
@@ -854,7 +851,7 @@ class CycleViewSet(BaseViewSet):
                )
                .annotate(
                    pending_estimates=Sum(
-                        Cast("estimate_point__value", FloatField()),
+                        Cast("estimate_point__value", IntegerField()),
                        filter=Q(
                            completed_at__isnull=True,
                            archived_at__isnull=True,
@@ -866,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,
@@ -877,12 +874,12 @@ class CycleViewSet(BaseViewSet):
                .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,
@@ -892,7 +889,7 @@ class CycleViewSet(BaseViewSet):
                )
                .annotate(
                    pending_estimates=Sum(
-                        Cast("estimate_point__value", FloatField()),
+                        Cast("estimate_point__value", IntegerField()),
                        filter=Q(
                            completed_at__isnull=True,
                            archived_at__isnull=True,
@@ -921,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,
@@ -972,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,
@@ -1033,30 +1030,15 @@ class CycleViewSet(BaseViewSet):
            status=status.HTTP_200_OK,
        )

-    @allow_permission([ROLE.ADMIN], creator=True, model=Cycle)
    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",
@@ -1077,23 +1059,14 @@ 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)


 class CycleDateCheckEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def post(self, request, slug, project_id):
        start_date = request.data.get("start_date", False)
        end_date = request.data.get("end_date", False)
@@ -1137,7 +1110,6 @@ class CycleFavoriteViewSet(BaseViewSet):
            .select_related("cycle", "cycle__owned_by")
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def create(self, request, slug, project_id):
        _ = UserFavorite.objects.create(
            project_id=project_id,
@@ -1147,7 +1119,6 @@ class CycleFavoriteViewSet(BaseViewSet):
        )
        return Response(status=status.HTTP_204_NO_CONTENT)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def destroy(self, request, slug, project_id, cycle_id):
        cycle_favorite = UserFavorite.objects.get(
            project=project_id,
@@ -1156,13 +1127,15 @@ 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)


 class TransferCycleIssueEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def post(self, request, slug, project_id, cycle_id):
        new_cycle_id = request.data.get("new_cycle_id", False)

@@ -1261,12 +1234,12 @@ class TransferCycleIssueEndpoint(BaseAPIView):
                .values("display_name", "assignee_id", "avatar")
                .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,
@@ -1276,7 +1249,7 @@ class TransferCycleIssueEndpoint(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,
@@ -1315,12 +1288,12 @@ class TransferCycleIssueEndpoint(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,
@@ -1330,7 +1303,7 @@ class TransferCycleIssueEndpoint(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,
@@ -1534,46 +1507,22 @@ class TransferCycleIssueEndpoint(BaseAPIView):
        )

        updated_cycles = []
-        update_cycle_issue_activity = []
        for cycle_issue in cycle_issues:
            cycle_issue.cycle_id = new_cycle_id
            updated_cycles.append(cycle_issue)
-            update_cycle_issue_activity.append(
-                {
-                    "old_cycle_id": str(cycle_id),
-                    "new_cycle_id": str(new_cycle_id),
-                    "issue_id": str(cycle_issue.issue_id),
-                }
-            )

        cycle_issues = CycleIssue.objects.bulk_update(
            updated_cycles, ["cycle_id"], batch_size=100
        )

-        # Capture Issue Activity
-        issue_activity.delay(
-            type="cycle.activity.created",
-            requested_data=json.dumps({"cycles_list": []}),
-            actor_id=str(self.request.user.id),
-            issue_id=None,
-            project_id=str(self.kwargs.get("project_id", None)),
-            current_instance=json.dumps(
-                {
-                    "updated_cycle_issues": update_cycle_issue_activity,
-                    "created_cycle_issues": "[]",
-                }
-            ),
-            epoch=int(timezone.now().timestamp()),
-            notification=True,
-            origin=request.META.get("HTTP_ORIGIN"),
-        )
-
        return Response({"message": "Success"}, status=status.HTTP_200_OK)


 class CycleUserPropertiesEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectLitePermission,
+    ]

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
    def patch(self, request, slug, project_id, cycle_id):
        cycle_properties = CycleUserProperties.objects.get(
            user=request.user,
@@ -1596,7 +1545,6 @@ class CycleUserPropertiesEndpoint(BaseAPIView):
        serializer = CycleUserPropertiesSerializer(cycle_properties)
        return Response(serializer.data, status=status.HTTP_201_CREATED)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
    def get(self, request, slug, project_id, cycle_id):
        cycle_properties, _ = CycleUserProperties.objects.get_or_create(
            user=request.user,
@@ -3,7 +3,12 @@ import json

 # Django imports
 from django.core import serializers
-from django.db.models import F, Func, OuterRef, Q
+from django.db.models import (
+    F,
+    Func,
+    OuterRef,
+    Q,
+)
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.gzip import gzip_page
@@ -12,12 +17,15 @@ from django.views.decorators.gzip import gzip_page
 from rest_framework import status
 from rest_framework.response import Response

+from plane.app.permissions import (
+    ProjectEntityPermission,
+)
 # Module imports
 from .. import BaseViewSet
 from plane.app.serializers import (
    CycleIssueSerializer,
 )
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
    Cycle,
    CycleIssue,
@@ -36,8 +44,8 @@ from plane.utils.paginator import (
    GroupedOffsetPaginator,
    SubGroupedOffsetPaginator,
 )
-from plane.app.permissions import allow_permission, ROLE

+# Module imports

 class CycleIssueViewSet(BaseViewSet):
    serializer_class = CycleIssueSerializer
@@ -46,6 +54,10 @@ class CycleIssueViewSet(BaseViewSet):
    webhook_event = "cycle_issue"
    bulk = True

+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
    filterset_fields = [
        "issue__labels__id",
        "issue__assignees__id",
@@ -80,7 +92,6 @@ class CycleIssueViewSet(BaseViewSet):
        )

    @method_decorator(gzip_page)
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
    def list(self, request, slug, project_id, cycle_id):
        order_by_param = request.GET.get("order_by", "created_at")
        filters = issue_filters(request.query_params, "GET")
@@ -227,7 +238,6 @@ class CycleIssueViewSet(BaseViewSet):
                ),
            )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def create(self, request, slug, project_id, cycle_id):
        issues = request.data.get("issues", [])

@@ -323,9 +333,8 @@ class CycleIssueViewSet(BaseViewSet):
        )
        return Response({"message": "success"}, status=status.HTTP_201_CREATED)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    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,
@@ -43,7 +43,6 @@ from plane.db.models import (
    ProjectMember,
    User,
    Widget,
-    WorkspaceMember,
 )
 from plane.utils.issue_filters import issue_filters

@@ -52,61 +51,36 @@ from .. import BaseAPIView


 def dashboard_overview_stats(self, request, slug):
-    extra_filters = {}
-    if WorkspaceMember.objects.filter(
+    assigned_issues = Issue.issue_objects.filter(
+        project__project_projectmember__is_active=True,
+        project__project_projectmember__member=request.user,
        workspace__slug=slug,
-        member=request.user,
-        role=5,
-        is_active=True,
-    ).exists():
-        extra_filters = {"created_by": request.user}
+        assignees__in=[request.user],
+    ).count()

-    assigned_issues = (
-        Issue.issue_objects.filter(
-            project__project_projectmember__is_active=True,
-            project__project_projectmember__member=request.user,
-            workspace__slug=slug,
-            assignees__in=[request.user],
-        )
-        .filter(**extra_filters)
-        .count()
-    )
+    pending_issues_count = Issue.issue_objects.filter(
+        ~Q(state__group__in=["completed", "cancelled"]),
+        target_date__lt=timezone.now().date(),
+        project__project_projectmember__is_active=True,
+        project__project_projectmember__member=request.user,
+        workspace__slug=slug,
+        assignees__in=[request.user],
+    ).count()

-    pending_issues_count = (
-        Issue.issue_objects.filter(
-            ~Q(state__group__in=["completed", "cancelled"]),
-            target_date__lt=timezone.now().date(),
-            project__project_projectmember__is_active=True,
-            project__project_projectmember__member=request.user,
-            workspace__slug=slug,
-            assignees__in=[request.user],
-        )
-        .filter(**extra_filters)
-        .count()
-    )
+    created_issues_count = Issue.issue_objects.filter(
+        workspace__slug=slug,
+        project__project_projectmember__is_active=True,
+        project__project_projectmember__member=request.user,
+        created_by_id=request.user.id,
+    ).count()

-    created_issues_count = (
-        Issue.issue_objects.filter(
-            workspace__slug=slug,
-            project__project_projectmember__is_active=True,
-            project__project_projectmember__member=request.user,
-            created_by_id=request.user.id,
-        )
-        .filter(**extra_filters)
-        .count()
-    )
-
-    completed_issues_count = (
-        Issue.issue_objects.filter(
-            workspace__slug=slug,
-            project__project_projectmember__is_active=True,
-            project__project_projectmember__member=request.user,
-            assignees__in=[request.user],
-            state__group="completed",
-        )
-        .filter(**extra_filters)
-        .count()
-    )
+    completed_issues_count = Issue.issue_objects.filter(
+        workspace__slug=slug,
+        project__project_projectmember__is_active=True,
+        project__project_projectmember__member=request.user,
+        assignees__in=[request.user],
+        state__group="completed",
+    ).count()

    return Response(
        {
@@ -192,14 +166,6 @@ def dashboard_assigned_issues(self, request, slug):
        )
    )

-    if WorkspaceMember.objects.filter(
-        workspace__slug=slug,
-        member=request.user,
-        role=5,
-        is_active=True,
-    ).exists():
-        assigned_issues = assigned_issues.filter(created_by=request.user)
-
    # Priority Ordering
    priority_order = ["urgent", "high", "medium", "low", "none"]
    assigned_issues = assigned_issues.annotate(
@@ -443,16 +409,6 @@ def dashboard_created_issues(self, request, slug):
 def dashboard_issues_by_state_groups(self, request, slug):
    filters = issue_filters(request.query_params, "GET")
    state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]
-    extra_filters = {}
-
-    if WorkspaceMember.objects.filter(
-        workspace__slug=slug,
-        member=request.user,
-        role=5,
-        is_active=True,
-    ).exists():
-        extra_filters = {"created_by": request.user}
-
    issues_by_state_groups = (
        Issue.issue_objects.filter(
            workspace__slug=slug,
@@ -460,7 +416,7 @@ def dashboard_issues_by_state_groups(self, request, slug):
            project__project_projectmember__member=request.user,
            assignees__in=[request.user],
        )
-        .filter(**filters, **extra_filters)
+        .filter(**filters)
        .values("state__group")
        .annotate(count=Count("id"))
    )
@@ -483,15 +439,6 @@ def dashboard_issues_by_state_groups(self, request, slug):
 def dashboard_issues_by_priority(self, request, slug):
    filters = issue_filters(request.query_params, "GET")
    priority_order = ["urgent", "high", "medium", "low", "none"]
-    extra_filters = {}
-
-    if WorkspaceMember.objects.filter(
-        workspace__slug=slug,
-        member=request.user,
-        role=5,
-        is_active=True,
-    ).exists():
-        extra_filters = {"created_by": request.user}

    issues_by_priority = (
        Issue.issue_objects.filter(
@@ -500,7 +447,7 @@ def dashboard_issues_by_priority(self, request, slug):
            project__project_projectmember__member=request.user,
            assignees__in=[request.user],
        )
-        .filter(**filters, **extra_filters)
+        .filter(**filters)
        .values("priority")
        .annotate(count=Count("id"))
    )
@@ -595,7 +542,6 @@ def dashboard_recent_collaborators(self, request, slug):
            project__project_projectmember__member=request.user,
            project__project_projectmember__is_active=True,
            project__archived_at__isnull=True,
-            is_active=True,
        )
        .annotate(
            num_activities=Coalesce(
@@ -7,11 +7,7 @@ from rest_framework import status

 # Module imports
 from ..base import BaseViewSet, BaseAPIView
-from plane.app.permissions import (
-    ProjectEntityPermission,
-    allow_permission,
-    ROLE,
-)
+from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import Project, Estimate, EstimatePoint, Issue
 from plane.app.serializers import (
    EstimateSerializer,
@@ -27,8 +23,10 @@ def generate_random_name(length=10):


 class ProjectEstimatePointEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
    def get(self, request, slug, project_id):
        project = Project.objects.get(workspace__slug=slug, pk=project_id)
        if project.estimate_id is not None:
@@ -191,8 +189,10 @@ class BulkEstimatePointEndpoint(BaseViewSet):


 class EstimatePointEndpoint(BaseViewSet):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def create(self, request, slug, project_id, estimate_id):
        #  TODO: add a key validation if the same key already exists
        if not request.data.get("key") or not request.data.get("value"):
@@ -211,7 +211,6 @@ class EstimatePointEndpoint(BaseViewSet):
        serializer = EstimatePointSerializer(estimate_point).data
        return Response(serializer, status=status.HTTP_200_OK)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def partial_update(
        self, request, slug, project_id, estimate_id, estimate_point_id
    ):
@@ -232,7 +231,6 @@ class EstimatePointEndpoint(BaseViewSet):
        serializer.save()
        return Response(serializer.data, status=status.HTTP_200_OK)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def destroy(
        self, request, slug, project_id, estimate_id, estimate_point_id
    ):
@@ -2,7 +2,7 @@
 from rest_framework import status
 from rest_framework.response import Response

-from plane.app.permissions import allow_permission, ROLE
+from plane.app.permissions import WorkSpaceAdminPermission
 from plane.app.serializers import ExporterHistorySerializer
 from plane.bgtasks.export_task import issue_export_task
 from plane.db.models import ExporterHistory, Project, Workspace
@@ -12,10 +12,12 @@ from .. import BaseAPIView


 class ExportIssuesEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkSpaceAdminPermission,
+    ]
    model = ExporterHistory
    serializer_class = ExporterHistorySerializer

-    @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
    def post(self, request, slug):
        # Get the workspace
        workspace = Workspace.objects.get(slug=slug)
@@ -39,7 +41,6 @@ class ExportIssuesEndpoint(BaseAPIView):
                project=project_ids,
                initiated_by=request.user,
                provider=provider,
-                type="issue_exports",
            )

            issue_export_task.delay(
@@ -62,11 +63,9 @@ class ExportIssuesEndpoint(BaseAPIView):
                status=status.HTTP_400_BAD_REQUEST,
            )

-    @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
    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(
@@ -11,7 +11,7 @@ from rest_framework import status

 # Module imports
 from ..base import BaseAPIView
-from plane.app.permissions import allow_permission, ROLE
+from plane.app.permissions import ProjectEntityPermission, WorkspaceEntityPermission
 from plane.db.models import Workspace, Project
 from plane.app.serializers import (
    ProjectLiteSerializer,
@@ -21,8 +21,10 @@ from plane.license.utils.instance_value import get_configuration_value


 class GPTIntegrationEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def post(self, request, slug, project_id):
        OPENAI_API_KEY, GPT_ENGINE = get_configuration_value(
            [
@@ -82,10 +84,10 @@ class GPTIntegrationEndpoint(BaseAPIView):


 class WorkspaceGPTIntegrationEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkspaceEntityPermission,
+    ]

-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"
-    )
    def post(self, request, slug):
        OPENAI_API_KEY, GPT_ENGINE = get_configuration_value(
            [
@@ -16,9 +16,7 @@ from rest_framework.response import Response

 # Module imports
 from ..base import BaseViewSet
-from plane.app.permissions import (
-    allow_permission, ROLE
-)
+from plane.app.permissions import ProjectBasePermission, ProjectLitePermission
 from plane.db.models import (
    Inbox,
    InboxIssue,
@@ -37,10 +35,13 @@ from plane.app.serializers import (
    InboxIssueDetailSerializer,
 )
 from plane.utils.issue_filters import issue_filters
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity


 class InboxViewSet(BaseViewSet):
+    permission_classes = [
+        ProjectBasePermission,
+    ]

    serializer_class = InboxSerializer
    model = Inbox
@@ -62,7 +63,6 @@ class InboxViewSet(BaseViewSet):
            .select_related("workspace", "project")
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def list(self, request, slug, project_id):
        inbox = self.get_queryset().first()
        return Response(
@@ -70,11 +70,9 @@ class InboxViewSet(BaseViewSet):
            status=status.HTTP_200_OK,
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def perform_create(self, serializer):
        serializer.save(project_id=self.kwargs.get("project_id"))

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def destroy(self, request, slug, project_id, pk):
        inbox = Inbox.objects.filter(
            workspace__slug=slug, project_id=project_id, pk=pk
@@ -90,6 +88,9 @@ class InboxViewSet(BaseViewSet):


 class InboxIssueViewSet(BaseViewSet):
+    permission_classes = [
+        ProjectLitePermission,
+    ]

    serializer_class = InboxIssueSerializer
    model = InboxIssue
@@ -159,15 +160,13 @@ 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())),
                ),
            )
        ).distinct()

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
    def list(self, request, slug, project_id):
        inbox_id = Inbox.objects.filter(
            workspace__slug=slug, project_id=project_id
@@ -201,14 +200,6 @@ class InboxIssueViewSet(BaseViewSet):
        if inbox_status:
            inbox_issue = inbox_issue.filter(status__in=inbox_status)

-        if ProjectMember.objects.filter(
-            workspace__slug=slug,
-            project_id=project_id,
-            member=request.user,
-            role=5,
-            is_active=True,
-        ).exists():
-            inbox_issue = inbox_issue.filter(created_by=request.user)
        return self.paginate(
            request=request,
            queryset=(inbox_issue),
@@ -218,7 +209,6 @@ class InboxIssueViewSet(BaseViewSet):
            ).data,
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def create(self, request, slug, project_id):
        if not request.data.get("issue", {}).get("name", False):
            return Response(
@@ -321,13 +311,12 @@ class InboxIssueViewSet(BaseViewSet):
                serializer.errors, status=status.HTTP_400_BAD_REQUEST
            )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
-    def partial_update(self, request, slug, project_id, pk):
+    def partial_update(self, request, slug, project_id, issue_id):
        inbox_id = Inbox.objects.filter(
            workspace__slug=slug, project_id=project_id
        ).first()
        inbox_issue = InboxIssue.objects.get(
-            issue_id=pk,
+            issue_id=issue_id,
            workspace__slug=slug,
            project_id=project_id,
            inbox_id=inbox_id,
@@ -468,7 +457,7 @@ class InboxIssueViewSet(BaseViewSet):
                        request.data, cls=DjangoJSONEncoder
                    ),
                    actor_id=str(request.user.id),
-                    issue_id=str(pk),
+                    issue_id=str(issue_id),
                    project_id=str(project_id),
                    current_instance=current_instance,
                    epoch=int(timezone.now().timestamp()),
@@ -503,7 +492,7 @@ class InboxIssueViewSet(BaseViewSet):
                    )
                    .get(
                        inbox_id=inbox_id.id,
-                        issue_id=pk,
+                        issue_id=issue_id,
                        project_id=project_id,
                    )
                )
@@ -516,12 +505,7 @@ class InboxIssueViewSet(BaseViewSet):
            serializer = InboxIssueDetailSerializer(inbox_issue).data
            return Response(serializer, status=status.HTTP_200_OK)

-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER],
-        creator=True,
-        model=Issue,
-    )
-    def retrieve(self, request, slug, project_id, pk):
+    def retrieve(self, request, slug, project_id, issue_id):
        inbox_id = Inbox.objects.filter(
            workspace__slug=slug, project_id=project_id
        ).first()
@@ -549,7 +533,9 @@ class InboxIssueViewSet(BaseViewSet):
                    Value([], output_field=ArrayField(UUIDField())),
                ),
            )
-            .get(inbox_id=inbox_id.id, issue_id=pk, project_id=project_id)
+            .get(
+                inbox_id=inbox_id.id, issue_id=issue_id, project_id=project_id
+            )
        )
        issue = InboxIssueDetailSerializer(inbox_issue).data
        return Response(
@@ -557,25 +543,38 @@ class InboxIssueViewSet(BaseViewSet):
            status=status.HTTP_200_OK,
        )

-    @allow_permission(allowed_roles=[ROLE.ADMIN], creator=True, model=Issue)
-    def destroy(self, request, slug, project_id, pk):
+    def destroy(self, request, slug, project_id, issue_id):
        inbox_id = Inbox.objects.filter(
            workspace__slug=slug, project_id=project_id
        ).first()
        inbox_issue = InboxIssue.objects.get(
-            issue_id=pk,
+            issue_id=issue_id,
            workspace__slug=slug,
            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(
-                workspace__slug=slug, project_id=project_id, pk=pk
-            ).first()
-            issue.delete()
+            Issue.objects.filter(
+                workspace__slug=slug, project_id=project_id, pk=issue_id
+            ).delete()

        inbox_issue.delete()
        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -19,7 +19,7 @@ from plane.app.serializers import (
    IssueActivitySerializer,
    IssueCommentSerializer,
 )
-from plane.app.permissions import ProjectEntityPermission, allow_permission, ROLE
+from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import (
    IssueActivity,
    IssueComment,
@@ -33,7 +33,6 @@ class IssueActivityEndpoint(BaseAPIView):
    ]

    @method_decorator(gzip_page)
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])
    def get(self, request, slug, project_id, issue_id):
        filters = {}
        if request.GET.get("created_at__gt", None) is not None:
@@ -25,9 +25,9 @@ from plane.app.permissions import (
 from plane.app.serializers import (
    IssueFlatSerializer,
    IssueSerializer,
-    IssueDetailSerializer,
+    IssueDetailSerializer
 )
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
    Issue,
    IssueAttachment,
@@ -46,13 +46,15 @@ from plane.utils.paginator import (
    GroupedOffsetPaginator,
    SubGroupedOffsetPaginator,
 )
-from plane.app.permissions import allow_permission, ROLE

 # Module imports
 from .. import BaseViewSet, BaseAPIView


 class IssueArchiveViewSet(BaseViewSet):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
    serializer_class = IssueFlatSerializer
    model = Issue

@@ -64,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"))
@@ -96,7 +97,6 @@ class IssueArchiveViewSet(BaseViewSet):
        )

    @method_decorator(gzip_page)
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
    def list(self, request, slug, project_id):
        filters = issue_filters(request.query_params, "GET")
        show_sub_issues = request.GET.get("show_sub_issues", "true")
@@ -212,7 +212,6 @@ class IssueArchiveViewSet(BaseViewSet):
                ),
            )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
    def retrieve(self, request, slug, project_id, pk=None):
        issue = (
            self.get_queryset()
@@ -256,7 +255,6 @@ class IssueArchiveViewSet(BaseViewSet):
        serializer = IssueDetailSerializer(issue, expand=self.expand)
        return Response(serializer.data, status=status.HTTP_200_OK)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def archive(self, request, slug, project_id, pk=None):
        issue = Issue.issue_objects.get(
            workspace__slug=slug,
@@ -295,7 +293,6 @@ class IssueArchiveViewSet(BaseViewSet):
            {"archived_at": str(issue.archived_at)}, status=status.HTTP_200_OK
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def unarchive(self, request, slug, project_id, pk=None):
        issue = Issue.objects.get(
            workspace__slug=slug,
@@ -327,7 +324,6 @@ class BulkArchiveIssuesEndpoint(BaseAPIView):
        ProjectEntityPermission,
    ]

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def post(self, request, slug, project_id):
        issue_ids = request.data.get("issue_ids", [])

@@ -346,7 +342,7 @@ class BulkArchiveIssuesEndpoint(BaseAPIView):
                return Response(
                    {
                        "error_code": 4091,
-                        "error_message": "INVALID_ARCHIVE_STATE_GROUP",
+                        "error_message": "INVALID_ARCHIVE_STATE_GROUP"
                    },
                    status=status.HTTP_400_BAD_REQUEST,
                )
@@ -13,17 +13,19 @@ from rest_framework.parsers import MultiPartParser, FormParser
 # Module imports
 from .. import BaseAPIView
 from plane.app.serializers import IssueAttachmentSerializer
+from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import IssueAttachment
-from plane.bgtasks.issue_activities_task import issue_activity
-from plane.app.permissions import allow_permission, ROLE
+from plane.bgtasks.issue_activites_task import issue_activity


 class IssueAttachmentEndpoint(BaseAPIView):
    serializer_class = IssueAttachmentSerializer
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
    model = IssueAttachment
    parser_classes = (MultiPartParser, FormParser)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    def post(self, request, slug, project_id, issue_id):
        serializer = IssueAttachmentSerializer(data=request.data)
        if serializer.is_valid():
@@ -45,7 +47,6 @@ class IssueAttachmentEndpoint(BaseAPIView):
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    @allow_permission([ROLE.ADMIN], creator=True, model=IssueAttachment)
    def delete(self, request, slug, project_id, issue_id, pk):
        issue_attachment = IssueAttachment.objects.get(pk=pk)
        issue_attachment.asset.delete(save=False)
@@ -64,7 +65,6 @@ class IssueAttachmentEndpoint(BaseAPIView):

        return Response(status=status.HTTP_204_NO_CONTENT)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])
    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
@@ -25,23 +25,25 @@ from rest_framework import status
 from rest_framework.response import Response

 # Module imports
-from plane.app.permissions import allow_permission, ROLE
+from plane.app.permissions import (
+    ProjectEntityPermission,
+    ProjectLitePermission,
+)
 from plane.app.serializers import (
    IssueCreateSerializer,
    IssueDetailSerializer,
-    IssueUserPropertySerializer,
+    IssuePropertySerializer,
    IssueSerializer,
 )
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
    Issue,
    IssueAttachment,
    IssueLink,
-    IssueUserProperty,
+    IssueProperty,
    IssueReaction,
    IssueSubscriber,
    Project,
-    ProjectMember,
 )
 from plane.utils.grouper import (
    issue_group_values,
@@ -57,10 +59,15 @@ from plane.utils.paginator import (
 from .. import BaseAPIView, BaseViewSet
 from plane.utils.user_timezone_converter import user_timezone_converter

+# Module imports
+

 class IssueListEndpoint(BaseAPIView):

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
    def get(self, request, slug, project_id):
        issue_ids = request.GET.get("issues", False)

@@ -158,7 +165,6 @@ class IssueListEndpoint(BaseAPIView):
                "link_count",
                "is_draft",
                "archived_at",
-                "deleted_at",
            )
            datetime_fields = ["created_at", "updated_at"]
            issues = user_timezone_converter(
@@ -177,6 +183,9 @@ class IssueViewSet(BaseViewSet):

    model = Issue
    webhook_event = "issue"
+    permission_classes = [
+        ProjectEntityPermission,
+    ]

    search_fields = [
        "name",
@@ -222,7 +231,6 @@ class IssueViewSet(BaseViewSet):
        ).distinct()

    @method_decorator(gzip_page)
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
    def list(self, request, slug, project_id):
        filters = issue_filters(request.query_params, "GET")
        order_by_param = request.GET.get("order_by", "-created_at")
@@ -247,15 +255,6 @@ class IssueViewSet(BaseViewSet):
            sub_group_by=sub_group_by,
        )

-        if ProjectMember.objects.filter(
-            workspace__slug=slug,
-            project_id=project_id,
-            member=request.user,
-            role=5,
-            is_active=True,
-        ).exists():
-            issue_queryset = issue_queryset.filter(created_by=request.user)
-
        if group_by:
            if sub_group_by:
                if group_by == sub_group_by:
@@ -337,7 +336,6 @@ class IssueViewSet(BaseViewSet):
                ),
            )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def create(self, request, slug, project_id):
        project = Project.objects.get(pk=project_id)

@@ -401,7 +399,6 @@ class IssueViewSet(BaseViewSet):
                    "link_count",
                    "is_draft",
                    "archived_at",
-                    "deleted_at",
                )
                .first()
            )
@@ -412,9 +409,6 @@ class IssueViewSet(BaseViewSet):
            return Response(issue, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    @allow_permission(
-        [ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER], creator=True, model=Issue
-    )
    def retrieve(self, request, slug, project_id, pk=None):
        issue = (
            self.get_queryset()
@@ -441,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())),
                ),
@@ -487,40 +480,8 @@ class IssueViewSet(BaseViewSet):
        serializer = IssueDetailSerializer(issue, expand=self.expand)
        return Response(serializer.data, status=status.HTTP_200_OK)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST])
    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(
@@ -553,12 +514,10 @@ class IssueViewSet(BaseViewSet):
            return Response(status=status.HTTP_204_NO_CONTENT)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    @allow_permission([ROLE.ADMIN], creator=True, model=Issue)
    def destroy(self, request, slug, project_id, pk=None):
        issue = Issue.objects.get(
            workspace__slug=slug, project_id=project_id, pk=pk
        )
-
        issue.delete()
        issue_activity.delay(
            type="issue.activity.deleted",
@@ -575,10 +534,12 @@ class IssueViewSet(BaseViewSet):


 class IssueUserDisplayPropertyEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectLitePermission,
+    ]

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])
    def patch(self, request, slug, project_id):
-        issue_property = IssueUserProperty.objects.get(
+        issue_property = IssueProperty.objects.get(
            user=request.user,
            project_id=project_id,
        )
@@ -593,23 +554,23 @@ 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)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])
    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)


 class BulkDeleteIssuesEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]

-    @allow_permission([ROLE.ADMIN])
    def delete(self, request, slug, project_id):
-
        issue_ids = request.data.get("issue_ids", [])

        if not len(issue_ids):
@@ -20,7 +20,7 @@ from plane.db.models import (
    IssueLabel,
    IssueAssignee,
 )
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity


 class BulkIssueOperationsEndpoint(BaseAPIView):
@@ -59,16 +59,10 @@ class BulkIssueOperationsEndpoint(BaseAPIView):

        properties = request.data.get("properties", {})

-        if properties.get("start_date", False) and properties.get(
-            "target_date", False
-        ):
+        if properties.get("start_date", False) and properties.get("target_date", False):
            if (
-                datetime.strptime(
-                    properties.get("start_date"), "%Y-%m-%d"
-                ).date()
-                > datetime.strptime(
-                    properties.get("target_date"), "%Y-%m-%d"
-                ).date()
+                datetime.strptime(properties.get("start_date"), "%Y-%m-%d").date()
+                > datetime.strptime(properties.get("target_date"), "%Y-%m-%d").date()
            ):
                return Response(
                    {
@@ -79,6 +73,7 @@ class BulkIssueOperationsEndpoint(BaseAPIView):
                )

        for issue in issues:
+
            # Priority
            if properties.get("priority", False):
                bulk_issue_activities.append(
@@ -16,19 +16,22 @@ from plane.app.serializers import (
    IssueCommentSerializer,
    CommentReactionSerializer,
 )
-from plane.app.permissions import ProjectLitePermission, allow_permission, ROLE
+from plane.app.permissions import ProjectLitePermission
 from plane.db.models import (
    IssueComment,
    ProjectMember,
    CommentReaction,
 )
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity


 class IssueCommentViewSet(BaseViewSet):
    serializer_class = IssueCommentSerializer
    model = IssueComment
    webhook_event = "issue_comment"
+    permission_classes = [
+        ProjectLitePermission,
+    ]

    filterset_fields = [
        "issue__id",
@@ -63,7 +66,6 @@ class IssueCommentViewSet(BaseViewSet):
            .distinct()
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST, ROLE.VIEWER])
    def create(self, request, slug, project_id, issue_id):
        serializer = IssueCommentSerializer(data=request.data)
        if serializer.is_valid():
@@ -88,11 +90,6 @@ class IssueCommentViewSet(BaseViewSet):
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER],
-        creator=True,
-        model=IssueComment,
-    )
    def partial_update(self, request, slug, project_id, issue_id, pk):
        issue_comment = IssueComment.objects.get(
            workspace__slug=slug,
@@ -124,9 +121,6 @@ class IssueCommentViewSet(BaseViewSet):
            return Response(serializer.data, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN], creator=True, model=IssueComment
-    )
    def destroy(self, request, slug, project_id, issue_id, pk):
        issue_comment = IssueComment.objects.get(
            workspace__slug=slug,
@@ -32,7 +32,7 @@ from plane.app.serializers import (
    IssueFlatSerializer,
    IssueSerializer,
 )
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
    Issue,
    IssueAttachment,
@@ -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",
@@ -11,7 +11,9 @@ from rest_framework import status
 # Module imports
 from .. import BaseViewSet, BaseAPIView
 from plane.app.serializers import LabelSerializer
-from plane.app.permissions import allow_permission, ProjectBasePermission, ROLE
+from plane.app.permissions import (
+    ProjectMemberPermission,
+)
 from plane.db.models import (
    Project,
    Label,
@@ -23,7 +25,7 @@ class LabelViewSet(BaseViewSet):
    serializer_class = LabelSerializer
    model = Label
    permission_classes = [
-        ProjectBasePermission,
+        ProjectMemberPermission,
    ]

    def get_queryset(self):
@@ -43,7 +45,6 @@ class LabelViewSet(BaseViewSet):
    @invalidate_cache(
        path="/api/workspaces/:slug/labels/", url_params=True, user=False
    )
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def create(self, request, slug, project_id):
        try:
            serializer = LabelSerializer(data=request.data)
@@ -66,20 +67,17 @@ class LabelViewSet(BaseViewSet):
    @invalidate_cache(
        path="/api/workspaces/:slug/labels/", url_params=True, user=False
    )
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def partial_update(self, request, *args, **kwargs):
        return super().partial_update(request, *args, **kwargs)

    @invalidate_cache(
        path="/api/workspaces/:slug/labels/", url_params=True, user=False
    )
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def destroy(self, request, *args, **kwargs):
        return super().destroy(request, *args, **kwargs)


 class BulkCreateIssueLabelsEndpoint(BaseAPIView):
-    @allow_permission([ROLE.ADMIN])
    def post(self, request, slug, project_id):
        label_data = request.data.get("label_data", [])
        project = Project.objects.get(pk=project_id)
@@ -14,7 +14,7 @@ from .. import BaseViewSet
 from plane.app.serializers import IssueLinkSerializer
 from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import IssueLink
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity


 class IssueLinkViewSet(BaseViewSet):
@@ -14,7 +14,7 @@ from .. import BaseViewSet
 from plane.app.serializers import IssueReactionSerializer
 from plane.app.permissions import ProjectLitePermission
 from plane.db.models import IssueReaction
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity


 class IssueReactionViewSet(BaseViewSet):
@@ -3,11 +3,8 @@ import json

 # Django imports
 from django.utils import timezone
-from django.db.models import Q, OuterRef, F, Func, UUIDField, Value, CharField
+from django.db.models import Q
 from django.core.serializers.json import DjangoJSONEncoder
-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.response import Response
@@ -23,11 +20,8 @@ from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import (
    Project,
    IssueRelation,
-    Issue,
-    IssueAttachment,
-    IssueLink,
 )
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity


 class IssueRelationViewSet(BaseViewSet):
@@ -37,6 +31,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(
@@ -49,145 +61,56 @@ class IssueRelationViewSet(BaseViewSet):
            .order_by("-created_at")
            .distinct()
        )
-        # get all blocking issues
+
        blocking_issues = issue_relations.filter(
            relation_type="blocked_by", related_issue_id=issue_id
-        ).values_list("issue_id", flat=True)
-
-        # get all blocked by issues
+        )
        blocked_by_issues = issue_relations.filter(
            relation_type="blocked_by", issue_id=issue_id
-        ).values_list("related_issue_id", flat=True)
-
-        # get all duplicate issues
+        )
        duplicate_issues = issue_relations.filter(
            issue_id=issue_id, relation_type="duplicate"
-        ).values_list("related_issue_id", flat=True)
-
-        # get all relates to issues
+        )
        duplicate_issues_related = issue_relations.filter(
            related_issue_id=issue_id, relation_type="duplicate"
-        ).values_list("issue_id", flat=True)
-
-        # get all relates to issues
+        )
        relates_to_issues = issue_relations.filter(
            issue_id=issue_id, relation_type="relates_to"
-        ).values_list("related_issue_id", flat=True)
-
-        # get all relates to issues
+        )
        relates_to_issues_related = issue_relations.filter(
            related_issue_id=issue_id, relation_type="relates_to"
-        ).values_list("issue_id", flat=True)
+        )

-        queryset = (
-            Issue.issue_objects.filter(workspace__slug=slug)
-            .select_related("workspace", "project", "state", "parent")
-            .prefetch_related("assignees", "labels", "issue_module__module")
-            .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(
-                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-            .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())),
-                ),
-            )
-        ).distinct()
+        blocked_by_issues_serialized = IssueRelationSerializer(
+            blocked_by_issues, many=True
+        ).data
+        duplicate_issues_serialized = IssueRelationSerializer(
+            duplicate_issues, many=True
+        ).data
+        relates_to_issues_serialized = IssueRelationSerializer(
+            relates_to_issues, many=True
+        ).data

-        # Fields
-        fields = [
-            "id",
-            "name",
-            "state_id",
-            "sort_order",
-            "priority",
-            "sequence_id",
-            "project_id",
-            "label_ids",
-            "assignee_ids",
-            "created_at",
-            "updated_at",
-            "created_by",
-            "updated_by",
-            "relation_type",
-        ]
+        # revere relation for blocked by issues
+        blocking_issues_serialized = RelatedIssueSerializer(
+            blocking_issues, many=True
+        ).data
+        # reverse relation for duplicate issues
+        duplicate_issues_related_serialized = RelatedIssueSerializer(
+            duplicate_issues_related, many=True
+        ).data
+        # reverse relation for related issues
+        relates_to_issues_related_serialized = RelatedIssueSerializer(
+            relates_to_issues_related, many=True
+        ).data

        response_data = {
-            "blocking": queryset.filter(pk__in=blocking_issues)
-            .annotate(
-                relation_type=Value("blocking", output_field=CharField())
-            )
-            .values(*fields),
-            "blocked_by": queryset.filter(pk__in=blocked_by_issues)
-            .annotate(
-                relation_type=Value("blocked_by", output_field=CharField())
-            )
-            .values(*fields),
-            "duplicate": queryset.filter(pk__in=duplicate_issues)
-            .annotate(
-                relation_type=Value(
-                    "duplicate",
-                    output_field=CharField(),
-                )
-            )
-            .values(*fields)
-            | queryset.filter(pk__in=duplicate_issues_related)
-            .annotate(
-                relation_type=Value(
-                    "duplicate",
-                    output_field=CharField(),
-                )
-            )
-            .values(*fields),
-            "relates_to": queryset.filter(pk__in=relates_to_issues)
-            .annotate(
-                relation_type=Value(
-                    "relates_to",
-                    output_field=CharField(),
-                )
-            )
-            .values(*fields)
-            | queryset.filter(pk__in=relates_to_issues_related)
-            .annotate(
-                relation_type=Value(
-                    "relates_to",
-                    output_field=CharField(),
-                )
-            )
-            .values(*fields),
+            "blocking": blocking_issues_serialized,
+            "blocked_by": blocked_by_issues_serialized,
+            "duplicate": duplicate_issues_serialized
+            + duplicate_issues_related_serialized,
+            "relates_to": relates_to_issues_serialized
+            + relates_to_issues_related_serialized,
        }

        return Response(response_data, status=status.HTTP_200_OK)
@@ -30,7 +30,7 @@ from plane.db.models import (
    IssueLink,
    IssueAttachment,
 )
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.user_timezone_converter import user_timezone_converter
 from collections import defaultdict

@@ -99,7 +99,6 @@ class SubIssuesEndpoint(BaseAPIView):
                ),
            )
            .annotate(state_group=F("state__group"))
-            .order_by("-created_at")
        )

        # create's a dict with state group name with their respective issue id's
@@ -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,
@@ -17,7 +17,6 @@ from django.db.models import (
    UUIDField,
    Value,
    Sum,
-    FloatField,
 )
 from django.db.models.functions import Coalesce, Cast
 from django.core.serializers.json import DjangoJSONEncoder
@@ -30,10 +29,8 @@ from rest_framework.response import Response
 # Module imports
 from plane.app.permissions import (
    ProjectEntityPermission,
-    allow_permission,
-    ROLE,
+    ProjectLitePermission,
 )
-
 from plane.app.serializers import (
    ModuleDetailSerializer,
    ModuleLinkSerializer,
@@ -41,7 +38,7 @@ from plane.app.serializers import (
    ModuleUserPropertiesSerializer,
    ModuleWriteSerializer,
 )
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
    Issue,
    Module,
@@ -59,6 +56,9 @@ from .. import BaseAPIView, BaseViewSet

 class ModuleViewSet(BaseViewSet):
    model = Module
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
    webhook_event = "module"

    def get_serializer_class(self):
@@ -138,7 +138,7 @@ class ModuleViewSet(BaseViewSet):
            .values("issue_module__module_id")
            .annotate(
                completed_estimate_points=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                )
            )
            .values("completed_estimate_points")[:1]
@@ -152,7 +152,7 @@ class ModuleViewSet(BaseViewSet):
            .values("issue_module__module_id")
            .annotate(
                total_estimate_points=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                )
            )
            .values("total_estimate_points")[:1]
@@ -166,7 +166,7 @@ class ModuleViewSet(BaseViewSet):
            .values("issue_module__module_id")
            .annotate(
                backlog_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                )
            )
            .values("backlog_estimate_point")[:1]
@@ -180,7 +180,7 @@ class ModuleViewSet(BaseViewSet):
            .values("issue_module__module_id")
            .annotate(
                unstarted_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                )
            )
            .values("unstarted_estimate_point")[:1]
@@ -194,7 +194,7 @@ class ModuleViewSet(BaseViewSet):
            .values("issue_module__module_id")
            .annotate(
                started_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                )
            )
            .values("started_estimate_point")[:1]
@@ -208,7 +208,7 @@ class ModuleViewSet(BaseViewSet):
            .values("issue_module__module_id")
            .annotate(
                cancelled_estimate_point=Sum(
-                    Cast("estimate_point__value", FloatField())
+                    Cast("estimate_point__value", IntegerField())
                )
            )
            .values("cancelled_estimate_point")[:1]
@@ -270,37 +270,37 @@ class ModuleViewSet(BaseViewSet):
            .annotate(
                backlog_estimate_points=Coalesce(
                    Subquery(backlog_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                ),
            )
            .annotate(
                unstarted_estimate_points=Coalesce(
                    Subquery(unstarted_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                ),
            )
            .annotate(
                started_estimate_points=Coalesce(
                    Subquery(started_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                ),
            )
            .annotate(
                cancelled_estimate_points=Coalesce(
                    Subquery(cancelled_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                ),
            )
            .annotate(
                completed_estimate_points=Coalesce(
                    Subquery(completed_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                ),
            )
            .annotate(
                total_estimate_points=Coalesce(
                    Subquery(total_estimate_point),
-                    Value(0, output_field=FloatField()),
+                    Value(0, output_field=IntegerField()),
                ),
            )
            .annotate(
@@ -316,8 +316,6 @@ class ModuleViewSet(BaseViewSet):
            .order_by("-is_favorite", "-created_at")
        )

-    allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
-
    def create(self, request, slug, project_id):
        project = Project.objects.get(workspace__slug=slug, pk=project_id)
        serializer = ModuleWriteSerializer(
@@ -380,8 +378,6 @@ class ModuleViewSet(BaseViewSet):
            return Response(module, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
-
    def list(self, request, slug, project_id):
        queryset = self.get_queryset().filter(archived_at__isnull=True)
        if self.fields:
@@ -429,8 +425,6 @@ class ModuleViewSet(BaseViewSet):
            )
        return Response(modules, status=status.HTTP_200_OK)

-    allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
-
    def retrieve(self, request, slug, project_id, pk):
        queryset = (
            self.get_queryset()
@@ -448,12 +442,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,
@@ -487,12 +475,12 @@ class ModuleViewSet(BaseViewSet):
                )
                .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,
@@ -502,7 +490,7 @@ class ModuleViewSet(BaseViewSet):
                )
                .annotate(
                    pending_estimates=Sum(
-                        Cast("estimate_point__value", FloatField()),
+                        Cast("estimate_point__value", IntegerField()),
                        filter=Q(
                            completed_at__isnull=True,
                            archived_at__isnull=True,
@@ -525,12 +513,12 @@ class ModuleViewSet(BaseViewSet):
                .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,
@@ -540,7 +528,7 @@ class ModuleViewSet(BaseViewSet):
                )
                .annotate(
                    pending_estimates=Sum(
-                        Cast("estimate_point__value", FloatField()),
+                        Cast("estimate_point__value", IntegerField()),
                        filter=Q(
                            completed_at__isnull=True,
                            archived_at__isnull=True,
@@ -565,7 +553,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,
@@ -615,7 +603,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,
@@ -675,7 +663,6 @@ class ModuleViewSet(BaseViewSet):
            status=status.HTTP_200_OK,
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def partial_update(self, request, slug, project_id, pk):
        module = self.get_queryset().filter(pk=pk)

@@ -745,12 +732,10 @@ class ModuleViewSet(BaseViewSet):
            return Response(module, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    @allow_permission([ROLE.ADMIN], creator=True, model=Module)
    def destroy(self, request, slug, project_id, pk):
        module = Module.objects.get(
            workspace__slug=slug, project_id=project_id, pk=pk
        )
-
        module_issues = list(
            ModuleIssue.objects.filter(module_id=pk).values_list(
                "issue", flat=True
@@ -771,18 +756,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)


@@ -846,13 +819,15 @@ 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)


 class ModuleUserPropertiesEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectLitePermission,
+    ]

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
    def patch(self, request, slug, project_id, module_id):
        module_properties = ModuleUserProperties.objects.get(
            user=request.user,
@@ -875,7 +850,6 @@ class ModuleUserPropertiesEndpoint(BaseAPIView):
        serializer = ModuleUserPropertiesSerializer(module_properties)
        return Response(serializer.data, status=status.HTTP_201_CREATED)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
    def get(self, request, slug, project_id, module_id):
        module_properties, _ = ModuleUserProperties.objects.get_or_create(
            user=request.user,
@@ -17,11 +17,13 @@ from django.views.decorators.gzip import gzip_page
 from rest_framework import status
 from rest_framework.response import Response

-from plane.app.permissions import allow_permission, ROLE
+from plane.app.permissions import (
+    ProjectEntityPermission,
+)
 from plane.app.serializers import (
    ModuleIssueSerializer,
 )
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import (
    Issue,
    IssueAttachment,
@@ -44,7 +46,6 @@ from plane.utils.paginator import (
 # Module imports
 from .. import BaseViewSet

-
 class ModuleIssueViewSet(BaseViewSet):
    serializer_class = ModuleIssueSerializer
    model = ModuleIssue
@@ -56,6 +57,10 @@ class ModuleIssueViewSet(BaseViewSet):
        "issue__assignees__id",
    ]

+    permission_classes = [
+        ProjectEntityPermission,
+    ]
+
    def get_queryset(self):
        return (
            Issue.issue_objects.filter(
@@ -91,7 +96,6 @@ class ModuleIssueViewSet(BaseViewSet):
        ).distinct()

    @method_decorator(gzip_page)
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
    def list(self, request, slug, project_id, module_id):
        filters = issue_filters(request.query_params, "GET")
        issue_queryset = self.get_queryset().filter(**filters)
@@ -199,7 +203,6 @@ class ModuleIssueViewSet(BaseViewSet):
                ),
            )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    # create multiple issues inside a module
    def create_module_issues(self, request, slug, project_id, module_id):
        issues = request.data.get("issues", [])
@@ -241,13 +244,13 @@ class ModuleIssueViewSet(BaseViewSet):
        ]
        return Response({"message": "success"}, status=status.HTTP_201_CREATED)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    # add multiple module inside an issue and remove multiple modules from an issue
    def create_issue_modules(self, request, slug, project_id, issue_id):
        modules = request.data.get("modules", [])
        removed_modules = request.data.get("removed_modules", [])
        project = Project.objects.get(pk=project_id)

+
        if modules:
            _ = ModuleIssue.objects.bulk_create(
                [
@@ -281,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,
@@ -294,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,
@@ -304,9 +307,8 @@ class ModuleIssueViewSet(BaseViewSet):

        return Response({"message": "success"}, status=status.HTTP_201_CREATED)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    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,
@@ -319,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
@@ -19,7 +19,6 @@ from plane.db.models import (
    WorkspaceMember,
 )
 from plane.utils.paginator import BasePaginator
-from plane.app.permissions import allow_permission, ROLE

 # Module imports
 from ..base import BaseAPIView, BaseViewSet
@@ -40,38 +39,18 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
            .select_related("workspace", "project," "triggered_by", "receiver")
        )

-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
-        level="WORKSPACE",
-    )
    def list(self, request, slug):
        # Get query parameters
        snoozed = request.GET.get("snoozed", "false")
        archived = request.GET.get("archived", "false")
        read = request.GET.get("read", None)
        type = request.GET.get("type", "all")
-        mentioned = request.GET.get("mentioned", False)
        q_filters = Q()

-        inbox_issue = Issue.objects.filter(
-            pk=OuterRef("entity_identifier"),
-            issue_inbox__status__in=[0, 2, -2],
-            workspace__slug=self.kwargs.get("slug"),
-        )
-
        notifications = (
            Notification.objects.filter(
                workspace__slug=slug, receiver_id=request.user.id
            )
-            .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")
        )
@@ -99,13 +78,6 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
        if read == "true":
            notifications = notifications.filter(read_at__isnull=False)

-        if mentioned:
-            notifications = notifications.filter(sender__icontains="mentioned")
-        else:
-            notifications = notifications.exclude(
-                sender__icontains="mentioned"
-            )
-
        type = type.split(",")
        # Subscribed issues
        if "subscribed" in type:
@@ -173,10 +145,6 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
        serializer = NotificationSerializer(notifications, many=True)
        return Response(serializer.data, status=status.HTTP_200_OK)

-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
-        level="WORKSPACE",
-    )
    def partial_update(self, request, slug, pk):
        notification = Notification.objects.get(
            workspace__slug=slug, pk=pk, receiver=request.user
@@ -194,9 +162,6 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
            return Response(serializer.data, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"
-    )
    def mark_read(self, request, slug, pk):
        notification = Notification.objects.get(
            receiver=request.user, workspace__slug=slug, pk=pk
@@ -206,9 +171,6 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
        serializer = NotificationSerializer(notification)
        return Response(serializer.data, status=status.HTTP_200_OK)

-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"
-    )
    def mark_unread(self, request, slug, pk):
        notification = Notification.objects.get(
            receiver=request.user, workspace__slug=slug, pk=pk
@@ -218,9 +180,6 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
        serializer = NotificationSerializer(notification)
        return Response(serializer.data, status=status.HTTP_200_OK)

-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"
-    )
    def archive(self, request, slug, pk):
        notification = Notification.objects.get(
            receiver=request.user, workspace__slug=slug, pk=pk
@@ -230,9 +189,6 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
        serializer = NotificationSerializer(notification)
        return Response(serializer.data, status=status.HTTP_200_OK)

-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"
-    )
    def unarchive(self, request, slug, pk):
        notification = Notification.objects.get(
            receiver=request.user, workspace__slug=slug, pk=pk
@@ -244,52 +200,54 @@ class NotificationViewSet(BaseViewSet, BasePaginator):


 class UnreadNotificationEndpoint(BaseAPIView):
-
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
-        level="WORKSPACE",
-    )
    def get(self, request, slug):
        # Watching Issues Count
-        unread_notifications_count = (
-            Notification.objects.filter(
-                workspace__slug=slug,
-                receiver_id=request.user.id,
-                read_at__isnull=True,
-                archived_at__isnull=True,
-                snoozed_till__isnull=True,
-            )
-            .exclude(sender__icontains="mentioned")
-            .count()
-        )
-
-        mention_notifications_count = Notification.objects.filter(
+        subscribed_issues_count = Notification.objects.filter(
            workspace__slug=slug,
            receiver_id=request.user.id,
            read_at__isnull=True,
            archived_at__isnull=True,
            snoozed_till__isnull=True,
-            sender__icontains="mentioned",
+            entity_identifier__in=IssueSubscriber.objects.filter(
+                workspace__slug=slug, subscriber_id=request.user.id
+            ).values_list("issue_id", flat=True),
+        ).count()
+
+        # My Issues Count
+        my_issues_count = Notification.objects.filter(
+            workspace__slug=slug,
+            receiver_id=request.user.id,
+            read_at__isnull=True,
+            archived_at__isnull=True,
+            snoozed_till__isnull=True,
+            entity_identifier__in=IssueAssignee.objects.filter(
+                workspace__slug=slug, assignee_id=request.user.id
+            ).values_list("issue_id", flat=True),
+        ).count()
+
+        # Created Issues Count
+        created_issues_count = Notification.objects.filter(
+            workspace__slug=slug,
+            receiver_id=request.user.id,
+            read_at__isnull=True,
+            archived_at__isnull=True,
+            snoozed_till__isnull=True,
+            entity_identifier__in=Issue.objects.filter(
+                workspace__slug=slug, created_by=request.user
+            ).values_list("pk", flat=True),
        ).count()

        return Response(
            {
-                "total_unread_notifications_count": int(
-                    unread_notifications_count
-                ),
-                "mention_unread_notifications_count": int(
-                    mention_notifications_count
-                ),
+                "subscribed_issues": subscribed_issues_count,
+                "my_issues": my_issues_count,
+                "created_issues": created_issues_count,
            },
            status=status.HTTP_200_OK,
        )


 class MarkAllReadNotificationViewSet(BaseViewSet):
-
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"
-    )
    def create(self, request, slug):
        snoozed = request.data.get("snoozed", False)
        archived = request.data.get("archived", False)
@@ -373,9 +331,6 @@ class UserNotificationPreferenceEndpoint(BaseAPIView):
    serializer_class = UserNotificationPreferenceSerializer

    # request the object
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
-    )
    def get(self, request):
        user_notification_preference = UserNotificationPreference.objects.get(
            user=request.user
@@ -386,9 +341,6 @@ class UserNotificationPreferenceEndpoint(BaseAPIView):
        return Response(serializer.data, status=status.HTTP_200_OK)

    # update the object
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE"
-    )
    def patch(self, request):
        user_notification_preference = UserNotificationPreference.objects.get(
            user=request.user
@@ -19,7 +19,7 @@ from rest_framework import status
 from rest_framework.response import Response


-from plane.app.permissions import allow_permission, ROLE
+from plane.app.permissions import ProjectEntityPermission
 from plane.app.serializers import (
    PageLogSerializer,
    PageSerializer,
@@ -38,7 +38,6 @@ from plane.db.models import (
 from ..base import BaseAPIView, BaseViewSet

 from plane.bgtasks.page_transaction_task import page_transaction
-from plane.bgtasks.page_version_task import page_version


 def unarchive_archive_page_and_descendants(page_id, archived_at):
@@ -60,6 +59,9 @@ def unarchive_archive_page_and_descendants(page_id, archived_at):
 class PageViewSet(BaseViewSet):
    serializer_class = PageSerializer
    model = Page
+    permission_classes = [
+        ProjectEntityPermission,
+    ]
    search_fields = [
        "name",
    ]
@@ -119,7 +121,6 @@ class PageViewSet(BaseViewSet):
            .distinct()
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def create(self, request, slug, project_id):
        serializer = PageSerializer(
            data=request.data,
@@ -141,7 +142,6 @@ class PageViewSet(BaseViewSet):
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def partial_update(self, request, slug, project_id, pk):
        try:
            page = Page.objects.get(
@@ -207,7 +207,6 @@ class PageViewSet(BaseViewSet):
                status=status.HTTP_400_BAD_REQUEST,
            )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
    def retrieve(self, request, slug, project_id, pk=None):
        page = self.get_queryset().filter(pk=pk).first()
        if page is None:
@@ -216,17 +215,10 @@ class PageViewSet(BaseViewSet):
                status=status.HTTP_404_NOT_FOUND,
            )
        else:
-            issue_ids = PageLog.objects.filter(
-                page_id=pk, entity_name="issue"
-            ).values_list("entity_identifier", flat=True)
-            data = PageDetailSerializer(page).data
-            data["issue_ids"] = issue_ids
            return Response(
-                data,
-                status=status.HTTP_200_OK,
+                PageDetailSerializer(page).data, status=status.HTTP_200_OK
            )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def lock(self, request, slug, project_id, pk):
        page = Page.objects.filter(
            pk=pk, workspace__slug=slug, projects__id=project_id
@@ -236,7 +228,6 @@ class PageViewSet(BaseViewSet):
        page.save()
        return Response(status=status.HTTP_204_NO_CONTENT)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def unlock(self, request, slug, project_id, pk):
        page = Page.objects.filter(
            pk=pk, workspace__slug=slug, projects__id=project_id
@@ -247,36 +238,11 @@ class PageViewSet(BaseViewSet):

        return Response(status=status.HTTP_204_NO_CONTENT)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
-    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)
-
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
    def list(self, request, slug, project_id):
        queryset = self.get_queryset()
        pages = PageSerializer(queryset, many=True).data
        return Response(pages, status=status.HTTP_200_OK)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def archive(self, request, slug, project_id, pk):
        page = Page.objects.get(
            pk=pk, workspace__slug=slug, projects__id=project_id
@@ -304,7 +270,6 @@ class PageViewSet(BaseViewSet):
            status=status.HTTP_200_OK,
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def unarchive(self, request, slug, project_id, pk):
        page = Page.objects.get(
            pk=pk, workspace__slug=slug, projects__id=project_id
@@ -334,53 +299,48 @@ class PageViewSet(BaseViewSet):

        return Response(status=status.HTTP_204_NO_CONTENT)

-    @allow_permission([ROLE.ADMIN], creator=True, model=Page)
    def destroy(self, request, slug, project_id, pk):
        page = Page.objects.get(
            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)


 class PageFavoriteViewSet(BaseViewSet):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]

    model = UserFavorite

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def create(self, request, slug, project_id, pk):
        _ = UserFavorite.objects.create(
            project_id=project_id,
@@ -390,7 +350,6 @@ class PageFavoriteViewSet(BaseViewSet):
        )
        return Response(status=status.HTTP_204_NO_CONTENT)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def destroy(self, request, slug, project_id, pk):
        page_favorite = UserFavorite.objects.get(
            project=project_id,
@@ -399,11 +358,14 @@ 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)


 class PageLogEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]

    serializer_class = PageLogSerializer
    model = PageLog
@@ -443,6 +405,9 @@ class PageLogEndpoint(BaseAPIView):


 class SubPagesEndpoint(BaseAPIView):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]

    @method_decorator(gzip_page)
    def get(self, request, slug, project_id, page_id):
@@ -461,8 +426,10 @@ class SubPagesEndpoint(BaseAPIView):


 class PagesDescriptionViewSet(BaseViewSet):
+    permission_classes = [
+        ProjectEntityPermission,
+    ]

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER])
    def retrieve(self, request, slug, project_id, pk):
        page = (
            Page.objects.filter(
@@ -487,7 +454,6 @@ class PagesDescriptionViewSet(BaseViewSet):
        )
        return response

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
    def partial_update(self, request, slug, project_id, pk):
        page = (
            Page.objects.filter(
@@ -497,12 +463,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"},
@@ -515,38 +475,16 @@ class PagesDescriptionViewSet(BaseViewSet):
                status=472,
            )

-        # Serialize the existing instance
-        existing_instance = json.dumps(
-            {
-                "description_html": page.description_html,
-            },
-            cls=DjangoJSONEncoder,
-        )
-
-        # Get the base64 data from the request
        base64_data = request.data.get("description_binary")

-        # If base64 data is provided
        if base64_data:
            # Decode the base64 data to bytes
            new_binary_data = base64.b64decode(base64_data)
-            # capture the page transaction
-            if request.data.get("description_html"):
-                page_transaction.delay(
-                    new_value=request.data,
-                    old_value=existing_instance,
-                    page_id=pk,
-                )
+
            # Store the updated binary data
            page.description_binary = new_binary_data
            page.description_html = request.data.get("description_html")
            page.save()
-            # Return a success response
-            page_version.delay(
-                page_id=page.id,
-                existing_instance=existing_instance,
-                user_id=request.user.id,
-            )
            return Response({"message": "Updated successfully"})
        else:
            return Response({"error": "No binary data provided"})
@@ -1,37 +0,0 @@
-# Third party imports
-from rest_framework import status
-from rest_framework.response import Response
-
-# Module imports
-from plane.db.models import PageVersion
-from ..base import BaseAPIView
-from plane.app.permissions import ProjectEntityPermission
-from plane.app.serializers import PageVersionSerializer
-
-
-class PageVersionEndpoint(BaseAPIView):
-
-    permission_classes = [
-        ProjectEntityPermission,
-    ]
-
-    def get(self, request, slug, project_id, page_id, pk=None):
-        # Check if pk is provided
-        if pk:
-            # Return a single page version
-            page_version = PageVersion.objects.get(
-                workspace__slug=slug,
-                page_id=page_id,
-                pk=pk,
-            )
-            # Serialize the page version
-            serializer = PageVersionSerializer(page_version)
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        # Return all page versions
-        page_versions = PageVersion.objects.filter(
-            workspace__slug=slug,
-            page_id=page_id,
-        )
-        # Serialize the page versions
-        serializer = PageVersionSerializer(page_versions, many=True)
-        return Response(serializer.data, status=status.HTTP_200_OK)
@@ -31,16 +31,15 @@ from plane.app.serializers import (
 )

 from plane.app.permissions import (
+    ProjectBasePermission,
    ProjectMemberPermission,
-    allow_permission,
-    ROLE,
 )
 from plane.db.models import (
    UserFavorite,
    Cycle,
    Inbox,
    DeployBoard,
-    IssueUserProperty,
+    IssueProperty,
    Issue,
    Module,
    Project,
@@ -48,7 +47,6 @@ from plane.db.models import (
    ProjectMember,
    State,
    Workspace,
-    WorkspaceMember,
 )
 from plane.utils.cache import cache_response
 from plane.bgtasks.webhook_task import model_activity
@@ -59,6 +57,10 @@ class ProjectViewSet(BaseViewSet):
    model = Project
    webhook_event = "project"

+    permission_classes = [
+        ProjectBasePermission,
+    ]
+
    def get_queryset(self):
        sort_order = ProjectMember.objects.filter(
            member=self.request.user,
@@ -153,10 +155,6 @@ class ProjectViewSet(BaseViewSet):
            .distinct()
        )

-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
-        level="WORKSPACE",
-    )
    def list(self, request, slug):
        fields = [
            field
@@ -175,27 +173,11 @@ class ProjectViewSet(BaseViewSet):
                    projects, many=True
                ).data,
            )
-
-        if WorkspaceMember.objects.filter(
-            member=request.user,
-            workspace__slug=slug,
-            is_active=True,
-            role__in=[5, 10],
-        ).exists():
-            projects = projects.filter(
-                project_projectmember__member=self.request.user,
-                project_projectmember__is_active=True,
-            )
-
        projects = ProjectListSerializer(
            projects, many=True, fields=fields if fields else None
        ).data
        return Response(projects, status=status.HTTP_200_OK)

-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
-        level="WORKSPACE",
-    )
    def retrieve(self, request, slug, pk):
        project = (
            self.get_queryset()
@@ -267,7 +249,6 @@ class ProjectViewSet(BaseViewSet):
        serializer = ProjectListSerializer(project)
        return Response(serializer.data, status=status.HTTP_200_OK)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
    def create(self, request, slug):
        try:
            workspace = Workspace.objects.get(slug=slug)
@@ -285,7 +266,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,
                )
@@ -299,7 +280,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"],
                    )
@@ -361,7 +342,6 @@ class ProjectViewSet(BaseViewSet):
                    .first()
                )

-                # Create the model activity
                model_activity.delay(
                    model_name="project",
                    model_id=str(project.id),
@@ -397,7 +377,6 @@ class ProjectViewSet(BaseViewSet):
                status=status.HTTP_410_GONE,
            )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
    def partial_update(self, request, slug, pk=None):
        try:
            workspace = Workspace.objects.get(slug=slug)
@@ -479,7 +458,10 @@ class ProjectViewSet(BaseViewSet):

 class ProjectArchiveUnarchiveEndpoint(BaseAPIView):

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
+    permission_classes = [
+        ProjectBasePermission,
+    ]
+
    def post(self, request, slug, project_id):
        project = Project.objects.get(pk=project_id, workspace__slug=slug)
        project.archived_at = timezone.now()
@@ -489,7 +471,6 @@ class ProjectArchiveUnarchiveEndpoint(BaseAPIView):
            status=status.HTTP_200_OK,
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def delete(self, request, slug, project_id):
        project = Project.objects.get(pk=project_id, workspace__slug=slug)
        project.archived_at = None
@@ -498,7 +479,10 @@ class ProjectArchiveUnarchiveEndpoint(BaseAPIView):


 class ProjectIdentifierEndpoint(BaseAPIView):
-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
+    permission_classes = [
+        ProjectBasePermission,
+    ]
+
    def get(self, request, slug):
        name = request.GET.get("name", "").strip().upper()

@@ -517,7 +501,6 @@ class ProjectIdentifierEndpoint(BaseAPIView):
            status=status.HTTP_200_OK,
        )

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE")
    def delete(self, request, slug):
        name = request.data.get("name", "").strip().upper()

@@ -615,7 +598,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,17 +22,18 @@ from plane.db.models import (
    ProjectMember,
    Workspace,
    TeamMember,
-    IssueUserProperty,
-    WorkspaceMember,
+    IssueProperty,
 )
 from plane.bgtasks.project_add_user_email_task import project_add_user_email
 from plane.utils.host import base_host
-from plane.app.permissions.base import allow_permission, ROLE


 class ProjectMemberViewSet(BaseViewSet):
    serializer_class = ProjectMemberAdminSerializer
    model = ProjectMember
+    permission_classes = [
+        ProjectMemberPermission,
+    ]

    def get_permissions(self):
        if self.action == "leave":
@@ -64,7 +65,6 @@ class ProjectMemberViewSet(BaseViewSet):
            .select_related("workspace", "workspace__owner")
        )

-    @allow_permission([ROLE.ADMIN])
    def create(self, request, slug, project_id):
        # Get the list of members to be added to the project and their roles i.e. the user_id and the role
        members = request.data.get("members", [])
@@ -88,23 +88,6 @@ class ProjectMemberViewSet(BaseViewSet):
            member.get("member_id"): member.get("role") for member in members
        }

-        # check the workspace role of the new user
-        for member in member_roles:
-            workspace_member_role = WorkspaceMember.objects.get(
-                workspace__slug=slug,
-                member=member,
-                is_active=True,
-            ).role
-            if workspace_member_role in [5, 10] and member_roles.get(
-                member
-            ) in [15, 20]:
-                return Response(
-                    {
-                        "error": "You cannot add a user with role higher than the workspace role"
-                    },
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
        # Update roles in the members array based on the member_roles dictionary and set is_active to True
        for project_member in ProjectMember.objects.filter(
            project_id=project_id,
@@ -153,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,
@@ -167,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
        )

@@ -189,7 +172,6 @@ class ProjectMemberViewSet(BaseViewSet):
        # Return the serialized data
        return Response(serializer.data, status=status.HTTP_201_CREATED)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
    def list(self, request, slug, project_id):
        # Get the list of project members for the project
        project_members = ProjectMember.objects.filter(
@@ -204,7 +186,6 @@ class ProjectMemberViewSet(BaseViewSet):
        )
        return Response(serializer.data, status=status.HTTP_200_OK)

-    @allow_permission([ROLE.ADMIN])
    def partial_update(self, request, slug, project_id, pk):
        project_member = ProjectMember.objects.get(
            pk=pk,
@@ -224,22 +205,6 @@ class ProjectMemberViewSet(BaseViewSet):
            member=request.user,
            is_active=True,
        )
-
-        workspace_role = WorkspaceMember.objects.get(
-            workspace__slug=slug,
-            member=project_member.member,
-            is_active=True,
-        ).role
-        if workspace_role in [5, 10] and int(
-            request.data.get("role", project_member.role)
-        ) in [15, 20]:
-            return Response(
-                {
-                    "error": "You cannot add a user with role higher than the workspace role"
-                },
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
        if (
            "role" in request.data
            and int(request.data.get("role", project_member.role))
@@ -261,7 +226,6 @@ class ProjectMemberViewSet(BaseViewSet):
            return Response(serializer.data, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER])
    def destroy(self, request, slug, project_id, pk):
        project_member = ProjectMember.objects.get(
            workspace__slug=slug,
@@ -298,7 +262,6 @@ class ProjectMemberViewSet(BaseViewSet):
        project_member.save()
        return Response(status=status.HTTP_204_NO_CONTENT)

-    @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST])
    def leave(self, request, slug, project_id):
        project_member = ProjectMember.objects.get(
            workspace__slug=slug,
@@ -360,7 +323,7 @@ class AddTeamToProjectEndpoint(BaseAPIView):
                )
            )
            issue_props.append(
-                IssueUserProperty(
+                IssueProperty(
                    project_id=project_id,
                    user_id=member,
                    workspace=workspace,
@@ -372,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
        )

@@ -1,4 +1,5 @@
 # Python imports
+import re

 # Django imports
 from django.db.models import Q
@@ -9,7 +10,15 @@ from rest_framework.response import Response

 # Module imports
 from .base import BaseAPIView
-from plane.db.models import Issue, ProjectMember
+from plane.db.models import (
+    Workspace,
+    Project,
+    Issue,
+    Cycle,
+    Module,
+    Page,
+    IssueView,
+)
 from plane.utils.issue_search import search_issues


@@ -50,14 +59,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)
@@ -73,16 +76,6 @@ class IssueSearchEndpoint(BaseAPIView):

        if target_date == "none":
            issues = issues.filter(target_date__isnull=True)
-        
-        if ProjectMember.objects.filter(
-            project_id=project_id,
-            member=self.request.user,
-            is_active=True,
-            role=5
-        ).exists():
-            issues = issues.filter(
-                created_by=self.request.user
-        )

        return Response(
            issues.values(
@@ -37,9 +37,6 @@ from plane.utils.paginator import BasePaginator
 from plane.authentication.utils.host import user_ip
 from plane.bgtasks.user_deactivation_email_task import user_deactivation_email
 from plane.utils.host import base_host
-from django.utils.decorators import method_decorator
-from django.views.decorators.cache import cache_control
-from django.views.decorators.vary import vary_on_cookie


 class UserEndpoint(BaseViewSet):
@@ -50,8 +47,6 @@ class UserEndpoint(BaseViewSet):
        return self.request.user

    @cache_response(60 * 60)
-    @method_decorator(cache_control(private=True, max_age=12))
-    @method_decorator(vary_on_cookie)
    def retrieve(self, request):
        serialized_data = UserMeSerializer(request.user).data
        return Response(
@@ -60,8 +55,6 @@ class UserEndpoint(BaseViewSet):
        )

    @cache_response(60 * 60)
-    @method_decorator(cache_control(private=True, max_age=12))
-    @method_decorator(vary_on_cookie)
    def retrieve_user_settings(self, request):
        serialized_data = UserMeSettingsSerializer(request.user).data
        return Response(serialized_data, status=status.HTTP_200_OK)
@@ -86,9 +79,6 @@ class UserEndpoint(BaseViewSet):
        return super().partial_update(request, *args, **kwargs)

    @invalidate_cache(path="/api/users/me/")
-    @invalidate_cache(
-        path="/api/users/me/workspaces/", multiple=True, user=False
-    )
    def deactivate(self, request):
        # Check all workspace user is active
        user = self.get_object()
@@ -298,8 +288,6 @@ class AccountEndpoint(BaseAPIView):


 class ProfileEndpoint(BaseAPIView):
-    @method_decorator(cache_control(private=True, max_age=12))
-    @method_decorator(vary_on_cookie)
    def get(self, request):
        profile = Profile.objects.get(user=request.user)
        serializer = ProfileSerializer(profile)
@@ -20,8 +20,8 @@ from django.db import transaction
 from rest_framework.response import Response

 from plane.app.permissions import (
-    allow_permission,
-    ROLE,
+    ProjectEntityPermission,
+    WorkspaceEntityPermission,
 )
 from plane.app.serializers import (
    IssueViewSerializer,
@@ -58,6 +58,9 @@ from plane.db.models import (
 class WorkspaceViewViewSet(BaseViewSet):
    serializer_class = IssueViewSerializer
    model = IssueView
+    permission_classes = [
+        WorkspaceEntityPermission,
+    ]

    def perform_create(self, serializer):
        workspace = Workspace.objects.get(slug=self.kwargs.get("slug"))
@@ -75,32 +78,6 @@ class WorkspaceViewViewSet(BaseViewSet):
            .distinct()
        )

-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
-        level="WORKSPACE",
-    )
-    def list(self, request, slug):
-        queryset = self.get_queryset()
-        fields = [
-            field
-            for field in request.GET.get("fields", "").split(",")
-            if field
-        ]
-        if WorkspaceMember.objects.filter(
-            workspace__slug=slug,
-            member=request.user,
-            role=5,
-            is_active=True,
-        ).exists():
-            queryset = queryset.filter(owned_by=request.user)
-        views = IssueViewSerializer(
-            queryset, many=True, fields=fields if fields else None
-        ).data
-        return Response(views, status=status.HTTP_200_OK)
-
-    @allow_permission(
-        allowed_roles=[], level="WORKSPACE", creator=True, model=IssueView
-    )
    def partial_update(self, request, slug, pk):
        with transaction.atomic():
            workspace_view = IssueView.objects.select_for_update().get(
@@ -134,31 +111,11 @@ class WorkspaceViewViewSet(BaseViewSet):
                serializer.errors, status=status.HTTP_400_BAD_REQUEST
            )

-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN],
-        level="WORKSPACE",
-        creator=True,
-        model=IssueView,
-    )
    def destroy(self, request, slug, pk):
        workspace_view = IssueView.objects.get(
            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,
@@ -170,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"},
@@ -186,6 +136,10 @@ class WorkspaceViewViewSet(BaseViewSet):


 class WorkspaceViewIssuesViewSet(BaseViewSet):
+    permission_classes = [
+        WorkspaceEntityPermission,
+    ]
+
    def get_queryset(self):
        return (
            Issue.issue_objects.annotate(
@@ -248,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())),
                ),
@@ -257,10 +210,6 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
        )

    @method_decorator(gzip_page)
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST],
-        level="WORKSPACE",
-    )
    def list(self, request, slug):
        filters = issue_filters(request.query_params, "GET")
        order_by_param = request.GET.get("order_by", "-created_at")
@@ -271,16 +220,6 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
            .annotate(cycle_id=F("issue_cycle__cycle_id"))
        )

-        if WorkspaceMember.objects.filter(
-            workspace__slug=slug,
-            member=request.user,
-            role=5,
-            is_active=True,
-        ).exists():
-            issue_queryset = issue_queryset.filter(
-                created_by=request.user,
-            )
-
        # Issue queryset
        issue_queryset, order_by_param = order_issue_queryset(
            issue_queryset=issue_queryset,
@@ -387,6 +326,9 @@ class WorkspaceViewIssuesViewSet(BaseViewSet):
 class IssueViewViewSet(BaseViewSet):
    serializer_class = IssueViewSerializer
    model = IssueView
+    permission_classes = [
+        ProjectEntityPermission,
+    ]

    def perform_create(self, serializer):
        serializer.save(
@@ -420,20 +362,8 @@ class IssueViewViewSet(BaseViewSet):
            .distinct()
        )

-    allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER, ROLE.VIEWER, ROLE.GUEST]
-    )
-
    def list(self, request, slug, project_id):
        queryset = self.get_queryset()
-        if ProjectMember.objects.filter(
-            workspace__slug=slug,
-            project_id=project_id,
-            member=request.user,
-            role=5,
-            is_active=True,
-        ).exists():
-            queryset = queryset.filter(owned_by=request.user)
        fields = [
            field
            for field in request.GET.get("fields", "").split(",")
@@ -444,8 +374,6 @@ class IssueViewViewSet(BaseViewSet):
        ).data
        return Response(views, status=status.HTTP_200_OK)

-    allow_permission(allowed_roles=[], creator=True, model=IssueView)
-
    def partial_update(self, request, slug, project_id, pk):
        with transaction.atomic():
            issue_view = IssueView.objects.select_for_update().get(
@@ -478,32 +406,21 @@ class IssueViewViewSet(BaseViewSet):
                serializer.errors, status=status.HTTP_400_BAD_REQUEST
            )

-    allow_permission(allowed_roles=[ROLE.ADMIN], creator=True, model=IssueView)
-
    def destroy(self, request, slug, project_id, pk):
        project_view = IssueView.objects.get(
            pk=pk,
            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"},
@@ -524,8 +441,6 @@ class IssueViewFavoriteViewSet(BaseViewSet):
            .select_related("view")
        )

-    allow_permission([ROLE.ADMIN, ROLE.MEMBER])
-
    def create(self, request, slug, project_id):
        _ = UserFavorite.objects.create(
            user=request.user,
@@ -535,8 +450,6 @@ class IssueViewFavoriteViewSet(BaseViewSet):
        )
        return Response(status=status.HTTP_204_NO_CONTENT)

-    allow_permission([ROLE.ADMIN, ROLE.MEMBER])
-
    def destroy(self, request, slug, project_id, view_id):
        view_favorite = UserFavorite.objects.get(
            project=project_id,
@@ -545,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)
@@ -9,13 +9,15 @@ from rest_framework.response import Response
 from plane.db.models import Webhook, WebhookLog, Workspace
 from plane.db.models.webhook import generate_token
 from ..base import BaseAPIView
-from plane.app.permissions import allow_permission, ROLE
+from plane.app.permissions import WorkspaceOwnerPermission
 from plane.app.serializers import WebhookSerializer, WebhookLogSerializer


 class WebhookEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkspaceOwnerPermission,
+    ]

-    @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
    def post(self, request, slug):
        workspace = Workspace.objects.get(slug=slug)
        try:
@@ -38,7 +40,6 @@ class WebhookEndpoint(BaseAPIView):
                )
            raise IntegrityError

-    @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
    def get(self, request, slug, pk=None):
        if pk is None:
            webhooks = Webhook.objects.filter(workspace__slug=slug)
@@ -78,7 +79,6 @@ class WebhookEndpoint(BaseAPIView):
            )
            return Response(serializer.data, status=status.HTTP_200_OK)

-    @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
    def patch(self, request, slug, pk):
        webhook = Webhook.objects.get(workspace__slug=slug, pk=pk)
        serializer = WebhookSerializer(
@@ -104,7 +104,6 @@ class WebhookEndpoint(BaseAPIView):
            return Response(serializer.data, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
    def delete(self, request, slug, pk):
        webhook = Webhook.objects.get(pk=pk, workspace__slug=slug)
        webhook.delete()
@@ -112,8 +111,10 @@ class WebhookEndpoint(BaseAPIView):


 class WebhookSecretRegenerateEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkspaceOwnerPermission,
+    ]

-    @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
    def post(self, request, slug, pk):
        webhook = Webhook.objects.get(workspace__slug=slug, pk=pk)
        webhook.secret_key = generate_token()
@@ -123,8 +124,10 @@ class WebhookSecretRegenerateEndpoint(BaseAPIView):


 class WebhookLogsEndpoint(BaseAPIView):
+    permission_classes = [
+        WorkspaceOwnerPermission,
+    ]

-    @allow_permission(allowed_roles=[ROLE.ADMIN], level="WORKSPACE")
    def get(self, request, slug, webhook_id):
        webhook_logs = WebhookLog.objects.filter(
            workspace__slug=slug, webhook_id=webhook_id
@@ -44,10 +44,6 @@ from plane.db.models import (
    WorkspaceTheme,
 )
 from plane.utils.cache import cache_response, invalidate_cache
-from django.utils.decorators import method_decorator
-from django.views.decorators.cache import cache_control
-from django.views.decorators.vary import vary_on_cookie
-from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS


 class WorkSpaceViewSet(BaseViewSet):
@@ -122,7 +118,7 @@ class WorkSpaceViewSet(BaseViewSet):
                    status=status.HTTP_400_BAD_REQUEST,
                )

-            if serializer.is_valid(raise_exception=True):
+            if serializer.is_valid():
                serializer.save(owner=request.user)
                # Create Workspace member
                _ = WorkspaceMember.objects.create(
@@ -175,8 +171,6 @@ class UserWorkSpacesEndpoint(BaseAPIView):
    ]

    @cache_response(60 * 60 * 2)
-    @method_decorator(cache_control(private=True, max_age=12))
-    @method_decorator(vary_on_cookie)
    def get(self, request):
        fields = [
            field
@@ -237,10 +231,7 @@ class WorkSpaceAvailabilityCheckEndpoint(BaseAPIView):
                status=status.HTTP_400_BAD_REQUEST,
            )

-        workspace = (
-            Workspace.objects.filter(slug=slug).exists()
-            or slug in RESTRICTED_WORKSPACE_SLUGS
-        )
+        workspace = Workspace.objects.filter(slug=slug).exists()
        return Response({"status": not workspace}, status=status.HTTP_200_OK)


@@ -1,97 +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 allow_permission, ROLE
-
-
-class WorkspaceFavoriteEndpoint(BaseAPIView):
-
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"
-    )
-    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)
-
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"
-    )
-    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)
-
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"
-    )
-    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)
-
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"
-    )
-    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):
-
-    @allow_permission(
-        allowed_roles=[ROLE.ADMIN, ROLE.MEMBER], level="WORKSPACE"
-    )
-    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)
@@ -13,7 +13,7 @@ class WorkspaceLabelsEndpoint(BaseAPIView):
    permission_classes = [
        WorkspaceViewerPermission,
    ]
-    
+
    @cache_response(60 * 60 * 2)
    def get(self, request, slug):
        labels = Label.objects.filter(
@@ -39,16 +39,6 @@ class OauthAdapter(Adapter):
        self.client_secret = client_secret
        self.code = code

-    def authentication_error_code(self):
-        if self.provider == "google":
-            return "GOOGLE_OAUTH_PROVIDER_ERROR"
-        elif self.provider == "github":
-            return "GITHUB_OAUTH_PROVIDER_ERROR"
-        elif self.provider == "gitlab":
-            return "GITLAB_OAUTH_PROVIDER_ERROR"
-        else:
-            return "OAUTH_NOT_CONFIGURED"
-
    def get_auth_url(self):
        return self.auth_url

@@ -72,7 +62,7 @@ class OauthAdapter(Adapter):
            response.raise_for_status()
            return response.json()
        except requests.RequestException:
-            code = self.authentication_error_code()
+            code = self._provider_error_code()
            raise AuthenticationException(
                error_code=AUTHENTICATION_ERROR_CODES[code],
                error_message=str(code),
@@ -87,7 +77,15 @@ class OauthAdapter(Adapter):
            response.raise_for_status()
            return response.json()
        except requests.RequestException:
-            code = self.authentication_error_code()
+            if self.provider == "google":
+                code = "GOOGLE_OAUTH_PROVIDER_ERROR"
+            elif self.provider == "github":
+                code = "GITHUB_OAUTH_PROVIDER_ERROR"
+            elif self.provider == "gitlab":
+                code = "GITLAB_OAUTH_PROVIDER_ERROR"
+            else:
+                code = "OAUTH_NOT_CONFIGURED"
+
            raise AuthenticationException(
                error_code=AUTHENTICATION_ERROR_CODES[code],
                error_message=str(code),
@@ -100,8 +98,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
@@ -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=(
@@ -10,7 +10,7 @@ from django.db.models import Q
 from django.utils import timezone

 # Module imports
-from plane.bgtasks.issue_activities_task import issue_activity
+from plane.bgtasks.issue_activites_task import issue_activity
 from plane.db.models import Issue, Project, State
 from plane.utils.exception_logger import log_exception

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
rahulramesha	f04220818c	override methods used for typeError	2024-07-03 18:49:49 +05:30
rahulramesha	98562a55c7	fix issue changes done in Peek overview to reflect in the issue boards	2024-07-02 15:48:54 +05:30