fix: proper toast message for lower roles

chore: access control to create issue, cycle, module, pages
dev: instance refactor (#3015 )
2023-12-08 16:18:23 +05:30 · 2023-12-07 17:47:35 +05:30 · 2023-12-07 14:51:27 +05:30 · 2023-12-07 14:43:33 +05:30 · 2023-12-07 14:26:17 +05:30 · 2023-12-07 12:04:21 +05:30
1716 changed files with 55537 additions and 61667 deletions
@@ -1,12 +1,14 @@
 # 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=""
@@ -1,8 +1,7 @@
 name: Bug report
 description: Create a bug report to help us improve Plane
 title: "[bug]: "
-labels: [🐛bug]
-assignees: [srinivaspendem, pushya-plane]
+labels: [bug, need testing]
 body:
 - type: markdown
  attributes:
@@ -1,8 +1,7 @@
 name: Feature request
 description: Suggest a feature to improve Plane
 title: "[feature]: "
-labels: [✨feature]
-assignees: [srinivaspendem, pushya-plane]
+labels: [feature]
 body:
 - type: markdown
  attributes:
@@ -9,7 +9,6 @@ on:
      - preview
      - qa
      - develop
-      - release-*
  release:
    types: [released, prereleased]

@@ -63,14 +62,14 @@ jobs:
    runs-on: ubuntu-20.04
    needs: [branch_build_setup]
    env:
-      FRONTEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      FRONTEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-ce:${{ needs.branch_build_setup.outputs.gh_branch_name }}
    steps:
      - name: Set Frontend Docker Tag 
        run: |
          if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-ce:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-ce:${{ github.event.release.tag_name }}
          elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:stable
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-ce:stable
          else
            TAG=${{ env.FRONTEND_TAG }}
          fi
@@ -105,14 +104,14 @@ jobs:
    runs-on: ubuntu-20.04
    needs: [branch_build_setup]
    env:
-      SPACE_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      SPACE_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space-ce:${{ needs.branch_build_setup.outputs.gh_branch_name }}
    steps:
      - name: Set Space Docker Tag 
        run: |
          if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space${{ secrets.DOCKER_REPO_SUFFIX || '' }}:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-space${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space-ce:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-space-ce:${{ github.event.release.tag_name }}
          elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space${{ secrets.DOCKER_REPO_SUFFIX || '' }}:stable
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space-ce:stable
          else
            TAG=${{ env.SPACE_TAG }}
          fi
@@ -147,14 +146,14 @@ jobs:
    runs-on: ubuntu-20.04
    needs: [branch_build_setup]
    env:
-      BACKEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-backend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      BACKEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-ce:${{ needs.branch_build_setup.outputs.gh_branch_name }}
    steps:
      - name: Set Backend Docker Tag 
        run: |
          if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-backend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-ce:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-ce:${{ github.event.release.tag_name }}
          elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend${{ secrets.DOCKER_REPO_SUFFIX || '' }}:stable
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-ce:stable
          else
            TAG=${{ env.BACKEND_TAG }}
          fi
@@ -189,14 +188,14 @@ jobs:
    runs-on: ubuntu-20.04
    needs: [branch_build_setup]
    env:
-      PROXY_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      PROXY_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-ce:${{ needs.branch_build_setup.outputs.gh_branch_name }}
    steps:
      - name: Set Proxy Docker Tag 
        run: |
          if [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ] && [ "${{ github.event_name }}" == "release" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy${{ secrets.DOCKER_REPO_SUFFIX || '' }}:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy${{ secrets.DOCKER_REPO_SUFFIX || '' }}:${{ github.event.release.tag_name }}
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-ce:latest,${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-ce:${{ github.event.release.tag_name }}
          elif [ "${{ needs.branch_build_setup.outputs.gh_branch_name }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy${{ secrets.DOCKER_REPO_SUFFIX || '' }}:stable
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-ce:stable
          else
            TAG=${{ env.PROXY_TAG }}
          fi
@@ -1,6 +1,6 @@
 name: Build Pull Request Contents

-on:
+on: 
  pull_request:
    types: ["opened", "synchronize"]

@@ -14,18 +14,16 @@ jobs:
    steps:
      - name: Checkout Repository to Actions
        uses: actions/checkout@v3.3.0
-        with:
-          token: ${{ secrets.ACCESS_TOKEN }}

      - name: Setup Node.js 18.x
        uses: actions/setup-node@v2
        with:
          node-version: 18.x
-          cache: "yarn"
-
+          cache: 'yarn'
+      
      - name: Get changed files
        id: changed-files
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v38
        with:
          files_yaml: |
            apiserver:
@@ -46,3 +44,5 @@ jobs:
        run: |
          yarn 
          yarn build --filter=space
+
+
@@ -2,10 +2,10 @@ name: "CodeQL"

 on:
  push:
-    branches: [ 'develop', 'preview', 'master' ]
+    branches: [ 'develop', 'hot-fix', 'stage-release' ]
  pull_request:
    # The branches below must be a subset of the branches above
-    branches: [ 'develop', 'preview', 'master' ]
+    branches: [ 'develop' ]
  schedule:
    - cron: '53 19 * * 5'

@@ -1,16 +1,14 @@
-name: Create Sync Action
+name: Create PR in Plane EE Repository to sync the changes

 on:
  pull_request:
    branches:
-      - preview
+      - master
    types:
      - closed
-env:
-  SOURCE_BRANCH_NAME: ${{github.event.pull_request.base.ref}}

 jobs:
-  sync_changes:
+  create_pr:
    # Only run the job when a PR is merged
    if: github.event.pull_request.merged == true
    runs-on: ubuntu-latest
@@ -18,13 +16,27 @@ jobs:
      pull-requests: write
      contents: read
    steps:
+      - name: Check SOURCE_REPO
+        id: check_repo
+        env:
+          SOURCE_REPO: ${{ secrets.SOURCE_REPO_NAME }}
+        run: |
+          echo "::set-output name=is_correct_repo::$(if [[ "$SOURCE_REPO" == "makeplane/plane" ]]; then echo 'true'; else echo 'false'; fi)"
+
      - name: Checkout Code
+        if: steps.check_repo.outputs.is_correct_repo == 'true'
        uses: actions/checkout@v2
        with:
          persist-credentials: false
          fetch-depth: 0

+      - name: Set up Branch Name
+        if: steps.check_repo.outputs.is_correct_repo == 'true'
+        run: |
+          echo "SOURCE_BRANCH_NAME=${{ github.head_ref }}" >> $GITHUB_ENV
+
      - name: Setup GH CLI
+        if: steps.check_repo.outputs.is_correct_repo == 'true'
        run: |
          type -p curl >/dev/null || (sudo apt update && sudo apt install curl -y)
          curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
@@ -33,14 +45,35 @@ jobs:
          sudo apt update
          sudo apt install gh -y

-      - name: Push Changes to Target Repo
+      - name: Create Pull Request
+        if: steps.check_repo.outputs.is_correct_repo == 'true'
        env:
          GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
        run: |
-          TARGET_REPO="${{ secrets.SYNC_TARGET_REPO_NAME }}"
-          TARGET_BRANCH="${{ secrets.SYNC_TARGET_BRANCH_NAME }}"
+          TARGET_REPO="${{ secrets.TARGET_REPO_NAME }}"
+          TARGET_BRANCH="${{ secrets.TARGET_REPO_BRANCH }}"
          SOURCE_BRANCH="${{ env.SOURCE_BRANCH_NAME }}"

          git checkout $SOURCE_BRANCH
-          git remote add target-origin "https://$GH_TOKEN@github.com/$TARGET_REPO.git"
-          git push target-origin $SOURCE_BRANCH:$TARGET_BRANCH
+          git remote add target "https://$GH_TOKEN@github.com/$TARGET_REPO.git"
+          git push target $SOURCE_BRANCH:$SOURCE_BRANCH
+
+          PR_TITLE="${{ github.event.pull_request.title }}"
+          PR_BODY="${{ github.event.pull_request.body }}"
+
+          # Remove double quotes
+          PR_TITLE_CLEANED="${PR_TITLE//\"/}"
+          PR_BODY_CLEANED="${PR_BODY//\"/}"
+
+          # Construct PR_BODY_CONTENT using a here-document
+          PR_BODY_CONTENT=$(cat <<EOF
+          $PR_BODY_CLEANED
+          EOF
+          )
+
+          gh pr create \
+            --base $TARGET_BRANCH \
+            --head $SOURCE_BRANCH \
+            --title "[SYNC] $PR_TITLE_CLEANED" \
+            --body "$PR_BODY_CONTENT" \
+            --repo $TARGET_REPO
@@ -33,8 +33,8 @@ The backend is a django project which is kept inside apiserver
 1. Clone the repo

 ```bash
-git clone https://github.com/makeplane/plane.git [folder-name]
-cd [folder-name]
+git clone https://github.com/makeplane/plane
+cd plane
 chmod +x setup.sh
 ```

@@ -44,12 +44,33 @@ chmod +x setup.sh
 ./setup.sh
 ```

-3. Start the containers
+3. Define `NEXT_PUBLIC_API_BASE_URL=http://localhost` in **web/.env** and **space/.env** file

 ```bash
-docker compose -f docker-compose-local.yml up
+echo "\nNEXT_PUBLIC_API_BASE_URL=http://localhost\n" >> ./web/.env
 ```

+```bash
+echo "\nNEXT_PUBLIC_API_BASE_URL=http://localhost\n" >> ./space/.env
+```
+
+4. Run Docker compose up
+
+```bash
+docker compose up -d
+```
+
+5. Install dependencies
+
+```bash
+yarn install
+```
+
+6. Run the web app in development mode
+
+```bash
+yarn dev
+```

 ## Missing a Feature?

@@ -49,10 +49,24 @@ NGINX_PORT=80


 ```
+# Enable/Disable OAUTH - default 0 for selfhosted instance
+NEXT_PUBLIC_ENABLE_OAUTH=0
 # Public boards deploy URL
 NEXT_PUBLIC_DEPLOY_URL="http://localhost/spaces"
 ```

+
+
+## {PROJECT_FOLDER}/spaces/.env.example
+
+
+
+```
+# Flag to toggle OAuth
+NEXT_PUBLIC_ENABLE_OAUTH=0
+```
+
+

 ## {PROJECT_FOLDER}/apiserver/.env

@@ -37,7 +37,7 @@ Meet [Plane](https://plane.so). An open-source software development tool to mana

 > Plane is still in its early days, not everything will be perfect yet, and hiccups may happen. Please let us know of any suggestions, ideas, or bugs that you encounter on our [Discord](https://discord.com/invite/A92xrEGCge) or GitHub issues, and we will use your feedback to improve on our upcoming releases.

-The easiest way to get started with Plane is by creating a [Plane Cloud](https://app.plane.so) account. Plane Cloud offers a hosted solution for Plane. If you prefer to self-host Plane, please refer to our [deployment documentation](https://docs.plane.so/docker-compose). 
+The easiest way to get started with Plane is by creating a [Plane Cloud](https://app.plane.so) account. Plane Cloud offers a hosted solution for Plane. If you prefer to self-host Plane, please refer to our [deployment documentation](https://docs.plane.so/self-hosting).

 ## ⚡️ Contributors Quick Start

@@ -63,7 +63,7 @@ Thats it!

 ## 🍙 Self Hosting

-For self hosting environment setup, visit the [Self Hosting](https://docs.plane.so/docker-compose) documentation page
+For self hosting environment setup, visit the [Self Hosting](https://docs.plane.so/self-hosting) documentation page

 ## 🚀 Features

@@ -8,11 +8,11 @@ SENTRY_DSN=""
 SENTRY_ENVIRONMENT="development"

 # Database Settings
-POSTGRES_USER="plane"
-POSTGRES_PASSWORD="plane"
-POSTGRES_HOST="plane-db"
-POSTGRES_DB="plane"
-DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}/${POSTGRES_DB}
+PGUSER="plane"
+PGPASSWORD="plane"
+PGHOST="plane-db"
+PGDATABASE="plane"
+DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}

 # Oauth variables
 GOOGLE_CLIENT_ID=""
@@ -39,6 +39,9 @@ OPENAI_API_BASE="https://api.openai.com/v1" # deprecated
 OPENAI_API_KEY="sk-" # deprecated
 GPT_ENGINE="gpt-3.5-turbo" # deprecated

+# Github
+GITHUB_CLIENT_SECRET="" # For fetching release notes
+
 # Settings related to Docker
 DOCKERIZED=1 # deprecated

@@ -27,8 +27,7 @@ WORKDIR /code
 COPY requirements.txt ./requirements.txt
 ADD requirements ./requirements

-# Install the local development settings
-RUN pip install -r requirements/local.txt --compile --no-cache-dir
+RUN pip install -r requirements.txt --compile --no-cache-dir

 RUN addgroup -S plane && \
    adduser -S captain -G plane
@@ -49,5 +48,5 @@ USER captain
 # Expose container port and run entry point script
 EXPOSE 8000

-CMD [ "./bin/takeoff.local" ]
+# CMD [ "./bin/takeoff" ]

@@ -26,9 +26,7 @@ def update_description():
            updated_issues.append(issue)

        Issue.objects.bulk_update(
-            updated_issues,
-            ["description_html", "description_stripped"],
-            batch_size=100,
+            updated_issues, ["description_html", "description_stripped"], batch_size=100
        )
        print("Success")
    except Exception as e:
@@ -42,9 +40,7 @@ def update_comments():
        updated_issue_comments = []

        for issue_comment in issue_comments:
-            issue_comment.comment_html = (
-                f"<p>{issue_comment.comment_stripped}</p>"
-            )
+            issue_comment.comment_html = f"<p>{issue_comment.comment_stripped}</p>"
            updated_issue_comments.append(issue_comment)

        IssueComment.objects.bulk_update(
@@ -103,9 +99,7 @@ def updated_issue_sort_order():
            issue.sort_order = issue.sequence_id * random.randint(100, 500)
            updated_issues.append(issue)

-        Issue.objects.bulk_update(
-            updated_issues, ["sort_order"], batch_size=100
-        )
+        Issue.objects.bulk_update(updated_issues, ["sort_order"], batch_size=100)
        print("Success")
    except Exception as e:
        print(e)
@@ -143,9 +137,7 @@ def update_project_cover_images():
            project.cover_image = project_cover_images[random.randint(0, 19)]
            updated_projects.append(project)

-        Project.objects.bulk_update(
-            updated_projects, ["cover_image"], batch_size=100
-        )
+        Project.objects.bulk_update(updated_projects, ["cover_image"], batch_size=100)
        print("Success")
    except Exception as e:
        print(e)
@@ -194,9 +186,7 @@ def update_label_color():

 def create_slack_integration():
    try:
-        _ = Integration.objects.create(
-            provider="slack", network=2, title="Slack"
-        )
+        _ = Integration.objects.create(provider="slack", network=2, title="Slack")
        print("Success")
    except Exception as e:
        print(e)
@@ -222,16 +212,12 @@ def update_integration_verified():

 def update_start_date():
    try:
-        issues = Issue.objects.filter(
-            state__group__in=["started", "completed"]
-        )
+        issues = Issue.objects.filter(state__group__in=["started", "completed"])
        updated_issues = []
        for issue in issues:
            issue.start_date = issue.created_at.date()
            updated_issues.append(issue)
-        Issue.objects.bulk_update(
-            updated_issues, ["start_date"], batch_size=500
-        )
+        Issue.objects.bulk_update(updated_issues, ["start_date"], batch_size=500)
        print("Success")
    except Exception as e:
        print(e)
@@ -1,31 +0,0 @@
-#!/bin/bash
-set -e
-python manage.py wait_for_db
-python manage.py migrate
-
-# Create the default bucket
-#!/bin/bash
-
-# Collect system information
-HOSTNAME=$(hostname)
-MAC_ADDRESS=$(ip link show | awk '/ether/ {print $2}' | head -n 1)
-CPU_INFO=$(cat /proc/cpuinfo)
-MEMORY_INFO=$(free -h)
-DISK_INFO=$(df -h)
-
-# Concatenate information and compute SHA-256 hash
-SIGNATURE=$(echo "$HOSTNAME$MAC_ADDRESS$CPU_INFO$MEMORY_INFO$DISK_INFO" | sha256sum | awk '{print $1}')
-
-# Export the variables
-export MACHINE_SIGNATURE=$SIGNATURE
-
-# Register instance
-python manage.py register_instance $MACHINE_SIGNATURE
-# Load the configuration variable
-python manage.py configure_instance
-
-# Create the default bucket
-python manage.py create_bucket
-
-python manage.py runserver 0.0.0.0:8000 --settings=plane.settings.local
-
@@ -2,10 +2,10 @@
 import os
 import sys

-if __name__ == "__main__":
+if __name__ == '__main__':
    os.environ.setdefault(
-        "DJANGO_SETTINGS_MODULE", "plane.settings.production"
-    )
+        'DJANGO_SETTINGS_MODULE',
+        'plane.settings.production')
    try:
        from django.core.management import execute_from_command_line
    except ImportError as exc:
@@ -1,4 +1,4 @@
 {
-  "name": "plane-api",
-  "version": "0.14.0"
-}
+    "name": "plane-api",
+    "version": "0.13.2"
+}
@@ -1,3 +1,3 @@
 from .celery import app as celery_app

-__all__ = ("celery_app",)
+__all__ = ('celery_app',)
@@ -2,4 +2,4 @@ from django.apps import AppConfig


 class AnalyticsConfig(AppConfig):
-    name = "plane.analytics"
+    name = 'plane.analytics'
@@ -2,4 +2,4 @@ from django.apps import AppConfig


 class ApiConfig(AppConfig):
-    name = "plane.api"
+    name = "plane.api"
@@ -25,10 +25,7 @@ class APIKeyAuthentication(authentication.BaseAuthentication):
    def validate_api_token(self, token):
        try:
            api_token = APIToken.objects.get(
-                Q(
-                    Q(expired_at__gt=timezone.now())
-                    | Q(expired_at__isnull=True)
-                ),
+                Q(Q(expired_at__gt=timezone.now()) | Q(expired_at__isnull=True)),
                token=token,
                is_active=True,
            )
@@ -47,4 +44,4 @@ class APIKeyAuthentication(authentication.BaseAuthentication):

        # Validate the API token
        user, token = self.validate_api_token(token)
-        return user, token
+        return user, token
@@ -1,18 +1,17 @@
 from rest_framework.throttling import SimpleRateThrottle

-
 class ApiKeyRateThrottle(SimpleRateThrottle):
-    scope = "api_key"
-    rate = "60/minute"
+    scope = 'api_key'
+    rate = '60/minute'

    def get_cache_key(self, request, view):
        # Retrieve the API key from the request header
-        api_key = request.headers.get("X-Api-Key")
+        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}"
+        return f'{self.scope}:{api_key}'

    def allow_request(self, request, view):
        allowed = super().allow_request(request, view)
@@ -25,7 +24,7 @@ class ApiKeyRateThrottle(SimpleRateThrottle):
            # Remove old histories
            while history and history[-1] <= now - self.duration:
                history.pop()
-
+            
            # Calculate the requests
            num_requests = len(history)

@@ -36,7 +35,7 @@ class ApiKeyRateThrottle(SimpleRateThrottle):
            reset_time = int(now + self.duration)

            # Add headers
-            request.META["X-RateLimit-Remaining"] = max(0, available)
-            request.META["X-RateLimit-Reset"] = reset_time
+            request.META['X-RateLimit-Remaining'] = max(0, available)
+            request.META['X-RateLimit-Reset'] = reset_time

-        return allowed
+        return allowed
@@ -13,9 +13,5 @@ from .issue import (
 )
 from .state import StateLiteSerializer, StateSerializer
 from .cycle import CycleSerializer, CycleIssueSerializer, CycleLiteSerializer
-from .module import (
-    ModuleSerializer,
-    ModuleIssueSerializer,
-    ModuleLiteSerializer,
-)
-from .inbox import InboxIssueSerializer
+from .module import ModuleSerializer, ModuleIssueSerializer, ModuleLiteSerializer
+from .inbox import InboxIssueSerializer
@@ -97,11 +97,9 @@ class BaseSerializer(serializers.ModelSerializer):
                            exp_serializer = expansion[expand](
                                getattr(instance, expand)
                            )
-                        response[expand] = exp_serializer.data
+                            response[expand] = exp_serializer.data
                    else:
                        # You might need to handle this case differently
-                        response[expand] = getattr(
-                            instance, f"{expand}_id", None
-                        )
+                        response[expand] = getattr(instance, f"{expand}_id", None)

-        return response
+        return response
@@ -23,9 +23,7 @@ class CycleSerializer(BaseSerializer):
            and data.get("end_date", None) is not None
            and data.get("start_date", None) > data.get("end_date", None)
        ):
-            raise serializers.ValidationError(
-                "Start date cannot exceed end date"
-            )
+            raise serializers.ValidationError("Start date cannot exceed end date")
        return data

    class Meta:
@@ -57,6 +55,7 @@ class CycleIssueSerializer(BaseSerializer):


 class CycleLiteSerializer(BaseSerializer):
+
    class Meta:
        model = Cycle
-        fields = "__all__"
+        fields = "__all__"
@@ -2,8 +2,8 @@
 from .base import BaseSerializer
 from plane.db.models import InboxIssue

-
 class InboxIssueSerializer(BaseSerializer):
+
    class Meta:
        model = InboxIssue
        fields = "__all__"
@@ -16,4 +16,4 @@ class InboxIssueSerializer(BaseSerializer):
            "updated_by",
            "created_at",
            "updated_at",
-        ]
+        ]
@@ -27,7 +27,6 @@ from .module import ModuleSerializer, ModuleLiteSerializer
 from .user import UserLiteSerializer
 from .state import StateLiteSerializer

-
 class IssueSerializer(BaseSerializer):
    assignees = serializers.ListField(
        child=serializers.PrimaryKeyRelatedField(
@@ -67,16 +66,14 @@ class IssueSerializer(BaseSerializer):
            and data.get("target_date", None) is not None
            and data.get("start_date", None) > data.get("target_date", None)
        ):
-            raise serializers.ValidationError(
-                "Start date cannot exceed target date"
-            )
-
+            raise serializers.ValidationError("Start date cannot exceed target date")
+        
        try:
-            if data.get("description_html", None) is not None:
+            if(data.get("description_html", None) is not None):
                parsed = html.fromstring(data["description_html"])
-                parsed_str = html.tostring(parsed, encoding="unicode")
+                parsed_str = html.tostring(parsed, encoding='unicode')
                data["description_html"] = parsed_str
-
+            
        except Exception as e:
            raise serializers.ValidationError(f"Invalid HTML: {str(e)}")

@@ -99,8 +96,7 @@ class IssueSerializer(BaseSerializer):
        if (
            data.get("state")
            and not State.objects.filter(
-                project_id=self.context.get("project_id"),
-                pk=data.get("state").id,
+                project_id=self.context.get("project_id"), pk=data.get("state")
            ).exists()
        ):
            raise serializers.ValidationError(
@@ -111,8 +107,7 @@ class IssueSerializer(BaseSerializer):
        if (
            data.get("parent")
            and not Issue.objects.filter(
-                workspace_id=self.context.get("workspace_id"),
-                pk=data.get("parent").id,
+                workspace_id=self.context.get("workspace_id"), pk=data.get("parent")
            ).exists()
        ):
            raise serializers.ValidationError(
@@ -243,13 +238,9 @@ class IssueSerializer(BaseSerializer):
                ]
        if "labels" in self.fields:
            if "labels" in self.expand:
-                data["labels"] = LabelSerializer(
-                    instance.labels.all(), many=True
-                ).data
+                data["labels"] = LabelSerializer(instance.labels.all(), many=True).data
            else:
-                data["labels"] = [
-                    str(label.id) for label in instance.labels.all()
-                ]
+                data["labels"] = [str(label.id) for label in instance.labels.all()]

        return data

@@ -287,8 +278,7 @@ class IssueLinkSerializer(BaseSerializer):
    # Validation if url already exists
    def create(self, validated_data):
        if IssueLink.objects.filter(
-            url=validated_data.get("url"),
-            issue_id=validated_data.get("issue_id"),
+            url=validated_data.get("url"), issue_id=validated_data.get("issue_id")
        ).exists():
            raise serializers.ValidationError(
                {"error": "URL already exists for this Issue"}
@@ -334,11 +324,11 @@ class IssueCommentSerializer(BaseSerializer):

    def validate(self, data):
        try:
-            if data.get("comment_html", None) is not None:
+            if(data.get("comment_html", None) is not None):
                parsed = html.fromstring(data["comment_html"])
-                parsed_str = html.tostring(parsed, encoding="unicode")
+                parsed_str = html.tostring(parsed, encoding='unicode')
                data["comment_html"] = parsed_str
-
+            
        except Exception as e:
            raise serializers.ValidationError(f"Invalid HTML: {str(e)}")
        return data
@@ -372,6 +362,7 @@ class ModuleIssueSerializer(BaseSerializer):


 class LabelLiteSerializer(BaseSerializer):
+
    class Meta:
        model = Label
        fields = [
@@ -52,9 +52,7 @@ class ModuleSerializer(BaseSerializer):
            and data.get("target_date", None) is not None
            and data.get("start_date", None) > data.get("target_date", None)
        ):
-            raise serializers.ValidationError(
-                "Start date cannot exceed target date"
-            )
+            raise serializers.ValidationError("Start date cannot exceed target date")

        if data.get("members", []):
            data["members"] = ProjectMember.objects.filter(
@@ -67,18 +65,18 @@ class ModuleSerializer(BaseSerializer):
    def create(self, validated_data):
        members = validated_data.pop("members", None)

-        project_id = self.context["project_id"]
-        workspace_id = self.context["workspace_id"]
+        project = self.context["project"]
+
+        module = Module.objects.create(**validated_data, project=project)

-        module = Module.objects.create(**validated_data, project_id=project_id)
        if members is not None:
            ModuleMember.objects.bulk_create(
                [
                    ModuleMember(
                        module=module,
-                        member_id=str(member),
-                        project_id=project_id,
-                        workspace_id=workspace_id,
+                        member=member,
+                        project=project,
+                        workspace=project.workspace,
                        created_by=module.created_by,
                        updated_by=module.updated_by,
                    )
@@ -99,7 +97,7 @@ class ModuleSerializer(BaseSerializer):
                [
                    ModuleMember(
                        module=instance,
-                        member_id=str(member),
+                        member=member,
                        project=instance.project,
                        workspace=instance.project.workspace,
                        created_by=instance.created_by,
@@ -148,16 +146,16 @@ class ModuleLinkSerializer(BaseSerializer):
    # Validation if url already exists
    def create(self, validated_data):
        if ModuleLink.objects.filter(
-            url=validated_data.get("url"),
-            module_id=validated_data.get("module_id"),
+            url=validated_data.get("url"), module_id=validated_data.get("module_id")
        ).exists():
            raise serializers.ValidationError(
                {"error": "URL already exists for this Issue"}
            )
        return ModuleLink.objects.create(**validated_data)
-
+    

 class ModuleLiteSerializer(BaseSerializer):
+
    class Meta:
        model = Module
-        fields = "__all__"
+        fields = "__all__"
@@ -2,17 +2,12 @@
 from rest_framework import serializers

 # Module imports
-from plane.db.models import (
-    Project,
-    ProjectIdentifier,
-    WorkspaceMember,
-    State,
-    Estimate,
-)
+from plane.db.models import Project, ProjectIdentifier, WorkspaceMember, State, Estimate
 from .base import BaseSerializer


 class ProjectSerializer(BaseSerializer):
+
    total_members = serializers.IntegerField(read_only=True)
    total_cycles = serializers.IntegerField(read_only=True)
    total_modules = serializers.IntegerField(read_only=True)
@@ -26,7 +21,7 @@ class ProjectSerializer(BaseSerializer):
        fields = "__all__"
        read_only_fields = [
            "id",
-            "emoji",
+            'emoji',
            "workspace",
            "created_at",
            "updated_at",
@@ -64,16 +59,12 @@ class ProjectSerializer(BaseSerializer):
    def create(self, validated_data):
        identifier = validated_data.get("identifier", "").strip().upper()
        if identifier == "":
-            raise serializers.ValidationError(
-                detail="Project Identifier is required"
-            )
+            raise serializers.ValidationError(detail="Project Identifier is required")

        if ProjectIdentifier.objects.filter(
            name=identifier, workspace_id=self.context["workspace_id"]
        ).exists():
-            raise serializers.ValidationError(
-                detail="Project Identifier is taken"
-            )
+            raise serializers.ValidationError(detail="Project Identifier is taken")

        project = Project.objects.create(
            **validated_data, workspace_id=self.context["workspace_id"]
@@ -98,4 +89,4 @@ class ProjectLiteSerializer(BaseSerializer):
            "emoji",
            "description",
        ]
-        read_only_fields = fields
+        read_only_fields = fields
@@ -7,9 +7,9 @@ class StateSerializer(BaseSerializer):
    def validate(self, data):
        # If the default is being provided then make all other states default False
        if data.get("default", False):
-            State.objects.filter(
-                project_id=self.context.get("project_id")
-            ).update(default=False)
+            State.objects.filter(project_id=self.context.get("project_id")).update(
+                default=False
+            )
        return data

    class Meta:
@@ -35,4 +35,4 @@ class StateLiteSerializer(BaseSerializer):
            "color",
            "group",
        ]
-        read_only_fields = fields
+        read_only_fields = fields
@@ -13,4 +13,4 @@ class UserLiteSerializer(BaseSerializer):
            "avatar",
            "display_name",
        ]
-        read_only_fields = fields
+        read_only_fields = fields
@@ -5,7 +5,6 @@ from .base import BaseSerializer

 class WorkspaceLiteSerializer(BaseSerializer):
    """Lite serializer with only required fields"""
-
    class Meta:
        model = Workspace
        fields = [
@@ -13,4 +12,4 @@ class WorkspaceLiteSerializer(BaseSerializer):
            "slug",
            "id",
        ]
-        read_only_fields = fields
+        read_only_fields = fields
@@ -12,4 +12,4 @@ urlpatterns = [
    *cycle_patterns,
    *module_patterns,
    *inbox_patterns,
-]
+]
@@ -32,4 +32,4 @@ urlpatterns = [
        TransferCycleIssueAPIEndpoint.as_view(),
        name="transfer-issues",
    ),
-]
+]
@@ -14,4 +14,4 @@ urlpatterns = [
        InboxIssueAPIEndpoint.as_view(),
        name="inbox-issue",
    ),
-]
+]
@@ -23,4 +23,4 @@ urlpatterns = [
        ModuleIssueAPIEndpoint.as_view(),
        name="module-issues",
    ),
-]
+]
@@ -3,7 +3,7 @@ from django.urls import path
 from plane.api.views import ProjectAPIEndpoint

 urlpatterns = [
-    path(
+        path(
        "workspaces/<str:slug>/projects/",
        ProjectAPIEndpoint.as_view(),
        name="project",
@@ -13,4 +13,4 @@ urlpatterns = [
        ProjectAPIEndpoint.as_view(),
        name="project",
    ),
-]
+]
@@ -13,4 +13,4 @@ urlpatterns = [
        StateAPIEndpoint.as_view(),
        name="states",
    ),
-]
+]
@@ -18,4 +18,4 @@ from .cycle import (

 from .module import ModuleAPIEndpoint, ModuleIssueAPIEndpoint

-from .inbox import InboxIssueAPIEndpoint
+from .inbox import InboxIssueAPIEndpoint
@@ -41,9 +41,7 @@ class WebhookMixin:
    bulk = False

    def finalize_response(self, request, response, *args, **kwargs):
-        response = super().finalize_response(
-            request, response, *args, **kwargs
-        )
+        response = super().finalize_response(request, response, *args, **kwargs)

        # Check for the case should webhook be sent
        if (
@@ -106,14 +104,15 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
                )

            if isinstance(e, ObjectDoesNotExist):
+                model_name = str(exc).split(" matching query does not exist.")[0]
                return Response(
-                    {"error": f"The required object does not exist."},
+                    {"error": f"{model_name} does not exist."},
                    status=status.HTTP_404_NOT_FOUND,
                )

            if isinstance(e, KeyError):
                return Response(
-                    {"error": f" The required key does not exist."},
+                    {"error": f"key {e} does not exist"},
                    status=status.HTTP_400_BAD_REQUEST,
                )

@@ -141,9 +140,7 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):

    def finalize_response(self, request, response, *args, **kwargs):
        # Call super to get the default response
-        response = super().finalize_response(
-            request, response, *args, **kwargs
-        )
+        response = super().finalize_response(request, response, *args, **kwargs)

        # Add custom headers if they exist in the request META
        ratelimit_remaining = request.META.get("X-RateLimit-Remaining")
@@ -167,17 +164,13 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
    @property
    def fields(self):
        fields = [
-            field
-            for field in self.request.GET.get("fields", "").split(",")
-            if field
+            field for field in self.request.GET.get("fields", "").split(",") if field
        ]
        return fields if fields else None

    @property
    def expand(self):
        expand = [
-            expand
-            for expand in self.request.GET.get("expand", "").split(",")
-            if expand
+            expand for expand in self.request.GET.get("expand", "").split(",") if expand
        ]
        return expand if expand else None
@@ -12,13 +12,7 @@ from rest_framework import status

 # Module imports
 from .base import BaseAPIView, WebhookMixin
-from plane.db.models import (
-    Cycle,
-    Issue,
-    CycleIssue,
-    IssueLink,
-    IssueAttachment,
-)
+from plane.db.models import Cycle, Issue, CycleIssue, IssueLink, IssueAttachment
 from plane.app.permissions import ProjectEntityPermission
 from plane.api.serializers import (
    CycleSerializer,
@@ -108,9 +102,7 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
                    ),
                )
            )
-            .annotate(
-                total_estimates=Sum("issue_cycle__issue__estimate_point")
-            )
+            .annotate(total_estimates=Sum("issue_cycle__issue__estimate_point"))
            .annotate(
                completed_estimates=Sum(
                    "issue_cycle__issue__estimate_point",
@@ -209,8 +201,7 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
        # Incomplete Cycles
        if cycle_view == "incomplete":
            queryset = queryset.filter(
-                Q(end_date__gte=timezone.now().date())
-                | Q(end_date__isnull=True),
+                Q(end_date__gte=timezone.now().date()) | Q(end_date__isnull=True),
            )
            return self.paginate(
                request=request,
@@ -247,12 +238,8 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
                    project_id=project_id,
                    owned_by=request.user,
                )
-                return Response(
-                    serializer.data, status=status.HTTP_201_CREATED
-                )
-            return Response(
-                serializer.errors, status=status.HTTP_400_BAD_REQUEST
-            )
+                return Response(serializer.data, status=status.HTTP_201_CREATED)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
        else:
            return Response(
                {
@@ -262,22 +249,15 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):
            )

    def patch(self, request, slug, project_id, pk):
-        cycle = Cycle.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
+        cycle = Cycle.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)

        request_data = request.data

-        if (
-            cycle.end_date is not None
-            and cycle.end_date < timezone.now().date()
-        ):
+        if cycle.end_date is not None and cycle.end_date < timezone.now().date():
            if "sort_order" in request_data:
                # Can only change sort order
                request_data = {
-                    "sort_order": request_data.get(
-                        "sort_order", cycle.sort_order
-                    )
+                    "sort_order": request_data.get("sort_order", cycle.sort_order)
                }
            else:
                return Response(
@@ -295,13 +275,11 @@ class CycleAPIEndpoint(WebhookMixin, BaseAPIView):

    def delete(self, request, slug, project_id, pk):
        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
+            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",
@@ -341,9 +319,7 @@ class CycleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
    def get_queryset(self):
        return (
            CycleIssue.objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("issue_id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("issue_id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -366,9 +342,7 @@ class CycleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
        issues = (
            Issue.issue_objects.filter(issue_cycle__cycle_id=cycle_id)
            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -390,9 +364,7 @@ class CycleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
                .values("count")
            )
            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
+                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -415,18 +387,14 @@ class CycleIssueAPIEndpoint(WebhookMixin, BaseAPIView):

        if not issues:
            return Response(
-                {"error": "Issues are required"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Issues are required"}, status=status.HTTP_400_BAD_REQUEST
            )

        cycle = Cycle.objects.get(
            workspace__slug=slug, project_id=project_id, pk=cycle_id
        )

-        if (
-            cycle.end_date is not None
-            and cycle.end_date < timezone.now().date()
-        ):
+        if cycle.end_date is not None and cycle.end_date < timezone.now().date():
            return Response(
                {
                    "error": "The Cycle has already been completed so no new issues can be added"
@@ -511,10 +479,7 @@ class CycleIssueAPIEndpoint(WebhookMixin, BaseAPIView):

    def delete(self, request, slug, project_id, cycle_id, issue_id):
        cycle_issue = CycleIssue.objects.get(
-            issue_id=issue_id,
-            workspace__slug=slug,
-            project_id=project_id,
-            cycle_id=cycle_id,
+            issue_id=issue_id, workspace__slug=slug, project_id=project_id, cycle_id=cycle_id
        )
        issue_id = cycle_issue.issue_id
        cycle_issue.delete()
@@ -585,4 +550,4 @@ class TransferCycleIssueAPIEndpoint(BaseAPIView):
            updated_cycles, ["cycle_id"], batch_size=100
        )

-        return Response({"message": "Success"}, status=status.HTTP_200_OK)
+        return Response({"message": "Success"}, status=status.HTTP_200_OK)
@@ -14,14 +14,7 @@ from rest_framework.response import Response
 from .base import BaseAPIView
 from plane.app.permissions import ProjectLitePermission
 from plane.api.serializers import InboxIssueSerializer, IssueSerializer
-from plane.db.models import (
-    InboxIssue,
-    Issue,
-    State,
-    ProjectMember,
-    Project,
-    Inbox,
-)
+from plane.db.models import InboxIssue, Issue, State, ProjectMember, Project, Inbox
 from plane.bgtasks.issue_activites_task import issue_activity


@@ -50,8 +43,7 @@ class InboxIssueAPIEndpoint(BaseAPIView):
        ).first()

        project = Project.objects.get(
-            workspace__slug=self.kwargs.get("slug"),
-            pk=self.kwargs.get("project_id"),
+            workspace__slug=self.kwargs.get("slug"), pk=self.kwargs.get("project_id")
        )

        if inbox is None and not project.inbox_view:
@@ -59,8 +51,7 @@ class InboxIssueAPIEndpoint(BaseAPIView):

        return (
            InboxIssue.objects.filter(
-                Q(snoozed_till__gte=timezone.now())
-                | Q(snoozed_till__isnull=True),
+                Q(snoozed_till__gte=timezone.now()) | Q(snoozed_till__isnull=True),
                workspace__slug=self.kwargs.get("slug"),
                project_id=self.kwargs.get("project_id"),
                inbox_id=inbox.id,
@@ -96,8 +87,7 @@ class InboxIssueAPIEndpoint(BaseAPIView):
    def post(self, request, slug, project_id):
        if not request.data.get("issue", {}).get("name", False):
            return Response(
-                {"error": "Name is required"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Name is required"}, status=status.HTTP_400_BAD_REQUEST
            )

        inbox = Inbox.objects.filter(
@@ -127,8 +117,7 @@ class InboxIssueAPIEndpoint(BaseAPIView):
            "none",
        ]:
            return Response(
-                {"error": "Invalid priority"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Invalid priority"}, status=status.HTTP_400_BAD_REQUEST
            )

        # Create or get state
@@ -233,14 +222,10 @@ class InboxIssueAPIEndpoint(BaseAPIView):
                    "description_html": issue_data.get(
                        "description_html", issue.description_html
                    ),
-                    "description": issue_data.get(
-                        "description", issue.description
-                    ),
+                    "description": issue_data.get("description", issue.description),
                }

-            issue_serializer = IssueSerializer(
-                issue, data=issue_data, partial=True
-            )
+            issue_serializer = IssueSerializer(issue, data=issue_data, partial=True)

            if issue_serializer.is_valid():
                current_instance = issue
@@ -281,9 +266,7 @@ class InboxIssueAPIEndpoint(BaseAPIView):
                        project_id=project_id,
                    )
                    state = State.objects.filter(
-                        group="cancelled",
-                        workspace__slug=slug,
-                        project_id=project_id,
+                        group="cancelled", workspace__slug=slug, project_id=project_id
                    ).first()
                    if state is not None:
                        issue.state = state
@@ -301,22 +284,17 @@ class InboxIssueAPIEndpoint(BaseAPIView):
                    if issue.state.name == "Triage":
                        # Move to default state
                        state = State.objects.filter(
-                            workspace__slug=slug,
-                            project_id=project_id,
-                            default=True,
+                            workspace__slug=slug, project_id=project_id, default=True
                        ).first()
                        if state is not None:
                            issue.state = state
                            issue.save()

                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(
-                serializer.errors, status=status.HTTP_400_BAD_REQUEST
-            )
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
        else:
            return Response(
-                InboxIssueSerializer(inbox_issue).data,
-                status=status.HTTP_200_OK,
+                InboxIssueSerializer(inbox_issue).data, status=status.HTTP_200_OK
            )

    def delete(self, request, slug, project_id, issue_id):
@@ -67,9 +67,7 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
    def get_queryset(self):
        return (
            Issue.issue_objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -88,9 +86,7 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
    def get(self, request, slug, project_id, pk=None):
        if pk:
            issue = Issue.issue_objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -106,13 +102,7 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):

        # Custom ordering for priority and state
        priority_order = ["urgent", "high", "medium", "low", "none"]
-        state_order = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
+        state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]

        order_by_param = request.GET.get("order_by", "-created_at")

@@ -127,9 +117,7 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
                .values("count")
            )
            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
+                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -139,9 +127,7 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
        # Priority Ordering
        if order_by_param == "priority" or order_by_param == "-priority":
            priority_order = (
-                priority_order
-                if order_by_param == "priority"
-                else priority_order[::-1]
+                priority_order if order_by_param == "priority" else priority_order[::-1]
            )
            issue_queryset = issue_queryset.annotate(
                priority_order=Case(
@@ -189,9 +175,7 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
                    else order_by_param
                )
            ).order_by(
-                "-max_values"
-                if order_by_param.startswith("-")
-                else "max_values"
+                "-max_values" if order_by_param.startswith("-") else "max_values"
            )
        else:
            issue_queryset = issue_queryset.order_by(order_by_param)
@@ -225,9 +209,7 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
            # Track the issue
            issue_activity.delay(
                type="issue.activity.created",
-                requested_data=json.dumps(
-                    self.request.data, cls=DjangoJSONEncoder
-                ),
+                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),
@@ -238,23 +220,12 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
        return Response(serializer.errors, 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
-        )
-        project = Project.objects.get(pk=project_id)
+        issue = Issue.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
        current_instance = json.dumps(
            IssueSerializer(issue).data, cls=DjangoJSONEncoder
        )
        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,
-        )
+        serializer = IssueSerializer(issue, data=request.data, partial=True)
        if serializer.is_valid():
            serializer.save()
            issue_activity.delay(
@@ -270,9 +241,7 @@ class IssueAPIEndpoint(WebhookMixin, BaseAPIView):
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

    def delete(self, request, slug, project_id, pk=None):
-        issue = Issue.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
+        issue = Issue.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
        current_instance = json.dumps(
            IssueSerializer(issue).data, cls=DjangoJSONEncoder
        )
@@ -319,17 +288,11 @@ class LabelAPIEndpoint(BaseAPIView):
            serializer = LabelSerializer(data=request.data)
            if serializer.is_valid():
                serializer.save(project_id=project_id)
-                return Response(
-                    serializer.data, status=status.HTTP_201_CREATED
-                )
-            return Response(
-                serializer.errors, status=status.HTTP_400_BAD_REQUEST
-            )
+                return Response(serializer.data, status=status.HTTP_201_CREATED)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
        except IntegrityError:
            return Response(
-                {
-                    "error": "Label with the same name already exists in the project"
-                },
+                {"error": "Label with the same name already exists in the project"},
                status=status.HTTP_400_BAD_REQUEST,
            )

@@ -346,11 +309,7 @@ class LabelAPIEndpoint(BaseAPIView):
                ).data,
            )
        label = self.get_queryset().get(pk=pk)
-        serializer = LabelSerializer(
-            label,
-            fields=self.fields,
-            expand=self.expand,
-        )
+        serializer = LabelSerializer(label, fields=self.fields, expand=self.expand,)
        return Response(serializer.data, status=status.HTTP_200_OK)

    def patch(self, request, slug, project_id, pk=None):
@@ -360,6 +319,7 @@ class LabelAPIEndpoint(BaseAPIView):
            serializer.save()
            return Response(serializer.data, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+    

    def delete(self, request, slug, project_id, pk=None):
        label = self.get_queryset().get(pk=pk)
@@ -426,9 +386,7 @@ class IssueLinkAPIEndpoint(BaseAPIView):
            )
            issue_activity.delay(
                type="link.activity.created",
-                requested_data=json.dumps(
-                    serializer.data, cls=DjangoJSONEncoder
-                ),
+                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")),
@@ -440,19 +398,14 @@ class IssueLinkAPIEndpoint(BaseAPIView):

    def patch(self, request, slug, project_id, issue_id, pk):
        issue_link = IssueLink.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            issue_id=issue_id,
-            pk=pk,
+            workspace__slug=slug, project_id=project_id, issue_id=issue_id, pk=pk
        )
        requested_data = json.dumps(request.data, cls=DjangoJSONEncoder)
        current_instance = json.dumps(
            IssueLinkSerializer(issue_link).data,
            cls=DjangoJSONEncoder,
        )
-        serializer = IssueLinkSerializer(
-            issue_link, data=request.data, partial=True
-        )
+        serializer = IssueLinkSerializer(issue_link, data=request.data, partial=True)
        if serializer.is_valid():
            serializer.save()
            issue_activity.delay(
@@ -469,10 +422,7 @@ class IssueLinkAPIEndpoint(BaseAPIView):

    def delete(self, request, slug, project_id, issue_id, pk):
        issue_link = IssueLink.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            issue_id=issue_id,
-            pk=pk,
+            workspace__slug=slug, project_id=project_id, issue_id=issue_id, pk=pk
        )
        current_instance = json.dumps(
            IssueLinkSerializer(issue_link).data,
@@ -507,9 +457,7 @@ class IssueCommentAPIEndpoint(WebhookMixin, BaseAPIView):

    def get_queryset(self):
        return (
-            IssueComment.objects.filter(
-                workspace__slug=self.kwargs.get("slug")
-            )
+            IssueComment.objects.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)
@@ -561,9 +509,7 @@ class IssueCommentAPIEndpoint(WebhookMixin, BaseAPIView):
            )
            issue_activity.delay(
                type="comment.activity.created",
-                requested_data=json.dumps(
-                    serializer.data, cls=DjangoJSONEncoder
-                ),
+                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")),
@@ -575,10 +521,7 @@ class IssueCommentAPIEndpoint(WebhookMixin, BaseAPIView):

    def patch(self, request, slug, project_id, issue_id, pk):
        issue_comment = IssueComment.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            issue_id=issue_id,
-            pk=pk,
+            workspace__slug=slug, project_id=project_id, issue_id=issue_id, pk=pk
        )
        requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
        current_instance = json.dumps(
@@ -604,10 +547,7 @@ class IssueCommentAPIEndpoint(WebhookMixin, BaseAPIView):

    def delete(self, request, slug, project_id, issue_id, pk):
        issue_comment = IssueComment.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            issue_id=issue_id,
-            pk=pk,
+            workspace__slug=slug, project_id=project_id, issue_id=issue_id, pk=pk
        )
        current_instance = json.dumps(
            IssueCommentSerializer(issue_comment).data,
@@ -642,7 +582,7 @@ class IssueActivityAPIEndpoint(BaseAPIView):
            )
            .select_related("actor", "workspace", "issue", "project")
        ).order_by(request.GET.get("order_by", "created_at"))
-
+ 
        if pk:
            issue_activities = issue_activities.get(pk=pk)
            serializer = IssueActivitySerializer(issue_activities)
@@ -55,9 +55,7 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
            .prefetch_related(
                Prefetch(
                    "link_module",
-                    queryset=ModuleLink.objects.select_related(
-                        "module", "created_by"
-                    ),
+                    queryset=ModuleLink.objects.select_related("module", "created_by"),
                )
            )
            .annotate(
@@ -123,31 +121,18 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
        )

    def post(self, request, slug, project_id):
-        project = Project.objects.get(pk=project_id, workspace__slug=slug)
-        serializer = ModuleSerializer(
-            data=request.data,
-            context={
-                "project_id": project_id,
-                "workspace_id": project.workspace_id,
-            },
-        )
+        project = Project.objects.get(workspace__slug=slug, pk=project_id)
+        serializer = ModuleSerializer(data=request.data, context={"project": project})
        if serializer.is_valid():
            serializer.save()
            module = Module.objects.get(pk=serializer.data["id"])
            serializer = ModuleSerializer(module)
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
+    
    def patch(self, request, slug, project_id, pk):
-        module = Module.objects.get(
-            pk=pk, project_id=project_id, workspace__slug=slug
-        )
-        serializer = ModuleSerializer(
-            module,
-            data=request.data,
-            context={"project_id": project_id},
-            partial=True,
-        )
+        module = Module.objects.get(pk=pk, project_id=project_id, workspace__slug=slug)
+        serializer = ModuleSerializer(module, data=request.data)
        if serializer.is_valid():
            serializer.save()
            return Response(serializer.data, status=status.HTTP_201_CREATED)
@@ -177,13 +162,9 @@ class ModuleAPIEndpoint(WebhookMixin, BaseAPIView):
        )

    def delete(self, request, slug, project_id, pk):
-        module = Module.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=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
-            )
+            ModuleIssue.objects.filter(module_id=pk).values_list("issue", flat=True)
        )
        issue_activity.delay(
            type="module.activity.deleted",
@@ -223,9 +204,7 @@ class ModuleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
    def get_queryset(self):
        return (
            ModuleIssue.objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("issue")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("issue"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -249,9 +228,7 @@ class ModuleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
        issues = (
            Issue.issue_objects.filter(issue_module__module_id=module_id)
            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -273,9 +250,7 @@ class ModuleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
                .values("count")
            )
            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
+                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -296,8 +271,7 @@ class ModuleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
        issues = request.data.get("issues", [])
        if not len(issues):
            return Response(
-                {"error": "Issues are required"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Issues are required"}, status=status.HTTP_400_BAD_REQUEST
            )
        module = Module.objects.get(
            workspace__slug=slug, project_id=project_id, pk=module_id
@@ -380,10 +354,7 @@ class ModuleIssueAPIEndpoint(WebhookMixin, BaseAPIView):

    def delete(self, request, slug, project_id, module_id, issue_id):
        module_issue = ModuleIssue.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            module_id=module_id,
-            issue_id=issue_id,
+            workspace__slug=slug, project_id=project_id, module_id=module_id, issue_id=issue_id
        )
        module_issue.delete()
        issue_activity.delay(
@@ -400,4 +371,4 @@ class ModuleIssueAPIEndpoint(WebhookMixin, BaseAPIView):
            current_instance=None,
            epoch=int(timezone.now().timestamp()),
        )
-        return Response(status=status.HTTP_204_NO_CONTENT)
+        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -39,15 +39,9 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):
    def get_queryset(self):
        return (
            Project.objects.filter(workspace__slug=self.kwargs.get("slug"))
-            .filter(
-                Q(project_projectmember__member=self.request.user)
-                | Q(network=2)
-            )
+            .filter(Q(project_projectmember__member=self.request.user) | Q(network=2))
            .select_related(
-                "workspace",
-                "workspace__owner",
-                "default_assignee",
-                "project_lead",
+                "workspace", "workspace__owner", "default_assignee", "project_lead"
            )
            .annotate(
                is_member=Exists(
@@ -126,18 +120,11 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):
                request=request,
                queryset=(projects),
                on_results=lambda projects: ProjectSerializer(
-                    projects,
-                    many=True,
-                    fields=self.fields,
-                    expand=self.expand,
+                    projects, many=True, fields=self.fields, expand=self.expand,
                ).data,
            )
        project = self.get_queryset().get(workspace__slug=slug, pk=project_id)
-        serializer = ProjectSerializer(
-            project,
-            fields=self.fields,
-            expand=self.expand,
-        )
+        serializer = ProjectSerializer(project, fields=self.fields, expand=self.expand,)
        return Response(serializer.data, status=status.HTTP_200_OK)

    def post(self, request, slug):
@@ -151,9 +138,7 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):

                # Add the user as Administrator to the project
                project_member = ProjectMember.objects.create(
-                    project_id=serializer.data["id"],
-                    member=request.user,
-                    role=20,
+                    project_id=serializer.data["id"], member=request.user, role=20
                )
                # Also create the issue property for the user
                _ = IssueProperty.objects.create(
@@ -226,15 +211,9 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):
                    ]
                )

-                project = (
-                    self.get_queryset()
-                    .filter(pk=serializer.data["id"])
-                    .first()
-                )
+                project = self.get_queryset().filter(pk=serializer.data["id"]).first()
                serializer = ProjectSerializer(project)
-                return Response(
-                    serializer.data, status=status.HTTP_201_CREATED
-                )
+                return Response(serializer.data, status=status.HTTP_201_CREATED)
            return Response(
                serializer.errors,
                status=status.HTTP_400_BAD_REQUEST,
@@ -247,8 +226,7 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):
                )
        except Workspace.DoesNotExist as e:
            return Response(
-                {"error": "Workspace does not exist"},
-                status=status.HTTP_404_NOT_FOUND,
+                {"error": "Workspace does not exist"}, status=status.HTTP_404_NOT_FOUND
            )
        except ValidationError as e:
            return Response(
@@ -272,9 +250,7 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):
                serializer.save()
                if serializer.data["inbox_view"]:
                    Inbox.objects.get_or_create(
-                        name=f"{project.name} Inbox",
-                        project=project,
-                        is_default=True,
+                        name=f"{project.name} Inbox", project=project, is_default=True
                    )

                    # Create the triage state in Backlog group
@@ -286,16 +262,10 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):
                        color="#ff7700",
                    )

-                project = (
-                    self.get_queryset()
-                    .filter(pk=serializer.data["id"])
-                    .first()
-                )
+                project = self.get_queryset().filter(pk=serializer.data["id"]).first()
                serializer = ProjectSerializer(project)
                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(
-                serializer.errors, status=status.HTTP_400_BAD_REQUEST
-            )
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
        except IntegrityError as e:
            if "already exists" in str(e):
                return Response(
@@ -304,8 +274,7 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):
                )
        except (Project.DoesNotExist, Workspace.DoesNotExist):
            return Response(
-                {"error": "Project does not exist"},
-                status=status.HTTP_404_NOT_FOUND,
+                {"error": "Project does not exist"}, status=status.HTTP_404_NOT_FOUND
            )
        except ValidationError as e:
            return Response(
@@ -316,4 +285,4 @@ class ProjectAPIEndpoint(WebhookMixin, BaseAPIView):
    def delete(self, request, slug, project_id):
        project = Project.objects.get(pk=project_id, workspace__slug=slug)
        project.delete()
-        return Response(status=status.HTTP_204_NO_CONTENT)
+        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -34,9 +34,7 @@ class StateAPIEndpoint(BaseAPIView):
        )

    def post(self, request, slug, project_id):
-        serializer = StateSerializer(
-            data=request.data, context={"project_id": project_id}
-        )
+        serializer = StateSerializer(data=request.data, context={"project_id": project_id})
        if serializer.is_valid():
            serializer.save(project_id=project_id)
            return Response(serializer.data, status=status.HTTP_200_OK)
@@ -66,19 +64,14 @@ class StateAPIEndpoint(BaseAPIView):
        )

        if state.default:
-            return Response(
-                {"error": "Default state cannot be deleted"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
+            return Response({"error": "Default state cannot be deleted"}, status=status.HTTP_400_BAD_REQUEST)

        # Check for any issues in the state
        issue_exist = Issue.issue_objects.filter(state=state_id).exists()

        if issue_exist:
            return Response(
-                {
-                    "error": "The state is not empty, only empty states can be deleted"
-                },
+                {"error": "The state is not empty, only empty states can be deleted"},
                status=status.HTTP_400_BAD_REQUEST,
            )

@@ -86,11 +79,9 @@ class StateAPIEndpoint(BaseAPIView):
        return Response(status=status.HTTP_204_NO_CONTENT)

    def patch(self, request, slug, project_id, state_id=None):
-        state = State.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=state_id
-        )
+        state = State.objects.get(workspace__slug=slug, project_id=project_id, pk=state_id)
        serializer = StateSerializer(state, 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)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@@ -25,10 +25,7 @@ class APIKeyAuthentication(authentication.BaseAuthentication):
    def validate_api_token(self, token):
        try:
            api_token = APIToken.objects.get(
-                Q(
-                    Q(expired_at__gt=timezone.now())
-                    | Q(expired_at__isnull=True)
-                ),
+                Q(Q(expired_at__gt=timezone.now()) | Q(expired_at__isnull=True)),
                token=token,
                is_active=True,
            )
@@ -1,3 +1,4 @@
+
 from .workspace import (
    WorkSpaceBasePermission,
    WorkspaceOwnerPermission,
@@ -12,3 +13,5 @@ from .project import (
    ProjectMemberPermission,
    ProjectLitePermission,
 )
+
+
@@ -17,7 +17,6 @@ from .workspace import (
    WorkspaceThemeSerializer,
    WorkspaceMemberAdminSerializer,
    WorkspaceMemberMeSerializer,
-    WorkspaceUserPropertiesSerializer,
 )
 from .project import (
    ProjectSerializer,
@@ -32,20 +31,14 @@ from .project import (
    ProjectDeployBoardSerializer,
    ProjectMemberAdminSerializer,
    ProjectPublicMemberSerializer,
-    ProjectMemberRoleSerializer,
 )
 from .state import StateSerializer, StateLiteSerializer
-from .view import (
-    GlobalViewSerializer,
-    IssueViewSerializer,
-    IssueViewFavoriteSerializer,
-)
+from .view import GlobalViewSerializer, IssueViewSerializer, IssueViewFavoriteSerializer
 from .cycle import (
    CycleSerializer,
    CycleIssueSerializer,
    CycleFavoriteSerializer,
    CycleWriteSerializer,
-    CycleUserPropertiesSerializer,
 )
 from .asset import FileAssetSerializer
 from .issue import (
@@ -76,7 +69,6 @@ from .module import (
    ModuleIssueSerializer,
    ModuleLinkSerializer,
    ModuleFavoriteSerializer,
-    ModuleUserPropertiesSerializer,
 )

 from .api import APITokenSerializer, APITokenReadSerializer
@@ -93,12 +85,7 @@ from .integration import (

 from .importer import ImporterSerializer

-from .page import (
-    PageSerializer,
-    PageLogSerializer,
-    SubPageSerializer,
-    PageFavoriteSerializer,
-)
+from .page import PageSerializer, PageLogSerializer, SubPageSerializer, PageFavoriteSerializer

 from .estimate import (
    EstimateSerializer,
@@ -106,11 +93,7 @@ from .estimate import (
    EstimateReadSerializer,
 )

-from .inbox import (
-    InboxSerializer,
-    InboxIssueSerializer,
-    IssueStateInboxSerializer,
-)
+from .inbox import InboxSerializer, InboxIssueSerializer, IssueStateInboxSerializer

 from .analytic import AnalyticViewSerializer

@@ -118,6 +101,4 @@ from .notification import NotificationSerializer

 from .exporter import ExporterHistorySerializer

-from .webhook import WebhookSerializer, WebhookLogSerializer
-
-from .dashboard import DashboardSerializer, WidgetSerializer
+from .webhook import WebhookSerializer, WebhookLogSerializer
@@ -3,6 +3,7 @@ from plane.db.models import APIToken, APIActivityLog


 class APITokenSerializer(BaseSerializer):
+    
    class Meta:
        model = APIToken
        fields = "__all__"
@@ -17,12 +18,14 @@ class APITokenSerializer(BaseSerializer):


 class APITokenReadSerializer(BaseSerializer):
+
    class Meta:
        model = APIToken
-        exclude = ("token",)
+        exclude = ('token',)


 class APIActivityLogSerializer(BaseSerializer):
+
    class Meta:
        model = APIActivityLog
        fields = "__all__"
@@ -4,17 +4,16 @@ from rest_framework import serializers
 class BaseSerializer(serializers.ModelSerializer):
    id = serializers.PrimaryKeyRelatedField(read_only=True)

-
 class DynamicBaseSerializer(BaseSerializer):
+
    def __init__(self, *args, **kwargs):
        # If 'fields' is provided in the arguments, remove it and store it separately.
        # This is done so as not to pass this custom argument up to the superclass.
-        fields = kwargs.pop("fields", [])
-        self.expand = kwargs.pop("expand", []) or []
-        fields = self.expand
+        fields = kwargs.pop("fields", None)

        # Call the initialization of the superclass.
        super().__init__(*args, **kwargs)
+
        # If 'fields' was provided, filter the fields of the serializer accordingly.
        if fields is not None:
            self.fields = self._filter_fields(fields)
@@ -32,7 +31,7 @@ class DynamicBaseSerializer(BaseSerializer):
            # loop through its keys and values.
            if isinstance(field_name, dict):
                for key, value in field_name.items():
-                    # If the value of this nested field is a list,
+                    # If the value of this nested field is a list, 
                    # perform a recursive filter on it.
                    if isinstance(value, list):
                        self._filter_fields(self.fields[key], value)
@@ -48,97 +47,12 @@ class DynamicBaseSerializer(BaseSerializer):
            elif isinstance(item, dict):
                allowed.append(list(item.keys())[0])

-        for field in allowed:
-            if field not in self.fields:
-                from . import (
-                    WorkspaceLiteSerializer,
-                    ProjectLiteSerializer,
-                    UserLiteSerializer,
-                    StateLiteSerializer,
-                    IssueSerializer,
-                    LabelSerializer,
-                    CycleIssueSerializer,
-                    IssueFlatSerializer,
-                    IssueRelationSerializer,
-                )
+        # Convert the current serializer's fields and the allowed fields to sets.
+        existing = set(self.fields)
+        allowed = set(allowed)

-                # Expansion mapper
-                expansion = {
-                    "user": UserLiteSerializer,
-                    "workspace": WorkspaceLiteSerializer,
-                    "project": ProjectLiteSerializer,
-                    "default_assignee": UserLiteSerializer,
-                    "project_lead": UserLiteSerializer,
-                    "state": StateLiteSerializer,
-                    "created_by": UserLiteSerializer,
-                    "issue": IssueSerializer,
-                    "actor": UserLiteSerializer,
-                    "owned_by": UserLiteSerializer,
-                    "members": UserLiteSerializer,
-                    "assignees": UserLiteSerializer,
-                    "labels": LabelSerializer,
-                    "issue_cycle": CycleIssueSerializer,
-                    "parent": IssueSerializer,
-                    "issue_relation": IssueRelationSerializer,
-                }
-                
-                self.fields[field] = expansion[field](many=True if field in ["members", "assignees", "labels", "issue_cycle", "issue_relation"] else False)            
+        # Remove fields from the serializer that aren't in the 'allowed' list.
+        for field_name in (existing - allowed):
+            self.fields.pop(field_name)

        return self.fields
-
-    def to_representation(self, instance):
-        response = super().to_representation(instance)
-
-        # Ensure 'expand' is iterable before processing
-        if self.expand:
-            for expand in self.expand:
-                if expand in self.fields:
-                    # Import all the expandable serializers
-                    from . import (
-                        WorkspaceLiteSerializer,
-                        ProjectLiteSerializer,
-                        UserLiteSerializer,
-                        StateLiteSerializer,
-                        IssueSerializer,
-                        LabelSerializer,
-                        CycleIssueSerializer,
-                        IssueRelationSerializer,
-                    )
-
-                    # Expansion mapper
-                    expansion = {
-                        "user": UserLiteSerializer,
-                        "workspace": WorkspaceLiteSerializer,
-                        "project": ProjectLiteSerializer,
-                        "default_assignee": UserLiteSerializer,
-                        "project_lead": UserLiteSerializer,
-                        "state": StateLiteSerializer,
-                        "created_by": UserLiteSerializer,
-                        "issue": IssueSerializer,
-                        "actor": UserLiteSerializer,
-                        "owned_by": UserLiteSerializer,
-                        "members": UserLiteSerializer,
-                        "assignees": UserLiteSerializer,
-                        "labels": LabelSerializer,
-                        "issue_cycle": CycleIssueSerializer,
-                        "parent": IssueSerializer,
-                        "issue_relation": IssueRelationSerializer
-                    }
-                    # Check if field in expansion then expand the field
-                    if expand in expansion:
-                        if isinstance(response.get(expand), list):
-                            exp_serializer = expansion[expand](
-                                getattr(instance, expand), many=True
-                            )
-                        else:
-                            exp_serializer = expansion[expand](
-                                getattr(instance, expand)
-                            )
-                        response[expand] = exp_serializer.data
-                    else:
-                        # You might need to handle this case differently
-                        response[expand] = getattr(
-                            instance, f"{expand}_id", None
-                        )
-
-        return response
@@ -7,12 +7,7 @@ from .user import UserLiteSerializer
 from .issue import IssueStateSerializer
 from .workspace import WorkspaceLiteSerializer
 from .project import ProjectLiteSerializer
-from plane.db.models import (
-    Cycle,
-    CycleIssue,
-    CycleFavorite,
-    CycleUserProperties,
-)
+from plane.db.models import Cycle, CycleIssue, CycleFavorite


 class CycleWriteSerializer(BaseSerializer):
@@ -22,9 +17,7 @@ class CycleWriteSerializer(BaseSerializer):
            and data.get("end_date", None) is not None
            and data.get("start_date", None) > data.get("end_date", None)
        ):
-            raise serializers.ValidationError(
-                "Start date cannot exceed end date"
-            )
+            raise serializers.ValidationError("Start date cannot exceed end date")
        return data

    class Meta:
@@ -45,11 +38,8 @@ class CycleSerializer(BaseSerializer):
    total_estimates = serializers.IntegerField(read_only=True)
    completed_estimates = serializers.IntegerField(read_only=True)
    started_estimates = serializers.IntegerField(read_only=True)
-    workspace_detail = WorkspaceLiteSerializer(
-        read_only=True, source="workspace"
-    )
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
    project_detail = ProjectLiteSerializer(read_only=True, source="project")
-    status = serializers.CharField(read_only=True)

    def validate(self, data):
        if (
@@ -57,9 +47,7 @@ class CycleSerializer(BaseSerializer):
            and data.get("end_date", None) is not None
            and data.get("start_date", None) > data.get("end_date", None)
        ):
-            raise serializers.ValidationError(
-                "Start date cannot exceed end date"
-            )
+            raise serializers.ValidationError("Start date cannot exceed end date")
        return data

    def get_assignees(self, obj):
@@ -117,14 +105,3 @@ class CycleFavoriteSerializer(BaseSerializer):
            "project",
            "user",
        ]
-
-
-class CycleUserPropertiesSerializer(BaseSerializer):
-    class Meta:
-        model = CycleUserProperties
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "project",
-            "cycle" "user",
-        ]
@@ -1,26 +0,0 @@
-# Module imports
-from .base import BaseSerializer
-from plane.db.models import Dashboard, Widget
-
-# Third party frameworks
-from rest_framework import serializers
-
-
-class DashboardSerializer(BaseSerializer):
-    class Meta:
-        model = Dashboard
-        fields = "__all__"
-
-
-class WidgetSerializer(BaseSerializer):
-    is_visible = serializers.BooleanField(read_only=True)
-    widget_filters = serializers.JSONField(read_only=True)
-
-    class Meta:
-        model = Widget
-        fields = [
-            "id",
-            "key",
-            "is_visible",
-            "widget_filters"
-        ]
@@ -2,18 +2,11 @@
 from .base import BaseSerializer

 from plane.db.models import Estimate, EstimatePoint
-from plane.app.serializers import (
-    WorkspaceLiteSerializer,
-    ProjectLiteSerializer,
-)
-
-from rest_framework import serializers
+from plane.app.serializers import WorkspaceLiteSerializer, ProjectLiteSerializer


 class EstimateSerializer(BaseSerializer):
-    workspace_detail = WorkspaceLiteSerializer(
-        read_only=True, source="workspace"
-    )
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
    project_detail = ProjectLiteSerializer(read_only=True, source="project")

    class Meta:
@@ -26,16 +19,6 @@ class EstimateSerializer(BaseSerializer):


 class EstimatePointSerializer(BaseSerializer):
-    def validate(self, data):
-        if not data:
-            raise serializers.ValidationError("Estimate points are required")
-        value = data.get("value")
-        if value and len(value) > 20:
-            raise serializers.ValidationError(
-                "Value can't be more than 20 characters"
-            )
-        return data
-
    class Meta:
        model = EstimatePoint
        fields = "__all__"
@@ -48,9 +31,7 @@ class EstimatePointSerializer(BaseSerializer):

 class EstimateReadSerializer(BaseSerializer):
    points = EstimatePointSerializer(read_only=True, many=True)
-    workspace_detail = WorkspaceLiteSerializer(
-        read_only=True, source="workspace"
-    )
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
    project_detail = ProjectLiteSerializer(read_only=True, source="project")

    class Meta:
@@ -5,9 +5,7 @@ from .user import UserLiteSerializer


 class ExporterHistorySerializer(BaseSerializer):
-    initiated_by_detail = UserLiteSerializer(
-        source="initiated_by", read_only=True
-    )
+    initiated_by_detail = UserLiteSerializer(source="initiated_by", read_only=True)

    class Meta:
        model = ExporterHistory
@@ -7,13 +7,9 @@ from plane.db.models import Importer


 class ImporterSerializer(BaseSerializer):
-    initiated_by_detail = UserLiteSerializer(
-        source="initiated_by", read_only=True
-    )
+    initiated_by_detail = UserLiteSerializer(source="initiated_by", read_only=True)
    project_detail = ProjectLiteSerializer(source="project", read_only=True)
-    workspace_detail = WorkspaceLiteSerializer(
-        source="workspace", read_only=True
-    )
+    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)

    class Meta:
        model = Importer
@@ -46,13 +46,10 @@ class InboxIssueLiteSerializer(BaseSerializer):
 class IssueStateInboxSerializer(BaseSerializer):
    state_detail = StateLiteSerializer(read_only=True, source="state")
    project_detail = ProjectLiteSerializer(read_only=True, source="project")
-    label_details = LabelLiteSerializer(
-        read_only=True, source="labels", many=True
-    )
-    assignee_details = UserLiteSerializer(
-        read_only=True, source="assignees", many=True
-    )
+    label_details = LabelLiteSerializer(read_only=True, source="labels", many=True)
+    assignee_details = UserLiteSerializer(read_only=True, source="assignees", many=True)
    sub_issues_count = serializers.IntegerField(read_only=True)
+    bridge_id = serializers.UUIDField(read_only=True)
    issue_inbox = InboxIssueLiteSerializer(read_only=True, many=True)

    class Meta:
@@ -13,9 +13,7 @@ class IntegrationSerializer(BaseSerializer):


 class WorkspaceIntegrationSerializer(BaseSerializer):
-    integration_detail = IntegrationSerializer(
-        read_only=True, source="integration"
-    )
+    integration_detail = IntegrationSerializer(read_only=True, source="integration")

    class Meta:
        model = WorkspaceIntegration
@@ -30,8 +30,6 @@ from plane.db.models import (
    CommentReaction,
    IssueVote,
    IssueRelation,
-    State,
-    Project,
 )


@@ -71,26 +69,19 @@ class IssueProjectLiteSerializer(BaseSerializer):
 ##TODO: Find a better way to write this serializer
 ## Find a better approach to save manytomany?
 class IssueCreateSerializer(BaseSerializer):
-    # ids
-    state_id = serializers.PrimaryKeyRelatedField(
-        source="state",
-        queryset=State.objects.all(),
-        required=False,
-        allow_null=True,
-    )
-    parent_id = serializers.PrimaryKeyRelatedField(
-        source="parent",
-        queryset=Issue.objects.all(),
-        required=False,
-        allow_null=True,
-    )
-    label_ids = serializers.ListField(
-        child=serializers.PrimaryKeyRelatedField(queryset=Label.objects.all()),
+    state_detail = StateSerializer(read_only=True, source="state")
+    created_by_detail = UserLiteSerializer(read_only=True, source="created_by")
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
+
+    assignees = serializers.ListField(
+        child=serializers.PrimaryKeyRelatedField(queryset=User.objects.all()),
        write_only=True,
        required=False,
    )
-    assignee_ids = serializers.ListField(
-        child=serializers.PrimaryKeyRelatedField(queryset=User.objects.all()),
+
+    labels = serializers.ListField(
+        child=serializers.PrimaryKeyRelatedField(queryset=Label.objects.all()),
        write_only=True,
        required=False,
    )
@@ -109,10 +100,8 @@ class IssueCreateSerializer(BaseSerializer):

    def to_representation(self, instance):
        data = super().to_representation(instance)
-        assignee_ids = self.initial_data.get("assignee_ids")
-        data["assignee_ids"] = assignee_ids if assignee_ids else []
-        label_ids = self.initial_data.get("label_ids")
-        data["label_ids"] = label_ids if label_ids else []
+        data['assignees'] = [str(assignee.id) for assignee in instance.assignees.all()]
+        data['labels'] = [str(label.id) for label in instance.labels.all()]
        return data

    def validate(self, data):
@@ -121,14 +110,12 @@ class IssueCreateSerializer(BaseSerializer):
            and data.get("target_date", None) is not None
            and data.get("start_date", None) > data.get("target_date", None)
        ):
-            raise serializers.ValidationError(
-                "Start date cannot exceed target date"
-            )
+            raise serializers.ValidationError("Start date cannot exceed target date")
        return data

    def create(self, validated_data):
-        assignees = validated_data.pop("assignee_ids", None)
-        labels = validated_data.pop("label_ids", None)
+        assignees = validated_data.pop("assignees", None)
+        labels = validated_data.pop("labels", None)

        project_id = self.context["project_id"]
        workspace_id = self.context["workspace_id"]
@@ -186,8 +173,8 @@ class IssueCreateSerializer(BaseSerializer):
        return issue

    def update(self, instance, validated_data):
-        assignees = validated_data.pop("assignee_ids", None)
-        labels = validated_data.pop("label_ids", None)
+        assignees = validated_data.pop("assignees", None)
+        labels = validated_data.pop("labels", None)

        # Related models
        project_id = instance.project_id
@@ -238,15 +225,14 @@ class IssueActivitySerializer(BaseSerializer):
    actor_detail = UserLiteSerializer(read_only=True, source="actor")
    issue_detail = IssueFlatSerializer(read_only=True, source="issue")
    project_detail = ProjectLiteSerializer(read_only=True, source="project")
-    workspace_detail = WorkspaceLiteSerializer(
-        read_only=True, source="workspace"
-    )
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")

    class Meta:
        model = IssueActivity
        fields = "__all__"


+
 class IssuePropertySerializer(BaseSerializer):
    class Meta:
        model = IssueProperty
@@ -259,9 +245,7 @@ class IssuePropertySerializer(BaseSerializer):


 class LabelSerializer(BaseSerializer):
-    workspace_detail = WorkspaceLiteSerializer(
-        source="workspace", read_only=True
-    )
+    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
    project_detail = ProjectLiteSerializer(source="project", read_only=True)

    class Meta:
@@ -284,6 +268,7 @@ class LabelLiteSerializer(BaseSerializer):


 class IssueLabelSerializer(BaseSerializer):
+
    class Meta:
        model = IssueLabel
        fields = "__all__"
@@ -294,38 +279,33 @@ class IssueLabelSerializer(BaseSerializer):


 class IssueRelationSerializer(BaseSerializer):
-    id = serializers.UUIDField(source="related_issue.id", read_only=True)
-    project_id = serializers.PrimaryKeyRelatedField(source="related_issue.project_id", read_only=True)
-    sequence_id = serializers.IntegerField(source="related_issue.sequence_id", read_only=True)
-    relation_type = serializers.CharField(read_only=True)
+    issue_detail = IssueProjectLiteSerializer(read_only=True, source="related_issue")

    class Meta:
        model = IssueRelation
        fields = [
-            "id",
-            "project_id",
-            "sequence_id",
+            "issue_detail",
            "relation_type",
+            "related_issue",
+            "issue",
+            "id"
        ]
        read_only_fields = [
            "workspace",
            "project",
        ]

-
 class RelatedIssueSerializer(BaseSerializer):
-    id = serializers.UUIDField(source="issue.id", read_only=True)
-    project_id = serializers.PrimaryKeyRelatedField(source="issue.project_id", read_only=True)
-    sequence_id = serializers.IntegerField(source="issue.sequence_id", read_only=True)
-    relation_type = serializers.CharField(read_only=True)
+    issue_detail = IssueProjectLiteSerializer(read_only=True, source="issue")

    class Meta:
        model = IssueRelation
        fields = [
-            "id",
-            "project_id",
-            "sequence_id",
+            "issue_detail",
            "relation_type",
+            "related_issue",
+            "issue",
+            "id"
        ]
        read_only_fields = [
            "workspace",
@@ -420,8 +400,7 @@ class IssueLinkSerializer(BaseSerializer):
    # Validation if url already exists
    def create(self, validated_data):
        if IssueLink.objects.filter(
-            url=validated_data.get("url"),
-            issue_id=validated_data.get("issue_id"),
+            url=validated_data.get("url"), issue_id=validated_data.get("issue_id")
        ).exists():
            raise serializers.ValidationError(
                {"error": "URL already exists for this Issue"}
@@ -445,8 +424,9 @@ class IssueAttachmentSerializer(BaseSerializer):


 class IssueReactionSerializer(BaseSerializer):
+    
    actor_detail = UserLiteSerializer(read_only=True, source="actor")
-
+    
    class Meta:
        model = IssueReaction
        fields = "__all__"
@@ -479,18 +459,12 @@ class CommentReactionSerializer(BaseSerializer):


 class IssueVoteSerializer(BaseSerializer):
+
    actor_detail = UserLiteSerializer(read_only=True, source="actor")

    class Meta:
        model = IssueVote
-        fields = [
-            "issue",
-            "vote",
-            "workspace",
-            "project",
-            "actor",
-            "actor_detail",
-        ]
+        fields = ["issue", "vote", "workspace", "project", "actor", "actor_detail"]
        read_only_fields = fields


@@ -498,12 +472,8 @@ class IssueCommentSerializer(BaseSerializer):
    actor_detail = UserLiteSerializer(read_only=True, source="actor")
    issue_detail = IssueFlatSerializer(read_only=True, source="issue")
    project_detail = ProjectLiteSerializer(read_only=True, source="project")
-    workspace_detail = WorkspaceLiteSerializer(
-        read_only=True, source="workspace"
-    )
-    comment_reactions = CommentReactionLiteSerializer(
-        read_only=True, many=True
-    )
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
+    comment_reactions = CommentReactionLiteSerializer(read_only=True, many=True)
    is_member = serializers.BooleanField(read_only=True)

    class Meta:
@@ -537,15 +507,12 @@ class IssueStateFlatSerializer(BaseSerializer):

 # Issue Serializer with state details
 class IssueStateSerializer(DynamicBaseSerializer):
-    label_details = LabelLiteSerializer(
-        read_only=True, source="labels", many=True
-    )
+    label_details = LabelLiteSerializer(read_only=True, source="labels", many=True)
    state_detail = StateLiteSerializer(read_only=True, source="state")
    project_detail = ProjectLiteSerializer(read_only=True, source="project")
-    assignee_details = UserLiteSerializer(
-        read_only=True, source="assignees", many=True
-    )
+    assignee_details = UserLiteSerializer(read_only=True, source="assignees", many=True)
    sub_issues_count = serializers.IntegerField(read_only=True)
+    bridge_id = serializers.UUIDField(read_only=True)
    attachment_count = serializers.IntegerField(read_only=True)
    link_count = serializers.IntegerField(read_only=True)

@@ -554,76 +521,40 @@ class IssueStateSerializer(DynamicBaseSerializer):
        fields = "__all__"


-class IssueSerializer(DynamicBaseSerializer):
-    # ids
-    project_id = serializers.PrimaryKeyRelatedField(read_only=True)
-    state_id = serializers.PrimaryKeyRelatedField(read_only=True)
-    parent_id = serializers.PrimaryKeyRelatedField(read_only=True)
-    cycle_id = serializers.PrimaryKeyRelatedField(read_only=True)
-    module_id = serializers.PrimaryKeyRelatedField(read_only=True)
-
-    # Many to many
-    label_ids = serializers.PrimaryKeyRelatedField(
-        read_only=True, many=True, source="labels"
-    )
-    assignee_ids = serializers.PrimaryKeyRelatedField(
-        read_only=True, many=True, source="assignees"
-    )
-
-    # Count items
+class IssueSerializer(BaseSerializer):
+    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    state_detail = StateSerializer(read_only=True, source="state")
+    parent_detail = IssueStateFlatSerializer(read_only=True, source="parent")
+    label_details = LabelSerializer(read_only=True, source="labels", many=True)
+    assignee_details = UserLiteSerializer(read_only=True, source="assignees", many=True)
+    related_issues = IssueRelationSerializer(read_only=True, source="issue_relation", many=True)
+    issue_relations = RelatedIssueSerializer(read_only=True, source="issue_related", many=True)
+    issue_cycle = IssueCycleDetailSerializer(read_only=True)
+    issue_module = IssueModuleDetailSerializer(read_only=True)
+    issue_link = IssueLinkSerializer(read_only=True, many=True)
+    issue_attachment = IssueAttachmentSerializer(read_only=True, many=True)
    sub_issues_count = serializers.IntegerField(read_only=True)
-    attachment_count = serializers.IntegerField(read_only=True)
-    link_count = serializers.IntegerField(read_only=True)
-
-    # is_subscribed
-    is_subscribed = serializers.BooleanField(read_only=True)
+    issue_reactions = IssueReactionSerializer(read_only=True, many=True)

    class Meta:
        model = Issue
-        fields = [
-            "id",
-            "name",
-            "state_id",
-            "description_html",
-            "sort_order",
-            "completed_at",
-            "estimate_point",
-            "priority",
-            "start_date",
-            "target_date",
-            "sequence_id",
-            "project_id",
-            "parent_id",
-            "cycle_id",
-            "module_id",
-            "label_ids",
-            "assignee_ids",
-            "sub_issues_count",
-            "created_at",
-            "updated_at",
+        fields = "__all__"
+        read_only_fields = [
+            "workspace",
+            "project",
            "created_by",
            "updated_by",
-            "attachment_count",
-            "link_count",
-            "is_subscribed",
-            "is_draft",
-            "archived_at",
+            "created_at",
+            "updated_at",
        ]
-        read_only_fields = fields


 class IssueLiteSerializer(DynamicBaseSerializer):
-    workspace_detail = WorkspaceLiteSerializer(
-        read_only=True, source="workspace"
-    )
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
    project_detail = ProjectLiteSerializer(read_only=True, source="project")
    state_detail = StateLiteSerializer(read_only=True, source="state")
-    label_details = LabelLiteSerializer(
-        read_only=True, source="labels", many=True
-    )
-    assignee_details = UserLiteSerializer(
-        read_only=True, source="assignees", many=True
-    )
+    label_details = LabelLiteSerializer(read_only=True, source="labels", many=True)
+    assignee_details = UserLiteSerializer(read_only=True, source="assignees", many=True)
    sub_issues_count = serializers.IntegerField(read_only=True)
    cycle_id = serializers.UUIDField(read_only=True)
    module_id = serializers.UUIDField(read_only=True)
@@ -650,9 +581,7 @@ class IssueLiteSerializer(DynamicBaseSerializer):
 class IssuePublicSerializer(BaseSerializer):
    project_detail = ProjectLiteSerializer(read_only=True, source="project")
    state_detail = StateLiteSerializer(read_only=True, source="state")
-    reactions = IssueReactionSerializer(
-        read_only=True, many=True, source="issue_reactions"
-    )
+    reactions = IssueReactionSerializer(read_only=True, many=True, source="issue_reactions")
    votes = IssueVoteSerializer(read_only=True, many=True)

    class Meta:
@@ -675,6 +604,7 @@ class IssuePublicSerializer(BaseSerializer):
        read_only_fields = fields


+
 class IssueSubscriberSerializer(BaseSerializer):
    class Meta:
        model = IssueSubscriber
@@ -2,7 +2,7 @@
 from rest_framework import serializers

 # Module imports
-from .base import BaseSerializer, DynamicBaseSerializer
+from .base import BaseSerializer
 from .user import UserLiteSerializer
 from .project import ProjectLiteSerializer
 from .workspace import WorkspaceLiteSerializer
@@ -14,7 +14,6 @@ from plane.db.models import (
    ModuleIssue,
    ModuleLink,
    ModuleFavorite,
-    ModuleUserProperties,
 )


@@ -26,9 +25,7 @@ class ModuleWriteSerializer(BaseSerializer):
    )

    project_detail = ProjectLiteSerializer(source="project", read_only=True)
-    workspace_detail = WorkspaceLiteSerializer(
-        source="workspace", read_only=True
-    )
+    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)

    class Meta:
        model = Module
@@ -41,22 +38,16 @@ class ModuleWriteSerializer(BaseSerializer):
            "created_at",
            "updated_at",
        ]
-
+    
    def to_representation(self, instance):
        data = super().to_representation(instance)
-        data["members"] = [str(member.id) for member in instance.members.all()]
+        data['members'] = [str(member.id) for member in instance.members.all()]
        return data

    def validate(self, data):
-        if (
-            data.get("start_date", None) is not None
-            and data.get("target_date", None) is not None
-            and data.get("start_date", None) > data.get("target_date", None)
-        ):
-            raise serializers.ValidationError(
-                "Start date cannot exceed target date"
-            )
-        return data
+        if data.get("start_date", None) is not None and data.get("target_date", None) is not None and data.get("start_date", None) > data.get("target_date", None):
+            raise serializers.ValidationError("Start date cannot exceed target date")
+        return data    

    def create(self, validated_data):
        members = validated_data.pop("members", None)
@@ -160,8 +151,7 @@ class ModuleLinkSerializer(BaseSerializer):
    # Validation if url already exists
    def create(self, validated_data):
        if ModuleLink.objects.filter(
-            url=validated_data.get("url"),
-            module_id=validated_data.get("module_id"),
+            url=validated_data.get("url"), module_id=validated_data.get("module_id")
        ).exists():
            raise serializers.ValidationError(
                {"error": "URL already exists for this Issue"}
@@ -169,12 +159,10 @@ class ModuleLinkSerializer(BaseSerializer):
        return ModuleLink.objects.create(**validated_data)


-class ModuleSerializer(DynamicBaseSerializer):
+class ModuleSerializer(BaseSerializer):
    project_detail = ProjectLiteSerializer(read_only=True, source="project")
    lead_detail = UserLiteSerializer(read_only=True, source="lead")
-    members_detail = UserLiteSerializer(
-        read_only=True, many=True, source="members"
-    )
+    members_detail = UserLiteSerializer(read_only=True, many=True, source="members")
    link_module = ModuleLinkSerializer(read_only=True, many=True)
    is_favorite = serializers.BooleanField(read_only=True)
    total_issues = serializers.IntegerField(read_only=True)
@@ -208,10 +196,3 @@ class ModuleFavoriteSerializer(BaseSerializer):
            "project",
            "user",
        ]
-
-
-class ModuleUserPropertiesSerializer(BaseSerializer):
-    class Meta:
-        model = ModuleUserProperties
-        fields = "__all__"
-        read_only_fields = ["workspace", "project", "module", "user"]
@@ -3,12 +3,10 @@ from .base import BaseSerializer
 from .user import UserLiteSerializer
 from plane.db.models import Notification

-
 class NotificationSerializer(BaseSerializer):
-    triggered_by_details = UserLiteSerializer(
-        read_only=True, source="triggered_by"
-    )
+    triggered_by_details = UserLiteSerializer(read_only=True, source="triggered_by")

    class Meta:
        model = Notification
        fields = "__all__"
+
@@ -6,31 +6,19 @@ from .base import BaseSerializer
 from .issue import IssueFlatSerializer, LabelLiteSerializer
 from .workspace import WorkspaceLiteSerializer
 from .project import ProjectLiteSerializer
-from plane.db.models import (
-    Page,
-    PageLog,
-    PageFavorite,
-    PageLabel,
-    Label,
-    Issue,
-    Module,
-)
+from plane.db.models import Page, PageLog, PageFavorite, PageLabel, Label, Issue, Module


 class PageSerializer(BaseSerializer):
    is_favorite = serializers.BooleanField(read_only=True)
-    label_details = LabelLiteSerializer(
-        read_only=True, source="labels", many=True
-    )
+    label_details = LabelLiteSerializer(read_only=True, source="labels", many=True)
    labels = serializers.ListField(
        child=serializers.PrimaryKeyRelatedField(queryset=Label.objects.all()),
        write_only=True,
        required=False,
    )
    project_detail = ProjectLiteSerializer(source="project", read_only=True)
-    workspace_detail = WorkspaceLiteSerializer(
-        source="workspace", read_only=True
-    )
+    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)

    class Meta:
        model = Page
@@ -40,10 +28,9 @@ class PageSerializer(BaseSerializer):
            "project",
            "owned_by",
        ]
-
    def to_representation(self, instance):
        data = super().to_representation(instance)
-        data["labels"] = [str(label.id) for label in instance.labels.all()]
+        data['labels'] = [str(label.id) for label in instance.labels.all()]
        return data

    def create(self, validated_data):
@@ -107,7 +94,7 @@ class SubPageSerializer(BaseSerializer):

    def get_entity_details(self, obj):
        entity_name = obj.entity_name
-        if entity_name == "forward_link" or entity_name == "back_link":
+        if entity_name == 'forward_link' or entity_name == 'back_link':
            try:
                page = Page.objects.get(pk=obj.entity_identifier)
                return PageSerializer(page).data
@@ -117,6 +104,7 @@ class SubPageSerializer(BaseSerializer):


 class PageLogSerializer(BaseSerializer):
+
    class Meta:
        model = PageLog
        fields = "__all__"
@@ -4,10 +4,7 @@ from rest_framework import serializers
 # Module imports
 from .base import BaseSerializer, DynamicBaseSerializer
 from plane.app.serializers.workspace import WorkspaceLiteSerializer
-from plane.app.serializers.user import (
-    UserLiteSerializer,
-    UserAdminLiteSerializer,
-)
+from plane.app.serializers.user import UserLiteSerializer, UserAdminLiteSerializer
 from plane.db.models import (
    Project,
    ProjectMember,
@@ -20,9 +17,7 @@ from plane.db.models import (


 class ProjectSerializer(BaseSerializer):
-    workspace_detail = WorkspaceLiteSerializer(
-        source="workspace", read_only=True
-    )
+    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)

    class Meta:
        model = Project
@@ -34,16 +29,12 @@ class ProjectSerializer(BaseSerializer):
    def create(self, validated_data):
        identifier = validated_data.get("identifier", "").strip().upper()
        if identifier == "":
-            raise serializers.ValidationError(
-                detail="Project Identifier is required"
-            )
+            raise serializers.ValidationError(detail="Project Identifier is required")

        if ProjectIdentifier.objects.filter(
            name=identifier, workspace_id=self.context["workspace_id"]
        ).exists():
-            raise serializers.ValidationError(
-                detail="Project Identifier is taken"
-            )
+            raise serializers.ValidationError(detail="Project Identifier is taken")
        project = Project.objects.create(
            **validated_data, workspace_id=self.context["workspace_id"]
        )
@@ -82,9 +73,7 @@ class ProjectSerializer(BaseSerializer):
            return project

        # If not same fail update
-        raise serializers.ValidationError(
-            detail="Project Identifier is already taken"
-        )
+        raise serializers.ValidationError(detail="Project Identifier is already taken")


 class ProjectLiteSerializer(BaseSerializer):
@@ -171,12 +160,6 @@ class ProjectMemberAdminSerializer(BaseSerializer):
        fields = "__all__"


-class ProjectMemberRoleSerializer(DynamicBaseSerializer):
-    class Meta:
-        model = ProjectMember
-        fields = ("id", "role", "member", "project")
-
-
 class ProjectMemberInviteSerializer(BaseSerializer):
    project = ProjectLiteSerializer(read_only=True)
    workspace = WorkspaceLiteSerializer(read_only=True)
@@ -214,9 +197,7 @@ class ProjectMemberLiteSerializer(BaseSerializer):

 class ProjectDeployBoardSerializer(BaseSerializer):
    project_details = ProjectLiteSerializer(read_only=True, source="project")
-    workspace_detail = WorkspaceLiteSerializer(
-        read_only=True, source="workspace"
-    )
+    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")

    class Meta:
        model = ProjectDeployBoard
@@ -236,4 +217,4 @@ class ProjectPublicMemberSerializer(BaseSerializer):
            "workspace",
            "project",
            "member",
-        ]
+        ]
@@ -6,6 +6,7 @@ from plane.db.models import State


 class StateSerializer(BaseSerializer):
+
    class Meta:
        model = State
        fields = "__all__"
@@ -24,4 +25,4 @@ class StateLiteSerializer(BaseSerializer):
            "color",
            "group",
        ]
-        read_only_fields = fields
+        read_only_fields = fields
@@ -99,9 +99,7 @@ class UserMeSettingsSerializer(BaseSerializer):
            ).first()
            return {
                "last_workspace_id": obj.last_workspace_id,
-                "last_workspace_slug": workspace.slug
-                if workspace is not None
-                else "",
+                "last_workspace_slug": workspace.slug if workspace is not None else "",
                "fallback_workspace_id": obj.last_workspace_id,
                "fallback_workspace_slug": workspace.slug
                if workspace is not None
@@ -111,8 +109,7 @@ class UserMeSettingsSerializer(BaseSerializer):
        else:
            fallback_workspace = (
                Workspace.objects.filter(
-                    workspace_member__member_id=obj.id,
-                    workspace_member__is_active=True,
+                    workspace_member__member_id=obj.id, workspace_member__is_active=True
                )
                .order_by("created_at")
                .first()
@@ -183,9 +180,7 @@ class ChangePasswordSerializer(serializers.Serializer):

        if data.get("new_password") != data.get("confirm_password"):
            raise serializers.ValidationError(
-                {
-                    "error": "Confirm password should be same as the new password."
-                }
+                {"error": "Confirm password should be same as the new password."}
            )

        return data
@@ -195,5 +190,4 @@ class ResetPasswordSerializer(serializers.Serializer):
    """
    Serializer for password change endpoint.
    """
-
    new_password = serializers.CharField(required=True, min_length=8)
@@ -2,7 +2,7 @@
 from rest_framework import serializers

 # Module imports
-from .base import BaseSerializer, DynamicBaseSerializer
+from .base import BaseSerializer
 from .workspace import WorkspaceLiteSerializer
 from .project import ProjectLiteSerializer
 from plane.db.models import GlobalView, IssueView, IssueViewFavorite
@@ -10,9 +10,7 @@ from plane.utils.issue_filters import issue_filters


 class GlobalViewSerializer(BaseSerializer):
-    workspace_detail = WorkspaceLiteSerializer(
-        source="workspace", read_only=True
-    )
+    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)

    class Meta:
        model = GlobalView
@@ -40,12 +38,10 @@ class GlobalViewSerializer(BaseSerializer):
        return super().update(instance, validated_data)


-class IssueViewSerializer(DynamicBaseSerializer):
+class IssueViewSerializer(BaseSerializer):
    is_favorite = serializers.BooleanField(read_only=True)
    project_detail = ProjectLiteSerializer(source="project", read_only=True)
-    workspace_detail = WorkspaceLiteSerializer(
-        source="workspace", read_only=True
-    )
+    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)

    class Meta:
        model = IssueView
@@ -10,113 +10,78 @@ from rest_framework import serializers
 # Module imports
 from .base import DynamicBaseSerializer
 from plane.db.models import Webhook, WebhookLog
-from plane.db.models.webhook import validate_domain, validate_schema
-
+from plane.db.models.webhook import validate_domain, validate_schema 

 class WebhookSerializer(DynamicBaseSerializer):
    url = serializers.URLField(validators=[validate_schema, validate_domain])
-
+    
    def create(self, validated_data):
        url = validated_data.get("url", None)

        # Extract the hostname from the URL
        hostname = urlparse(url).hostname
        if not hostname:
-            raise serializers.ValidationError(
-                {"url": "Invalid URL: No hostname found."}
-            )
+            raise serializers.ValidationError({"url": "Invalid URL: No hostname found."})

        # Resolve the hostname to IP addresses
        try:
            ip_addresses = socket.getaddrinfo(hostname, None)
        except socket.gaierror:
-            raise serializers.ValidationError(
-                {"url": "Hostname could not be resolved."}
-            )
+            raise serializers.ValidationError({"url": "Hostname could not be resolved."})

        if not ip_addresses:
-            raise serializers.ValidationError(
-                {"url": "No IP addresses found for the hostname."}
-            )
+            raise serializers.ValidationError({"url": "No IP addresses found for the hostname."})

        for addr in ip_addresses:
            ip = ipaddress.ip_address(addr[4][0])
            if ip.is_private or ip.is_loopback:
-                raise serializers.ValidationError(
-                    {"url": "URL resolves to a blocked IP address."}
-                )
+                raise serializers.ValidationError({"url": "URL resolves to a blocked IP address."})

        # Additional validation for multiple request domains and their subdomains
-        request = self.context.get("request")
-        disallowed_domains = [
-            "plane.so",
-        ]  # Add your disallowed domains here
+        request = self.context.get('request')
+        disallowed_domains = ['plane.so',]  # Add your disallowed domains here
        if request:
-            request_host = request.get_host().split(":")[
-                0
-            ]  # Remove port if present
+            request_host = request.get_host().split(':')[0]  # Remove port if present
            disallowed_domains.append(request_host)

        # Check if hostname is a subdomain or exact match of any disallowed domain
-        if any(
-            hostname == domain or hostname.endswith("." + domain)
-            for domain in disallowed_domains
-        ):
-            raise serializers.ValidationError(
-                {"url": "URL domain or its subdomain is not allowed."}
-            )
+        if any(hostname == domain or hostname.endswith('.' + domain) for domain in disallowed_domains):
+            raise serializers.ValidationError({"url": "URL domain or its subdomain is not allowed."})

        return Webhook.objects.create(**validated_data)
-
+    
    def update(self, instance, validated_data):
        url = validated_data.get("url", None)
        if url:
            # Extract the hostname from the URL
            hostname = urlparse(url).hostname
            if not hostname:
-                raise serializers.ValidationError(
-                    {"url": "Invalid URL: No hostname found."}
-                )
+                raise serializers.ValidationError({"url": "Invalid URL: No hostname found."})

            # Resolve the hostname to IP addresses
            try:
                ip_addresses = socket.getaddrinfo(hostname, None)
            except socket.gaierror:
-                raise serializers.ValidationError(
-                    {"url": "Hostname could not be resolved."}
-                )
+                raise serializers.ValidationError({"url": "Hostname could not be resolved."})

            if not ip_addresses:
-                raise serializers.ValidationError(
-                    {"url": "No IP addresses found for the hostname."}
-                )
+                raise serializers.ValidationError({"url": "No IP addresses found for the hostname."})

            for addr in ip_addresses:
                ip = ipaddress.ip_address(addr[4][0])
                if ip.is_private or ip.is_loopback:
-                    raise serializers.ValidationError(
-                        {"url": "URL resolves to a blocked IP address."}
-                    )
+                    raise serializers.ValidationError({"url": "URL resolves to a blocked IP address."})

            # Additional validation for multiple request domains and their subdomains
-            request = self.context.get("request")
-            disallowed_domains = [
-                "plane.so",
-            ]  # Add your disallowed domains here
+            request = self.context.get('request')
+            disallowed_domains = ['plane.so',]  # Add your disallowed domains here
            if request:
-                request_host = request.get_host().split(":")[
-                    0
-                ]  # Remove port if present
+                request_host = request.get_host().split(':')[0]  # Remove port if present
                disallowed_domains.append(request_host)

            # Check if hostname is a subdomain or exact match of any disallowed domain
-            if any(
-                hostname == domain or hostname.endswith("." + domain)
-                for domain in disallowed_domains
-            ):
-                raise serializers.ValidationError(
-                    {"url": "URL domain or its subdomain is not allowed."}
-                )
+            if any(hostname == domain or hostname.endswith('.' + domain) for domain in disallowed_domains):
+                raise serializers.ValidationError({"url": "URL domain or its subdomain is not allowed."})

        return super().update(instance, validated_data)

@@ -130,7 +95,12 @@ class WebhookSerializer(DynamicBaseSerializer):


 class WebhookLogSerializer(DynamicBaseSerializer):
+
    class Meta:
        model = WebhookLog
        fields = "__all__"
-        read_only_fields = ["workspace", "webhook"]
+        read_only_fields = [
+            "workspace",
+            "webhook"
+        ]
+
@@ -2,7 +2,7 @@
 from rest_framework import serializers

 # Module imports
-from .base import BaseSerializer, DynamicBaseSerializer
+from .base import BaseSerializer
 from .user import UserLiteSerializer, UserAdminLiteSerializer

 from plane.db.models import (
@@ -13,11 +13,10 @@ from plane.db.models import (
    TeamMember,
    WorkspaceMemberInvite,
    WorkspaceTheme,
-    WorkspaceUserProperties,
 )


-class WorkSpaceSerializer(DynamicBaseSerializer):
+class WorkSpaceSerializer(BaseSerializer):
    owner = UserLiteSerializer(read_only=True)
    total_members = serializers.IntegerField(read_only=True)
    total_issues = serializers.IntegerField(read_only=True)
@@ -51,7 +50,6 @@ class WorkSpaceSerializer(DynamicBaseSerializer):
            "owner",
        ]

-
 class WorkspaceLiteSerializer(BaseSerializer):
    class Meta:
        model = Workspace
@@ -63,7 +61,8 @@ class WorkspaceLiteSerializer(BaseSerializer):
        read_only_fields = fields


-class WorkSpaceMemberSerializer(DynamicBaseSerializer):
+
+class WorkSpaceMemberSerializer(BaseSerializer):
    member = UserLiteSerializer(read_only=True)
    workspace = WorkspaceLiteSerializer(read_only=True)

@@ -73,12 +72,13 @@ class WorkSpaceMemberSerializer(DynamicBaseSerializer):


 class WorkspaceMemberMeSerializer(BaseSerializer):
+
    class Meta:
        model = WorkspaceMember
        fields = "__all__"


-class WorkspaceMemberAdminSerializer(DynamicBaseSerializer):
+class WorkspaceMemberAdminSerializer(BaseSerializer):
    member = UserAdminLiteSerializer(read_only=True)
    workspace = WorkspaceLiteSerializer(read_only=True)

@@ -108,9 +108,7 @@ class WorkSpaceMemberInviteSerializer(BaseSerializer):


 class TeamSerializer(BaseSerializer):
-    members_detail = UserLiteSerializer(
-        read_only=True, source="members", many=True
-    )
+    members_detail = UserLiteSerializer(read_only=True, source="members", many=True)
    members = serializers.ListField(
        child=serializers.PrimaryKeyRelatedField(queryset=User.objects.all()),
        write_only=True,
@@ -147,9 +145,7 @@ class TeamSerializer(BaseSerializer):
            members = validated_data.pop("members")
            TeamMember.objects.filter(team=instance).delete()
            team_members = [
-                TeamMember(
-                    member=member, team=instance, workspace=instance.workspace
-                )
+                TeamMember(member=member, team=instance, workspace=instance.workspace)
                for member in members
            ]
            TeamMember.objects.bulk_create(team_members, batch_size=10)
@@ -165,13 +161,3 @@ class WorkspaceThemeSerializer(BaseSerializer):
            "workspace",
            "actor",
        ]
-
-
-class WorkspaceUserPropertiesSerializer(BaseSerializer):
-    class Meta:
-        model = WorkspaceUserProperties
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "user",
-        ]
@@ -3,7 +3,6 @@ from .asset import urlpatterns as asset_urls
 from .authentication import urlpatterns as authentication_urls
 from .config import urlpatterns as configuration_urls
 from .cycle import urlpatterns as cycle_urls
-from .dashboard import urlpatterns as dashboard_urls
 from .estimate import urlpatterns as estimate_urls
 from .external import urlpatterns as external_urls
 from .importer import urlpatterns as importer_urls
@@ -29,7 +28,6 @@ urlpatterns = [
    *authentication_urls,
    *configuration_urls,
    *cycle_urls,
-    *dashboard_urls,
    *estimate_urls,
    *external_urls,
    *importer_urls,
@@ -47,4 +45,4 @@ urlpatterns = [
    *workspace_urls,
    *api_urls,
    *webhook_urls,
-]
+]
@@ -31,14 +31,8 @@ urlpatterns = [
    path("sign-in/", SignInEndpoint.as_view(), name="sign-in"),
    path("sign-out/", SignOutEndpoint.as_view(), name="sign-out"),
    # magic sign in
-    path(
-        "magic-generate/",
-        MagicGenerateEndpoint.as_view(),
-        name="magic-generate",
-    ),
-    path(
-        "magic-sign-in/", MagicSignInEndpoint.as_view(), name="magic-sign-in"
-    ),
+    path("magic-generate/", MagicGenerateEndpoint.as_view(), name="magic-generate"),
+    path("magic-sign-in/", MagicSignInEndpoint.as_view(), name="magic-sign-in"),
    path("token/refresh/", TokenRefreshView.as_view(), name="token_refresh"),
    # Password Manipulation
    path(
@@ -58,8 +52,6 @@ urlpatterns = [
    ),
    # API Tokens
    path("api-tokens/", ApiTokenEndpoint.as_view(), name="api-tokens"),
-    path(
-        "api-tokens/<uuid:pk>/", ApiTokenEndpoint.as_view(), name="api-tokens"
-    ),
+    path("api-tokens/<uuid:pk>/", ApiTokenEndpoint.as_view(), name="api-tokens"),
    ## End API Tokens
 ]
@@ -1,7 +1,7 @@
 from django.urls import path


-from plane.app.views import ConfigurationEndpoint, MobileConfigurationEndpoint
+from plane.app.views import ConfigurationEndpoint

 urlpatterns = [
    path(
@@ -9,9 +9,4 @@ urlpatterns = [
        ConfigurationEndpoint.as_view(),
        name="configuration",
    ),
-    path(
-        "mobile-configs/",
-        MobileConfigurationEndpoint.as_view(),
-        name="configuration",
-    ),
-]
+]
@@ -7,17 +7,10 @@ from plane.app.views import (
    CycleDateCheckEndpoint,
    CycleFavoriteViewSet,
    TransferCycleIssueEndpoint,
-    CycleUserPropertiesEndpoint,
-    ActiveCycleEndpoint
 )


 urlpatterns = [
-    path(
-        "workspaces/<str:slug>/active-cycles/",
-        ActiveCycleEndpoint.as_view(),
-        name="workspace-active-cycle",
-    ),
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/",
        CycleViewSet.as_view(
@@ -51,7 +44,7 @@ urlpatterns = [
        name="project-issue-cycle",
    ),
    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/cycle-issues/<uuid:issue_id>/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/cycle-issues/<uuid:pk>/",
        CycleIssueViewSet.as_view(
            {
                "get": "retrieve",
@@ -91,9 +84,4 @@ urlpatterns = [
        TransferCycleIssueEndpoint.as_view(),
        name="transfer-issues",
    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/cycles/<uuid:cycle_id>/user-properties/",
-        CycleUserPropertiesEndpoint.as_view(),
-        name="cycle-user-filters",
-    ),
 ]
@@ -1,23 +0,0 @@
-from django.urls import path
-
-
-from plane.app.views import DashboardEndpoint, WidgetsEndpoint
-
-
-urlpatterns = [
-    path(
-        "workspaces/<str:slug>/dashboard/",
-        DashboardEndpoint.as_view(),
-        name="dashboard",
-    ),
-    path(
-        "workspaces/<str:slug>/dashboard/<uuid:dashboard_id>/",
-        DashboardEndpoint.as_view(),
-        name="dashboard",
-    ),
-    path(
-        "dashboard/<uuid:dashboard_id>/widgets/<uuid:widget_id>/",
-        WidgetsEndpoint.as_view(),
-        name="widgets",
-    ),
-]
@@ -40,7 +40,7 @@ urlpatterns = [
        name="inbox-issue",
    ),
    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/inboxes/<uuid:inbox_id>/inbox-issues/<uuid:issue_id>/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/inboxes/<uuid:inbox_id>/inbox-issues/<uuid:pk>/",
        InboxIssueViewSet.as_view(
            {
                "get": "retrieve",
@@ -235,7 +235,7 @@ urlpatterns = [
    ## End Comment Reactions
    ## IssueProperty
    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/user-properties/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/issue-display-properties/",
        IssueUserDisplayPropertyEndpoint.as_view(),
        name="project-issue-display-properties",
    ),
@@ -275,17 +275,16 @@ urlpatterns = [
        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-relation/",
        IssueRelationViewSet.as_view(
            {
-                "get": "list",
                "post": "create",
            }
        ),
        name="issue-relation",
    ),
    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/remove-relation/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-relation/<uuid:pk>/",
        IssueRelationViewSet.as_view(
            {
-                "post": "remove_relation",
+                "delete": "destroy",
            }
        ),
        name="issue-relation",
@@ -7,7 +7,6 @@ from plane.app.views import (
    ModuleLinkViewSet,
    ModuleFavoriteViewSet,
    BulkImportModulesEndpoint,
-    ModuleUserPropertiesEndpoint,
 )


@@ -45,7 +44,7 @@ urlpatterns = [
        name="project-module-issues",
    ),
    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/modules/<uuid:module_id>/module-issues/<uuid:issue_id>/",
+        "workspaces/<str:slug>/projects/<uuid:project_id>/modules/<uuid:module_id>/module-issues/<uuid:pk>/",
        ModuleIssueViewSet.as_view(
            {
                "get": "retrieve",
@@ -102,9 +101,4 @@ urlpatterns = [
        BulkImportModulesEndpoint.as_view(),
        name="bulk-modules-create",
    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/modules/<uuid:module_id>/user-properties/",
-        ModuleUserPropertiesEndpoint.as_view(),
-        name="cycle-user-filters",
-    ),
 ]
@@ -13,7 +13,6 @@ from plane.app.views import (
    UserProjectInvitationsViewset,
    ProjectPublicCoverImagesEndpoint,
    ProjectDeployBoardViewSet,
-    UserProjectRolesEndpoint,
 )


@@ -75,11 +74,6 @@ urlpatterns = [
        ),
        name="user-project-invitations",
    ),
-    path(
-        "users/me/workspaces/<str:slug>/project-roles/",
-        UserProjectRolesEndpoint.as_view(),
-        name="user-project-roles",
-    ),
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/join/<uuid:pk>/",
        ProjectJoinEndpoint.as_view(),
@@ -175,4 +169,4 @@ urlpatterns = [
        ),
        name="project-deploy-board",
    ),
-]
+]
@@ -5,7 +5,7 @@ from plane.app.views import (
    IssueViewViewSet,
    GlobalViewViewSet,
    GlobalViewIssuesViewSet,
-    IssueViewFavoriteViewSet,
+    IssueViewFavoriteViewSet,   
 )


@@ -18,8 +18,6 @@ from plane.app.views import (
    WorkspaceUserProfileEndpoint,
    WorkspaceUserProfileIssuesEndpoint,
    WorkspaceLabelsEndpoint,
-    WorkspaceProjectMemberEndpoint,
-    WorkspaceUserPropertiesEndpoint,
 )


@@ -94,11 +92,6 @@ urlpatterns = [
        WorkSpaceMemberViewSet.as_view({"get": "list"}),
        name="workspace-member",
    ),
-    path(
-        "workspaces/<str:slug>/project-members/",
-        WorkspaceProjectMemberEndpoint.as_view(),
-        name="workspace-member-roles",
-    ),
    path(
        "workspaces/<str:slug>/members/<uuid:pk>/",
        WorkSpaceMemberViewSet.as_view(
@@ -202,9 +195,4 @@ urlpatterns = [
        WorkspaceLabelsEndpoint.as_view(),
        name="workspace-labels",
    ),
-    path(
-        "workspaces/<str:slug>/user-properties/",
-        WorkspaceUserPropertiesEndpoint.as_view(),
-        name="workspace-user-filters",
-    ),
 ]
@@ -192,7 +192,7 @@ from plane.app.views import (
 )


-# TODO: Delete this file
+#TODO: Delete this file
 # This url file has been deprecated use apiserver/plane/urls folder to create new urls

 urlpatterns = [
@@ -204,14 +204,10 @@ urlpatterns = [
    path("sign-out/", SignOutEndpoint.as_view(), name="sign-out"),
    # Magic Sign In/Up
    path(
-        "magic-generate/",
-        MagicSignInGenerateEndpoint.as_view(),
-        name="magic-generate",
+        "magic-generate/", MagicSignInGenerateEndpoint.as_view(), name="magic-generate"
    ),
-    path(
-        "magic-sign-in/", MagicSignInEndpoint.as_view(), name="magic-sign-in"
-    ),
-    path("token/refresh/", TokenRefreshView.as_view(), name="token_refresh"),
+    path("magic-sign-in/", MagicSignInEndpoint.as_view(), name="magic-sign-in"),
+    path('token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
    # Email verification
    path("email-verify/", VerifyEmailEndpoint.as_view(), name="email-verify"),
    path(
@@ -276,9 +272,7 @@ urlpatterns = [
    # user workspace invitations
    path(
        "users/me/invitations/workspaces/",
-        UserWorkspaceInvitationsEndpoint.as_view(
-            {"get": "list", "post": "create"}
-        ),
+        UserWorkspaceInvitationsEndpoint.as_view({"get": "list", "post": "create"}),
        name="user-workspace-invitations",
    ),
    # user workspace invitation
@@ -317,9 +311,7 @@ urlpatterns = [
    # user project invitations
    path(
        "users/me/invitations/projects/",
-        UserProjectInvitationsViewset.as_view(
-            {"get": "list", "post": "create"}
-        ),
+        UserProjectInvitationsViewset.as_view({"get": "list", "post": "create"}),
        name="user-project-invitaions",
    ),
    ## Workspaces ##
@@ -1246,7 +1238,7 @@ urlpatterns = [
                "post": "unarchive",
            }
        ),
-        name="project-page-unarchive",
+        name="project-page-unarchive"
    ),
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/archived-pages/",
@@ -1272,22 +1264,19 @@ urlpatterns = [
            {
                "post": "unlock",
            }
-        ),
+        )
    ),
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/transactions/",
-        PageLogEndpoint.as_view(),
-        name="page-transactions",
+        PageLogEndpoint.as_view(), name="page-transactions"
    ),
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/transactions/<uuid:transaction>/",
-        PageLogEndpoint.as_view(),
-        name="page-transactions",
+        PageLogEndpoint.as_view(), name="page-transactions"
    ),
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/pages/<uuid:page_id>/sub-pages/",
-        SubPagesEndpoint.as_view(),
-        name="sub-page",
+          SubPagesEndpoint.as_view(), name="sub-page"
    ),
    path(
        "workspaces/<str:slug>/projects/<uuid:project_id>/estimates/",
@@ -1337,9 +1326,7 @@ urlpatterns = [
    ## End Pages
    # API Tokens
    path("api-tokens/", ApiTokenEndpoint.as_view(), name="api-tokens"),
-    path(
-        "api-tokens/<uuid:pk>/", ApiTokenEndpoint.as_view(), name="api-tokens"
-    ),
+    path("api-tokens/<uuid:pk>/", ApiTokenEndpoint.as_view(), name="api-tokens"),
    ## End API Tokens
    # Integrations
    path(
@@ -11,7 +11,6 @@ from .project import (
    ProjectFavoritesViewSet,
    ProjectPublicCoverImagesEndpoint,
    ProjectDeployBoardViewSet,
-    UserProjectRolesEndpoint,
 )
 from .user import (
    UserEndpoint,
@@ -45,8 +44,6 @@ from .workspace import (
    WorkspaceUserProfileEndpoint,
    WorkspaceUserProfileIssuesEndpoint,
    WorkspaceLabelsEndpoint,
-    WorkspaceProjectMemberEndpoint,
-    WorkspaceUserPropertiesEndpoint,
 )
 from .state import StateViewSet
 from .view import (
@@ -61,8 +58,6 @@ from .cycle import (
    CycleDateCheckEndpoint,
    CycleFavoriteViewSet,
    TransferCycleIssueEndpoint,
-    CycleUserPropertiesEndpoint,
-    ActiveCycleEndpoint,
 )
 from .asset import FileAssetEndpoint, UserAssetsEndpoint, FileAssetViewSet
 from .issue import (
@@ -107,7 +102,6 @@ from .module import (
    ModuleIssueViewSet,
    ModuleLinkViewSet,
    ModuleFavoriteViewSet,
-    ModuleUserPropertiesEndpoint,
 )

 from .api import ApiTokenEndpoint
@@ -141,11 +135,7 @@ from .page import (
 from .search import GlobalSearchEndpoint, IssueSearchEndpoint


-from .external import (
-    GPTIntegrationEndpoint,
-    ReleaseNotesEndpoint,
-    UnsplashEndpoint,
-)
+from .external import GPTIntegrationEndpoint, ReleaseNotesEndpoint, UnsplashEndpoint

 from .estimate import (
    ProjectEstimatePointEndpoint,
@@ -170,15 +160,10 @@ from .notification import (

 from .exporter import ExportIssuesEndpoint

-from .config import ConfigurationEndpoint, MobileConfigurationEndpoint
+from .config import ConfigurationEndpoint

 from .webhook import (
    WebhookEndpoint,
    WebhookLogsEndpoint,
    WebhookSecretRegenerateEndpoint,
 )
-
-from .dashboard import (
-    DashboardEndpoint,
-    WidgetsEndpoint
-)
@@ -61,9 +61,7 @@ class AnalyticsEndpoint(BaseAPIView):
            )

        # If segment is present it cannot be same as x-axis
-        if segment and (
-            segment not in valid_xaxis_segment or x_axis == segment
-        ):
+        if segment and (segment not in valid_xaxis_segment or x_axis == segment):
            return Response(
                {
                    "error": "Both segment and x axis cannot be same and segment should be valid"
@@ -112,9 +110,7 @@ class AnalyticsEndpoint(BaseAPIView):
        if x_axis in ["assignees__id"] or segment in ["assignees__id"]:
            assignee_details = (
                Issue.issue_objects.filter(
-                    workspace__slug=slug,
-                    **filters,
-                    assignees__avatar__isnull=False,
+                    workspace__slug=slug, **filters, assignees__avatar__isnull=False
                )
                .order_by("assignees__id")
                .distinct("assignees__id")
@@ -128,9 +124,7 @@ class AnalyticsEndpoint(BaseAPIView):
            )

        cycle_details = {}
-        if x_axis in ["issue_cycle__cycle_id"] or segment in [
-            "issue_cycle__cycle_id"
-        ]:
+        if x_axis in ["issue_cycle__cycle_id"] or segment in ["issue_cycle__cycle_id"]:
            cycle_details = (
                Issue.issue_objects.filter(
                    workspace__slug=slug,
@@ -192,9 +186,7 @@ class AnalyticViewViewset(BaseViewSet):

    def get_queryset(self):
        return self.filter_queryset(
-            super()
-            .get_queryset()
-            .filter(workspace__slug=self.kwargs.get("slug"))
+            super().get_queryset().filter(workspace__slug=self.kwargs.get("slug"))
        )


@@ -204,9 +196,7 @@ class SavedAnalyticEndpoint(BaseAPIView):
    ]

    def get(self, request, slug, analytic_id):
-        analytic_view = AnalyticView.objects.get(
-            pk=analytic_id, workspace__slug=slug
-        )
+        analytic_view = AnalyticView.objects.get(pk=analytic_id, workspace__slug=slug)

        filter = analytic_view.query
        queryset = Issue.issue_objects.filter(**filter)
@@ -276,9 +266,7 @@ class ExportAnalyticsEndpoint(BaseAPIView):
            )

        # If segment is present it cannot be same as x-axis
-        if segment and (
-            segment not in valid_xaxis_segment or x_axis == segment
-        ):
+        if segment and (segment not in valid_xaxis_segment or x_axis == segment):
            return Response(
                {
                    "error": "Both segment and x axis cannot be same and segment should be valid"
@@ -305,9 +293,7 @@ class DefaultAnalyticsEndpoint(BaseAPIView):

    def get(self, request, slug):
        filters = issue_filters(request.GET, "GET")
-        base_issues = Issue.issue_objects.filter(
-            workspace__slug=slug, **filters
-        )
+        base_issues = Issue.issue_objects.filter(workspace__slug=slug, **filters)

        total_issues = base_issues.count()

@@ -320,9 +306,7 @@ class DefaultAnalyticsEndpoint(BaseAPIView):
        )

        open_issues_groups = ["backlog", "unstarted", "started"]
-        open_issues_queryset = state_groups.filter(
-            state__group__in=open_issues_groups
-        )
+        open_issues_queryset = state_groups.filter(state__group__in=open_issues_groups)

        open_issues = open_issues_queryset.count()
        open_issues_classified = (
@@ -377,12 +361,10 @@ class DefaultAnalyticsEndpoint(BaseAPIView):
            .order_by("-count")
        )

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

        return Response(
            {
@@ -71,9 +71,7 @@ class ApiTokenEndpoint(BaseAPIView):
            user=request.user,
            pk=pk,
        )
-        serializer = APITokenSerializer(
-            api_token, data=request.data, partial=True
-        )
+        serializer = APITokenSerializer(api_token, data=request.data, partial=True)
        if serializer.is_valid():
            serializer.save()
            return Response(serializer.data, status=status.HTTP_200_OK)
@@ -10,11 +10,7 @@ from plane.app.serializers import FileAssetSerializer


 class FileAssetEndpoint(BaseAPIView):
-    parser_classes = (
-        MultiPartParser,
-        FormParser,
-        JSONParser,
-    )
+    parser_classes = (MultiPartParser, FormParser, JSONParser,)

    """
    A viewset for viewing and editing task instances.
@@ -24,18 +20,10 @@ class FileAssetEndpoint(BaseAPIView):
        asset_key = str(workspace_id) + "/" + asset_key
        files = FileAsset.objects.filter(asset=asset_key)
        if files.exists():
-            serializer = FileAssetSerializer(
-                files, context={"request": request}, many=True
-            )
-            return Response(
-                {"data": serializer.data, "status": True},
-                status=status.HTTP_200_OK,
-            )
+            serializer = FileAssetSerializer(files, context={"request": request}, many=True)
+            return Response({"data": serializer.data, "status": True}, status=status.HTTP_200_OK)
        else:
-            return Response(
-                {"error": "Asset key does not exist", "status": False},
-                status=status.HTTP_200_OK,
-            )
+            return Response({"error": "Asset key does not exist", "status": False}, status=status.HTTP_200_OK)

    def post(self, request, slug):
        serializer = FileAssetSerializer(data=request.data)
@@ -45,7 +33,7 @@ class FileAssetEndpoint(BaseAPIView):
            serializer.save(workspace_id=workspace.id)
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
+    
    def delete(self, request, workspace_id, asset_key):
        asset_key = str(workspace_id) + "/" + asset_key
        file_asset = FileAsset.objects.get(asset=asset_key)
@@ -55,6 +43,7 @@ class FileAssetEndpoint(BaseAPIView):


 class FileAssetViewSet(BaseViewSet):
+
    def restore(self, request, workspace_id, asset_key):
        asset_key = str(workspace_id) + "/" + asset_key
        file_asset = FileAsset.objects.get(asset=asset_key)
@@ -67,22 +56,12 @@ class UserAssetsEndpoint(BaseAPIView):
    parser_classes = (MultiPartParser, FormParser)

    def get(self, request, asset_key):
-        files = FileAsset.objects.filter(
-            asset=asset_key, created_by=request.user
-        )
+        files = FileAsset.objects.filter(asset=asset_key, created_by=request.user)
        if files.exists():
-            serializer = FileAssetSerializer(
-                files, context={"request": request}
-            )
-            return Response(
-                {"data": serializer.data, "status": True},
-                status=status.HTTP_200_OK,
-            )
+            serializer = FileAssetSerializer(files, context={"request": request})
+            return Response({"data": serializer.data, "status": True}, status=status.HTTP_200_OK)
        else:
-            return Response(
-                {"error": "Asset key does not exist", "status": False},
-                status=status.HTTP_200_OK,
-            )
+            return Response({"error": "Asset key does not exist", "status": False}, status=status.HTTP_200_OK)

    def post(self, request):
        serializer = FileAssetSerializer(data=request.data)
@@ -91,10 +70,9 @@ class UserAssetsEndpoint(BaseAPIView):
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

+
    def delete(self, request, asset_key):
-        file_asset = FileAsset.objects.get(
-            asset=asset_key, created_by=request.user
-        )
+        file_asset = FileAsset.objects.get(asset=asset_key, created_by=request.user)
        file_asset.is_deleted = True
        file_asset.save()
        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -128,8 +128,7 @@ class ForgotPasswordEndpoint(BaseAPIView):
                status=status.HTTP_200_OK,
            )
        return Response(
-            {"error": "Please check the email"},
-            status=status.HTTP_400_BAD_REQUEST,
+            {"error": "Please check the email"}, status=status.HTTP_400_BAD_REQUEST
        )


@@ -168,9 +167,7 @@ class ResetPasswordEndpoint(BaseAPIView):
                }

                return Response(data, status=status.HTTP_200_OK)
-            return Response(
-                serializer.errors, status=status.HTTP_400_BAD_REQUEST
-            )
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

        except DjangoUnicodeDecodeError as indentifier:
            return Response(
@@ -194,8 +191,7 @@ class ChangePasswordEndpoint(BaseAPIView):
            user.is_password_autoset = False
            user.save()
            return Response(
-                {"message": "Password updated successfully"},
-                status=status.HTTP_200_OK,
+                {"message": "Password updated successfully"}, status=status.HTTP_200_OK
            )
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

@@ -217,8 +213,7 @@ class SetUserPasswordEndpoint(BaseAPIView):
        # Check password validation
        if not password and len(str(password)) < 8:
            return Response(
-                {"error": "Password is not valid"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Password is not valid"}, status=status.HTTP_400_BAD_REQUEST
            )

        # Set the user password
@@ -286,9 +281,7 @@ class MagicGenerateEndpoint(BaseAPIView):

            if data["current_attempt"] > 2:
                return Response(
-                    {
-                        "error": "Max attempts exhausted. Please try again later."
-                    },
+                    {"error": "Max attempts exhausted. Please try again later."},
                    status=status.HTTP_400_BAD_REQUEST,
                )

@@ -346,8 +339,7 @@ class EmailCheckEndpoint(BaseAPIView):

        if not email:
            return Response(
-                {"error": "Email is required"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Email is required"}, status=status.HTTP_400_BAD_REQUEST
            )

        # validate the email
@@ -355,8 +347,7 @@ class EmailCheckEndpoint(BaseAPIView):
            validate_email(email)
        except ValidationError:
            return Response(
-                {"error": "Email is not valid"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Email is not valid"}, status=status.HTTP_400_BAD_REQUEST
            )

        # Check if the user exists
@@ -408,18 +399,13 @@ class EmailCheckEndpoint(BaseAPIView):
            key, token, current_attempt = generate_magic_token(email=email)
            if not current_attempt:
                return Response(
-                    {
-                        "error": "Max attempts exhausted. Please try again later."
-                    },
+                    {"error": "Max attempts exhausted. Please try again later."},
                    status=status.HTTP_400_BAD_REQUEST,
                )
            # Trigger the email
            magic_link.delay(email, "magic_" + str(email), token, current_site)
            return Response(
-                {
-                    "is_password_autoset": user.is_password_autoset,
-                    "is_existing": False,
-                },
+                {"is_password_autoset": user.is_password_autoset, "is_existing": False},
                status=status.HTTP_200_OK,
            )

@@ -447,9 +433,7 @@ class EmailCheckEndpoint(BaseAPIView):
                key, token, current_attempt = generate_magic_token(email=email)
                if not current_attempt:
                    return Response(
-                        {
-                            "error": "Max attempts exhausted. Please try again later."
-                        },
+                        {"error": "Max attempts exhausted. Please try again later."},
                        status=status.HTTP_400_BAD_REQUEST,
                    )

@@ -73,7 +73,7 @@ class SignUpEndpoint(BaseAPIView):

        # get configuration values
        # Get configuration values
-        (ENABLE_SIGNUP,) = get_configuration_value(
+        ENABLE_SIGNUP, = get_configuration_value(
            [
                {
                    "key": "ENABLE_SIGNUP",
@@ -173,7 +173,7 @@ class SignInEndpoint(BaseAPIView):

        # Create the user
        else:
-            (ENABLE_SIGNUP,) = get_configuration_value(
+            ENABLE_SIGNUP, = get_configuration_value(
                [
                    {
                        "key": "ENABLE_SIGNUP",
@@ -325,7 +325,7 @@ class MagicSignInEndpoint(BaseAPIView):
            )

        user_token = request.data.get("token", "").strip()
-        key = request.data.get("key", "").strip().lower()
+        key = request.data.get("key", False).strip().lower()

        if not key or user_token == "":
            return Response(
@@ -343,6 +343,13 @@ class MagicSignInEndpoint(BaseAPIView):

            if str(token) == str(user_token):
                user = User.objects.get(email=email)
+                if not user.is_active:
+                    return Response(
+                        {
+                            "error": "Your account has been deactivated. Please contact your site administrator."
+                        },
+                        status=status.HTTP_403_FORBIDDEN,
+                    )
                # Send event
                auth_events.delay(
                    user=user.id,
@@ -364,10 +371,8 @@ class MagicSignInEndpoint(BaseAPIView):
                user.save()

                # Check if user has any accepted invites for workspace and add them to workspace
-                workspace_member_invites = (
-                    WorkspaceMemberInvite.objects.filter(
-                        email=user.email, accepted=True
-                    )
+                workspace_member_invites = WorkspaceMemberInvite.objects.filter(
+                    email=user.email, accepted=True
                )

                WorkspaceMember.objects.bulk_create(
@@ -433,9 +438,7 @@ class MagicSignInEndpoint(BaseAPIView):

            else:
                return Response(
-                    {
-                        "error": "Your login code was incorrect. Please try again."
-                    },
+                    {"error": "Your login code was incorrect. Please try again."},
                    status=status.HTTP_400_BAD_REQUEST,
                )

@@ -46,9 +46,7 @@ class WebhookMixin:
    bulk = False

    def finalize_response(self, request, response, *args, **kwargs):
-        response = super().finalize_response(
-            request, response, *args, **kwargs
-        )
+        response = super().finalize_response(request, response, *args, **kwargs)

        # Check for the case should webhook be sent
        if (
@@ -90,9 +88,7 @@ class BaseViewSet(TimezoneMixin, ModelViewSet, BasePaginator):
            return self.model.objects.all()
        except Exception as e:
            capture_exception(e)
-            raise APIException(
-                "Please check the view", status.HTTP_400_BAD_REQUEST
-            )
+            raise APIException("Please check the view", status.HTTP_400_BAD_REQUEST)

    def handle_exception(self, exc):
        """
@@ -103,7 +99,6 @@ class BaseViewSet(TimezoneMixin, ModelViewSet, BasePaginator):
            response = super().handle_exception(exc)
            return response
        except Exception as e:
-            print(e) if settings.DEBUG else print("Server Error")
            if isinstance(e, IntegrityError):
                return Response(
                    {"error": "The payload is not valid"},
@@ -117,23 +112,23 @@ class BaseViewSet(TimezoneMixin, ModelViewSet, BasePaginator):
                )

            if isinstance(e, ObjectDoesNotExist):
+                model_name = str(exc).split(" matching query does not exist.")[0]
                return Response(
-                    {"error": f"The required object does not exist."},
+                    {"error": f"{model_name} does not exist."},
                    status=status.HTTP_404_NOT_FOUND,
                )

            if isinstance(e, KeyError):
                capture_exception(e)
                return Response(
-                    {"error": f"The required key does not exist."},
+                    {"error": f"key {e} does not exist"},
                    status=status.HTTP_400_BAD_REQUEST,
                )
-
+            
+            print(e) if settings.DEBUG else print("Server Error")
            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            )
+            return Response({"error": "Something went wrong please try again later"}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+

    def dispatch(self, request, *args, **kwargs):
        try:
@@ -164,24 +159,6 @@ class BaseViewSet(TimezoneMixin, ModelViewSet, BasePaginator):
        if resolve(self.request.path_info).url_name == "project":
            return self.kwargs.get("pk", None)

-    @property
-    def fields(self):
-        fields = [
-            field
-            for field in self.request.GET.get("fields", "").split(",")
-            if field
-        ]
-        return fields if fields else None
-
-    @property
-    def expand(self):
-        expand = [
-            expand
-            for expand in self.request.GET.get("expand", "").split(",")
-            if expand
-        ]
-        return expand if expand else None
-

 class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
    permission_classes = [
@@ -224,24 +201,20 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
                )

            if isinstance(e, ObjectDoesNotExist):
+                model_name = str(exc).split(" matching query does not exist.")[0]
                return Response(
-                    {"error": f"The required object does not exist."},
+                    {"error": f"{model_name} does not exist."},
                    status=status.HTTP_404_NOT_FOUND,
                )
-
+            
            if isinstance(e, KeyError):
-                return Response(
-                    {"error": f"The required key does not exist."},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
+                return Response({"error": f"key {e} does not exist"}, status=status.HTTP_400_BAD_REQUEST)

            if settings.DEBUG:
                print(e)
            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            )
+            return Response({"error": "Something went wrong please try again later"}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+

    def dispatch(self, request, *args, **kwargs):
        try:
@@ -266,21 +239,3 @@ class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
    @property
    def project_id(self):
        return self.kwargs.get("project_id", None)
-
-    @property
-    def fields(self):
-        fields = [
-            field
-            for field in self.request.GET.get("fields", "").split(",")
-            if field
-        ]
-        return fields if fields else None
-
-    @property
-    def expand(self):
-        expand = [
-            expand
-            for expand in self.request.GET.get("expand", "").split(",")
-            if expand
-        ]
-        return expand if expand else None
@@ -20,6 +20,7 @@ class ConfigurationEndpoint(BaseAPIView):
    ]

    def get(self, request):
+
        # Get all the configuration
        (
            GOOGLE_CLIENT_ID,
@@ -89,16 +90,8 @@ class ConfigurationEndpoint(BaseAPIView):

        data = {}
        # Authentication
-        data["google_client_id"] = (
-            GOOGLE_CLIENT_ID
-            if GOOGLE_CLIENT_ID and GOOGLE_CLIENT_ID != '""'
-            else None
-        )
-        data["github_client_id"] = (
-            GITHUB_CLIENT_ID
-            if GITHUB_CLIENT_ID and GITHUB_CLIENT_ID != '""'
-            else None
-        )
+        data["google_client_id"] = GOOGLE_CLIENT_ID
+        data["github_client_id"] = GITHUB_CLIENT_ID
        data["github_app_name"] = GITHUB_APP_NAME
        data["magic_login"] = (
            bool(EMAIL_HOST_USER) and bool(EMAIL_HOST_PASSWORD)
@@ -113,135 +106,15 @@ class ConfigurationEndpoint(BaseAPIView):
        data["posthog_host"] = POSTHOG_HOST

        # Unsplash
-        data["has_unsplash_configured"] = bool(UNSPLASH_ACCESS_KEY)
+        data["has_unsplash_configured"] = UNSPLASH_ACCESS_KEY

        # Open AI settings
        data["has_openai_configured"] = bool(OPENAI_API_KEY)

        # File size settings
-        data["file_size_limit"] = float(
-            os.environ.get("FILE_SIZE_LIMIT", 5242880)
-        )
+        data["file_size_limit"] = float(os.environ.get("FILE_SIZE_LIMIT", 5242880))

-        # is smtp configured
-        data["is_smtp_configured"] = bool(EMAIL_HOST_USER) and bool(
-            EMAIL_HOST_PASSWORD
-        )
-
-        return Response(data, status=status.HTTP_200_OK)
-
-
-class MobileConfigurationEndpoint(BaseAPIView):
-    permission_classes = [
-        AllowAny,
-    ]
-
-    def get(self, request):
-        (
-            GOOGLE_CLIENT_ID,
-            GOOGLE_SERVER_CLIENT_ID,
-            GOOGLE_IOS_CLIENT_ID,
-            EMAIL_HOST_USER,
-            EMAIL_HOST_PASSWORD,
-            ENABLE_MAGIC_LINK_LOGIN,
-            ENABLE_EMAIL_PASSWORD,
-            POSTHOG_API_KEY,
-            POSTHOG_HOST,
-            UNSPLASH_ACCESS_KEY,
-            OPENAI_API_KEY,
-        ) = get_configuration_value(
-            [
-                {
-                    "key": "GOOGLE_CLIENT_ID",
-                    "default": os.environ.get("GOOGLE_CLIENT_ID", None),
-                },
-                {
-                    "key": "GOOGLE_SERVER_CLIENT_ID",
-                    "default": os.environ.get("GOOGLE_SERVER_CLIENT_ID", None),
-                },
-                {
-                    "key": "GOOGLE_IOS_CLIENT_ID",
-                    "default": os.environ.get("GOOGLE_IOS_CLIENT_ID", None),
-                },
-                {
-                    "key": "EMAIL_HOST_USER",
-                    "default": os.environ.get("EMAIL_HOST_USER", None),
-                },
-                {
-                    "key": "EMAIL_HOST_PASSWORD",
-                    "default": os.environ.get("EMAIL_HOST_PASSWORD", None),
-                },
-                {
-                    "key": "ENABLE_MAGIC_LINK_LOGIN",
-                    "default": os.environ.get("ENABLE_MAGIC_LINK_LOGIN", "1"),
-                },
-                {
-                    "key": "ENABLE_EMAIL_PASSWORD",
-                    "default": os.environ.get("ENABLE_EMAIL_PASSWORD", "1"),
-                },
-                {
-                    "key": "POSTHOG_API_KEY",
-                    "default": os.environ.get("POSTHOG_API_KEY", "1"),
-                },
-                {
-                    "key": "POSTHOG_HOST",
-                    "default": os.environ.get("POSTHOG_HOST", "1"),
-                },
-                {
-                    "key": "UNSPLASH_ACCESS_KEY",
-                    "default": os.environ.get("UNSPLASH_ACCESS_KEY", "1"),
-                },
-                {
-                    "key": "OPENAI_API_KEY",
-                    "default": os.environ.get("OPENAI_API_KEY", "1"),
-                },
-            ]
-        )
-        data = {}
-        # Authentication
-        data["google_client_id"] = (
-            GOOGLE_CLIENT_ID
-            if GOOGLE_CLIENT_ID and GOOGLE_CLIENT_ID != '""'
-            else None
-        )
-        data["google_server_client_id"] = (
-            GOOGLE_SERVER_CLIENT_ID
-            if GOOGLE_SERVER_CLIENT_ID and GOOGLE_SERVER_CLIENT_ID != '""'
-            else None
-        )
-        data["google_ios_client_id"] = (
-            (GOOGLE_IOS_CLIENT_ID)[::-1]
-            if GOOGLE_IOS_CLIENT_ID is not None
-            else None
-        )
-        # Posthog
-        data["posthog_api_key"] = POSTHOG_API_KEY
-        data["posthog_host"] = POSTHOG_HOST
-
-        data["magic_login"] = (
-            bool(EMAIL_HOST_USER) and bool(EMAIL_HOST_PASSWORD)
-        ) and ENABLE_MAGIC_LINK_LOGIN == "1"
-
-        data["email_password_login"] = ENABLE_EMAIL_PASSWORD == "1"
-
-        # Posthog
-        data["posthog_api_key"] = POSTHOG_API_KEY
-        data["posthog_host"] = POSTHOG_HOST
-
-        # Unsplash
-        data["has_unsplash_configured"] = bool(UNSPLASH_ACCESS_KEY)
-
-        # Open AI settings
-        data["has_openai_configured"] = bool(OPENAI_API_KEY)
-
-        # File size settings
-        data["file_size_limit"] = float(
-            os.environ.get("FILE_SIZE_LIMIT", 5242880)
-        )
-
-        # is smtp configured
-        data["is_smtp_configured"] = not (
-            bool(EMAIL_HOST_USER) and bool(EMAIL_HOST_PASSWORD)
-        )
+        # is self managed
+        data["is_self_managed"] = bool(int(os.environ.get("IS_SELF_MANAGED", "1")))

        return Response(data, status=status.HTTP_200_OK)
@@ -11,10 +11,6 @@ from django.db.models import (
    Count,
    Prefetch,
    Sum,
-    Case,
-    When,
-    Value,
-    CharField,
 )
 from django.core import serializers
 from django.utils import timezone
@@ -31,16 +27,10 @@ from plane.app.serializers import (
    CycleSerializer,
    CycleIssueSerializer,
    CycleFavoriteSerializer,
-    IssueSerializer,
    IssueStateSerializer,
    CycleWriteSerializer,
-    CycleUserPropertiesSerializer,
-)
-from plane.app.permissions import (
-    ProjectEntityPermission,
-    ProjectLitePermission,
-    WorkspaceUserPermission
 )
+from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import (
    User,
    Cycle,
@@ -50,10 +40,9 @@ from plane.db.models import (
    IssueLink,
    IssueAttachment,
    Label,
-    CycleUserProperties,
-    IssueSubscriber,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
+from plane.utils.grouper import group_results
 from plane.utils.issue_filters import issue_filters
 from plane.utils.analytics_plot import burndown_plot

@@ -68,8 +57,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):

    def perform_create(self, serializer):
        serializer.save(
-            project_id=self.kwargs.get("project_id"),
-            owned_by=self.request.user,
+            project_id=self.kwargs.get("project_id"), owned_by=self.request.user
        )

    def get_queryset(self):
@@ -148,9 +136,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
                    ),
                )
            )
-            .annotate(
-                total_estimates=Sum("issue_cycle__issue__estimate_point")
-            )
+            .annotate(total_estimates=Sum("issue_cycle__issue__estimate_point"))
            .annotate(
                completed_estimates=Sum(
                    "issue_cycle__issue__estimate_point",
@@ -171,39 +157,16 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
                    ),
                )
            )
-            .annotate(
-                status=Case(
-                    When(
-                        Q(start_date__lte=timezone.now())
-                        & Q(end_date__gte=timezone.now()),
-                        then=Value("CURRENT"),
-                    ),
-                    When(
-                        start_date__gt=timezone.now(), then=Value("UPCOMING")
-                    ),
-                    When(end_date__lt=timezone.now(), then=Value("COMPLETED")),
-                    When(
-                        Q(start_date__isnull=True) & Q(end_date__isnull=True),
-                        then=Value("DRAFT"),
-                    ),
-                    default=Value("DRAFT"),
-                    output_field=CharField(),
-                )
-            )
            .prefetch_related(
                Prefetch(
                    "issue_cycle__issue__assignees",
-                    queryset=User.objects.only(
-                        "avatar", "first_name", "id"
-                    ).distinct(),
+                    queryset=User.objects.only("avatar", "first_name", "id").distinct(),
                )
            )
            .prefetch_related(
                Prefetch(
                    "issue_cycle__issue__labels",
-                    queryset=Label.objects.only(
-                        "name", "color", "id"
-                    ).distinct(),
+                    queryset=Label.objects.only("name", "color", "id").distinct(),
                )
            )
            .order_by("-is_favorite", "name")
@@ -213,13 +176,8 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
    def list(self, request, slug, project_id):
        queryset = self.get_queryset()
        cycle_view = request.GET.get("cycle_view", "all")
-        fields = [
-            field
-            for field in request.GET.get("fields", "").split(",")
-            if field
-        ]

-        queryset = queryset.order_by("-is_favorite", "-created_at")
+        queryset = queryset.order_by("-is_favorite","-created_at")

        # Current Cycle
        if cycle_view == "current":
@@ -314,9 +272,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
                    "completion_chart": {},
                }
                if data[0]["start_date"] and data[0]["end_date"]:
-                    data[0]["distribution"][
-                        "completion_chart"
-                    ] = burndown_plot(
+                    data[0]["distribution"]["completion_chart"] = burndown_plot(
                        queryset=queryset.first(),
                        slug=slug,
                        project_id=project_id,
@@ -325,8 +281,44 @@ class CycleViewSet(WebhookMixin, BaseViewSet):

            return Response(data, status=status.HTTP_200_OK)

-        cycles = CycleSerializer(queryset, many=True).data
-        return Response(cycles, status=status.HTTP_200_OK)
+        # Upcoming Cycles
+        if cycle_view == "upcoming":
+            queryset = queryset.filter(start_date__gt=timezone.now())
+            return Response(
+                CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+            )
+
+        # Completed Cycles
+        if cycle_view == "completed":
+            queryset = queryset.filter(end_date__lt=timezone.now())
+            return Response(
+                CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+            )
+
+        # Draft Cycles
+        if cycle_view == "draft":
+            queryset = queryset.filter(
+                end_date=None,
+                start_date=None,
+            )
+
+            return Response(
+                CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+            )
+
+        # Incomplete Cycles
+        if cycle_view == "incomplete":
+            queryset = queryset.filter(
+                Q(end_date__gte=timezone.now().date()) | Q(end_date__isnull=True),
+            )
+            return Response(
+                CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+            )
+
+        # If no matching view is found return all cycles
+        return Response(
+            CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+        )

    def create(self, request, slug, project_id):
        if (
@@ -342,18 +334,8 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
                    project_id=project_id,
                    owned_by=request.user,
                )
-                cycle = (
-                    self.get_queryset()
-                    .filter(pk=serializer.data["id"])
-                    .first()
-                )
-                serializer = CycleSerializer(cycle)
-                return Response(
-                    serializer.data, status=status.HTTP_201_CREATED
-                )
-            return Response(
-                serializer.errors, status=status.HTTP_400_BAD_REQUEST
-            )
+                return Response(serializer.data, status=status.HTTP_201_CREATED)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
        else:
            return Response(
                {
@@ -363,22 +345,15 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
            )

    def partial_update(self, request, slug, project_id, pk):
-        cycle = Cycle.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
+        cycle = Cycle.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)

        request_data = request.data

-        if (
-            cycle.end_date is not None
-            and cycle.end_date < timezone.now().date()
-        ):
+        if cycle.end_date is not None and cycle.end_date < timezone.now().date():
            if "sort_order" in request_data:
                # Can only change sort order
                request_data = {
-                    "sort_order": request_data.get(
-                        "sort_order", cycle.sort_order
-                    )
+                    "sort_order": request_data.get("sort_order", cycle.sort_order)
                }
            else:
                return Response(
@@ -388,9 +363,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
                    status=status.HTTP_400_BAD_REQUEST,
                )

-        serializer = CycleWriteSerializer(
-            cycle, data=request.data, partial=True
-        )
+        serializer = CycleWriteSerializer(cycle, data=request.data, partial=True)
        if serializer.is_valid():
            serializer.save()
            return Response(serializer.data, status=status.HTTP_200_OK)
@@ -411,13 +384,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):
            .annotate(assignee_id=F("assignees__id"))
            .annotate(avatar=F("assignees__avatar"))
            .annotate(display_name=F("assignees__display_name"))
-            .values(
-                "first_name",
-                "last_name",
-                "assignee_id",
-                "avatar",
-                "display_name",
-            )
+            .values("first_name", "last_name", "assignee_id", "avatar", "display_name")
            .annotate(
                total_issues=Count(
                    "assignee_id",
@@ -496,10 +463,7 @@ class CycleViewSet(WebhookMixin, BaseViewSet):

        if queryset.start_date and queryset.end_date:
            data["distribution"]["completion_chart"] = burndown_plot(
-                queryset=queryset,
-                slug=slug,
-                project_id=project_id,
-                cycle_id=pk,
+                queryset=queryset, slug=slug, project_id=project_id, cycle_id=pk
            )

        return Response(
@@ -509,13 +473,11 @@ class CycleViewSet(WebhookMixin, BaseViewSet):

    def destroy(self, request, slug, project_id, pk):
        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
+            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",
@@ -558,9 +520,7 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
            super()
            .get_queryset()
            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("issue_id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("issue_id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -579,23 +539,18 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):

    @method_decorator(gzip_page)
    def list(self, request, slug, project_id, cycle_id):
-        fields = [
-            field
-            for field in request.GET.get("fields", "").split(",")
-            if field
-        ]
+        fields = [field for field in request.GET.get("fields", "").split(",") if field]
        order_by = request.GET.get("order_by", "created_at")
        filters = issue_filters(request.query_params, "GET")
        issues = (
            Issue.issue_objects.filter(issue_cycle__cycle_id=cycle_id)
            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
            )
+            .annotate(bridge_id=F("issue_cycle__id"))
            .filter(project_id=project_id)
            .filter(workspace__slug=slug)
            .select_related("project")
@@ -606,8 +561,6 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
            .prefetch_related("labels")
            .order_by(order_by)
            .filter(**filters)
-            .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(module_id=F("issue_module__module_id"))
            .annotate(
                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
                .order_by()
@@ -615,43 +568,30 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
                .values("count")
            )
            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
+                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
            )
-            .annotate(
-                is_subscribed=Exists(
-                    IssueSubscriber.objects.filter(
-                        subscriber=self.request.user, issue_id=OuterRef("id")
-                    )
-                )
-            )
        )
-        serializer = IssueSerializer(
-            issues, many=True, fields=fields if fields else None
-        )
-        return Response(serializer.data, status=status.HTTP_200_OK)
+
+        issues = IssueStateSerializer(issues, many=True, fields=fields if fields else None).data
+        issue_dict = {str(issue["id"]): issue for issue in issues}
+        return Response(issue_dict, status=status.HTTP_200_OK)

    def create(self, request, slug, project_id, cycle_id):
        issues = request.data.get("issues", [])

        if not len(issues):
            return Response(
-                {"error": "Issues are required"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Issues are required"}, status=status.HTTP_400_BAD_REQUEST
            )

        cycle = Cycle.objects.get(
            workspace__slug=slug, project_id=project_id, pk=cycle_id
        )

-        if (
-            cycle.end_date is not None
-            and cycle.end_date < timezone.now().date()
-        ):
+        if cycle.end_date is not None and cycle.end_date < timezone.now().date():
            return Response(
                {
                    "error": "The Cycle has already been completed so no new issues can be added"
@@ -725,22 +665,16 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
        )

        # Return all Cycle Issues
-        issues = self.get_queryset().values_list("issue_id", flat=True)
-
        return Response(
-            IssueSerializer(
-                Issue.objects.filter(pk__in=issues), many=True
-            ).data,
+            CycleIssueSerializer(self.get_queryset(), many=True).data,
            status=status.HTTP_200_OK,
        )

-    def destroy(self, request, slug, project_id, cycle_id, issue_id):
+    def destroy(self, request, slug, project_id, cycle_id, pk):
        cycle_issue = CycleIssue.objects.get(
-            issue_id=issue_id,
-            workspace__slug=slug,
-            project_id=project_id,
-            cycle_id=cycle_id,
+            pk=pk, workspace__slug=slug, project_id=project_id, cycle_id=cycle_id
        )
+        issue_id = cycle_issue.issue_id
        issue_activity.delay(
            type="cycle.activity.deleted",
            requested_data=json.dumps(
@@ -750,7 +684,7 @@ class CycleIssueViewSet(WebhookMixin, BaseViewSet):
                }
            ),
            actor_id=str(self.request.user.id),
-            issue_id=str(issue_id),
+            issue_id=str(cycle_issue.issue_id),
            project_id=str(self.kwargs.get("project_id", None)),
            current_instance=None,
            epoch=int(timezone.now().timestamp()),
@@ -871,274 +805,4 @@ class TransferCycleIssueEndpoint(BaseAPIView):
            updated_cycles, ["cycle_id"], batch_size=100
        )

-        return Response({"message": "Success"}, status=status.HTTP_200_OK)
-
-
-class CycleUserPropertiesEndpoint(BaseAPIView):
-    permission_classes = [
-        ProjectLitePermission,
-    ]
-
-    def patch(self, request, slug, project_id, cycle_id):
-        cycle_properties = CycleUserProperties.objects.get(
-            user=request.user,
-            cycle_id=cycle_id,
-            project_id=project_id,
-            workspace__slug=slug,
-        )
-
-        cycle_properties.filters = request.data.get(
-            "filters", cycle_properties.filters
-        )
-        cycle_properties.display_filters = request.data.get(
-            "display_filters", cycle_properties.display_filters
-        )
-        cycle_properties.display_properties = request.data.get(
-            "display_properties", cycle_properties.display_properties
-        )
-        cycle_properties.save()
-
-        serializer = CycleUserPropertiesSerializer(cycle_properties)
-        return Response(serializer.data, status=status.HTTP_201_CREATED)
-
-    def get(self, request, slug, project_id, cycle_id):
-        cycle_properties, _ = CycleUserProperties.objects.get_or_create(
-            user=request.user,
-            project_id=project_id,
-            cycle_id=cycle_id,
-            workspace__slug=slug,
-        )
-        serializer = CycleUserPropertiesSerializer(cycle_properties)
-        return Response(serializer.data, status=status.HTTP_200_OK)
-
-
-class ActiveCycleEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceUserPermission,
-    ]
-    def get(self, request, slug):
-        subquery = CycleFavorite.objects.filter(
-            user=self.request.user,
-            cycle_id=OuterRef("pk"),
-            project_id=self.kwargs.get("project_id"),
-            workspace__slug=self.kwargs.get("slug"),
-        )
-        active_cycles = (
-            Cycle.objects.filter(
-                workspace__slug=slug,
-                project__project_projectmember__member=self.request.user,
-                start_date__lte=timezone.now(),
-                end_date__gte=timezone.now(),
-            )
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("owned_by")
-            .annotate(is_favorite=Exists(subquery))
-            .annotate(
-                total_issues=Count(
-                    "issue_cycle",
-                    filter=Q(
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                completed_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="completed",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                cancelled_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="cancelled",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                started_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="started",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                unstarted_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="unstarted",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                backlog_issues=Count(
-                    "issue_cycle__issue__state__group",
-                    filter=Q(
-                        issue_cycle__issue__state__group="backlog",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(total_estimates=Sum("issue_cycle__issue__estimate_point"))
-            .annotate(
-                completed_estimates=Sum(
-                    "issue_cycle__issue__estimate_point",
-                    filter=Q(
-                        issue_cycle__issue__state__group="completed",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                started_estimates=Sum(
-                    "issue_cycle__issue__estimate_point",
-                    filter=Q(
-                        issue_cycle__issue__state__group="started",
-                        issue_cycle__issue__archived_at__isnull=True,
-                        issue_cycle__issue__is_draft=False,
-                    ),
-                )
-            )
-            .annotate(
-                status=Case(
-                    When(
-                        Q(start_date__lte=timezone.now())
-                        & Q(end_date__gte=timezone.now()),
-                        then=Value("CURRENT"),
-                    ),
-                    When(start_date__gt=timezone.now(), then=Value("UPCOMING")),
-                    When(end_date__lt=timezone.now(), then=Value("COMPLETED")),
-                    When(
-                        Q(start_date__isnull=True) & Q(end_date__isnull=True),
-                        then=Value("DRAFT"),
-                    ),
-                    default=Value("DRAFT"),
-                    output_field=CharField(),
-                )
-            )
-            .prefetch_related(
-                Prefetch(
-                    "issue_cycle__issue__assignees",
-                    queryset=User.objects.only("avatar", "first_name", "id").distinct(),
-                )
-            )
-            .prefetch_related(
-                Prefetch(
-                    "issue_cycle__issue__labels",
-                    queryset=Label.objects.only("name", "color", "id").distinct(),
-                )
-            )
-            .order_by("-created_at")
-        )
-
-        cycles = CycleSerializer(active_cycles, many=True).data
-
-        for cycle in cycles:
-            assignee_distribution = (
-                Issue.objects.filter(
-                    issue_cycle__cycle_id=cycle["id"],
-                    project_id=cycle["project"],
-                    workspace__slug=slug,
-                )
-                .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_issues=Count(
-                        "assignee_id",
-                        filter=Q(archived_at__isnull=True, is_draft=False),
-                    ),
-                )
-                .annotate(
-                    completed_issues=Count(
-                        "assignee_id",
-                        filter=Q(
-                            completed_at__isnull=False,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .annotate(
-                    pending_issues=Count(
-                        "assignee_id",
-                        filter=Q(
-                            completed_at__isnull=True,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .order_by("display_name")
-            )
-
-            label_distribution = (
-                Issue.objects.filter(
-                    issue_cycle__cycle_id=cycle["id"],
-                    project_id=cycle["project"],
-                    workspace__slug=slug,
-                )
-                .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_issues=Count(
-                        "label_id",
-                        filter=Q(archived_at__isnull=True, is_draft=False),
-                    )
-                )
-                .annotate(
-                    completed_issues=Count(
-                        "label_id",
-                        filter=Q(
-                            completed_at__isnull=False,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .annotate(
-                    pending_issues=Count(
-                        "label_id",
-                        filter=Q(
-                            completed_at__isnull=True,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
-                .order_by("label_name")
-            )
-            cycle["distribution"] = {
-                "assignees": assignee_distribution,
-                "labels": label_distribution,
-                "completion_chart": {},
-            }
-            if cycle["start_date"] and cycle["end_date"]:
-                cycle["distribution"][
-                    "completion_chart"
-                ] = burndown_plot(
-                    queryset=active_cycles.get(pk=cycle["id"]),
-                    slug=slug,
-                    project_id=cycle["project"],
-                    cycle_id=cycle["id"],
-                )
-
-        return Response(cycles, status=status.HTTP_200_OK)
+        return Response({"message": "Success"}, status=status.HTTP_200_OK)
@@ -1,658 +0,0 @@
-# Django imports
-from django.db.models import (
-    Q,
-    Case,
-    When,
-    Value,
-    CharField,
-    Count,
-    F,
-    Exists,
-    OuterRef,
-    Max,
-    Subquery,
-    JSONField,
-    Func,
-    Prefetch,
-)
-from django.utils import timezone
-
-# Third Party imports
-from rest_framework.response import Response
-from rest_framework import status
-
-# Module imports
-from . import BaseAPIView
-from plane.db.models import (
-    Issue,
-    IssueActivity,
-    ProjectMember,
-    Widget,
-    DashboardWidget,
-    Dashboard,
-    Project,
-    IssueLink,
-    IssueAttachment,
-    IssueRelation,
-)
-from plane.app.serializers import (
-    IssueActivitySerializer,
-    IssueSerializer,
-    DashboardSerializer,
-    WidgetSerializer,
-)
-from plane.utils.issue_filters import issue_filters
-
-
-def dashboard_overview_stats(self, request, slug):
-    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],
-    ).count()
-
-    pending_issues_count = Issue.issue_objects.filter(
-        ~Q(state__group__in=["completed", "cancelled"]),
-        project__project_projectmember__is_active=True,
-        project__project_projectmember__member=request.user,
-        workspace__slug=slug,
-        assignees__in=[request.user],
-    ).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()
-
-    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(
-        {
-            "assigned_issues_count": assigned_issues,
-            "pending_issues_count": pending_issues_count,
-            "completed_issues_count": completed_issues_count,
-            "created_issues_count": created_issues_count,
-        },
-        status=status.HTTP_200_OK,
-    )
-
-
-def dashboard_assigned_issues(self, request, slug):
-    filters = issue_filters(request.query_params, "GET")
-    issue_type = request.GET.get("issue_type", None)
-
-    # get all the assigned issues
-    assigned_issues = (
-        Issue.issue_objects.filter(
-            workspace__slug=slug,
-            project__project_projectmember__member=request.user,
-            project__project_projectmember__is_active=True,
-            assignees__in=[request.user],
-        )
-        .filter(**filters)
-        .select_related("workspace", "project", "state", "parent")
-        .prefetch_related("assignees", "labels")
-        .prefetch_related(
-            Prefetch(
-                "issue_relation",
-                queryset=IssueRelation.objects.select_related(
-                    "related_issue"
-                ).select_related("issue"),
-            )
-        )
-        .annotate(cycle_id=F("issue_cycle__cycle_id"))
-        .annotate(module_id=F("issue_module__module_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")
-        )
-        .order_by("created_at")
-    )
-
-    # Priority Ordering
-    priority_order = ["urgent", "high", "medium", "low", "none"]
-    assigned_issues = assigned_issues.annotate(
-        priority_order=Case(
-            *[
-                When(priority=p, then=Value(i))
-                for i, p in enumerate(priority_order)
-            ],
-            output_field=CharField(),
-        )
-    ).order_by("priority_order")
-
-    if issue_type == "completed":
-        completed_issues_count = assigned_issues.filter(
-            state__group__in=["completed"]
-        ).count()
-        completed_issues = assigned_issues.filter(
-            state__group__in=["completed"]
-        )[:5]
-        return Response(
-            {
-                "issues": IssueSerializer(
-                    completed_issues, many=True, expand=self.expand
-                ).data,
-                "count": completed_issues_count,
-            },
-            status=status.HTTP_200_OK,
-        )
-
-    if issue_type == "overdue":
-        overdue_issues_count = assigned_issues.filter(
-            state__group__in=["backlog", "unstarted", "started"],
-            target_date__lt=timezone.now()
-        ).count()
-        overdue_issues = assigned_issues.filter(
-            state__group__in=["backlog", "unstarted", "started"],
-            target_date__lt=timezone.now()
-        )[:5]
-        return Response(
-            {
-                "issues": IssueSerializer(
-                    overdue_issues, many=True, expand=self.expand
-                ).data,
-                "count": overdue_issues_count,
-            },
-            status=status.HTTP_200_OK,
-        )
-
-    if issue_type == "upcoming":
-        upcoming_issues_count = assigned_issues.filter(
-            state__group__in=["backlog", "unstarted", "started"],
-            target_date__gte=timezone.now()
-        ).count()
-        upcoming_issues = assigned_issues.filter(
-            state__group__in=["backlog", "unstarted", "started"],
-            target_date__gte=timezone.now()
-        )[:5]
-        return Response(
-            {
-                "issues": IssueSerializer(
-                    upcoming_issues, many=True, expand=self.expand
-                ).data,
-                "count": upcoming_issues_count,
-            },
-            status=status.HTTP_200_OK,
-        )
-
-    return Response(
-        {"error": "Please specify a valid issue type"},
-        status=status.HTTP_400_BAD_REQUEST,
-    )
-
-
-def dashboard_created_issues(self, request, slug):
-    filters = issue_filters(request.query_params, "GET")
-    issue_type = request.GET.get("issue_type", None)
-
-    # get all the assigned issues
-    created_issues = (
-        Issue.issue_objects.filter(
-            workspace__slug=slug,
-            project__project_projectmember__member=request.user,
-            project__project_projectmember__is_active=True,
-            created_by=request.user,
-        )
-        .filter(**filters)
-        .select_related("workspace", "project", "state", "parent")
-        .prefetch_related("assignees", "labels")
-        .annotate(cycle_id=F("issue_cycle__cycle_id"))
-        .annotate(module_id=F("issue_module__module_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")
-        )
-        .order_by("created_at")
-    )
-
-    # Priority Ordering
-    priority_order = ["urgent", "high", "medium", "low", "none"]
-    created_issues = created_issues.annotate(
-        priority_order=Case(
-            *[
-                When(priority=p, then=Value(i))
-                for i, p in enumerate(priority_order)
-            ],
-            output_field=CharField(),
-        )
-    ).order_by("priority_order")
-
-    if issue_type == "completed":
-        completed_issues_count = created_issues.filter(
-            state__group__in=["completed"]
-        ).count()
-        completed_issues = created_issues.filter(
-            state__group__in=["completed"]
-        )[:5]
-        return Response(
-            {
-                "issues": IssueSerializer(completed_issues, many=True).data,
-                "count": completed_issues_count,
-            },
-            status=status.HTTP_200_OK,
-        )
-
-    if issue_type == "overdue":
-        overdue_issues_count = created_issues.filter(
-            state__group__in=["backlog", "unstarted", "started"],
-            target_date__lt=timezone.now()
-        ).count()
-        overdue_issues = created_issues.filter(
-            state__group__in=["backlog", "unstarted", "started"],
-            target_date__lt=timezone.now()
-        )[:5]
-        return Response(
-            {
-                "issues": IssueSerializer(overdue_issues, many=True).data,
-                "count": overdue_issues_count,
-            },
-            status=status.HTTP_200_OK,
-        )
-
-    if issue_type == "upcoming":
-        upcoming_issues_count = created_issues.filter(
-            state__group__in=["backlog", "unstarted", "started"],
-            target_date__gte=timezone.now()
-        ).count()
-        upcoming_issues = created_issues.filter(
-            state__group__in=["backlog", "unstarted", "started"],
-            target_date__gte=timezone.now()
-        )[:5]
-        return Response(
-            {
-                "issues": IssueSerializer(upcoming_issues, many=True).data,
-                "count": upcoming_issues_count,
-            },
-            status=status.HTTP_200_OK,
-        )
-
-    return Response(
-        {"error": "Please specify a valid issue type"},
-        status=status.HTTP_400_BAD_REQUEST,
-    )
-
-
-def dashboard_issues_by_state_groups(self, request, slug):
-    filters = issue_filters(request.query_params, "GET")
-    state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]
-    issues_by_state_groups = (
-        Issue.issue_objects.filter(
-            workspace__slug=slug,
-            project__project_projectmember__is_active=True,
-            project__project_projectmember__member=request.user,
-            assignees__in=[request.user],
-        )
-        .filter(**filters)
-        .values("state__group")
-        .annotate(count=Count("id"))
-    )
-
-    # default state
-    all_groups = {state: 0 for state in state_order}
-
-    # Update counts for existing groups
-    for entry in issues_by_state_groups:
-        all_groups[entry["state__group"]] = entry["count"]
-
-    # Prepare output including all groups with their counts
-    output_data = [
-        {"state": group, "count": count} for group, count in all_groups.items()
-    ]
-
-    return Response(output_data, status=status.HTTP_200_OK)
-
-
-def dashboard_issues_by_priority(self, request, slug):
-    filters = issue_filters(request.query_params, "GET")
-    priority_order = ["urgent", "high", "medium", "low", "none"]
-
-    issues_by_priority = (
-        Issue.issue_objects.filter(
-            workspace__slug=slug,
-            project__project_projectmember__is_active=True,
-            project__project_projectmember__member=request.user,
-            assignees__in=[request.user],
-        )
-        .filter(**filters)
-        .values("priority")
-        .annotate(count=Count("id"))
-    )
-
-    # default priority
-    all_groups = {priority: 0 for priority in priority_order}
-
-    # Update counts for existing groups
-    for entry in issues_by_priority:
-        all_groups[entry["priority"]] = entry["count"]
-
-    # Prepare output including all groups with their counts
-    output_data = [
-        {"priority": group, "count": count}
-        for group, count in all_groups.items()
-    ]
-
-    return Response(output_data, status=status.HTTP_200_OK)
-
-
-def dashboard_recent_activity(self, request, slug):
-    queryset = IssueActivity.objects.filter(
-        ~Q(field__in=["comment", "vote", "reaction", "draft"]),
-        workspace__slug=slug,
-        project__project_projectmember__member=request.user,
-        project__project_projectmember__is_active=True,
-        actor=request.user,
-    ).select_related("actor", "workspace", "issue", "project")[:8]
-
-    return Response(
-        IssueActivitySerializer(queryset, many=True).data,
-        status=status.HTTP_200_OK,
-    )
-
-
-def dashboard_recent_projects(self, request, slug):
-    project_ids = (
-        IssueActivity.objects.filter(
-            workspace__slug=slug,
-            project__project_projectmember__member=request.user,
-            project__project_projectmember__is_active=True,
-            actor=request.user,
-        )
-        .values_list("project_id", flat=True)
-        .distinct()
-    )
-
-    # Extract project IDs from the recent projects
-    unique_project_ids = set(project_id for project_id in project_ids)
-
-    # Fetch additional projects only if needed
-    if len(unique_project_ids) < 4:
-        additional_projects = Project.objects.filter(
-            project_projectmember__member=request.user,
-            project_projectmember__is_active=True,
-            workspace__slug=slug,
-        ).exclude(id__in=unique_project_ids)
-
-        # Append additional project IDs to the existing list
-        unique_project_ids.update(additional_projects.values_list("id", flat=True))
-
-    return Response(
-        list(unique_project_ids)[:4],
-        status=status.HTTP_200_OK,
-    )
-
-
-def dashboard_recent_collaborators(self, request, slug):
-    # Fetch all project IDs where the user belongs to
-    user_projects = Project.objects.filter(
-        project_projectmember__member=request.user,
-        project_projectmember__is_active=True,
-        workspace__slug=slug,
-    ).values_list("id", flat=True)
-
-    # Fetch all users who have performed an activity in the projects where the user exists
-    users_with_activities = (
-        IssueActivity.objects.filter(
-            workspace__slug=slug,
-            project_id__in=user_projects,
-        )
-        .values("actor")
-        .exclude(actor=request.user)
-        .annotate(num_activities=Count("actor"))
-        .order_by("-num_activities")
-    )[:7]
-
-    # Get the count of active issues for each user in users_with_activities
-    users_with_active_issues = []
-    for user_activity in users_with_activities:
-        user_id = user_activity["actor"]
-        active_issue_count = Issue.objects.filter(
-            assignees__in=[user_id],
-            state__group__in=["unstarted", "started"],
-        ).count()
-        users_with_active_issues.append(
-            {"user_id": user_id, "active_issue_count": active_issue_count}
-        )
-
-    # Insert the logged-in user's ID and their active issue count at the beginning
-    active_issue_count = Issue.objects.filter(
-        assignees__in=[request.user],
-        state__group__in=["unstarted", "started"],
-    ).count()
-
-    if users_with_activities.count() < 7:
-        # Calculate the additional collaborators needed
-        additional_collaborators_needed = 7 - users_with_activities.count()
-
-        # Fetch additional collaborators from the project_member table
-        additional_collaborators = list(
-            set(
-                ProjectMember.objects.filter(
-                    ~Q(member=request.user),
-                    project_id__in=user_projects,
-                    workspace__slug=slug,
-                )
-                .exclude(
-                    member__in=[
-                        user["actor"] for user in users_with_activities
-                    ]
-                )
-                .values_list("member", flat=True)
-            )
-        )
-
-        additional_collaborators = additional_collaborators[
-            :additional_collaborators_needed
-        ]
-
-        # Append additional collaborators to the list
-        for collaborator_id in additional_collaborators:
-            active_issue_count = Issue.objects.filter(
-                assignees__in=[collaborator_id],
-                state__group__in=["unstarted", "started"],
-            ).count()
-            users_with_active_issues.append(
-                {
-                    "user_id": str(collaborator_id),
-                    "active_issue_count": active_issue_count,
-                }
-            )
-
-    users_with_active_issues.insert(
-        0,
-        {"user_id": request.user.id, "active_issue_count": active_issue_count},
-    )
-
-    return Response(users_with_active_issues, status=status.HTTP_200_OK)
-
-
-class DashboardEndpoint(BaseAPIView):
-    def create(self, request, slug):
-        serializer = DashboardSerializer(data=request.data)
-        if serializer.is_valid():
-            serializer.save()
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    def patch(self, request, slug, pk):
-        serializer = DashboardSerializer(data=request.data, partial=True)
-        if serializer.is_valid():
-            serializer.save()
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    def delete(self, request, slug, pk):
-        serializer = DashboardSerializer(data=request.data, partial=True)
-        if serializer.is_valid():
-            serializer.save()
-            return Response(serializer.data, status=status.HTTP_204_NO_CONTENT)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-    def get(self, request, slug, dashboard_id=None):
-        if not dashboard_id:
-            dashboard_type = request.GET.get("dashboard_type", None)
-            if dashboard_type == "home":
-                dashboard, created = Dashboard.objects.get_or_create(
-                    type_identifier=dashboard_type, owned_by=request.user, is_default=True
-                )
-
-                if created:
-                    widgets_to_fetch = [
-                        "overview_stats",
-                        "assigned_issues",
-                        "created_issues",
-                        "issues_by_state_groups",
-                        "issues_by_priority",
-                        "recent_activity",
-                        "recent_projects",
-                        "recent_collaborators",
-                    ]
-
-                    updated_dashboard_widgets = []
-                    for widget_key in widgets_to_fetch:
-                        widget = Widget.objects.filter(key=widget_key).values_list("id", flat=True)
-                        if widget:
-                            updated_dashboard_widgets.append(
-                                DashboardWidget(
-                                    widget_id=widget,
-                                    dashboard_id=dashboard.id,
-                                )
-                            )
-
-                    DashboardWidget.objects.bulk_create(
-                        updated_dashboard_widgets, batch_size=100
-                    )
-
-                widgets = (
-                    Widget.objects.annotate(
-                        is_visible=Exists(
-                            DashboardWidget.objects.filter(
-                                widget_id=OuterRef("pk"),
-                                dashboard_id=dashboard.id,
-                                is_visible=True,
-                            )
-                        )
-                    )
-                    .annotate(
-                        dashboard_filters=Subquery(
-                            DashboardWidget.objects.filter(
-                                widget_id=OuterRef("pk"),
-                                dashboard_id=dashboard.id,
-                                filters__isnull=False,
-                            )
-                            .exclude(filters={})
-                            .values("filters")[:1]
-                        )
-                    )
-                    .annotate(
-                        widget_filters=Case(
-                            When(
-                                dashboard_filters__isnull=False,
-                                then=F("dashboard_filters"),
-                            ),
-                            default=F("filters"),
-                            output_field=JSONField(),
-                        )
-                    )
-                )
-                return Response(
-                    {
-                        "dashboard": DashboardSerializer(dashboard).data,
-                        "widgets": WidgetSerializer(widgets, many=True).data,
-                    },
-                    status=status.HTTP_200_OK,
-                )
-            return Response(
-                {"error": "Please specify a valid dashboard type"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-        widget_key = request.GET.get("widget_key", "overview_stats")
-
-        WIDGETS_MAPPER = {
-            "overview_stats": dashboard_overview_stats,
-            "assigned_issues": dashboard_assigned_issues,
-            "created_issues": dashboard_created_issues,
-            "issues_by_state_groups": dashboard_issues_by_state_groups,
-            "issues_by_priority": dashboard_issues_by_priority,
-            "recent_activity": dashboard_recent_activity,
-            "recent_projects": dashboard_recent_projects,
-            "recent_collaborators": dashboard_recent_collaborators,
-        }
-
-        func = WIDGETS_MAPPER.get(widget_key)
-        if func is not None:
-            response = func(
-                self,
-                request=request,
-                slug=slug,
-            )
-            if isinstance(response, Response):
-                return response
-
-        return Response(
-            {"error": "Please specify a valid widget key"},
-            status=status.HTTP_400_BAD_REQUEST,
-        )
-
-
-class WidgetsEndpoint(BaseAPIView):
-    def patch(self, request, dashboard_id, widget_id):
-        dashboard_widget = DashboardWidget.objects.filter(
-            widget_id=widget_id,
-            dashboard_id=dashboard_id,
-        ).first()
-        dashboard_widget.is_visible = request.data.get(
-            "is_visible", dashboard_widget.is_visible
-        )
-        dashboard_widget.sort_order = request.data.get(
-            "sort_order", dashboard_widget.sort_order
-        )
-        dashboard_widget.filters = request.data.get(
-            "filters", dashboard_widget.filters
-        )
-        dashboard_widget.save()
-        return Response(
-            {"message": "successfully updated"}, status=status.HTTP_200_OK
-        )
@@ -19,16 +19,16 @@ class ProjectEstimatePointEndpoint(BaseAPIView):
    ]

    def get(self, request, slug, project_id):
-        project = Project.objects.get(workspace__slug=slug, pk=project_id)
-        if project.estimate_id is not None:
-            estimate_points = EstimatePoint.objects.filter(
-                estimate_id=project.estimate_id,
-                project_id=project_id,
-                workspace__slug=slug,
-            )
-            serializer = EstimatePointSerializer(estimate_points, many=True)
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        return Response([], status=status.HTTP_200_OK)
+            project = Project.objects.get(workspace__slug=slug, pk=project_id)
+            if project.estimate_id is not None:
+                estimate_points = EstimatePoint.objects.filter(
+                    estimate_id=project.estimate_id,
+                    project_id=project_id,
+                    workspace__slug=slug,
+                )
+                serializer = EstimatePointSerializer(estimate_points, many=True)
+                return Response(serializer.data, status=status.HTTP_200_OK)
+            return Response([], status=status.HTTP_200_OK)


 class BulkEstimatePointEndpoint(BaseViewSet):
@@ -39,13 +39,9 @@ class BulkEstimatePointEndpoint(BaseViewSet):
    serializer_class = EstimateSerializer

    def list(self, request, slug, project_id):
-        estimates = (
-            Estimate.objects.filter(
-                workspace__slug=slug, project_id=project_id
-            )
-            .prefetch_related("points")
-            .select_related("workspace", "project")
-        )
+        estimates = Estimate.objects.filter(
+            workspace__slug=slug, project_id=project_id
+        ).prefetch_related("points").select_related("workspace", "project")
        serializer = EstimateReadSerializer(estimates, many=True)
        return Response(serializer.data, status=status.HTTP_200_OK)

@@ -58,17 +54,13 @@ class BulkEstimatePointEndpoint(BaseViewSet):

        estimate_points = request.data.get("estimate_points", [])

-        serializer = EstimatePointSerializer(
-            data=request.data.get("estimate_points"), many=True
-        )
-        if not serializer.is_valid():
+        if not len(estimate_points) or len(estimate_points) > 8:
            return Response(
-                serializer.errors, status=status.HTTP_400_BAD_REQUEST
+                {"error": "Estimate points are required"},
+                status=status.HTTP_400_BAD_REQUEST,
            )

-        estimate_serializer = EstimateSerializer(
-            data=request.data.get("estimate")
-        )
+        estimate_serializer = EstimateSerializer(data=request.data.get("estimate"))
        if not estimate_serializer.is_valid():
            return Response(
                estimate_serializer.errors, status=status.HTTP_400_BAD_REQUEST
@@ -143,8 +135,7 @@ class BulkEstimatePointEndpoint(BaseViewSet):

        estimate_points = EstimatePoint.objects.filter(
            pk__in=[
-                estimate_point.get("id")
-                for estimate_point in estimate_points_data
+                estimate_point.get("id") for estimate_point in estimate_points_data
            ],
            workspace__slug=slug,
            project_id=project_id,
@@ -166,14 +157,10 @@ class BulkEstimatePointEndpoint(BaseViewSet):
                updated_estimate_points.append(estimate_point)

        EstimatePoint.objects.bulk_update(
-            updated_estimate_points,
-            ["value"],
-            batch_size=10,
+            updated_estimate_points, ["value"], batch_size=10,
        )

-        estimate_point_serializer = EstimatePointSerializer(
-            estimate_points, many=True
-        )
+        estimate_point_serializer = EstimatePointSerializer(estimate_points, many=True)
        return Response(
            {
                "estimate": estimate_serializer.data,
@@ -21,11 +21,11 @@ class ExportIssuesEndpoint(BaseAPIView):
    def post(self, request, slug):
        # Get the workspace
        workspace = Workspace.objects.get(slug=slug)
-
+        
        provider = request.data.get("provider", False)
        multiple = request.data.get("multiple", False)
        project_ids = request.data.get("project", [])
-
+        
        if provider in ["csv", "xlsx", "json"]:
            if not project_ids:
                project_ids = Project.objects.filter(
@@ -63,11 +63,9 @@ class ExportIssuesEndpoint(BaseAPIView):
    def get(self, request, slug):
        exporter_history = ExporterHistory.objects.filter(
            workspace__slug=slug
-        ).select_related("workspace", "initiated_by")
+        ).select_related("workspace","initiated_by")

-        if request.GET.get("per_page", False) and request.GET.get(
-            "cursor", False
-        ):
+        if request.GET.get("per_page", False) and request.GET.get("cursor", False):
            return self.paginate(
                request=request,
                queryset=exporter_history,
@@ -14,10 +14,7 @@ from django.conf import settings
 from .base import BaseAPIView
 from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import Workspace, Project
-from plane.app.serializers import (
-    ProjectLiteSerializer,
-    WorkspaceLiteSerializer,
-)
+from plane.app.serializers import ProjectLiteSerializer, WorkspaceLiteSerializer
 from plane.utils.integrations.github import get_release_notes
 from plane.license.utils.instance_value import get_configuration_value

@@ -54,8 +51,7 @@ class GPTIntegrationEndpoint(BaseAPIView):

        if not task:
            return Response(
-                {"error": "Task is required"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Task is required"}, status=status.HTTP_400_BAD_REQUEST
            )

        final_text = task + "\n" + prompt
@@ -93,7 +89,7 @@ class ReleaseNotesEndpoint(BaseAPIView):

 class UnsplashEndpoint(BaseAPIView):
    def get(self, request):
-        (UNSPLASH_ACCESS_KEY,) = get_configuration_value(
+        UNSPLASH_ACCESS_KEY, = get_configuration_value(
            [
                {
                    "key": "UNSPLASH_ACCESS_KEY",
@@ -35,16 +35,14 @@ from plane.app.serializers import (
    ModuleSerializer,
 )
 from plane.utils.integrations.github import get_github_repo_details
-from plane.utils.importers.jira import (
-    jira_project_issue_summary,
-    is_allowed_hostname,
-)
+from plane.utils.importers.jira import jira_project_issue_summary
 from plane.bgtasks.importer_task import service_importer
 from plane.utils.html_processor import strip_tags
 from plane.app.permissions import WorkSpaceAdminPermission


 class ServiceIssueImportSummaryEndpoint(BaseAPIView):
+
    def get(self, request, slug, service):
        if service == "github":
            owner = request.GET.get("owner", False)
@@ -96,8 +94,7 @@ class ServiceIssueImportSummaryEndpoint(BaseAPIView):
            for key, error_message in params.items():
                if not request.GET.get(key, False):
                    return Response(
-                        {"error": error_message},
-                        status=status.HTTP_400_BAD_REQUEST,
+                        {"error": error_message}, status=status.HTTP_400_BAD_REQUEST
                    )

            project_key = request.GET.get("project_key", "")
@@ -125,7 +122,6 @@ class ImportServiceEndpoint(BaseAPIView):
    permission_classes = [
        WorkSpaceAdminPermission,
    ]
-
    def post(self, request, slug, service):
        project_id = request.data.get("project_id", False)

@@ -178,21 +174,6 @@ class ImportServiceEndpoint(BaseAPIView):
            data = request.data.get("data", False)
            metadata = request.data.get("metadata", False)
            config = request.data.get("config", False)
-
-            cloud_hostname = metadata.get("cloud_hostname", False)
-
-            if not cloud_hostname:
-                return Response(
-                    {"error": "Cloud hostname is required"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
-            if not is_allowed_hostname(cloud_hostname):
-                return Response(
-                    {"error": "Hostname is not a valid hostname."},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
            if not data or not metadata:
                return Response(
                    {"error": "Data, config and metadata are required"},
@@ -263,9 +244,7 @@ class ImportServiceEndpoint(BaseAPIView):
        importer = Importer.objects.get(
            pk=pk, service=service, workspace__slug=slug
        )
-        serializer = ImporterSerializer(
-            importer, data=request.data, partial=True
-        )
+        serializer = ImporterSerializer(importer, data=request.data, partial=True)
        if serializer.is_valid():
            serializer.save()
            return Response(serializer.data, status=status.HTTP_200_OK)
@@ -301,9 +280,9 @@ class BulkImportIssuesEndpoint(BaseAPIView):
            ).first()

        # Get the maximum sequence_id
-        last_id = IssueSequence.objects.filter(
-            project_id=project_id
-        ).aggregate(largest=Max("sequence"))["largest"]
+        last_id = IssueSequence.objects.filter(project_id=project_id).aggregate(
+            largest=Max("sequence")
+        )["largest"]

        last_id = 1 if last_id is None else last_id + 1

@@ -336,9 +315,7 @@ class BulkImportIssuesEndpoint(BaseAPIView):
                    if issue_data.get("state", False)
                    else default_state.id,
                    name=issue_data.get("name", "Issue Created through Bulk"),
-                    description_html=issue_data.get(
-                        "description_html", "<p></p>"
-                    ),
+                    description_html=issue_data.get("description_html", "<p></p>"),
                    description_stripped=(
                        None
                        if (
@@ -450,21 +427,15 @@ class BulkImportIssuesEndpoint(BaseAPIView):
                for comment in comments_list
            ]

-        _ = IssueComment.objects.bulk_create(
-            bulk_issue_comments, batch_size=100
-        )
+        _ = IssueComment.objects.bulk_create(bulk_issue_comments, batch_size=100)

        # Attach Links
        _ = IssueLink.objects.bulk_create(
            [
                IssueLink(
                    issue=issue,
-                    url=issue_data.get("link", {}).get(
-                        "url", "https://github.com"
-                    ),
-                    title=issue_data.get("link", {}).get(
-                        "title", "Original Issue"
-                    ),
+                    url=issue_data.get("link", {}).get("url", "https://github.com"),
+                    title=issue_data.get("link", {}).get("title", "Original Issue"),
                    project_id=project_id,
                    workspace_id=project.workspace_id,
                    created_by=request.user,
@@ -501,9 +472,7 @@ class BulkImportModulesEndpoint(BaseAPIView):
            ignore_conflicts=True,
        )

-        modules = Module.objects.filter(
-            id__in=[module.id for module in modules]
-        )
+        modules = Module.objects.filter(id__in=[module.id for module in modules])

        if len(modules) == len(modules_data):
            _ = ModuleLink.objects.bulk_create(
@@ -551,8 +520,6 @@ class BulkImportModulesEndpoint(BaseAPIView):

        else:
            return Response(
-                {
-                    "message": "Modules created but issues could not be imported"
-                },
+                {"message": "Modules created but issues could not be imported"},
                status=status.HTTP_200_OK,
            )
@@ -62,9 +62,7 @@ class InboxViewSet(BaseViewSet):
        serializer.save(project_id=self.kwargs.get("project_id"))

    def destroy(self, request, slug, project_id, pk):
-        inbox = Inbox.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
+        inbox = Inbox.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
        # Handle default inbox delete
        if inbox.is_default:
            return Response(
@@ -92,8 +90,7 @@ class InboxIssueViewSet(BaseViewSet):
            super()
            .get_queryset()
            .filter(
-                Q(snoozed_till__gte=timezone.now())
-                | Q(snoozed_till__isnull=True),
+                Q(snoozed_till__gte=timezone.now()) | Q(snoozed_till__isnull=True),
                workspace__slug=self.kwargs.get("slug"),
                project_id=self.kwargs.get("project_id"),
                inbox_id=self.kwargs.get("inbox_id"),
@@ -110,13 +107,12 @@ class InboxIssueViewSet(BaseViewSet):
                project_id=project_id,
            )
            .filter(**filters)
+            .annotate(bridge_id=F("issue_inbox__id"))
            .select_related("workspace", "project", "state", "parent")
            .prefetch_related("assignees", "labels")
            .order_by("issue_inbox__snoozed_till", "issue_inbox__status")
            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -128,9 +124,7 @@ class InboxIssueViewSet(BaseViewSet):
                .values("count")
            )
            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
+                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -153,8 +147,7 @@ class InboxIssueViewSet(BaseViewSet):
    def create(self, request, slug, project_id, inbox_id):
        if not request.data.get("issue", {}).get("name", False):
            return Response(
-                {"error": "Name is required"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Name is required"}, status=status.HTTP_400_BAD_REQUEST
            )

        # Check for valid priority
@@ -166,8 +159,7 @@ class InboxIssueViewSet(BaseViewSet):
            "none",
        ]:
            return Response(
-                {"error": "Invalid priority"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Invalid priority"}, status=status.HTTP_400_BAD_REQUEST
            )

        # Create or get state
@@ -212,12 +204,9 @@ class InboxIssueViewSet(BaseViewSet):
        serializer = IssueStateInboxSerializer(issue)
        return Response(serializer.data, status=status.HTTP_200_OK)

-    def partial_update(self, request, slug, project_id, inbox_id, issue_id):
+    def partial_update(self, request, slug, project_id, inbox_id, pk):
        inbox_issue = InboxIssue.objects.get(
-            issue_id=issue_id,
-            workspace__slug=slug,
-            project_id=project_id,
-            inbox_id=inbox_id,
+            pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
        )
        # Get the project member
        project_member = ProjectMember.objects.get(
@@ -240,9 +229,7 @@ class InboxIssueViewSet(BaseViewSet):

        if bool(issue_data):
            issue = Issue.objects.get(
-                pk=inbox_issue.issue_id,
-                workspace__slug=slug,
-                project_id=project_id,
+                pk=inbox_issue.issue_id, workspace__slug=slug, project_id=project_id
            )
            # Only allow guests and viewers to edit name and description
            if project_member.role <= 10:
@@ -252,9 +239,7 @@ class InboxIssueViewSet(BaseViewSet):
                    "description_html": issue_data.get(
                        "description_html", issue.description_html
                    ),
-                    "description": issue_data.get(
-                        "description", issue.description
-                    ),
+                    "description": issue_data.get("description", issue.description),
                }

            issue_serializer = IssueCreateSerializer(
@@ -300,9 +285,7 @@ class InboxIssueViewSet(BaseViewSet):
                        project_id=project_id,
                    )
                    state = State.objects.filter(
-                        group="cancelled",
-                        workspace__slug=slug,
-                        project_id=project_id,
+                        group="cancelled", workspace__slug=slug, project_id=project_id
                    ).first()
                    if state is not None:
                        issue.state = state
@@ -320,37 +303,32 @@ class InboxIssueViewSet(BaseViewSet):
                    if issue.state.name == "Triage":
                        # Move to default state
                        state = State.objects.filter(
-                            workspace__slug=slug,
-                            project_id=project_id,
-                            default=True,
+                            workspace__slug=slug, project_id=project_id, default=True
                        ).first()
                        if state is not None:
                            issue.state = state
                            issue.save()

                return Response(serializer.data, status=status.HTTP_200_OK)
-            return Response(
-                serializer.errors, status=status.HTTP_400_BAD_REQUEST
-            )
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
        else:
            return Response(
-                InboxIssueSerializer(inbox_issue).data,
-                status=status.HTTP_200_OK,
+                InboxIssueSerializer(inbox_issue).data, status=status.HTTP_200_OK
            )

-    def retrieve(self, request, slug, project_id, inbox_id, issue_id):
+    def retrieve(self, request, slug, project_id, inbox_id, pk):
+        inbox_issue = InboxIssue.objects.get(
+            pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
+        )
        issue = Issue.objects.get(
-            pk=issue_id, workspace__slug=slug, project_id=project_id
+            pk=inbox_issue.issue_id, workspace__slug=slug, project_id=project_id
        )
        serializer = IssueStateInboxSerializer(issue)
        return Response(serializer.data, status=status.HTTP_200_OK)

-    def destroy(self, request, slug, project_id, inbox_id, issue_id):
+    def destroy(self, request, slug, project_id, inbox_id, pk):
        inbox_issue = InboxIssue.objects.get(
-            issue_id=issue_id,
-            workspace__slug=slug,
-            project_id=project_id,
-            inbox_id=inbox_id,
+            pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
        )
        # Get the project member
        project_member = ProjectMember.objects.get(
@@ -372,8 +350,9 @@ class InboxIssueViewSet(BaseViewSet):
        if inbox_issue.status in [-2, -1, 0, 2]:
            # Delete the issue also
            Issue.objects.filter(
-                workspace__slug=slug, project_id=project_id, pk=issue_id
+                workspace__slug=slug, project_id=project_id, pk=inbox_issue.issue_id
            ).delete()

        inbox_issue.delete()
        return Response(status=status.HTTP_204_NO_CONTENT)
+
@@ -1,7 +1,6 @@
 # Python improts
 import uuid
 import requests
-
 # Django imports
 from django.contrib.auth.hashers import make_password

@@ -20,10 +19,7 @@ from plane.db.models import (
    WorkspaceMember,
    APIToken,
 )
-from plane.app.serializers import (
-    IntegrationSerializer,
-    WorkspaceIntegrationSerializer,
-)
+from plane.app.serializers import IntegrationSerializer, WorkspaceIntegrationSerializer
 from plane.utils.integrations.github import (
    get_github_metadata,
    delete_github_installation,
@@ -31,7 +27,6 @@ from plane.utils.integrations.github import (
 from plane.app.permissions import WorkSpaceAdminPermission
 from plane.utils.integrations.slack import slack_oauth

-
 class IntegrationViewSet(BaseViewSet):
    serializer_class = IntegrationSerializer
    model = Integration
@@ -106,10 +101,7 @@ class WorkspaceIntegrationViewSet(BaseViewSet):
            code = request.data.get("code", False)

            if not code:
-                return Response(
-                    {"error": "Code is required"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
+                return Response({"error": "Code is required"}, status=status.HTTP_400_BAD_REQUEST)

            slack_response = slack_oauth(code=code)

@@ -118,9 +110,7 @@ class WorkspaceIntegrationViewSet(BaseViewSet):
            team_id = metadata.get("team", {}).get("id", False)
            if not metadata or not access_token or not team_id:
                return Response(
-                    {
-                        "error": "Slack could not be installed. Please try again later"
-                    },
+                    {"error": "Slack could not be installed. Please try again later"},
                    status=status.HTTP_400_BAD_REQUEST,
                )
            config = {"team_id": team_id, "access_token": access_token}
@@ -21,10 +21,7 @@ from plane.app.serializers import (
    GithubCommentSyncSerializer,
 )
 from plane.utils.integrations.github import get_github_repos
-from plane.app.permissions import (
-    ProjectBasePermission,
-    ProjectEntityPermission,
-)
+from plane.app.permissions import ProjectBasePermission, ProjectEntityPermission


 class GithubRepositoriesEndpoint(BaseAPIView):
@@ -188,10 +185,11 @@ class BulkCreateGithubIssueSyncEndpoint(BaseAPIView):


 class GithubCommentSyncViewSet(BaseViewSet):
+
    permission_classes = [
        ProjectEntityPermission,
    ]
-
+    
    serializer_class = GithubCommentSyncSerializer
    model = GithubCommentSync

@@ -8,16 +8,9 @@ from sentry_sdk import capture_exception

 # Module imports
 from plane.app.views import BaseViewSet, BaseAPIView
-from plane.db.models import (
-    SlackProjectSync,
-    WorkspaceIntegration,
-    ProjectMember,
-)
+from plane.db.models import SlackProjectSync, WorkspaceIntegration, ProjectMember
 from plane.app.serializers import SlackProjectSyncSerializer
-from plane.app.permissions import (
-    ProjectBasePermission,
-    ProjectEntityPermission,
-)
+from plane.app.permissions import ProjectBasePermission, ProjectEntityPermission
 from plane.utils.integrations.slack import slack_oauth


@@ -45,8 +38,7 @@ class SlackProjectSyncViewSet(BaseViewSet):

            if not code:
                return Response(
-                    {"error": "Code is required"},
-                    status=status.HTTP_400_BAD_REQUEST,
+                    {"error": "Code is required"}, status=status.HTTP_400_BAD_REQUEST
                )

            slack_response = slack_oauth(code=code)
@@ -62,9 +54,7 @@ class SlackProjectSyncViewSet(BaseViewSet):
                access_token=slack_response.get("access_token"),
                scopes=slack_response.get("scope"),
                bot_user_id=slack_response.get("bot_user_id"),
-                webhook_url=slack_response.get("incoming_webhook", {}).get(
-                    "url"
-                ),
+                webhook_url=slack_response.get("incoming_webhook", {}).get("url"),
                data=slack_response,
                team_id=slack_response.get("team", {}).get("id"),
                team_name=slack_response.get("team", {}).get("name"),
@@ -72,9 +62,7 @@ class SlackProjectSyncViewSet(BaseViewSet):
                project_id=project_id,
            )
            _ = ProjectMember.objects.get_or_create(
-                member=workspace_integration.actor,
-                role=20,
-                project_id=project_id,
+                member=workspace_integration.actor, role=20, project_id=project_id
            )
            serializer = SlackProjectSyncSerializer(slack_project_sync)
            return Response(serializer.data, status=status.HTTP_200_OK)
@@ -86,8 +74,6 @@ class SlackProjectSyncViewSet(BaseViewSet):
                )
            capture_exception(e)
            return Response(
-                {
-                    "error": "Slack could not be installed. Please try again later"
-                },
+                {"error": "Slack could not be installed. Please try again later"},
                status=status.HTTP_400_BAD_REQUEST,
            )
@@ -34,11 +34,11 @@ from rest_framework.parsers import MultiPartParser, FormParser
 # Module imports
 from . import BaseViewSet, BaseAPIView, WebhookMixin
 from plane.app.serializers import (
+    IssueCreateSerializer,
    IssueActivitySerializer,
    IssueCommentSerializer,
    IssuePropertySerializer,
    IssueSerializer,
-    IssueCreateSerializer,
    LabelSerializer,
    IssueFlatSerializer,
    IssueLinkSerializer,
@@ -81,7 +81,7 @@ from plane.db.models import (
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.grouper import group_results
 from plane.utils.issue_filters import issue_filters
-from collections import defaultdict
+

 class IssueViewSet(WebhookMixin, BaseViewSet):
    def get_serializer_class(self):
@@ -109,9 +109,13 @@ class IssueViewSet(WebhookMixin, BaseViewSet):

    def get_queryset(self):
        return (
-            Issue.issue_objects.filter(
-                project_id=self.kwargs.get("project_id")
+            Issue.issue_objects.annotate(
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+                .order_by()
+                .annotate(count=Func(F("id"), function="Count"))
+                .values("count")
            )
+            .filter(project_id=self.kwargs.get("project_id"))
            .filter(workspace__slug=self.kwargs.get("slug"))
            .select_related("project")
            .select_related("workspace")
@@ -125,6 +129,22 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
                    queryset=IssueReaction.objects.select_related("actor"),
                )
            )
+        ).distinct()
+
+    @method_decorator(gzip_page)
+    def list(self, request, slug, project_id):
+        fields = [field for field in request.GET.get("fields", "").split(",") if field]
+        filters = issue_filters(request.query_params, "GET")
+
+        # Custom ordering for priority and state
+        priority_order = ["urgent", "high", "medium", "low", "none"]
+        state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]
+
+        order_by_param = request.GET.get("order_by", "-created_at")
+
+        issue_queryset = (
+            self.get_queryset()
+            .filter(**filters)
            .annotate(cycle_id=F("issue_cycle__cycle_id"))
            .annotate(module_id=F("issue_module__module_id"))
            .annotate(
@@ -134,47 +154,17 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
                .values("count")
            )
            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
+                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
            )
-            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
-                .order_by()
-                .annotate(count=Func(F("id"), function="Count"))
-                .values("count")
-            )
-        ).distinct()
-
-    @method_decorator(gzip_page)
-    def list(self, request, slug, project_id):
-        filters = issue_filters(request.query_params, "GET")
-
-        # Custom ordering for priority and state
-        priority_order = ["urgent", "high", "medium", "low", "none"]
-        state_order = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
-
-        order_by_param = request.GET.get("order_by", "-created_at")
-
-        issue_queryset = self.get_queryset().filter(**filters)
+        )

        # Priority Ordering
        if order_by_param == "priority" or order_by_param == "-priority":
            priority_order = (
-                priority_order
-                if order_by_param == "priority"
-                else priority_order[::-1]
+                priority_order if order_by_param == "priority" else priority_order[::-1]
            )
            issue_queryset = issue_queryset.annotate(
                priority_order=Case(
@@ -222,17 +212,14 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
                    else order_by_param
                )
            ).order_by(
-                "-max_values"
-                if order_by_param.startswith("-")
-                else "max_values"
+                "-max_values" if order_by_param.startswith("-") else "max_values"
            )
        else:
            issue_queryset = issue_queryset.order_by(order_by_param)

-        issues = IssueSerializer(
-            issue_queryset, many=True, fields=self.fields, expand=self.expand
-        ).data
-        return Response(issues, status=status.HTTP_200_OK)
+        issues = IssueLiteSerializer(issue_queryset, many=True, fields=fields if fields else None).data
+        issue_dict = {str(issue["id"]): issue for issue in issues}
+        return Response(issue_dict, status=status.HTTP_200_OK)

    def create(self, request, slug, project_id):
        project = Project.objects.get(pk=project_id)
@@ -252,42 +239,32 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
            # Track the issue
            issue_activity.delay(
                type="issue.activity.created",
-                requested_data=json.dumps(
-                    self.request.data, cls=DjangoJSONEncoder
-                ),
+                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()),
            )
-            issue = (
-                self.get_queryset().filter(pk=serializer.data["id"]).first()
-            )
-            serializer = IssueSerializer(issue)
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

    def retrieve(self, request, slug, project_id, pk=None):
-        issue = self.get_queryset().filter(pk=pk).first()
-        return Response(
-            IssueSerializer(
-                issue, fields=self.fields, expand=self.expand
-            ).data,
-            status=status.HTTP_200_OK,
-        )
+        issue = Issue.issue_objects.annotate(
+            sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
+            .order_by()
+            .annotate(count=Func(F("id"), function="Count"))
+            .values("count")
+        ).get(workspace__slug=slug, project_id=project_id, pk=pk)
+        return Response(IssueSerializer(issue).data, status=status.HTTP_200_OK)

    def partial_update(self, request, slug, project_id, pk=None):
-        issue = Issue.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
+        issue = Issue.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
        current_instance = json.dumps(
            IssueSerializer(issue).data, cls=DjangoJSONEncoder
        )
        requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
-        serializer = IssueCreateSerializer(
-            issue, data=request.data, partial=True
-        )
+        serializer = IssueCreateSerializer(issue, data=request.data, partial=True)
        if serializer.is_valid():
            serializer.save()
            issue_activity.delay(
@@ -299,16 +276,11 @@ class IssueViewSet(WebhookMixin, BaseViewSet):
                current_instance=current_instance,
                epoch=int(timezone.now().timestamp()),
            )
-            issue = self.get_queryset().filter(pk=pk).first()
-            return Response(
-                IssueSerializer(issue).data, status=status.HTTP_200_OK
-            )
+            return Response(serializer.data, status=status.HTTP_200_OK)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

    def destroy(self, request, slug, project_id, pk=None):
-        issue = Issue.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
+        issue = Issue.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
        current_instance = json.dumps(
            IssueSerializer(issue).data, cls=DjangoJSONEncoder
        )
@@ -331,13 +303,7 @@ class UserWorkSpaceIssues(BaseAPIView):
        filters = issue_filters(request.query_params, "GET")
        # Custom ordering for priority and state
        priority_order = ["urgent", "high", "medium", "low", "none"]
-        state_order = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
+        state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]

        order_by_param = request.GET.get("order_by", "-created_at")

@@ -351,9 +317,7 @@ class UserWorkSpaceIssues(BaseAPIView):
                workspace__slug=slug,
            )
            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -372,9 +336,7 @@ class UserWorkSpaceIssues(BaseAPIView):
                .values("count")
            )
            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
+                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -391,9 +353,7 @@ class UserWorkSpaceIssues(BaseAPIView):
        # Priority Ordering
        if order_by_param == "priority" or order_by_param == "-priority":
            priority_order = (
-                priority_order
-                if order_by_param == "priority"
-                else priority_order[::-1]
+                priority_order if order_by_param == "priority" else priority_order[::-1]
            )
            issue_queryset = issue_queryset.annotate(
                priority_order=Case(
@@ -441,9 +401,7 @@ class UserWorkSpaceIssues(BaseAPIView):
                    else order_by_param
                )
            ).order_by(
-                "-max_values"
-                if order_by_param.startswith("-")
-                else "max_values"
+                "-max_values" if order_by_param.startswith("-") else "max_values"
            )
        else:
            issue_queryset = issue_queryset.order_by(order_by_param)
@@ -512,9 +470,7 @@ class IssueActivityEndpoint(BaseAPIView):
                )
            )
        )
-        issue_activities = IssueActivitySerializer(
-            issue_activities, many=True
-        ).data
+        issue_activities = IssueActivitySerializer(issue_activities, many=True).data
        issue_comments = IssueCommentSerializer(issue_comments, many=True).data

        result_list = sorted(
@@ -572,9 +528,7 @@ class IssueCommentViewSet(WebhookMixin, BaseViewSet):
            )
            issue_activity.delay(
                type="comment.activity.created",
-                requested_data=json.dumps(
-                    serializer.data, cls=DjangoJSONEncoder
-                ),
+                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")),
@@ -586,10 +540,7 @@ class IssueCommentViewSet(WebhookMixin, BaseViewSet):

    def partial_update(self, request, slug, project_id, issue_id, pk):
        issue_comment = IssueComment.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            issue_id=issue_id,
-            pk=pk,
+            workspace__slug=slug, project_id=project_id, issue_id=issue_id, pk=pk
        )
        requested_data = json.dumps(self.request.data, cls=DjangoJSONEncoder)
        current_instance = json.dumps(
@@ -615,10 +566,7 @@ class IssueCommentViewSet(WebhookMixin, BaseViewSet):

    def destroy(self, request, slug, project_id, issue_id, pk):
        issue_comment = IssueComment.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            issue_id=issue_id,
-            pk=pk,
+            workspace__slug=slug, project_id=project_id, issue_id=issue_id, pk=pk
        )
        current_instance = json.dumps(
            IssueCommentSerializer(issue_comment).data,
@@ -642,21 +590,16 @@ class IssueUserDisplayPropertyEndpoint(BaseAPIView):
        ProjectLitePermission,
    ]

-    def patch(self, request, slug, project_id):
-        issue_property = IssueProperty.objects.get(
+    def post(self, request, slug, project_id):
+        issue_property, created = IssueProperty.objects.get_or_create(
            user=request.user,
            project_id=project_id,
        )

-        issue_property.filters = request.data.get(
-            "filters", issue_property.filters
-        )
-        issue_property.display_filters = request.data.get(
-            "display_filters", issue_property.display_filters
-        )
-        issue_property.display_properties = request.data.get(
-            "display_properties", issue_property.display_properties
-        )
+        if not created:
+            issue_property.properties = request.data.get("properties", {})
+            issue_property.save()
+        issue_property.properties = request.data.get("properties", {})
        issue_property.save()
        serializer = IssuePropertySerializer(issue_property)
        return Response(serializer.data, status=status.HTTP_201_CREATED)
@@ -681,17 +624,11 @@ class LabelViewSet(BaseViewSet):
            serializer = LabelSerializer(data=request.data)
            if serializer.is_valid():
                serializer.save(project_id=project_id)
-                return Response(
-                    serializer.data, status=status.HTTP_201_CREATED
-                )
-            return Response(
-                serializer.errors, status=status.HTTP_400_BAD_REQUEST
-            )
+                return Response(serializer.data, status=status.HTTP_201_CREATED)
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
        except IntegrityError:
            return Response(
-                {
-                    "error": "Label with the same name already exists in the project"
-                },
+                {"error": "Label with the same name already exists in the project"},
                status=status.HTTP_400_BAD_REQUEST,
            )

@@ -746,9 +683,7 @@ class SubIssuesEndpoint(BaseAPIView):
    @method_decorator(gzip_page)
    def get(self, request, slug, project_id, issue_id):
        sub_issues = (
-            Issue.issue_objects.filter(
-                parent_id=issue_id, workspace__slug=slug
-            )
+            Issue.issue_objects.filter(parent_id=issue_id, workspace__slug=slug)
            .select_related("project")
            .select_related("workspace")
            .select_related("state")
@@ -756,9 +691,7 @@ class SubIssuesEndpoint(BaseAPIView):
            .prefetch_related("assignees")
            .prefetch_related("labels")
            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -770,9 +703,7 @@ class SubIssuesEndpoint(BaseAPIView):
                .values("count")
            )
            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
+                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -783,15 +714,21 @@ class SubIssuesEndpoint(BaseAPIView):
                    queryset=IssueReaction.objects.select_related("actor"),
                )
            )
-            .annotate(state_group=F("state__group"))
        )

-        # create's a dict with state group name with their respective issue id's
-        result = defaultdict(list)
-        for sub_issue in sub_issues:
-            result[sub_issue.state_group].append(str(sub_issue.id))
+        state_distribution = (
+            State.objects.filter(workspace__slug=slug, state_issue__parent_id=issue_id)
+            .annotate(state_group=F("group"))
+            .values("state_group")
+            .annotate(state_count=Count("state_group"))
+            .order_by("state_group")
+        )

-        serializer = IssueSerializer(
+        result = {
+            item["state_group"]: item["state_count"] for item in state_distribution
+        }
+
+        serializer = IssueLiteSerializer(
            sub_issues,
            many=True,
        )
@@ -821,7 +758,7 @@ class SubIssuesEndpoint(BaseAPIView):

        _ = Issue.objects.bulk_update(sub_issues, ["parent"], batch_size=10)

-        updated_sub_issues = Issue.issue_objects.filter(id__in=sub_issue_ids).annotate(state_group=F("state__group"))
+        updated_sub_issues = Issue.issue_objects.filter(id__in=sub_issue_ids)

        # Track the issue
        _ = [
@@ -836,24 +773,11 @@ class SubIssuesEndpoint(BaseAPIView):
            )
            for sub_issue_id in sub_issue_ids
        ]
-    
-        # create's a dict with state group name with their respective issue id's
-        result = defaultdict(list)
-        for sub_issue in updated_sub_issues:
-            result[sub_issue.state_group].append(str(sub_issue.id))

-        serializer = IssueSerializer(
-            updated_sub_issues,
-            many=True,
-        )
        return Response(
-            {
-                "sub_issues": serializer.data,
-                "state_distribution": result,
-            },
+            IssueFlatSerializer(updated_sub_issues, many=True).data,
            status=status.HTTP_200_OK,
        )
-    


 class IssueLinkViewSet(BaseViewSet):
@@ -885,9 +809,7 @@ class IssueLinkViewSet(BaseViewSet):
            )
            issue_activity.delay(
                type="link.activity.created",
-                requested_data=json.dumps(
-                    serializer.data, cls=DjangoJSONEncoder
-                ),
+                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")),
@@ -899,19 +821,14 @@ class IssueLinkViewSet(BaseViewSet):

    def partial_update(self, request, slug, project_id, issue_id, pk):
        issue_link = IssueLink.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            issue_id=issue_id,
-            pk=pk,
+            workspace__slug=slug, project_id=project_id, issue_id=issue_id, pk=pk
        )
        requested_data = json.dumps(request.data, cls=DjangoJSONEncoder)
        current_instance = json.dumps(
            IssueLinkSerializer(issue_link).data,
            cls=DjangoJSONEncoder,
        )
-        serializer = IssueLinkSerializer(
-            issue_link, data=request.data, partial=True
-        )
+        serializer = IssueLinkSerializer(issue_link, data=request.data, partial=True)
        if serializer.is_valid():
            serializer.save()
            issue_activity.delay(
@@ -928,10 +845,7 @@ class IssueLinkViewSet(BaseViewSet):

    def destroy(self, request, slug, project_id, issue_id, pk):
        issue_link = IssueLink.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            issue_id=issue_id,
-            pk=pk,
+            workspace__slug=slug, project_id=project_id, issue_id=issue_id, pk=pk
        )
        current_instance = json.dumps(
            IssueLinkSerializer(issue_link).data,
@@ -1057,23 +971,13 @@ class IssueArchiveViewSet(BaseViewSet):

    @method_decorator(gzip_page)
    def list(self, request, slug, project_id):
-        fields = [
-            field
-            for field in request.GET.get("fields", "").split(",")
-            if field
-        ]
+        fields = [field for field in request.GET.get("fields", "").split(",") if field]
        filters = issue_filters(request.query_params, "GET")
        show_sub_issues = request.GET.get("show_sub_issues", "true")

        # Custom ordering for priority and state
        priority_order = ["urgent", "high", "medium", "low", "none"]
-        state_order = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
+        state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]

        order_by_param = request.GET.get("order_by", "-created_at")

@@ -1089,9 +993,7 @@ class IssueArchiveViewSet(BaseViewSet):
                .values("count")
            )
            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
+                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -1101,9 +1003,7 @@ class IssueArchiveViewSet(BaseViewSet):
        # Priority Ordering
        if order_by_param == "priority" or order_by_param == "-priority":
            priority_order = (
-                priority_order
-                if order_by_param == "priority"
-                else priority_order[::-1]
+                priority_order if order_by_param == "priority" else priority_order[::-1]
            )
            issue_queryset = issue_queryset.annotate(
                priority_order=Case(
@@ -1151,9 +1051,7 @@ class IssueArchiveViewSet(BaseViewSet):
                    else order_by_param
                )
            ).order_by(
-                "-max_values"
-                if order_by_param.startswith("-")
-                else "max_values"
+                "-max_values" if order_by_param.startswith("-") else "max_values"
            )
        else:
            issue_queryset = issue_queryset.order_by(order_by_param)
@@ -1164,10 +1062,9 @@ class IssueArchiveViewSet(BaseViewSet):
            else issue_queryset.filter(parent__isnull=True)
        )

-        issues = IssueSerializer(
-            issue_queryset, many=True, fields=fields if fields else None
-        ).data
-        return Response(issues, status=status.HTTP_200_OK)
+        issues = IssueLiteSerializer(issue_queryset, many=True, fields=fields if fields else None).data
+        issue_dict = {str(issue["id"]): issue for issue in issues}
+        return Response(issue_dict, status=status.HTTP_200_OK)

    def retrieve(self, request, slug, project_id, pk=None):
        issue = Issue.objects.get(
@@ -1241,11 +1138,24 @@ class IssueSubscriberViewSet(BaseViewSet):
        )

    def list(self, request, slug, project_id, issue_id):
-        members = ProjectMember.objects.filter(
-            workspace__slug=slug,
-            project_id=project_id,
-            is_active=True,
-        ).select_related("member")
+        members = (
+            ProjectMember.objects.filter(
+                workspace__slug=slug,
+                project_id=project_id,
+                is_active=True,
+            )
+            .annotate(
+                is_subscribed=Exists(
+                    IssueSubscriber.objects.filter(
+                        workspace__slug=slug,
+                        project_id=project_id,
+                        issue_id=issue_id,
+                        subscriber=OuterRef("member"),
+                    )
+                )
+            )
+            .select_related("member")
+        )
        serializer = ProjectMemberLiteSerializer(members, many=True)
        return Response(serializer.data, status=status.HTTP_200_OK)

@@ -1300,9 +1210,7 @@ class IssueSubscriberViewSet(BaseViewSet):
            workspace__slug=slug,
            project=project_id,
        ).exists()
-        return Response(
-            {"subscribed": issue_subscriber}, status=status.HTTP_200_OK
-        )
+        return Response({"subscribed": issue_subscriber}, status=status.HTTP_200_OK)


 class IssueReactionViewSet(BaseViewSet):
@@ -1457,95 +1365,23 @@ class IssueRelationViewSet(BaseViewSet):
            .distinct()
        )

-    def list(self, request, slug, project_id, issue_id):
-        issue_relations = (
-            IssueRelation.objects.filter(
-                Q(issue_id=issue_id) | Q(related_issue=issue_id)
-            )
-            .filter(workspace__slug=self.kwargs.get("slug"))
-            .select_related("project")
-            .select_related("workspace")
-            .select_related("issue")
-            .order_by("-created_at")
-            .distinct()
-        )
-
-        blocking_issues = issue_relations.filter(
-            relation_type="blocked_by", related_issue_id=issue_id
-        )
-        blocked_by_issues = issue_relations.filter(
-            relation_type="blocked_by", issue_id=issue_id
-        )
-        duplicate_issues = issue_relations.filter(
-            issue_id=issue_id, relation_type="duplicate"
-        )
-        duplicate_issues_related = issue_relations.filter(
-            related_issue_id=issue_id, relation_type="duplicate"
-        )
-        relates_to_issues = issue_relations.filter(
-            issue_id=issue_id, relation_type="relates_to"
-        )
-        relates_to_issues_related = issue_relations.filter(
-            related_issue_id=issue_id, relation_type="relates_to"
-        )
-
-        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
-
-        # 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": 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)
-
    def create(self, request, slug, project_id, issue_id):
-        relation_type = request.data.get("relation_type", None)
-        issues = request.data.get("issues", [])
+        related_list = request.data.get("related_list", [])
+        relation = request.data.get("relation", None)
        project = Project.objects.get(pk=project_id)

        issue_relation = IssueRelation.objects.bulk_create(
            [
                IssueRelation(
-                    issue_id=issue
-                    if relation_type == "blocking"
-                    else issue_id,
-                    related_issue_id=issue_id
-                    if relation_type == "blocking"
-                    else issue,
-                    relation_type="blocked_by"
-                    if relation_type == "blocking"
-                    else relation_type,
+                    issue_id=related_issue["issue"],
+                    related_issue_id=related_issue["related_issue"],
+                    relation_type=related_issue["relation_type"],
                    project_id=project_id,
                    workspace_id=project.workspace_id,
                    created_by=request.user,
                    updated_by=request.user,
                )
-                for issue in issues
+                for related_issue in related_list
            ],
            batch_size=10,
            ignore_conflicts=True,
@@ -1561,7 +1397,7 @@ class IssueRelationViewSet(BaseViewSet):
            epoch=int(timezone.now().timestamp()),
        )

-        if relation_type == "blocking":
+        if relation == "blocking":
            return Response(
                RelatedIssueSerializer(issue_relation, many=True).data,
                status=status.HTTP_201_CREATED,
@@ -1572,24 +1408,10 @@ class IssueRelationViewSet(BaseViewSet):
                status=status.HTTP_201_CREATED,
            )

-    def remove_relation(self, request, slug, project_id, issue_id):
-        relation_type = request.data.get("relation_type", None)
-        related_issue = request.data.get("related_issue", None)
-
-        if relation_type == "blocking":
-            issue_relation = IssueRelation.objects.get(
-                workspace__slug=slug,
-                project_id=project_id,
-                issue_id=related_issue,
-                related_issue_id=issue_id,
-            )
-        else:
-            issue_relation = IssueRelation.objects.get(
-                workspace__slug=slug,
-                project_id=project_id,
-                issue_id=issue_id,
-                related_issue_id=related_issue,
-            )
+    def destroy(self, request, slug, project_id, issue_id, pk):
+        issue_relation = IssueRelation.objects.get(
+            workspace__slug=slug, project_id=project_id, issue_id=issue_id, pk=pk
+        )
        current_instance = json.dumps(
            IssueRelationSerializer(issue_relation).data,
            cls=DjangoJSONEncoder,
@@ -1597,7 +1419,7 @@ class IssueRelationViewSet(BaseViewSet):
        issue_relation.delete()
        issue_activity.delay(
            type="issue_relation.activity.deleted",
-            requested_data=json.dumps(request.data, cls=DjangoJSONEncoder),
+            requested_data=json.dumps({"related_list": None}),
            actor_id=str(request.user.id),
            issue_id=str(issue_id),
            project_id=str(project_id),
@@ -1617,9 +1439,7 @@ class IssueDraftViewSet(BaseViewSet):
    def get_queryset(self):
        return (
            Issue.objects.annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -1644,21 +1464,11 @@ class IssueDraftViewSet(BaseViewSet):
    @method_decorator(gzip_page)
    def list(self, request, slug, project_id):
        filters = issue_filters(request.query_params, "GET")
-        fields = [
-            field
-            for field in request.GET.get("fields", "").split(",")
-            if field
-        ]
+        fields = [field for field in request.GET.get("fields", "").split(",") if field]

        # Custom ordering for priority and state
        priority_order = ["urgent", "high", "medium", "low", "none"]
-        state_order = [
-            "backlog",
-            "unstarted",
-            "started",
-            "completed",
-            "cancelled",
-        ]
+        state_order = ["backlog", "unstarted", "started", "completed", "cancelled"]

        order_by_param = request.GET.get("order_by", "-created_at")

@@ -1674,9 +1484,7 @@ class IssueDraftViewSet(BaseViewSet):
                .values("count")
            )
            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
+                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -1686,9 +1494,7 @@ class IssueDraftViewSet(BaseViewSet):
        # Priority Ordering
        if order_by_param == "priority" or order_by_param == "-priority":
            priority_order = (
-                priority_order
-                if order_by_param == "priority"
-                else priority_order[::-1]
+                priority_order if order_by_param == "priority" else priority_order[::-1]
            )
            issue_queryset = issue_queryset.annotate(
                priority_order=Case(
@@ -1736,17 +1542,14 @@ class IssueDraftViewSet(BaseViewSet):
                    else order_by_param
                )
            ).order_by(
-                "-max_values"
-                if order_by_param.startswith("-")
-                else "max_values"
+                "-max_values" if order_by_param.startswith("-") else "max_values"
            )
        else:
            issue_queryset = issue_queryset.order_by(order_by_param)

-        issues = IssueSerializer(
-            issue_queryset, many=True, fields=fields if fields else None
-        ).data
-        return Response(issues, status=status.HTTP_200_OK)
+        issues = IssueLiteSerializer(issue_queryset, many=True, fields=fields if fields else None).data
+        issue_dict = {str(issue["id"]): issue for issue in issues}
+        return Response(issue_dict, status=status.HTTP_200_OK)

    def create(self, request, slug, project_id):
        project = Project.objects.get(pk=project_id)
@@ -1766,9 +1569,7 @@ class IssueDraftViewSet(BaseViewSet):
            # Track the issue
            issue_activity.delay(
                type="issue_draft.activity.created",
-                requested_data=json.dumps(
-                    self.request.data, cls=DjangoJSONEncoder
-                ),
+                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),
@@ -1779,18 +1580,14 @@ class IssueDraftViewSet(BaseViewSet):
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

    def partial_update(self, request, slug, project_id, pk):
-        issue = Issue.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
+        issue = Issue.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
        serializer = IssueSerializer(issue, data=request.data, partial=True)

        if serializer.is_valid():
-            if request.data.get(
+            if request.data.get("is_draft") is not None and not request.data.get(
                "is_draft"
-            ) is not None and not request.data.get("is_draft"):
-                serializer.save(
-                    created_at=timezone.now(), updated_at=timezone.now()
-                )
+            ):
+                serializer.save(created_at=timezone.now(), updated_at=timezone.now())
            else:
                serializer.save()
            issue_activity.delay(
@@ -1815,9 +1612,7 @@ class IssueDraftViewSet(BaseViewSet):
        return Response(IssueSerializer(issue).data, status=status.HTTP_200_OK)

    def destroy(self, request, slug, project_id, pk=None):
-        issue = Issue.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=pk
-        )
+        issue = Issue.objects.get(workspace__slug=slug, project_id=project_id, pk=pk)
        current_instance = json.dumps(
            IssueSerializer(issue).data, cls=DjangoJSONEncoder
        )
@@ -1831,4 +1626,4 @@ class IssueDraftViewSet(BaseViewSet):
            current_instance=current_instance,
            epoch=int(timezone.now().timestamp()),
        )
-        return Response(status=status.HTTP_204_NO_CONTENT)
+        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -20,13 +20,9 @@ from plane.app.serializers import (
    ModuleIssueSerializer,
    ModuleLinkSerializer,
    ModuleFavoriteSerializer,
-    IssueSerializer,
-    ModuleUserPropertiesSerializer,
-)
-from plane.app.permissions import (
-    ProjectEntityPermission,
-    ProjectLitePermission,
+    IssueStateSerializer,
 )
+from plane.app.permissions import ProjectEntityPermission
 from plane.db.models import (
    Module,
    ModuleIssue,
@@ -36,8 +32,6 @@ from plane.db.models import (
    ModuleFavorite,
    IssueLink,
    IssueAttachment,
-    IssueSubscriber,
-    ModuleUserProperties,
 )
 from plane.bgtasks.issue_activites_task import issue_activity
 from plane.utils.grouper import group_results
@@ -60,6 +54,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
        )

    def get_queryset(self):
+
        subquery = ModuleFavorite.objects.filter(
            user=self.request.user,
            module_id=OuterRef("pk"),
@@ -79,9 +74,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
            .prefetch_related(
                Prefetch(
                    "link_module",
-                    queryset=ModuleLink.objects.select_related(
-                        "module", "created_by"
-                    ),
+                    queryset=ModuleLink.objects.select_related("module", "created_by"),
                )
            )
            .annotate(
@@ -143,7 +136,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
                    ),
                )
            )
-            .order_by("-is_favorite", "-created_at")
+            .order_by("-is_favorite","-created_at")
        )

    def create(self, request, slug, project_id):
@@ -160,18 +153,6 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
            return Response(serializer.data, status=status.HTTP_201_CREATED)
        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)

-    def list(self, request, slug, project_id):
-        queryset = self.get_queryset()
-        fields = [
-            field
-            for field in request.GET.get("fields", "").split(",")
-            if field
-        ]
-        modules = ModuleSerializer(
-            queryset, many=True, fields=fields if fields else None
-        ).data
-        return Response(modules, status=status.HTTP_200_OK)
-
    def retrieve(self, request, slug, project_id, pk):
        queryset = self.get_queryset().get(pk=pk)

@@ -186,13 +167,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
            .annotate(assignee_id=F("assignees__id"))
            .annotate(display_name=F("assignees__display_name"))
            .annotate(avatar=F("assignees__avatar"))
-            .values(
-                "first_name",
-                "last_name",
-                "assignee_id",
-                "avatar",
-                "display_name",
-            )
+            .values("first_name", "last_name", "assignee_id", "avatar", "display_name")
            .annotate(
                total_issues=Count(
                    "assignee_id",
@@ -276,10 +251,7 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):

        if queryset.start_date and queryset.target_date:
            data["distribution"]["completion_chart"] = burndown_plot(
-                queryset=queryset,
-                slug=slug,
-                project_id=project_id,
-                module_id=pk,
+                queryset=queryset, slug=slug, project_id=project_id, module_id=pk
            )

        return Response(
@@ -288,13 +260,9 @@ class ModuleViewSet(WebhookMixin, BaseViewSet):
        )

    def destroy(self, request, slug, project_id, pk):
-        module = Module.objects.get(
-            workspace__slug=slug, project_id=project_id, pk=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
-            )
+            ModuleIssue.objects.filter(module_id=pk).values_list("issue", flat=True)
        )
        issue_activity.delay(
            type="module.activity.deleted",
@@ -321,6 +289,7 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
    webhook_event = "module_issue"
    bulk = True

+
    filterset_fields = [
        "issue__labels__id",
        "issue__assignees__id",
@@ -335,9 +304,7 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
            super()
            .get_queryset()
            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("issue")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("issue"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -357,23 +324,18 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):

    @method_decorator(gzip_page)
    def list(self, request, slug, project_id, module_id):
-        fields = [
-            field
-            for field in request.GET.get("fields", "").split(",")
-            if field
-        ]
+        fields = [field for field in request.GET.get("fields", "").split(",") if field]
        order_by = request.GET.get("order_by", "created_at")
        filters = issue_filters(request.query_params, "GET")
        issues = (
            Issue.issue_objects.filter(issue_module__module_id=module_id)
            .annotate(
-                sub_issues_count=Issue.issue_objects.filter(
-                    parent=OuterRef("id")
-                )
+                sub_issues_count=Issue.issue_objects.filter(parent=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
            )
+            .annotate(bridge_id=F("issue_module__id"))
            .filter(project_id=project_id)
            .filter(workspace__slug=slug)
            .select_related("project")
@@ -384,8 +346,6 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
            .prefetch_related("labels")
            .order_by(order_by)
            .filter(**filters)
-            .annotate(cycle_id=F("issue_cycle__cycle_id"))
-            .annotate(module_id=F("issue_module__module_id"))
            .annotate(
                link_count=IssueLink.objects.filter(issue=OuterRef("id"))
                .order_by()
@@ -393,32 +353,21 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
                .values("count")
            )
            .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
+                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
            )
-            .annotate(
-                is_subscribed=Exists(
-                    IssueSubscriber.objects.filter(
-                        subscriber=self.request.user, issue_id=OuterRef("id")
-                    )
-                )
-            )
        )
-        serializer = IssueSerializer(
-            issues, many=True, fields=fields if fields else None
-        )
-        return Response(serializer.data, status=status.HTTP_200_OK)
+        issues = IssueStateSerializer(issues, many=True, fields=fields if fields else None).data
+        issue_dict = {str(issue["id"]): issue for issue in issues}
+        return Response(issue_dict, status=status.HTTP_200_OK)

    def create(self, request, slug, project_id, module_id):
        issues = request.data.get("issues", [])
        if not len(issues):
            return Response(
-                {"error": "Issues are required"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "Issues are required"}, status=status.HTTP_400_BAD_REQUEST
            )
        module = Module.objects.get(
            workspace__slug=slug, project_id=project_id, pk=module_id
@@ -490,32 +439,25 @@ class ModuleIssueViewSet(WebhookMixin, BaseViewSet):
            epoch=int(timezone.now().timestamp()),
        )

-        issues = self.get_queryset().values_list("issue_id", flat=True)
-
        return Response(
-            IssueSerializer(
-                Issue.objects.filter(pk__in=issues), many=True
-            ).data,
+            ModuleIssueSerializer(self.get_queryset(), many=True).data,
            status=status.HTTP_200_OK,
        )

-    def destroy(self, request, slug, project_id, module_id, issue_id):
+    def destroy(self, request, slug, project_id, module_id, pk):
        module_issue = ModuleIssue.objects.get(
-            workspace__slug=slug,
-            project_id=project_id,
-            module_id=module_id,
-            issue_id=issue_id,
+            workspace__slug=slug, project_id=project_id, module_id=module_id, pk=pk
        )
        issue_activity.delay(
            type="module.activity.deleted",
            requested_data=json.dumps(
                {
                    "module_id": str(module_id),
-                    "issues": [str(issue_id)],
+                    "issues": [str(module_issue.issue_id)],
                }
            ),
            actor_id=str(request.user.id),
-            issue_id=str(issue_id),
+            issue_id=str(module_issue.issue_id),
            project_id=str(project_id),
            current_instance=None,
            epoch=int(timezone.now().timestamp()),
@@ -579,42 +521,4 @@ class ModuleFavoriteViewSet(BaseViewSet):
            module_id=module_id,
        )
        module_favorite.delete()
-        return Response(status=status.HTTP_204_NO_CONTENT)
-
-
-class ModuleUserPropertiesEndpoint(BaseAPIView):
-    permission_classes = [
-        ProjectLitePermission,
-    ]
-
-    def patch(self, request, slug, project_id, module_id):
-        module_properties = ModuleUserProperties.objects.get(
-            user=request.user,
-            module_id=module_id,
-            project_id=project_id,
-            workspace__slug=slug,
-        )
-
-        module_properties.filters = request.data.get(
-            "filters", module_properties.filters
-        )
-        module_properties.display_filters = request.data.get(
-            "display_filters", module_properties.display_filters
-        )
-        module_properties.display_properties = request.data.get(
-            "display_properties", module_properties.display_properties
-        )
-        module_properties.save()
-
-        serializer = ModuleUserPropertiesSerializer(module_properties)
-        return Response(serializer.data, status=status.HTTP_201_CREATED)
-
-    def get(self, request, slug, project_id, module_id):
-        module_properties, _ = ModuleUserProperties.objects.get_or_create(
-            user=request.user,
-            project_id=project_id,
-            module_id=module_id,
-            workspace__slug=slug,
-        )
-        serializer = ModuleUserPropertiesSerializer(module_properties)
-        return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response(status=status.HTTP_204_NO_CONTENT)
@@ -51,10 +51,8 @@ class NotificationViewSet(BaseViewSet, BasePaginator):

        # Filters based on query parameters
        snoozed_filters = {
-            "true": Q(snoozed_till__lt=timezone.now())
-            | Q(snoozed_till__isnull=False),
-            "false": Q(snoozed_till__gte=timezone.now())
-            | Q(snoozed_till__isnull=True),
+            "true": Q(snoozed_till__lt=timezone.now()) | Q(snoozed_till__isnull=False),
+            "false": Q(snoozed_till__gte=timezone.now()) | Q(snoozed_till__isnull=True),
        }

        notifications = notifications.filter(snoozed_filters[snoozed])
@@ -74,18 +72,14 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
            issue_ids = IssueSubscriber.objects.filter(
                workspace__slug=slug, subscriber_id=request.user.id
            ).values_list("issue_id", flat=True)
-            notifications = notifications.filter(
-                entity_identifier__in=issue_ids
-            )
+            notifications = notifications.filter(entity_identifier__in=issue_ids)

        # Assigned Issues
        if type == "assigned":
            issue_ids = IssueAssignee.objects.filter(
                workspace__slug=slug, assignee_id=request.user.id
            ).values_list("issue_id", flat=True)
-            notifications = notifications.filter(
-                entity_identifier__in=issue_ids
-            )
+            notifications = notifications.filter(entity_identifier__in=issue_ids)

        # Created issues
        if type == "created":
@@ -100,14 +94,10 @@ class NotificationViewSet(BaseViewSet, BasePaginator):
                issue_ids = Issue.objects.filter(
                    workspace__slug=slug, created_by=request.user
                ).values_list("pk", flat=True)
-                notifications = notifications.filter(
-                    entity_identifier__in=issue_ids
-                )
+                notifications = notifications.filter(entity_identifier__in=issue_ids)

        # Pagination
-        if request.GET.get("per_page", False) and request.GET.get(
-            "cursor", False
-        ):
+        if request.GET.get("per_page", False) and request.GET.get("cursor", False):
            return self.paginate(
                request=request,
                queryset=(notifications),
@@ -237,13 +227,11 @@ class MarkAllReadNotificationViewSet(BaseViewSet):
        # Filter for snoozed notifications
        if snoozed:
            notifications = notifications.filter(
-                Q(snoozed_till__lt=timezone.now())
-                | Q(snoozed_till__isnull=False)
+                Q(snoozed_till__lt=timezone.now()) | Q(snoozed_till__isnull=False)
            )
        else:
            notifications = notifications.filter(
-                Q(snoozed_till__gte=timezone.now())
-                | Q(snoozed_till__isnull=True),
+                Q(snoozed_till__gte=timezone.now()) | Q(snoozed_till__isnull=True),
            )

        # Filter for archived or unarchive
@@ -257,18 +245,14 @@ class MarkAllReadNotificationViewSet(BaseViewSet):
            issue_ids = IssueSubscriber.objects.filter(
                workspace__slug=slug, subscriber_id=request.user.id
            ).values_list("issue_id", flat=True)
-            notifications = notifications.filter(
-                entity_identifier__in=issue_ids
-            )
+            notifications = notifications.filter(entity_identifier__in=issue_ids)

        # Assigned Issues
        if type == "assigned":
            issue_ids = IssueAssignee.objects.filter(
                workspace__slug=slug, assignee_id=request.user.id
            ).values_list("issue_id", flat=True)
-            notifications = notifications.filter(
-                entity_identifier__in=issue_ids
-            )
+            notifications = notifications.filter(entity_identifier__in=issue_ids)

        # Created issues
        if type == "created":
@@ -283,9 +267,7 @@ class MarkAllReadNotificationViewSet(BaseViewSet):
                issue_ids = Issue.objects.filter(
                    workspace__slug=slug, created_by=request.user
                ).values_list("pk", flat=True)
-                notifications = notifications.filter(
-                    entity_identifier__in=issue_ids
-                )
+                notifications = notifications.filter(entity_identifier__in=issue_ids)

        updated_notifications = []
        for notification in notifications:
--- a/Show More
+++ b/Show More