dev: serializer updates for workspace, project, inbox etc.

Merge branch 'develop' of github.com:makeplane/plane into chore/serializers
fix: created dynamic serializer
2023-08-21 14:12:48 +05:30 · 2023-08-18 16:05:42 +05:30 · 2023-08-18 16:04:28 +05:30 · 2023-08-16 17:40:52 +05:30 · 2023-08-16 12:42:34 +05:30
1240 changed files with 15870 additions and 35198 deletions
@@ -1,3 +1,36 @@
+# Frontend
+# Extra image domains that need to be added for Next Image
+NEXT_PUBLIC_EXTRA_IMAGE_DOMAINS=
+# Google Client ID for Google OAuth
+NEXT_PUBLIC_GOOGLE_CLIENTID=""
+# Github ID for Github OAuth
+NEXT_PUBLIC_GITHUB_ID=""
+# Github App Name for GitHub Integration
+NEXT_PUBLIC_GITHUB_APP_NAME=""
+# Sentry DSN for error monitoring
+NEXT_PUBLIC_SENTRY_DSN=""
+# Enable/Disable OAUTH - default 0 for selfhosted instance
+NEXT_PUBLIC_ENABLE_OAUTH=0
+# Enable/Disable sentry
+NEXT_PUBLIC_ENABLE_SENTRY=0
+# Enable/Disable session recording
+NEXT_PUBLIC_ENABLE_SESSION_RECORDER=0
+# Enable/Disable event tracking
+NEXT_PUBLIC_TRACK_EVENTS=0
+# Slack for Slack Integration
+NEXT_PUBLIC_SLACK_CLIENT_ID=""
+# For Telemetry, set it to "app.plane.so"
+NEXT_PUBLIC_PLAUSIBLE_DOMAIN=""
+# public boards deploy url
+NEXT_PUBLIC_DEPLOY_URL=""
+
+# Backend
+# Debug value for api server use it as 0 for production use
+DEBUG=0
+
+# Error logs
+SENTRY_DSN=""
+
 # Database Settings
 PGUSER="plane"
 PGPASSWORD="plane"
@@ -10,6 +43,15 @@ REDIS_HOST="plane-redis"
 REDIS_PORT="6379"
 REDIS_URL="redis://${REDIS_HOST}:6379/"

+# Email Settings
+EMAIL_HOST=""
+EMAIL_HOST_USER=""
+EMAIL_HOST_PASSWORD=""
+EMAIL_PORT=587
+EMAIL_FROM="Team Plane <team@mailer.plane.so>"
+EMAIL_USE_TLS="1"
+EMAIL_USE_SSL="0"
+
 # AWS Settings
 AWS_REGION=""
 AWS_ACCESS_KEY_ID="access-key"
@@ -25,6 +67,9 @@ OPENAI_API_BASE="https://api.openai.com/v1" # change if using a custom endpoint
 OPENAI_API_KEY="sk-" # add your openai key here
 GPT_ENGINE="gpt-3.5-turbo" # use "gpt-4" if you have access

+# Github
+GITHUB_CLIENT_SECRET="" # For fetching release notes
+
 # Settings related to Docker
 DOCKERIZED=1
 # set to 1 If using the pre-configured minio setup
@@ -33,3 +78,10 @@ USE_MINIO=1
 # Nginx Configuration
 NGINX_PORT=80

+# Default Creds
+DEFAULT_EMAIL="captain@plane.so"
+DEFAULT_PASSWORD="password123"
+
+# SignUps
+ENABLE_SIGNUP="1"
+# Auto generated and Required that will be generated from setup.sh
@@ -4,7 +4,7 @@ module.exports = {
  extends: ["custom"],
  settings: {
    next: {
-      rootDir: ["web/", "space/"],
+      rootDir: ["apps/*"],
    },
  },
 };
@@ -1,55 +0,0 @@
-name: Build Pull Request Contents
-
-on: 
-  pull_request:
-    types: ["opened", "synchronize"]
-
-jobs:
-  build-pull-request-contents:
-    name: Build Pull Request Contents
-    runs-on: ubuntu-20.04
-    permissions:
-      pull-requests: read
-
-    steps:
-      - name: Checkout Repository to Actions
-        uses: actions/checkout@v3.3.0
-
-      - name: Setup Node.js 18.x
-        uses: actions/setup-node@v2
-        with:
-          node-version: 18.x
-          cache: 'yarn'
-      
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v38
-        with:
-          files_yaml: |
-            apiserver:
-              - apiserver/**
-            web:
-              - web/**
-            deploy:
-              - space/**
-
-      - name: Setup .npmrc for repository
-        run: |
-            echo -e "@tiptap-pro:registry=https://registry.tiptap.dev/\n//registry.tiptap.dev/:_authToken=${{ secrets.TIPTAP_TOKEN }}" > .npmrc
-
-      - name: Build Plane's Main App
-        if: steps.changed-files.outputs.web_any_changed == 'true'
-        run: |
-          mv ./.npmrc ./web
-          cd web
-          yarn
-          yarn build
-
-      - name: Build Plane's Deploy App
-        if: steps.changed-files.outputs.deploy_any_changed == 'true'
-        run: |
-          cd space
-          yarn 
-          yarn build
-
-
@@ -1,111 +0,0 @@
-name: Update Docker Images for Plane on Release
-
-on:
-  release:
-    types: [released, prereleased]
-
-jobs:
-  build_push_backend:
-    name: Build and Push Api Server Docker Image
-    runs-on: ubuntu-20.04
-
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3.3.0
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.5.0
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2.1.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Setup .npmrc for repository
-        run: |
-            echo -e "@tiptap-pro:registry=https://registry.tiptap.dev/\n//registry.tiptap.dev/:_authToken=${{ secrets.TIPTAP_TOKEN }}" > .npmrc
-
-      - name: Extract metadata (tags, labels) for Docker (Docker Hub) from Github Release
-        id: metaFrontend
-        uses: docker/metadata-action@v4.3.0
-        with:
-          images: ${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend
-          tags: |
-            type=ref,event=tag
-      
-      - name: Extract metadata (tags, labels) for Docker (Docker Hub) from Github Release
-        id: metaBackend
-        uses: docker/metadata-action@v4.3.0
-        with:
-          images: ${{ secrets.DOCKERHUB_USERNAME }}/plane-backend
-          tags: |
-            type=ref,event=tag
-
-      - name: Extract metadata (tags, labels) for Docker (Docker Hub) from Github Release
-        id: metaDeploy
-        uses: docker/metadata-action@v4.3.0
-        with:
-          images: ${{ secrets.DOCKERHUB_USERNAME }}/plane-deploy
-          tags: |
-            type=ref,event=tag
-
-      - name: Extract metadata (tags, labels) for Docker (Docker Hub) from Github Release
-        id: metaProxy
-        uses: docker/metadata-action@v4.3.0
-        with:
-          images: ${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy
-          tags: |
-            type=ref,event=tag
-
-      - name: Build and Push Frontend to Docker Container Registry
-        uses: docker/build-push-action@v4.0.0
-        with:
-          context: .
-          file: ./web/Dockerfile.web
-          platforms: linux/amd64
-          tags: ${{ steps.metaFrontend.outputs.tags }}
-          push: true
-        env:
-          DOCKER_BUILDKIT: 1
-          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKET_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and Push Backend to Docker Hub
-        uses: docker/build-push-action@v4.0.0
-        with:
-          context: ./apiserver
-          file: ./apiserver/Dockerfile.api
-          platforms: linux/amd64
-          push: true
-          tags: ${{ steps.metaBackend.outputs.tags }}
-        env:
-          DOCKER_BUILDKIT: 1
-          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKET_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and Push Plane-Deploy to Docker Hub
-        uses: docker/build-push-action@v4.0.0
-        with:
-          context: .
-          file: ./space/Dockerfile.space
-          platforms: linux/amd64
-          push: true
-          tags: ${{ steps.metaDeploy.outputs.tags }}
-        env:
-          DOCKER_BUILDKIT: 1
-          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKET_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and Push Plane-Proxy to Docker Hub
-        uses: docker/build-push-action@v4.0.0
-        with:
-          context: ./nginx
-          file: ./nginx/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: ${{ steps.metaProxy.outputs.tags }}
-        env:
-          DOCKER_BUILDKIT: 1
-          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKET_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -0,0 +1,77 @@
+name: Build and Push Backend Docker Image
+
+on:
+  push:
+    branches:
+      - 'develop'
+      - 'master'
+    tags:
+      - '*'
+
+jobs:
+  build_push_backend:
+    name: Build and Push Api Server Docker Image
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3.3.0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2.1.0
+        with:
+          platforms: linux/arm64,linux/amd64
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2.5.0
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.1.0
+        with:
+          registry: "ghcr.io"
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2.1.0
+        with:
+          registry: "registry.hub.docker.com"
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker (Docker Hub)
+        id: ghmeta
+        uses: docker/metadata-action@v4.3.0
+        with:
+          images: makeplane/plane-backend
+
+      - name: Extract metadata (tags, labels) for Docker (Github)
+        id: dkrmeta
+        uses: docker/metadata-action@v4.3.0
+        with:
+          images: ghcr.io/${{ github.repository }}-backend
+
+      - name: Build and Push to GitHub Container Registry
+        uses: docker/build-push-action@v4.0.0
+        with:
+          context: ./apiserver
+          file: ./apiserver/Dockerfile.api
+          platforms: linux/arm64,linux/amd64
+          push: true
+          cache-from: type=gha
+          cache-to: type=gha
+          tags: ${{ steps.ghmeta.outputs.tags }}
+          labels: ${{ steps.ghmeta.outputs.labels }}
+
+      - name: Build and Push to Docker Hub
+        uses: docker/build-push-action@v4.0.0
+        with:
+          context: ./apiserver
+          file: ./apiserver/Dockerfile.api
+          platforms: linux/arm64,linux/amd64
+          push: true
+          cache-from: type=gha
+          cache-to: type=gha
+          tags: ${{ steps.dkrmeta.outputs.tags }}
+          labels: ${{ steps.dkrmeta.outputs.labels }}
+
@@ -0,0 +1,77 @@
+name: Build and Push Frontend Docker Image
+
+on:
+  push:
+    branches:
+      - 'develop'
+      - 'master'
+    tags:
+      - '*'
+
+jobs:
+  build_push_frontend:
+    name: Build Frontend Docker Image
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3.3.0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2.1.0
+        with:
+          platforms: linux/arm64,linux/amd64
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2.5.0
+
+      - name: Login to Github Container Registry
+        uses: docker/login-action@v2.1.0
+        with:
+          registry: "ghcr.io"
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2.1.0
+        with:
+          registry: "registry.hub.docker.com"
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      
+      - name: Extract metadata (tags, labels) for Docker (Docker Hub)
+        id: ghmeta
+        uses: docker/metadata-action@v4.3.0
+        with:
+          images: makeplane/plane-frontend
+
+      - name: Extract metadata (tags, labels) for Docker (Github)
+        id: meta
+        uses: docker/metadata-action@v4.3.0
+        with:
+          images: ghcr.io/${{ github.repository }}-frontend
+
+      - name: Build and Push to GitHub Container Registry
+        uses: docker/build-push-action@v4.0.0
+        with:
+          context: .
+          file: ./apps/app/Dockerfile.web
+          platforms: linux/arm64,linux/amd64
+          push: true
+          cache-from: type=gha
+          cache-to: type=gha
+          tags: ${{ steps.ghmeta.outputs.tags }}
+          labels: ${{ steps.ghmeta.outputs.labels }}
+      
+      - name: Build and Push to Docker Container Registry
+        uses: docker/build-push-action@v4.0.0
+        with:
+          context: .
+          file: ./apps/app/Dockerfile.web
+          platforms: linux/arm64,linux/amd64
+          push: true
+          cache-from: type=gha
+          cache-to: type=gha
+          tags: ${{ steps.dkrmeta.outputs.tags }}
+          labels: ${{ steps.dkrmeta.outputs.labels }}
+
@@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
 Examples of behavior that contributes to a positive environment for our
 community include:

- Demonstrating empathy and kindness toward other people
- Being respectful of differing opinions, viewpoints, and experiences
- Giving and gracefully accepting constructive feedback
- Accepting responsibility and apologizing to those affected by our mistakes,
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
  and learning from the experience
- Focusing on what is best not just for us as individuals, but for the
+* Focusing on what is best not just for us as individuals, but for the
  overall community

 Examples of unacceptable behavior include:

- The use of sexualized language or imagery, and sexual attention or
+* The use of sexualized language or imagery, and sexual attention or
  advances of any kind
- Trolling, insulting or derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or email
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
  address, without their explicit permission
- Other conduct which could reasonably be considered inappropriate in a
+* Other conduct which could reasonably be considered inappropriate in a
  professional setting

 ## Enforcement Responsibilities
@@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
 ### 4. Permanent Ban

 **Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
+standards, including sustained inappropriate behavior,  harassment of an
 individual, or aggression toward or disparagement of classes of individuals.

 **Consequence**: A permanent ban from any sort of public interaction within
@@ -125,4 +125,4 @@ enforcement ladder](https://github.com/mozilla/diversity).

 For answers to common questions about this code of conduct, see the FAQ at
 https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.
+https://www.contributor-covenant.org/translations.
@@ -5,11 +5,9 @@ WORKDIR /app
 ENV NEXT_PUBLIC_API_BASE_URL=http://NEXT_PUBLIC_API_BASE_URL_PLACEHOLDER

 RUN yarn global add turbo
-RUN apk add tree
 COPY . .

-RUN turbo prune --scope=app --scope=plane-deploy --docker
-CMD tree -I node_modules/
+RUN turbo prune --scope=app --docker

 # Add lockfile and package.json's of isolated subworkspace
 FROM node:18-alpine AS installer
@@ -23,14 +21,14 @@ COPY --from=builder /app/out/json/ .
 COPY --from=builder /app/out/yarn.lock ./yarn.lock
 RUN yarn install

-# # Build the project
+# Build the project
 COPY --from=builder /app/out/full/ .
 COPY turbo.json turbo.json
 COPY replace-env-vars.sh /usr/local/bin/
 USER root
 RUN chmod +x /usr/local/bin/replace-env-vars.sh

-RUN yarn turbo run build
+RUN yarn turbo run build --filter=app

 ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
@@ -98,16 +96,11 @@ RUN adduser --system --uid 1001 captain

 COPY --from=installer /app/apps/app/next.config.js .
 COPY --from=installer /app/apps/app/package.json .
-COPY --from=installer /app/apps/space/next.config.js .
-COPY --from=installer /app/apps/space/package.json .

 COPY --from=installer --chown=captain:plane /app/apps/app/.next/standalone ./

 COPY --from=installer --chown=captain:plane /app/apps/app/.next/static ./apps/app/.next/static

-COPY --from=installer --chown=captain:plane /app/apps/space/.next/standalone ./
-COPY --from=installer --chown=captain:plane /app/apps/space/.next ./apps/space/.next
-
 ENV NEXT_TELEMETRY_DISABLED 1

 # RUN rm /etc/nginx/conf.d/default.conf
@@ -35,10 +35,12 @@

 Meet [Plane](https://plane.so). An open-source software development tool to manage issues, sprints, and product roadmaps with peace of mind 🧘‍♀️.

+
 > 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/self-hosting).

+
 ## ⚡️ Quick start with Docker Compose

 ### Docker Compose Setup
@@ -54,7 +56,7 @@ chmod +x setup.sh
 - Run setup.sh

 ```bash
-./setup.sh http://localhost
+./setup.sh http://localhost 
 ```

 > If running in a cloud env replace localhost with public facing IP address of the VM
@@ -63,32 +65,31 @@ chmod +x setup.sh

  Visit [Tiptap Pro](https://collab.tiptap.dev/pro-extensions) and signup (it is free).

-  Create a **`.npmrc`** file, copy the following and replace your registry token generated from Tiptap Pro.
+  Create a **`.npmrc`** file, copy the following and replace your registry token generated from Tiptap Pro. 

 ```
@tiptap-pro:registry=https://registry.tiptap.dev/
 //registry.tiptap.dev/:_authToken=YOUR_REGISTRY_TOKEN
 ```
-
 - Run Docker compose up

 ```bash
 docker compose up -d
 ```

-<strong>You can use the default email and password for your first login `captain@plane.so` and `password123`.</strong>
+<strong>You can use the default email and password for your first login `captain@plane.so` and `password123`.</strong> 

 ## 🚀 Features

- **Issue Planning and Tracking**: Quickly create issues and add details using a powerful rich text editor that supports file uploads. Add sub-properties and references to issues for better organization and tracking.
- **Issue Attachments**: Collaborate effectively by attaching files to issues, making it easy for your team to find and share important project-related documents.
- **Layouts**: Customize your project view with your preferred layout - choose from List, Kanban, or Calendar to visualize your project in a way that makes sense to you.
- **Cycles**: Plan sprints with Cycles to keep your team on track and productive. Gain insights into your project's progress with burn-down charts and other useful features.
- **Modules**: Break down your large projects into smaller, more manageable modules. Assign modules between teams to easily track and plan your project's progress.
- **Views**: Create custom filters to display only the issues that matter to you. Save and share your filters in just a few clicks.
- **Pages**: Plane pages function as an AI-powered notepad, allowing you to easily document issues, cycle plans, and module details, and then synchronize them with your issues.
- **Command K**: Enjoy a better user experience with the new Command + K menu. Easily manage and navigate through your projects from one convenient location.
- **GitHub Sync**: Streamline your planning process by syncing your GitHub issues with Plane. Keep all your issues in one place for better tracking and collaboration.
+* **Issue Planning and Tracking**: Quickly create issues and add details using a powerful rich text editor that supports file uploads. Add sub-properties and references to issues for better organization and tracking.
+* **Issue Attachments**: Collaborate effectively by attaching files to issues, making it easy for your team to find and share important project-related documents.
+* **Layouts**: Customize your project view with your preferred layout - choose from List, Kanban, or Calendar to visualize your project in a way that makes sense to you.
+* **Cycles**: Plan sprints with Cycles to keep your team on track and productive. Gain insights into your project's progress with burn-down charts and other useful features.
+* **Modules**: Break down your large projects into smaller, more manageable modules. Assign modules between teams to easily track and plan your project's progress.
+* **Views**: Create custom filters to display only the issues that matter to you. Save and share your filters in just a few clicks.
+* **Pages**: Plane pages function as an AI-powered notepad, allowing you to easily document issues, cycle plans, and module details, and then synchronize them with your issues.
+* **Command K**: Enjoy a better user experience with the new Command + K menu. Easily manage and navigate through your projects from one convenient location.
+* **GitHub Sync**: Streamline your planning process by syncing your GitHub issues with Plane. Keep all your issues in one place for better tracking and collaboration.

 ## 📸 Screenshots

@@ -149,6 +150,7 @@ docker compose up -d
  </p>
 </p>

+
 ## 📚Documentation

 For full documentation, visit [docs.plane.so](https://docs.plane.so/)
@@ -1,60 +0,0 @@
-# Backend
-# Debug value for api server use it as 0 for production use
-DEBUG=0
-
-# Error logs
-SENTRY_DSN=""
-
-# Database Settings
-PGUSER="plane"
-PGPASSWORD="plane"
-PGHOST="plane-db"
-PGDATABASE="plane"
-DATABASE_URL=postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}
-
-# Redis Settings
-REDIS_HOST="plane-redis"
-REDIS_PORT="6379"
-REDIS_URL="redis://${REDIS_HOST}:6379/"
-
-# Email Settings
-EMAIL_HOST=""
-EMAIL_HOST_USER=""
-EMAIL_HOST_PASSWORD=""
-EMAIL_PORT=587
-EMAIL_FROM="Team Plane <team@mailer.plane.so>"
-EMAIL_USE_TLS="1"
-EMAIL_USE_SSL="0"
-
-# AWS Settings
-AWS_REGION=""
-AWS_ACCESS_KEY_ID="access-key"
-AWS_SECRET_ACCESS_KEY="secret-key"
-AWS_S3_ENDPOINT_URL="http://plane-minio:9000"
-# Changing this requires change in the nginx.conf for uploads if using minio setup
-AWS_S3_BUCKET_NAME="uploads"
-# Maximum file upload limit
-FILE_SIZE_LIMIT=5242880
-
-# GPT settings
-OPENAI_API_BASE="https://api.openai.com/v1" # change if using a custom endpoint
-OPENAI_API_KEY="sk-" # add your openai key here
-GPT_ENGINE="gpt-3.5-turbo" # use "gpt-4" if you have access
-
-# Github
-GITHUB_CLIENT_SECRET="" # For fetching release notes
-
-# Settings related to Docker
-DOCKERIZED=1
-# set to 1 If using the pre-configured minio setup
-USE_MINIO=1
-
-# Nginx Configuration
-NGINX_PORT=80
-
-# Default Creds
-DEFAULT_EMAIL="captain@plane.so"
-DEFAULT_PASSWORD="password123"
-
-# SignUps
-ENABLE_SIGNUP="1"
@@ -1,3 +1,3 @@
-web: gunicorn -w 4 -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:$PORT --max-requests 10000 --max-requests-jitter 1000 --access-logfile -
+web: gunicorn -w 4 -k uvicorn.workers.UvicornWorker plane.asgi:application --bind 0.0.0.0:$PORT --config gunicorn.config.py --max-requests 10000 --max-requests-jitter 1000 --access-logfile -
 worker: celery -A plane worker -l info
 beat: celery -A plane beat -l INFO
@@ -1,13 +1,11 @@
 from .base import BaseSerializer
-from .user import UserSerializer, UserLiteSerializer, ChangePasswordSerializer, ResetPasswordSerializer, UserAdminLiteSerializer
+from .user import UserSerializer, ChangePasswordSerializer, ResetPasswordSerializer
 from .workspace import (
    WorkSpaceSerializer,
    WorkSpaceMemberSerializer,
    TeamSerializer,
    WorkSpaceMemberInviteSerializer,
-    WorkspaceLiteSerializer,
    WorkspaceThemeSerializer,
-    WorkspaceMemberAdminSerializer,
 )
 from .project import (
    ProjectSerializer,
@@ -16,13 +14,11 @@ from .project import (
    ProjectMemberInviteSerializer,
    ProjectIdentifierSerializer,
    ProjectFavoriteSerializer,
-    ProjectLiteSerializer,
    ProjectMemberLiteSerializer,
    ProjectDeployBoardSerializer,
    ProjectMemberAdminSerializer,
-    ProjectPublicMemberSerializer
 )
-from .state import StateSerializer, StateLiteSerializer
+from .state import StateSerializer
 from .view import IssueViewSerializer, IssueViewFavoriteSerializer
 from .cycle import CycleSerializer, CycleIssueSerializer, CycleFavoriteSerializer, CycleWriteSerializer
 from .asset import FileAssetSerializer
@@ -31,7 +27,9 @@ from .issue import (
    IssueActivitySerializer,
    IssueCommentSerializer,
    IssuePropertySerializer,
-    IssueAssigneeSerializer,
+    BlockerIssueSerializer,
+    BlockedIssueSerializer,
+    # IssueAssigneeSerializer,
    LabelSerializer,
    IssueSerializer,
    IssueFlatSerializer,
@@ -43,9 +41,6 @@ from .issue import (
    IssueReactionSerializer,
    CommentReactionSerializer,
    IssueVoteSerializer,
-    IssueRelationSerializer,
-    RelatedIssueSerializer,
-    IssuePublicSerializer,
 )

 from .module import (
@@ -75,7 +70,6 @@ from .page import PageSerializer, PageBlockSerializer, PageFavoriteSerializer
 from .estimate import (
    EstimateSerializer,
    EstimatePointSerializer,
-    EstimateReadSerializer,
 )

 from .inbox import InboxSerializer, InboxIssueSerializer, IssueStateInboxSerializer
@@ -1,5 +1,33 @@
 from rest_framework import serializers

+def filterFields(self, fields):
+    for field_name in fields:
+         if isinstance(field_name, dict):
+            for key, value in field_name.items():
+                if isinstance(value, list):
+                    filterFields(self.fields[key], value) 
+    allowed = []
+    for item in fields:
+        if isinstance(item, str):
+            allowed.append(item)
+        elif isinstance(item, dict):
+            allowed.append(list(item.keys())[0])
+    existing = set(self.fields)
+    allowed = set(allowed)
+    for field_name in existing - allowed:
+        self.fields.pop(field_name)
+    return self.fields

 class BaseSerializer(serializers.ModelSerializer):
    id = serializers.PrimaryKeyRelatedField(read_only=True)
+
+    def __init__(self, *args, **kwargs):
+        # Don't pass the 'fields' arg up to the superclass
+        fields = kwargs.pop("fields", None)
+
+        # Instantiate the superclass normally
+        super().__init__(*args, **kwargs)
+
+        if fields is not None:
+            # Drop any fields that are not specified in the `fields` argument.
+                self.fields = filterFields(self, fields)
@@ -6,26 +6,21 @@ from rest_framework import serializers

 # Module imports
 from .base import BaseSerializer
-from .user import UserLiteSerializer
+from .user import UserSerializer
 from .issue import IssueStateSerializer
-from .workspace import WorkspaceLiteSerializer
-from .project import ProjectLiteSerializer
+from .workspace import WorkSpaceSerializer
+from .project import ProjectSerializer
 from plane.db.models import Cycle, CycleIssue, CycleFavorite

 class CycleWriteSerializer(BaseSerializer):

-    def validate(self, data):
-        if data.get("start_date", None) is not None 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")
-        return data
-
    class Meta:
        model = Cycle
        fields = "__all__"


 class CycleSerializer(BaseSerializer):
-    owned_by = UserLiteSerializer(read_only=True)
+    owned_by = UserSerializer(read_only=True)
    is_favorite = serializers.BooleanField(read_only=True)
    total_issues = serializers.IntegerField(read_only=True)
    cancelled_issues = serializers.IntegerField(read_only=True)
@@ -38,14 +33,9 @@ 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")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    workspace_detail =  WorkSpaceSerializer(source="workspace",read_only=True) 
+    project_detail = ProjectSerializer(read_only=True, source="project")

-    def validate(self, data):
-        if data.get("start_date", None) is not None 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")
-        return data
-    
    def get_assignees(self, obj):
        members = [
            {
@@ -64,7 +54,7 @@ class CycleSerializer(BaseSerializer):
        unique_list = [dict(item) for item in unique_objects]

        return unique_list
-    
+
    def get_labels(self, obj):
        labels = [
            {
@@ -2,12 +2,12 @@
 from .base import BaseSerializer

 from plane.db.models import Estimate, EstimatePoint
-from plane.api.serializers import WorkspaceLiteSerializer, ProjectLiteSerializer
+from plane.api.serializers import WorkSpaceSerializer, ProjectSerializer


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

    class Meta:
        model = Estimate
@@ -27,18 +27,3 @@ class EstimatePointSerializer(BaseSerializer):
            "workspace",
            "project",
        ]
-
-
-class EstimateReadSerializer(BaseSerializer):
-    points = EstimatePointSerializer(read_only=True, many=True)
-    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
-
-    class Meta:
-        model = Estimate
-        fields = "__all__"
-        read_only_fields = [
-            "points",
-            "name",
-            "description",
-        ]
@@ -1,11 +1,11 @@
 # Module imports
 from .base import BaseSerializer
 from plane.db.models import ExporterHistory
-from .user import UserLiteSerializer
+from .user import UserSerializer


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

    class Meta:
        model = ExporterHistory
@@ -1,15 +1,15 @@
 # Module imports
 from .base import BaseSerializer
-from .user import UserLiteSerializer
-from .project import ProjectLiteSerializer
-from .workspace import WorkspaceLiteSerializer
+from .user import UserSerializer
+from .project import ProjectSerializer
+from .workspace import WorkSpaceSerializer
 from plane.db.models import Importer


 class ImporterSerializer(BaseSerializer):
-    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)
+    initiated_by_detail = UserSerializer(source="initiated_by", read_only=True)
+    project_detail = ProjectSerializer(source="project", read_only=True)
+    workspace_detail = WorkSpaceSerializer(source="workspace", read_only=True)

    class Meta:
        model = Importer
@@ -4,15 +4,14 @@ from rest_framework import serializers
 # Module imports
 from .base import BaseSerializer
 from .issue import IssueFlatSerializer, LabelLiteSerializer
-from .project import ProjectLiteSerializer
+from .project import ProjectSerializer
 from .state import StateLiteSerializer
-from .project import ProjectLiteSerializer
-from .user import UserLiteSerializer
+from .user import UserSerializer
 from plane.db.models import Inbox, InboxIssue, Issue


 class InboxSerializer(BaseSerializer):
-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    project_detail = ProjectSerializer(source="project", fields=("id","name","cover_image","icon_prop","emoji","description"), read_only=True)
    pending_issue_count = serializers.IntegerField(read_only=True)

    class Meta:
@@ -26,7 +25,7 @@ class InboxSerializer(BaseSerializer):

 class InboxIssueSerializer(BaseSerializer):
    issue_detail = IssueFlatSerializer(source="issue", read_only=True)
-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    project_detail = ProjectSerializer(source="project", fields=("id","name","cover_image","icon_prop","emoji","description"), read_only=True)

    class Meta:
        model = InboxIssue
@@ -46,9 +45,9 @@ class InboxIssueLiteSerializer(BaseSerializer):

 class IssueStateInboxSerializer(BaseSerializer):
    state_detail = StateLiteSerializer(read_only=True, source="state")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    project_detail = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
    label_details = LabelLiteSerializer(read_only=True, source="labels", many=True)
-    assignee_details = UserLiteSerializer(read_only=True, source="assignees", many=True)
+    assignee_details = UserSerializer(source="assignees", read_only=True, 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)
@@ -6,21 +6,22 @@ from rest_framework import serializers

 # Module imports
 from .base import BaseSerializer
-from .user import UserLiteSerializer
+from .user import UserSerializer
 from .state import StateSerializer, StateLiteSerializer
-from .user import UserLiteSerializer
-from .project import ProjectSerializer, ProjectLiteSerializer
-from .workspace import WorkspaceLiteSerializer
+from .project import ProjectSerializer
+from .workspace import WorkSpaceSerializer
 from plane.db.models import (
    User,
    Issue,
    IssueActivity,
    IssueComment,
    IssueProperty,
+    IssueBlocker,
    IssueAssignee,
    IssueSubscriber,
    IssueLabel,
    Label,
+    IssueBlocker,
    CycleIssue,
    Cycle,
    Module,
@@ -30,7 +31,6 @@ from plane.db.models import (
    IssueReaction,
    CommentReaction,
    IssueVote,
-    IssueRelation,
 )


@@ -49,12 +49,15 @@ class IssueFlatSerializer(BaseSerializer):
            "target_date",
            "sequence_id",
            "sort_order",
-            "is_draft",
        ]


 class IssueProjectLiteSerializer(BaseSerializer):
-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    project_detail = ProjectSerializer(
+        source="project",
+        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
+        read_only=True,
+    )

    class Meta:
        model = Issue
@@ -71,9 +74,12 @@ class IssueProjectLiteSerializer(BaseSerializer):
 ## Find a better approach to save manytomany?
 class IssueCreateSerializer(BaseSerializer):
    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")
+    created_by_detail = UserSerializer(
+        source="created_by",
+        read_only=True,
+    )
+    project_detail = ProjectSerializer(source="project", read_only=True)
+    workspace_detail = WorkSpaceSerializer(source="workspace", read_only=True)

    assignees_list = serializers.ListField(
        child=serializers.PrimaryKeyRelatedField(queryset=User.objects.all()),
@@ -81,12 +87,25 @@ class IssueCreateSerializer(BaseSerializer):
        required=False,
    )

+    # List of issues that are blocking this issue
+    blockers_list = serializers.ListField(
+        child=serializers.PrimaryKeyRelatedField(queryset=Issue.objects.all()),
+        write_only=True,
+        required=False,
+    )
    labels_list = serializers.ListField(
        child=serializers.PrimaryKeyRelatedField(queryset=Label.objects.all()),
        write_only=True,
        required=False,
    )

+    # List of issues that are blocked by this issue
+    blocks_list = serializers.ListField(
+        child=serializers.PrimaryKeyRelatedField(queryset=Issue.objects.all()),
+        write_only=True,
+        required=False,
+    )
+
    class Meta:
        model = Issue
        fields = "__all__"
@@ -109,8 +128,10 @@ class IssueCreateSerializer(BaseSerializer):
        return data

    def create(self, validated_data):
+        blockers = validated_data.pop("blockers_list", None)
        assignees = validated_data.pop("assignees_list", None)
        labels = validated_data.pop("labels_list", None)
+        blocks = validated_data.pop("blocks_list", None)

        project_id = self.context["project_id"]
        workspace_id = self.context["workspace_id"]
@@ -122,6 +143,22 @@ class IssueCreateSerializer(BaseSerializer):
        created_by_id = issue.created_by_id
        updated_by_id = issue.updated_by_id

+        if blockers is not None and len(blockers):
+            IssueBlocker.objects.bulk_create(
+                [
+                    IssueBlocker(
+                        block=issue,
+                        blocked_by=blocker,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for blocker in blockers
+                ],
+                batch_size=10,
+            )
+
        if assignees is not None and len(assignees):
            IssueAssignee.objects.bulk_create(
                [
@@ -165,11 +202,29 @@ class IssueCreateSerializer(BaseSerializer):
                batch_size=10,
            )

+        if blocks is not None and len(blocks):
+            IssueBlocker.objects.bulk_create(
+                [
+                    IssueBlocker(
+                        block=block,
+                        blocked_by=issue,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for block in blocks
+                ],
+                batch_size=10,
+            )
+
        return issue

    def update(self, instance, validated_data):
+        blockers = validated_data.pop("blockers_list", None)
        assignees = validated_data.pop("assignees_list", None)
        labels = validated_data.pop("labels_list", None)
+        blocks = validated_data.pop("blocks_list", None)

        # Related models
        project_id = instance.project_id
@@ -177,6 +232,23 @@ class IssueCreateSerializer(BaseSerializer):
        created_by_id = instance.created_by_id
        updated_by_id = instance.updated_by_id

+        if blockers is not None:
+            IssueBlocker.objects.filter(block=instance).delete()
+            IssueBlocker.objects.bulk_create(
+                [
+                    IssueBlocker(
+                        block=instance,
+                        blocked_by=blocker,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for blocker in blockers
+                ],
+                batch_size=10,
+            )
+
        if assignees is not None:
            IssueAssignee.objects.filter(issue=instance).delete()
            IssueAssignee.objects.bulk_create(
@@ -211,41 +283,42 @@ class IssueCreateSerializer(BaseSerializer):
                batch_size=10,
            )

+        if blocks is not None:
+            IssueBlocker.objects.filter(blocked_by=instance).delete()
+            IssueBlocker.objects.bulk_create(
+                [
+                    IssueBlocker(
+                        block=block,
+                        blocked_by=instance,
+                        project_id=project_id,
+                        workspace_id=workspace_id,
+                        created_by_id=created_by_id,
+                        updated_by_id=updated_by_id,
+                    )
+                    for block in blocks
+                ],
+                batch_size=10,
+            )
+
        # Time updation occues even when other related models are updated
        instance.updated_at = timezone.now()
        return super().update(instance, validated_data)


 class IssueActivitySerializer(BaseSerializer):
-    actor_detail = UserLiteSerializer(read_only=True, source="actor")
+    actor_detail = UserSerializer(source="actor", read_only=True)
    issue_detail = IssueFlatSerializer(read_only=True, source="issue")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    project_detail = ProjectSerializer(
+        source="project",
+        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
+        read_only=True,
+    )

    class Meta:
        model = IssueActivity
        fields = "__all__"


-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")
-
-    class Meta:
-        model = IssueComment
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "project",
-            "issue",
-            "created_by",
-            "updated_by",
-            "created_at",
-            "updated_at",
-        ]
-
-
 class IssuePropertySerializer(BaseSerializer):
    class Meta:
        model = IssueProperty
@@ -258,8 +331,14 @@ class IssuePropertySerializer(BaseSerializer):


 class LabelSerializer(BaseSerializer):
-    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    workspace_detail = WorkSpaceSerializer(
+        source="workspace", fields=("id", "name", "slug"), read_only=True
+    )
+    project_detail = ProjectSerializer(
+        source="project",
+        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
+        read_only=True,
+    )

    class Meta:
        model = Label
@@ -292,47 +371,44 @@ class IssueLabelSerializer(BaseSerializer):
        ]


-class IssueRelationSerializer(BaseSerializer):
-    issue_detail = IssueProjectLiteSerializer(read_only=True, source="related_issue")
+class BlockedIssueSerializer(BaseSerializer):
+    blocked_issue_detail = IssueProjectLiteSerializer(source="block", read_only=True)

    class Meta:
-        model = IssueRelation
+        model = IssueBlocker
        fields = [
-            "issue_detail",
-            "relation_type",
-            "related_issue",
-            "issue",
-            "id"
-        ]
-        read_only_fields = [
-            "workspace",
-            "project",
+            "blocked_issue_detail",
+            "blocked_by",
+            "block",
        ]
+        read_only_fields = fields

-class RelatedIssueSerializer(BaseSerializer):
-    issue_detail = IssueProjectLiteSerializer(read_only=True, source="issue")
+
+class BlockerIssueSerializer(BaseSerializer):
+    blocker_issue_detail = IssueProjectLiteSerializer(
+        source="blocked_by", read_only=True
+    )

    class Meta:
-        model = IssueRelation
+        model = IssueBlocker
        fields = [
-            "issue_detail",
-            "relation_type",
-            "related_issue",
-            "issue",
-            "id"
-        ]
-        read_only_fields = [
-            "workspace",
-            "project",
+            "blocker_issue_detail",
+            "blocked_by",
+            "block",
        ]
+        read_only_fields = fields


-class IssueAssigneeSerializer(BaseSerializer):
-    assignee_details = UserLiteSerializer(read_only=True, source="assignee")
+# class IssueAssigneeSerializer(BaseSerializer):
+#     assignee_details = UserSerializer(
+#         source="assignee",
+#         fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+#         read_only=True,
+#     )

-    class Meta:
-        model = IssueAssignee
-        fields = "__all__"
+#     class Meta:
+#         model = IssueAssignee
+#         fields = "__all__"


 class CycleBaseSerializer(BaseSerializer):
@@ -396,7 +472,11 @@ class IssueModuleDetailSerializer(BaseSerializer):


 class IssueLinkSerializer(BaseSerializer):
-    created_by_detail = UserLiteSerializer(read_only=True, source="created_by")
+    created_by_detail = UserSerializer(
+        source="created_by",
+        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )

    class Meta:
        model = IssueLink
@@ -438,9 +518,6 @@ class IssueAttachmentSerializer(BaseSerializer):


 class IssueReactionSerializer(BaseSerializer):
-    
-    actor_detail = UserLiteSerializer(read_only=True, source="actor")
-    
    class Meta:
        model = IssueReaction
        fields = "__all__"
@@ -452,8 +529,29 @@ class IssueReactionSerializer(BaseSerializer):
        ]


+class IssueReactionLiteSerializer(BaseSerializer):
+    actor_detail = UserSerializer(
+        source="actor",
+        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )
+
+    class Meta:
+        model = IssueReaction
+        fields = [
+            "id",
+            "reaction",
+            "issue",
+            "actor_detail",
+        ]
+
+
 class CommentReactionLiteSerializer(BaseSerializer):
-    actor_detail = UserLiteSerializer(read_only=True, source="actor")
+    actor_detail = UserSerializer(
+        source="actor",
+        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )

    class Meta:
        model = CommentReaction
@@ -473,22 +571,27 @@ 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_id", "project_id", "actor"]
        read_only_fields = fields


 class IssueCommentSerializer(BaseSerializer):
-    actor_detail = UserLiteSerializer(read_only=True, source="actor")
+    actor_detail = UserSerializer(source="actor", read_only=True)
    issue_detail = IssueFlatSerializer(read_only=True, source="issue")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
-    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
+    project_detail = ProjectSerializer(
+        source="project",
+        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
+        read_only=True,
+    )
+
+    workspace_details = WorkSpaceSerializer(
+        source="workspace",
+        fields=("id", "name", "slug"),
+        read_only=True,
+    )
    comment_reactions = CommentReactionLiteSerializer(read_only=True, many=True)
-    is_member = serializers.BooleanField(read_only=True)

    class Meta:
        model = IssueComment
@@ -501,12 +604,17 @@ class IssueCommentSerializer(BaseSerializer):
            "updated_by",
            "created_at",
            "updated_at",
+            "access",
        ]


 class IssueStateFlatSerializer(BaseSerializer):
    state_detail = StateLiteSerializer(read_only=True, source="state")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    project_detail = ProjectSerializer(
+        source="project",
+        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
+        read_only=True,
+    )

    class Meta:
        model = Issue
@@ -523,8 +631,17 @@ class IssueStateFlatSerializer(BaseSerializer):
 class IssueStateSerializer(BaseSerializer):
    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)
+    project_detail = ProjectSerializer(
+        source="project",
+        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
+        read_only=True,
+    )
+    assignee_details = UserSerializer(
+        source="assignees",
+        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+        many=True,
+    )
    sub_issues_count = serializers.IntegerField(read_only=True)
    bridge_id = serializers.UUIDField(read_only=True)
    attachment_count = serializers.IntegerField(read_only=True)
@@ -536,19 +653,30 @@ class IssueStateSerializer(BaseSerializer):


 class IssueSerializer(BaseSerializer):
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    project_detail = ProjectSerializer(
+        source="project",
+        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
+        read_only=True,
+    )
    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)
+    assignee_details = UserSerializer(
+        source="assignees",
+        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+        many=True,
+    )
+    # List of issues blocked by this issue
+    blocked_issues = BlockedIssueSerializer(read_only=True, many=True)
+    # List of issues that block this issue
+    blocker_issues = BlockerIssueSerializer(read_only=True, 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)
-    issue_reactions = IssueReactionSerializer(read_only=True, many=True)
+    issue_reactions = IssueReactionLiteSerializer(read_only=True, many=True)

    class Meta:
        model = Issue
@@ -564,17 +692,30 @@ class IssueSerializer(BaseSerializer):


 class IssueLiteSerializer(BaseSerializer):
-    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
-    project_detail = ProjectLiteSerializer(read_only=True, source="project")
+    workspace_detail = WorkSpaceSerializer(
+        source="workspace",
+        fields=("id", "name", "slug"),
+        read_only=True,
+    )
+    project_detail = ProjectSerializer(
+        source="project",
+        fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"),
+        read_only=True,
+    )
    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)
+    assignee_details = UserSerializer(
+        source="assignees",
+        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+        many=True,
+    )
    sub_issues_count = serializers.IntegerField(read_only=True)
    cycle_id = serializers.UUIDField(read_only=True)
    module_id = serializers.UUIDField(read_only=True)
    attachment_count = serializers.IntegerField(read_only=True)
    link_count = serializers.IntegerField(read_only=True)
-    issue_reactions = IssueReactionSerializer(read_only=True, many=True)
+    issue_reactions = IssueReactionLiteSerializer(read_only=True, many=True)

    class Meta:
        model = Issue
@@ -592,33 +733,6 @@ class IssueLiteSerializer(BaseSerializer):
        ]


-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")
-    votes = IssueVoteSerializer(read_only=True, many=True)
-
-    class Meta:
-        model = Issue
-        fields = [
-            "id",
-            "name",
-            "description_html",
-            "sequence_id",
-            "state",
-            "state_detail",
-            "project",
-            "project_detail",
-            "workspace",
-            "priority",
-            "target_date",
-            "reactions",
-            "votes",
-        ]
-        read_only_fields = fields
-
-
-
 class IssueSubscriberSerializer(BaseSerializer):
    class Meta:
        model = IssueSubscriber
@@ -3,9 +3,9 @@ from rest_framework import serializers

 # Module imports
 from .base import BaseSerializer
-from .user import UserLiteSerializer
-from .project import ProjectSerializer, ProjectLiteSerializer
-from .workspace import WorkspaceLiteSerializer
+from .user import UserSerializer
+from .project import ProjectSerializer
+from .workspace import WorkSpaceSerializer
 from .issue import IssueStateSerializer

 from plane.db.models import (
@@ -25,8 +25,12 @@ class ModuleWriteSerializer(BaseSerializer):
        required=False,
    )

-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
-    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
+    project_detail = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
+    workspace_detail = WorkSpaceSerializer(
+        source="workspace",
+        fields=("id", "name", "slug"),
+        read_only=True,
+    ) 

    class Meta:
        model = Module
@@ -40,11 +44,6 @@ class ModuleWriteSerializer(BaseSerializer):
            "updated_at",
        ]

-    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    
-
    def create(self, validated_data):
        members = validated_data.pop("members_list", None)

@@ -111,7 +110,7 @@ class ModuleFlatSerializer(BaseSerializer):

 class ModuleIssueSerializer(BaseSerializer):
    module_detail = ModuleFlatSerializer(read_only=True, source="module")
-    issue_detail = ProjectLiteSerializer(read_only=True, source="issue")
+    issue_detail = ProjectSerializer(source="issue", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
    sub_issues_count = serializers.IntegerField(read_only=True)

    class Meta:
@@ -129,7 +128,11 @@ class ModuleIssueSerializer(BaseSerializer):


 class ModuleLinkSerializer(BaseSerializer):
-    created_by_detail = UserLiteSerializer(read_only=True, source="created_by")
+    created_by_detail = UserSerializer(
+        source="created_by",
+        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )

    class Meta:
        model = ModuleLink
@@ -156,9 +159,18 @@ class ModuleLinkSerializer(BaseSerializer):


 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")
+    project_detail = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
+    lead_detail = UserSerializer(
+        source="lead",
+        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )
+    members_detail = UserSerializer(
+        source="members",
+        fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+        many=True,
+    )
    link_module = ModuleLinkSerializer(read_only=True, many=True)
    is_favorite = serializers.BooleanField(read_only=True)
    total_issues = serializers.IntegerField(read_only=True)
@@ -1,12 +1,16 @@
 # Module imports
 from .base import BaseSerializer
-from .user import UserLiteSerializer
+from .user import UserSerializer
 from plane.db.models import Notification

+
 class NotificationSerializer(BaseSerializer):
-    triggered_by_details = UserLiteSerializer(read_only=True, source="triggered_by")
+    triggered_by_details = UserSerializer(
+        source="triggered_by",
+        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )

    class Meta:
        model = Notification
        fields = "__all__"
-
@@ -4,15 +4,19 @@ from rest_framework import serializers
 # Module imports
 from .base import BaseSerializer
 from .issue import IssueFlatSerializer, LabelLiteSerializer
-from .workspace import WorkspaceLiteSerializer
-from .project import ProjectLiteSerializer
+from .workspace import WorkSpaceSerializer
+from .project import ProjectSerializer
 from plane.db.models import Page, PageBlock, PageFavorite, PageLabel, Label


 class PageBlockSerializer(BaseSerializer):
    issue_detail = IssueFlatSerializer(source="issue", read_only=True)
-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
-    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
+    project_detail = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
+    workspace_detail = WorkSpaceSerializer(
+        source="workspace",
+        fields=("id", "name", "slug"),
+        read_only=True,
+    ) 

    class Meta:
        model = PageBlock
@@ -39,8 +43,12 @@ class PageSerializer(BaseSerializer):
        required=False,
    )
    blocks = PageBlockLiteSerializer(read_only=True, many=True)
-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
-    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
+    project_detail = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
+    workspace_detail = WorkSpaceSerializer(
+        source="workspace",
+        fields=("id", "name", "slug"),
+        read_only=True,
+    ) 

    class Meta:
        model = Page
@@ -6,8 +6,8 @@ from rest_framework import serializers

 # Module imports
 from .base import BaseSerializer
-from plane.api.serializers.workspace import WorkSpaceSerializer, WorkspaceLiteSerializer
-from plane.api.serializers.user import UserLiteSerializer, UserAdminLiteSerializer
+from plane.api.serializers.workspace import WorkSpaceSerializer
+from plane.api.serializers.user import UserSerializer
 from plane.db.models import (
    Project,
    ProjectMember,
@@ -15,12 +15,32 @@ from plane.db.models import (
    ProjectIdentifier,
    ProjectFavorite,
    ProjectDeployBoard,
-    ProjectPublicMember,
 )


 class ProjectSerializer(BaseSerializer):
-    workspace_detail = WorkspaceLiteSerializer(source="workspace", read_only=True)
+    # workspace = WorkSpaceSerializer(read_only=True)
+    default_assignee = UserSerializer(
+        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )
+    project_lead = UserSerializer(
+        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )
+    is_favorite = serializers.BooleanField(read_only=True)
+    total_members = serializers.IntegerField(read_only=True)
+    total_cycles = serializers.IntegerField(read_only=True)
+    total_modules = serializers.IntegerField(read_only=True)
+    is_member = serializers.BooleanField(read_only=True)
+    sort_order = serializers.FloatField(read_only=True)
+    member_role = serializers.IntegerField(read_only=True)
+    is_deployed = serializers.BooleanField(read_only=True)
+    workspace_detail = WorkSpaceSerializer(
+        source="workspace",
+        # fields=("id", "name", "slug"),
+        read_only=True,
+    ) 

    class Meta:
        model = Project
@@ -79,25 +99,16 @@ class ProjectSerializer(BaseSerializer):
        raise serializers.ValidationError(detail="Project Identifier is already taken")


-class ProjectLiteSerializer(BaseSerializer):
-    class Meta:
-        model = Project
-        fields = [
-            "id",
-            "identifier",
-            "name",
-            "cover_image",
-            "icon_prop",
-            "emoji",
-            "description",
-        ]
-        read_only_fields = fields
-
-
 class ProjectDetailSerializer(BaseSerializer):
    workspace = WorkSpaceSerializer(read_only=True)
-    default_assignee = UserLiteSerializer(read_only=True)
-    project_lead = UserLiteSerializer(read_only=True)
+    default_assignee = UserSerializer(
+        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )
+    project_lead = UserSerializer(
+        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )
    is_favorite = serializers.BooleanField(read_only=True)
    total_members = serializers.IntegerField(read_only=True)
    total_cycles = serializers.IntegerField(read_only=True)
@@ -113,9 +124,12 @@ class ProjectDetailSerializer(BaseSerializer):


 class ProjectMemberSerializer(BaseSerializer):
-    workspace = WorkspaceLiteSerializer(read_only=True)
-    project = ProjectLiteSerializer(read_only=True)
-    member = UserLiteSerializer(read_only=True)
+    workspace = WorkSpaceSerializer(read_only=True)
+    project = ProjectSerializer(fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
+    member = UserSerializer(
+        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )

    class Meta:
        model = ProjectMember
@@ -123,9 +137,24 @@ class ProjectMemberSerializer(BaseSerializer):


 class ProjectMemberAdminSerializer(BaseSerializer):
-    workspace = WorkspaceLiteSerializer(read_only=True)
-    project = ProjectLiteSerializer(read_only=True)
-    member = UserAdminLiteSerializer(read_only=True)
+    workspace = WorkSpaceSerializer(
+        source="workspace",
+        fields=("id", "name", "slug"),
+        read_only=True,
+    ) 
+    project = ProjectSerializer(fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
+    member = UserSerializer(
+        # fields=(
+        #     "id",
+        #     "first_name",
+        #     "last_name",
+        #     "avatar",
+        #     "is_bot",
+        #     "display_name",
+        #     "email",
+        # ),
+        read_only=True,
+    )

    class Meta:
        model = ProjectMember
@@ -133,8 +162,11 @@ class ProjectMemberAdminSerializer(BaseSerializer):


 class ProjectMemberInviteSerializer(BaseSerializer):
-    project = ProjectLiteSerializer(read_only=True)
-    workspace = WorkspaceLiteSerializer(read_only=True)
+    project = ProjectSerializer(fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
+    workspace = WorkSpaceSerializer(
+        fields=("id", "name", "slug"),
+        read_only=True,
+    ) 

    class Meta:
        model = ProjectMemberInvite
@@ -148,7 +180,7 @@ class ProjectIdentifierSerializer(BaseSerializer):


 class ProjectFavoriteSerializer(BaseSerializer):
-    project_detail = ProjectLiteSerializer(source="project", read_only=True)
+    project_detail = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)

    class Meta:
        model = ProjectFavorite
@@ -160,7 +192,10 @@ class ProjectFavoriteSerializer(BaseSerializer):


 class ProjectMemberLiteSerializer(BaseSerializer):
-    member = UserLiteSerializer(read_only=True)
+    member = UserSerializer(
+        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )
    is_subscribed = serializers.BooleanField(read_only=True)

    class Meta:
@@ -170,25 +205,17 @@ class ProjectMemberLiteSerializer(BaseSerializer):


 class ProjectDeployBoardSerializer(BaseSerializer):
-    project_details = ProjectLiteSerializer(read_only=True, source="project")
-    workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
+    project_details = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
+    workspace_detail = WorkSpaceSerializer(
+        source="workspace",
+        fields=("id", "name", "slug"),
+        read_only=True,
+    ) 

    class Meta:
        model = ProjectDeployBoard
        fields = "__all__"
        read_only_fields = [
            "workspace",
-            "project", "anchor",
-        ]
-
-
-class ProjectPublicMemberSerializer(BaseSerializer):
-
-    class Meta:
-        model = ProjectPublicMember
-        fields = "__all__"
-        read_only_fields = [
-            "workspace",
-            "project",
-            "member",
+            "project" "anchor",
        ]
@@ -1,14 +1,14 @@
 # Module imports
 from .base import BaseSerializer
-from .workspace import WorkspaceLiteSerializer
-from .project import ProjectLiteSerializer
+from .workspace import WorkSpaceSerializer
+from .project import ProjectSerializer

 from plane.db.models import State


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

    class Meta:
        model = State
@@ -33,42 +33,6 @@ class UserSerializer(BaseSerializer):
            return bool(obj.first_name) or bool(obj.last_name)


-class UserLiteSerializer(BaseSerializer):
-    class Meta:
-        model = User
-        fields = [
-            "id",
-            "first_name",
-            "last_name",
-            "avatar",
-            "is_bot",
-            "display_name",
-        ]
-        read_only_fields = [
-            "id",
-            "is_bot",
-        ]
-
-
-class UserAdminLiteSerializer(BaseSerializer):
-
-    class Meta:
-        model = User
-        fields = [
-            "id",
-            "first_name",
-            "last_name",
-            "avatar",
-            "is_bot",
-            "display_name",
-            "email",
-        ]
-        read_only_fields = [
-            "id",
-            "is_bot",
-        ]
-
-
 class ChangePasswordSerializer(serializers.Serializer):
    model = User

@@ -3,16 +3,20 @@ from rest_framework import serializers

 # Module imports
 from .base import BaseSerializer
-from .workspace import WorkspaceLiteSerializer
-from .project import ProjectLiteSerializer
+from .workspace import WorkSpaceSerializer
+from .project import ProjectSerializer
 from plane.db.models import IssueView, IssueViewFavorite
 from plane.utils.issue_filters import issue_filters


 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)
+    project_detail = ProjectSerializer(source="project", fields=("id", "name", "cover_image", "icon_prop", "emoji", "description"), read_only=True)
+    workspace_detail = WorkSpaceSerializer(
+        source="workspace",
+        fields=("id", "name", "slug"),
+        read_only=True,
+    ) 

    class Meta:
        model = IssueView
@@ -3,7 +3,7 @@ from rest_framework import serializers

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

 from plane.db.models import (
    User,
@@ -17,7 +17,10 @@ from plane.db.models import (


 class WorkSpaceSerializer(BaseSerializer):
-    owner = UserLiteSerializer(read_only=True)
+    owner = UserSerializer(
+        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )
    total_members = serializers.IntegerField(read_only=True)
    total_issues = serializers.IntegerField(read_only=True)

@@ -33,30 +36,16 @@ class WorkSpaceSerializer(BaseSerializer):
            "owner",
        ]

-class WorkspaceLiteSerializer(BaseSerializer):
-    class Meta:
-        model = Workspace
-        fields = [
-            "name",
-            "slug",
-            "id",
-        ]
-        read_only_fields = fields
-
-

 class WorkSpaceMemberSerializer(BaseSerializer):
-    member = UserLiteSerializer(read_only=True)
-    workspace = WorkspaceLiteSerializer(read_only=True)
-
-    class Meta:
-        model = WorkspaceMember
-        fields = "__all__"
-
-
-class WorkspaceMemberAdminSerializer(BaseSerializer):
-    member = UserAdminLiteSerializer(read_only=True)
-    workspace = WorkspaceLiteSerializer(read_only=True)
+    member = UserSerializer(
+        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name" ,"email"),
+        read_only=True,
+    )
+    workspace = WorkSpaceSerializer(
+        fields=("id", "name", "slug"),
+        read_only=True,
+    )

    class Meta:
        model = WorkspaceMember
@@ -66,7 +55,11 @@ class WorkspaceMemberAdminSerializer(BaseSerializer):
 class WorkSpaceMemberInviteSerializer(BaseSerializer):
    workspace = WorkSpaceSerializer(read_only=True)
    total_members = serializers.IntegerField(read_only=True)
-    created_by_detail = UserLiteSerializer(read_only=True, source="created_by")
+    created_by_detail = UserSerializer(
+        source="created_by",
+        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+    )

    class Meta:
        model = WorkspaceMemberInvite
@@ -74,7 +67,12 @@ class WorkSpaceMemberInviteSerializer(BaseSerializer):


 class TeamSerializer(BaseSerializer):
-    members_detail = UserLiteSerializer(read_only=True, source="members", many=True)
+    members_detail = UserSerializer(
+        source="members",
+        # fields=("id", "first_name", "last_name", "avatar", "is_bot", "display_name"),
+        read_only=True,
+        many=True,
+    )
    members = serializers.ListField(
        child=serializers.PrimaryKeyRelatedField(queryset=User.objects.all()),
        write_only=True,
@@ -51,7 +51,6 @@ from plane.api.views import (
    WorkspaceUserProfileEndpoint,
    WorkspaceUserProfileIssuesEndpoint,
    WorkspaceLabelsEndpoint,
-    LeaveWorkspaceEndpoint,
    ## End Workspaces
    # File Assets
    FileAssetEndpoint,
@@ -69,7 +68,6 @@ from plane.api.views import (
    UserProjectInvitationsViewset,
    ProjectIdentifierEndpoint,
    ProjectFavoritesViewSet,
-    LeaveProjectEndpoint,
    ## End Projects
    # Issues
    IssueViewSet,
@@ -90,9 +88,8 @@ from plane.api.views import (
    IssueSubscriberViewSet,
    IssueCommentPublicViewSet,
    IssueReactionViewSet,
-    IssueRelationViewSet,
    CommentReactionViewSet,
-    IssueDraftViewSet,
+    ExportIssuesEndpoint,
    ## End Issues
    # States
    StateViewSet,
@@ -168,23 +165,16 @@ from plane.api.views import (
    # Notification
    NotificationViewSet,
    UnreadNotificationEndpoint,
-    MarkAllReadNotificationViewSet,
    ## End Notification
    # Public Boards
    ProjectDeployBoardViewSet,
-    ProjectIssuesPublicEndpoint,
+    ProjectDeployBoardIssuesPublicEndpoint,
    ProjectDeployBoardPublicSettingsEndpoint,
    IssueReactionPublicViewSet,
    CommentReactionPublicViewSet,
    InboxIssuePublicViewSet,
    IssueVotePublicViewSet,
-    WorkspaceProjectDeployBoardEndpoint,
-    IssueRetrievePublicEndpoint,
    ## End Public Boards
-    ## Exporter
-    ExportIssuesEndpoint,
-    ## End Exporter
-
 )


@@ -241,7 +231,7 @@ urlpatterns = [
        UpdateUserTourCompletedEndpoint.as_view(),
        name="user-tour",
    ),
-    path("users/workspaces/<str:slug>/activities/", UserActivityEndpoint.as_view(), name="user-activities"),
+    path("users/activities/", UserActivityEndpoint.as_view(), name="user-activities"),
    # user workspaces
    path(
        "users/me/workspaces/",
@@ -445,11 +435,6 @@ urlpatterns = [
        WorkspaceLabelsEndpoint.as_view(),
        name="workspace-labels",
    ),
-    path(
-        "workspaces/<str:slug>/members/leave/",
-        LeaveWorkspaceEndpoint.as_view(),
-        name="workspace-labels",
-    ),
    ## End Workspaces ##
    # Projects
    path(
@@ -563,11 +548,6 @@ urlpatterns = [
        ),
        name="project",
    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/members/leave/",
-        LeaveProjectEndpoint.as_view(),
-        name="project",
-    ),
    # End Projects
    #  States
    path(
@@ -1012,49 +992,6 @@ urlpatterns = [
        name="project-issue-archive",
    ),
    ## End Issue Archives
-    ## Issue Relation
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-relation/",
-        IssueRelationViewSet.as_view(
-            {
-                "post": "create",
-            }
-        ),
-        name="issue-relation",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issues/<uuid:issue_id>/issue-relation/<uuid:pk>/",
-        IssueRelationViewSet.as_view(
-            {
-                "delete": "destroy",
-            }
-        ),
-        name="issue-relation",
-    ),
-    ## End Issue Relation
-    ## Issue Drafts
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issue-drafts/",
-        IssueDraftViewSet.as_view(
-            {
-                "get": "list",
-                "post": "create",
-            }
-        ),
-        name="project-issue-draft",
-    ),
-    path(
-        "workspaces/<str:slug>/projects/<uuid:project_id>/issue-drafts/<uuid:pk>/",
-        IssueDraftViewSet.as_view(
-            {
-                "get": "retrieve",
-                "patch": "partial_update",
-                "delete": "destroy",
-            }
-        ),
-        name="project-issue-draft",
-    ),
-    ## End Issue Drafts
    ## File Assets
    path(
        "workspaces/<str:slug>/file-assets/",
@@ -1553,15 +1490,6 @@ urlpatterns = [
        UnreadNotificationEndpoint.as_view(),
        name="unread-notifications",
    ),
-    path(
-        "workspaces/<str:slug>/users/notifications/mark-all-read/",
-        MarkAllReadNotificationViewSet.as_view(
-            {
-                "post": "create",
-            }
-        ),
-        name="mark-all-read-notifications",
-    ),
    ## End Notification
    # Public Boards
    path(
@@ -1592,14 +1520,9 @@ urlpatterns = [
    ),
    path(
        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/",
-        ProjectIssuesPublicEndpoint.as_view(),
+        ProjectDeployBoardIssuesPublicEndpoint.as_view(),
        name="project-deploy-board",
    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/",
-        IssueRetrievePublicEndpoint.as_view(),
-        name="workspace-project-boards",
-    ),
    path(
        "public/workspaces/<str:slug>/project-boards/<uuid:project_id>/issues/<uuid:issue_id>/comments/",
        IssueCommentPublicViewSet.as_view(
@@ -1691,10 +1614,5 @@ urlpatterns = [
        ),
        name="issue-vote-project-board",
    ),
-    path(
-        "public/workspaces/<str:slug>/project-boards/",
-        WorkspaceProjectDeployBoardEndpoint.as_view(),
-        name="workspace-project-boards",
-    ),
    ## End Public Boards
 ]
@@ -12,11 +12,10 @@ from .project import (
    ProjectUserViewsEndpoint,
    ProjectMemberUserEndpoint,
    ProjectFavoritesViewSet,
+    ProjectDeployBoardIssuesPublicEndpoint,
    ProjectDeployBoardViewSet,
    ProjectDeployBoardPublicSettingsEndpoint,
    ProjectMemberEndpoint,
-    WorkspaceProjectDeployBoardEndpoint,
-    LeaveProjectEndpoint,
 )
 from .user import (
    UserEndpoint,
@@ -53,7 +52,6 @@ from .workspace import (
    WorkspaceUserProfileIssuesEndpoint,
    WorkspaceLabelsEndpoint,
    WorkspaceMembersEndpoint,
-    LeaveWorkspaceEndpoint,
 )
 from .state import StateViewSet
 from .view import IssueViewViewSet, ViewIssuesEndpoint, IssueViewFavoriteViewSet
@@ -86,10 +84,6 @@ from .issue import (
    IssueReactionPublicViewSet,
    CommentReactionPublicViewSet,
    IssueVotePublicViewSet,
-    IssueRelationViewSet,
-    IssueRetrievePublicEndpoint,
-    ProjectIssuesPublicEndpoint,
-    IssueDraftViewSet,
 )

 from .auth_extended import (
@@ -167,6 +161,8 @@ from .analytic import (
    DefaultAnalyticsEndpoint,
 )

-from .notification import NotificationViewSet, UnreadNotificationEndpoint, MarkAllReadNotificationViewSet
+from .notification import NotificationViewSet, UnreadNotificationEndpoint

-from .exporter import ExportIssuesEndpoint
+from .exporter import (
+    ExportIssuesEndpoint,
+)
@@ -18,21 +18,10 @@ class FileAssetEndpoint(BaseAPIView):
    """

    def get(self, request, workspace_id, asset_key):
-        try:
-            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)
-            else:
-                return Response({"error": "Asset key does not exist", "status": False}, status=status.HTTP_200_OK)
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
+        asset_key = str(workspace_id) + "/" + asset_key
+        files = FileAsset.objects.filter(asset=asset_key)
+        serializer = FileAssetSerializer(files, context={"request": request}, many=True)
+        return Response(serializer.data)

    def post(self, request, slug):
        try:
@@ -79,16 +68,11 @@ class UserAssetsEndpoint(BaseAPIView):
    def get(self, request, asset_key):
        try:
            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)
-            else:
-                return Response({"error": "Asset key does not exist", "status": False}, status=status.HTTP_200_OK)
-        except Exception as e:
-            capture_exception(e)
+            serializer = FileAssetSerializer(files, context={"request": request})
+            return Response(serializer.data)
+        except FileAsset.DoesNotExist:
            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {"error": "File Asset does not exist"}, status=status.HTTP_404_NOT_FOUND
            )

    def post(self, request):
@@ -1,41 +1,24 @@
-# Python imports
-import zoneinfo
-
 # Django imports
 from django.urls import resolve
 from django.conf import settings
-from django.utils import timezone
-# Third part imports

+# Third part imports
 from rest_framework import status
 from rest_framework.viewsets import ModelViewSet
 from rest_framework.exceptions import APIException
 from rest_framework.views import APIView
 from rest_framework.filters import SearchFilter
 from rest_framework.permissions import IsAuthenticated
+from rest_framework.exceptions import NotFound
 from sentry_sdk import capture_exception
 from django_filters.rest_framework import DjangoFilterBackend

 # Module imports
+from plane.db.models import Workspace, Project
 from plane.utils.paginator import BasePaginator


-class TimezoneMixin:
-    """
-    This enables timezone conversion according
-    to the user set timezone
-    """
-    def initial(self, request, *args, **kwargs):
-        super().initial(request, *args, **kwargs)
-        if request.user.is_authenticated:
-            timezone.activate(zoneinfo.ZoneInfo(request.user.user_timezone))
-        else:
-            timezone.deactivate()
-
-
-
-
-class BaseViewSet(TimezoneMixin, ModelViewSet, BasePaginator):
+class BaseViewSet(ModelViewSet, BasePaginator):

    model = None

@@ -84,7 +67,7 @@ class BaseViewSet(TimezoneMixin, ModelViewSet, BasePaginator):
            return self.kwargs.get("pk", None)


-class BaseAPIView(TimezoneMixin, APIView, BasePaginator):
+class BaseAPIView(APIView, BasePaginator):

    permission_classes = [
        IsAuthenticated,
@@ -56,6 +56,10 @@ class CycleViewSet(BaseViewSet):
    permission_classes = [
        ProjectEntityPermission,
    ]
+    # def get_serializer_class(self):
+    #     return (
+    #         CycleSerializer(nested_fields={"owned_by":("id", "first_name", "last_name", "avatar", "is_bot", "display_name")})
+    #     )

    def perform_create(self, serializer):
        serializer.save(
@@ -101,96 +105,62 @@ class CycleViewSet(BaseViewSet):
            .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(total_issues=Count("issue_cycle"))
            .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,
-                    ),
+                    filter=Q(issue_cycle__issue__state__group="completed"),
                )
            )
            .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,
-                    ),
+                    filter=Q(issue_cycle__issue__state__group="cancelled"),
                )
            )
            .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,
-                    ),
+                    filter=Q(issue_cycle__issue__state__group="started"),
                )
            )
            .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,
-                    ),
+                    filter=Q(issue_cycle__issue__state__group="unstarted"),
                )
            )
            .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,
-                    ),
+                    filter=Q(issue_cycle__issue__state__group="backlog"),
                )
            )
            .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,
-                    ),
+                    filter=Q(issue_cycle__issue__state__group="completed"),
                )
            )
            .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,
-                    ),
+                    filter=Q(issue_cycle__issue__state__group="started"),
                )
            )
            .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")
@@ -208,7 +178,8 @@ class CycleViewSet(BaseViewSet):
            # All Cycles
            if cycle_view == "all":
                return Response(
-                    CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+                    CycleSerializer(queryset, fields=["id", "created_by", "created_at", "updated_at", "updated_by", "project", "workspace", "name", "description", "start_date", "end_date", "owned_by", "view_props", "sort_order", "is_favorite", "total_issues", "cancelled_issues", "completed_issues", "started_issues", "unstarted_issues"
+                    , "backlog_issues", "assignees", "labels", "total_estimates", "completed_estimates", "started_estimates",{"workspace_detail": ["id", "name","slug"]},{ "project_detail": ["id", "name", "cover_image", "icon_prop", "emoji", "description"]}, {"owned_by": ["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}], many=True).data, status=status.HTTP_200_OK
                )

            # Current Cycle
@@ -218,7 +189,8 @@ class CycleViewSet(BaseViewSet):
                    end_date__gte=timezone.now(),
                )

-                data = CycleSerializer(queryset, many=True).data
+                data = CycleSerializer(queryset,  fields=["id", "created_by", "created_at", "updated_at", "updated_by", "project", "workspace", "name", "description", "start_date", "end_date", "owned_by", "view_props", "sort_order", "is_favorite", "total_issues", "cancelled_issues", "completed_issues", "started_issues", "unstarted_issues"
+                    , "backlog_issues", "assignees", "labels", "total_estimates", "completed_estimates", "started_estimates",{"workspace_detail": ["id", "name","slug"]},{ "project_detail": ["id", "name", "cover_image", "icon_prop", "emoji", "description"]}, {"owned_by": ["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}], many=True).data

                if len(data):
                    assignee_distribution = (
@@ -227,37 +199,25 @@ class CycleViewSet(BaseViewSet):
                            workspace__slug=slug,
                            project_id=project_id,
                        )
-                        .annotate(display_name=F("assignees__display_name"))
+                        .annotate(first_name=F("assignees__first_name"))
+                        .annotate(last_name=F("assignees__last_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),
-                            ),
-                        )
+                        .values("first_name", "last_name", "assignee_id", "avatar")
+                        .annotate(total_issues=Count("assignee_id"))
                        .annotate(
                            completed_issues=Count(
                                "assignee_id",
-                                filter=Q(
-                                    completed_at__isnull=False,
-                                    archived_at__isnull=True,
-                                    is_draft=False,
-                                ),
+                                filter=Q(completed_at__isnull=False),
                            )
                        )
                        .annotate(
                            pending_issues=Count(
                                "assignee_id",
-                                filter=Q(
-                                    completed_at__isnull=True,
-                                    archived_at__isnull=True,
-                                    is_draft=False,
-                                ),
+                                filter=Q(completed_at__isnull=True),
                            )
                        )
-                        .order_by("display_name")
+                        .order_by("first_name", "last_name")
                    )

                    label_distribution = (
@@ -270,30 +230,17 @@ class CycleViewSet(BaseViewSet):
                        .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(total_issues=Count("label_id"))
                        .annotate(
                            completed_issues=Count(
                                "label_id",
-                                filter=Q(
-                                    completed_at__isnull=False,
-                                    archived_at__isnull=True,
-                                    is_draft=False,
-                                ),
+                                filter=Q(completed_at__isnull=False),
                            )
                        )
                        .annotate(
                            pending_issues=Count(
                                "label_id",
-                                filter=Q(
-                                    completed_at__isnull=True,
-                                    archived_at__isnull=True,
-                                    is_draft=False,
-                                ),
+                                filter=Q(completed_at__isnull=True),
                            )
                        )
                        .order_by("label_name")
@@ -317,14 +264,16 @@ class CycleViewSet(BaseViewSet):
            if cycle_view == "upcoming":
                queryset = queryset.filter(start_date__gt=timezone.now())
                return Response(
-                    CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+                    CycleSerializer(queryset, fields=["id", "created_by", "created_at", "updated_at", "updated_by", "project", "workspace", "name", "description", "start_date", "end_date", "owned_by", "view_props", "sort_order", "is_favorite", "total_issues", "cancelled_issues", "completed_issues", "started_issues", "unstarted_issues"
+                    , "backlog_issues", "assignees", "labels", "total_estimates", "completed_estimates", "started_estimates",{"workspace_detail": ["id", "name","slug"]},{ "project_detail": ["id", "name", "cover_image", "icon_prop", "emoji", "description"]}, {"owned_by": ["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}], 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
+                    CycleSerializer(queryset,  fields=["id", "created_by", "created_at", "updated_at", "updated_by", "project", "workspace", "name", "description", "start_date", "end_date", "owned_by", "view_props", "sort_order", "is_favorite", "total_issues", "cancelled_issues", "completed_issues", "started_issues", "unstarted_issues"
+                    , "backlog_issues", "assignees", "labels", "total_estimates", "completed_estimates", "started_estimates",{"workspace_detail": ["id", "name","slug"]},{ "project_detail": ["id", "name", "cover_image", "icon_prop", "emoji", "description"]}, {"owned_by": ["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}], many=True).data, status=status.HTTP_200_OK
                )

            # Draft Cycles
@@ -335,16 +284,19 @@ class CycleViewSet(BaseViewSet):
                )

                return Response(
-                    CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+                    CycleSerializer(queryset,  fields=["id", "created_by", "created_at", "updated_at", "updated_by", "project", "workspace", "name", "description", "start_date", "end_date", "owned_by", "view_props", "sort_order", "is_favorite", "total_issues", "cancelled_issues", "completed_issues", "started_issues", "unstarted_issues"
+                    , "backlog_issues", "assignees", "labels", "total_estimates", "completed_estimates", "started_estimates",{"workspace_detail": ["id", "name","slug"]},{ "project_detail": ["id", "name", "cover_image", "icon_prop", "emoji", "description"]}, {"owned_by": ["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}], 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),
+                    Q(end_date__gte=timezone.now().date()) | Q(
+                        end_date__isnull=True),
                )
                return Response(
-                    CycleSerializer(queryset, many=True).data, status=status.HTTP_200_OK
+                    CycleSerializer(queryset,  fields=["id", "created_by", "created_at", "updated_at", "updated_by", "project", "workspace", "name", "description", "start_date", "end_date", "owned_by", "view_props", "sort_order", "is_favorite", "total_issues", "cancelled_issues", "completed_issues", "started_issues", "unstarted_issues"
+                    , "backlog_issues", "assignees", "labels", "total_estimates", "completed_estimates", "started_estimates",{"workspace_detail": ["id", "name","slug"]},{ "project_detail": ["id", "name", "cover_image", "icon_prop", "emoji", "description"]}, {"owned_by": ["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}], many=True).data, status=status.HTTP_200_OK
                )

            return Response(
@@ -367,7 +319,8 @@ class CycleViewSet(BaseViewSet):
                request.data.get("start_date", None) is not None
                and request.data.get("end_date", None) is not None
            ):
-                serializer = CycleSerializer(data=request.data)
+                serializer = CycleSerializer(data=request.data,  fields=["id", "created_by", "created_at", "updated_at", "updated_by", "project", "workspace", "name", "description", "start_date", "end_date", "owned_by", "view_props", "sort_order", "is_favorite", "total_issues", "cancelled_issues", "completed_issues", "started_issues", "unstarted_issues"
+                    , "backlog_issues", "assignees", "labels", "total_estimates", "completed_estimates", "started_estimates",{"workspace_detail": ["id", "name","slug"]},{ "project_detail": ["id", "name", "cover_image", "icon_prop", "emoji", "description"]}, {"owned_by": ["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}])
                if serializer.is_valid():
                    serializer.save(
                        project_id=project_id,
@@ -395,23 +348,16 @@ class CycleViewSet(BaseViewSet):
                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 "sort_order" in request_data:
-                    # Can only change sort order
-                    request_data = {
-                        "sort_order": request_data.get("sort_order", cycle.sort_order)
-                    }
-                else:
-                    return Response(
-                        {
-                            "error": "The Cycle has already been completed so it cannot be edited"
-                        },
-                        status=status.HTTP_400_BAD_REQUEST,
-                    )
+                return Response(
+                    {
+                        "error": "The Cycle has already been completed so it cannot be edited"
+                    },
+                    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)
@@ -443,33 +389,18 @@ class CycleViewSet(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"
-                )
-                .annotate(
-                    total_issues=Count(
-                        "assignee_id",
-                        filter=Q(archived_at__isnull=True, is_draft=False),
-                    ),
-                )
+                .values("first_name", "last_name", "assignee_id", "avatar", "display_name")
+                .annotate(total_issues=Count("assignee_id"))
                .annotate(
                    completed_issues=Count(
                        "assignee_id",
-                        filter=Q(
-                            completed_at__isnull=False,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
+                        filter=Q(completed_at__isnull=False),
                    )
                )
                .annotate(
                    pending_issues=Count(
                        "assignee_id",
-                        filter=Q(
-                            completed_at__isnull=True,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
+                        filter=Q(completed_at__isnull=True),
                    )
                )
                .order_by("first_name", "last_name")
@@ -486,36 +417,24 @@ class CycleViewSet(BaseViewSet):
                .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(total_issues=Count("label_id"))
                .annotate(
                    completed_issues=Count(
                        "label_id",
-                        filter=Q(
-                            completed_at__isnull=False,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
+                        filter=Q(completed_at__isnull=False),
                    )
                )
                .annotate(
                    pending_issues=Count(
                        "label_id",
-                        filter=Q(
-                            completed_at__isnull=True,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
+                        filter=Q(completed_at__isnull=True),
                    )
                )
                .order_by("label_name")
            )

-            data = CycleSerializer(queryset).data
+            data = CycleSerializer(queryset, fields=["id", "created_by", "created_at", "updated_at", "updated_by", "project", "workspace", "name", "description", "start_date", "end_date", "owned_by", "view_props", "sort_order", "is_favorite", "total_issues", "cancelled_issues", "completed_issues", "started_issues", "unstarted_issues"
+                    , "backlog_issues", "assignees", "labels", "total_estimates", "completed_estimates", "started_estimates",{"workspace_detail": ["id", "name","slug"]},{ "project_detail": ["id", "name", "cover_image", "icon_prop", "emoji", "description"]}, {"owned_by": ["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}]).data
            data["distribution"] = {
                "assignees": assignee_distribution,
                "labels": label_distribution,
@@ -583,7 +502,8 @@ class CycleIssueViewSet(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")
@@ -605,12 +525,12 @@ class CycleIssueViewSet(BaseViewSet):
        try:
            order_by = request.GET.get("order_by", "created_at")
            group_by = request.GET.get("group_by", False)
-            sub_group_by = request.GET.get("sub_group_by", False)
            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")
@@ -644,15 +564,9 @@ class CycleIssueViewSet(BaseViewSet):

            issues_data = IssueStateSerializer(issues, many=True).data

-            if sub_group_by and sub_group_by == group_by:
-                return Response(
-                    {"error": "Group by and sub group by cannot be same"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
            if group_by:
                return Response(
-                    group_results(issues_data, group_by, sub_group_by),
+                    group_results(issues_data, group_by),
                    status=status.HTTP_200_OK,
                )

@@ -814,6 +728,7 @@ class CycleDateCheckEndpoint(BaseAPIView):


 class CycleFavoriteViewSet(BaseViewSet):
+
    serializer_class = CycleFavoriteSerializer
    model = CycleFavorite

@@ -13,7 +13,6 @@ from plane.db.models import Project, Estimate, EstimatePoint
 from plane.api.serializers import (
    EstimateSerializer,
    EstimatePointSerializer,
-    EstimateReadSerializer,
 )


@@ -51,10 +50,38 @@ class BulkEstimatePointEndpoint(BaseViewSet):

    def list(self, request, slug, project_id):
        try:
-            estimates = Estimate.objects.filter(
-                workspace__slug=slug, project_id=project_id
-            ).prefetch_related("points").select_related("workspace", "project")
-            serializer = EstimateReadSerializer(estimates, many=True)
+            estimates = (
+                Estimate.objects.filter(workspace__slug=slug, project_id=project_id)
+                .prefetch_related("points")
+                .select_related("workspace", "project")
+            )
+            serializer = EstimateSerializer(
+                estimates,
+                fields=[
+                    "id",
+                    "created_at",
+                    "created_by",
+                    "updated_at",
+                    "updated_by",
+                    "workspace",
+                    "project",
+                    {"workspace_detail": ["id", "name", "slug"]},
+                    {
+                        "project_detail": [
+                            "id",
+                            "name",
+                            "cover_image",
+                            "icon_prop",
+                            "emoji",
+                            "description",
+                        ]
+                    },
+                    "name",
+                    "points",
+                    "description",
+                ],
+                many=True,
+            )
            return Response(serializer.data, status=status.HTTP_200_OK)
        except Exception as e:
            capture_exception(e)
@@ -79,7 +106,31 @@ class BulkEstimatePointEndpoint(BaseViewSet):
                    status=status.HTTP_400_BAD_REQUEST,
                )

-            estimate_serializer = EstimateSerializer(data=request.data.get("estimate"))
+            estimate_serializer = EstimateSerializer(
+                data=request.data.get("estimate"),
+                fields=[
+                    "id",
+                    "created_at",
+                    "created_by",
+                    "updated_at",
+                    "updated_by",
+                    "workspace",
+                    "project",
+                    {"workspace_detail": ["id", "name", "slug"]},
+                    {
+                        "project_detail": [
+                            "id",
+                            "name",
+                            "cover_image",
+                            "icon_prop",
+                            "emoji",
+                            "description",
+                        ]
+                    },
+                    "name",
+                    "description",
+                ],
+            )
            if not estimate_serializer.is_valid():
                return Response(
                    estimate_serializer.errors, status=status.HTTP_400_BAD_REQUEST
@@ -137,7 +188,32 @@ class BulkEstimatePointEndpoint(BaseViewSet):
            estimate = Estimate.objects.get(
                pk=estimate_id, workspace__slug=slug, project_id=project_id
            )
-            serializer = EstimateReadSerializer(estimate)
+            serializer = EstimateSerializer(
+                estimate,
+                fields=[
+                    "id",
+                    "created_at",
+                    "created_by",
+                    "updated_at",
+                    "updated_by",
+                    "workspace",
+                    "project",
+                    {"workspace_detail": ["id", "name", "slug"]},
+                    {
+                        "project_detail": [
+                            "id",
+                            "name",
+                            "cover_image",
+                            "icon_prop",
+                            "emoji",
+                            "description",
+                        ]
+                    },
+                    "name",
+                    "points",
+                    "description",
+                ],
+            )
            return Response(
                serializer.data,
                status=status.HTTP_200_OK,
@@ -170,7 +246,31 @@ class BulkEstimatePointEndpoint(BaseViewSet):
            estimate = Estimate.objects.get(pk=estimate_id)

            estimate_serializer = EstimateSerializer(
-                estimate, data=request.data.get("estimate"), partial=True
+                estimate,
+                data=request.data.get("estimate"),
+                fields=[
+                    "id",
+                    "created_at",
+                    "created_by",
+                    "updated_at",
+                    "updated_by",
+                    "workspace",
+                    "project",
+                    {"workspace_detail": ["id", "name", "slug"]},
+                    {
+                        "project_detail": [
+                            "id",
+                            "name",
+                            "cover_image",
+                            "icon_prop",
+                            "emoji",
+                            "description",
+                        ]
+                    },
+                    "name",
+                    "description",
+                ],
+                partial=True,
            )
            if not estimate_serializer.is_valid():
                return Response(
@@ -211,7 +311,9 @@ class BulkEstimatePointEndpoint(BaseViewSet):

            try:
                EstimatePoint.objects.bulk_update(
-                    updated_estimate_points, ["value"], batch_size=10,
+                    updated_estimate_points,
+                    ["value"],
+                    batch_size=10,
                )
            except IntegrityError as e:
                return Response(
@@ -219,7 +321,9 @@ class BulkEstimatePointEndpoint(BaseViewSet):
                    status=status.HTTP_400_BAD_REQUEST,
                )

-            estimate_point_serializer = EstimatePointSerializer(estimate_points, many=True)
+            estimate_point_serializer = EstimatePointSerializer(
+                estimate_points, many=True
+            )
            return Response(
                {
                    "estimate": estimate_serializer.data,
@@ -23,11 +23,11 @@ class ExportIssuesEndpoint(BaseAPIView):
        try:
            # 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(
@@ -77,14 +77,38 @@ class ExportIssuesEndpoint(BaseAPIView):
        try:
            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):
                return self.paginate(
                    request=request,
                    queryset=exporter_history,
                    on_results=lambda exporter_history: ExporterHistorySerializer(
-                        exporter_history, many=True
+                        exporter_history,
+                        fields=[
+                            "id",
+                            "created_by",
+                            "created_at",
+                            "updated_at",
+                            "updated_by",
+                            "initiated_by",
+                            "status",
+                            "url",
+                            "token",
+                            "project",
+                            "provider",
+                            {
+                                "initiated_by_detail": [
+                                    "id",
+                                    "first_name",
+                                    "last_name",
+                                    "avatar",
+                                    "is_bot",
+                                    "display_name",
+                                ]
+                            },
+                        ],
+                        many=True,
                    ).data,
                )
            else:
@@ -14,7 +14,7 @@ from django.conf import settings
 from .base import BaseAPIView
 from plane.api.permissions import ProjectEntityPermission
 from plane.db.models import Workspace, Project
-from plane.api.serializers import ProjectLiteSerializer, WorkspaceLiteSerializer
+from plane.api.serializers import ProjectSerializer, WorkSpaceSerializer


 class GPTIntegrationEndpoint(BaseAPIView):
@@ -41,9 +41,9 @@ class GPTIntegrationEndpoint(BaseAPIView):
            final_text = task + "\n" + prompt

            openai.api_key = settings.OPENAI_API_KEY
-            response = openai.ChatCompletion.create(
+            response = openai.Completion.create(
                model=settings.GPT_ENGINE,
-                messages=[{"role": "user", "content": final_text}],
+                prompt=final_text,
                temperature=0.7,
                max_tokens=1024,
            )
@@ -51,14 +51,32 @@ class GPTIntegrationEndpoint(BaseAPIView):
            workspace = Workspace.objects.get(slug=slug)
            project = Project.objects.get(pk=project_id)

-            text = response.choices[0].message.content.strip()
+            text = response.choices[0].text.strip()
            text_html = text.replace("\n", "<br/>")
            return Response(
                {
                    "response": text,
                    "response_html": text_html,
-                    "project_detail": ProjectLiteSerializer(project).data,
-                    "workspace_detail": WorkspaceLiteSerializer(workspace).data,
+                    "project_detail": ProjectSerializer(
+                        project,
+                        fields=[
+                            "id",
+                            "name",
+                            "cover_image",
+                            "icon_prop",
+                            "emoji",
+                            "description",
+                            "created_by",
+                            "updated_by",
+                            "created_at",
+                            "updated_at",
+                        ],
+                        read_only=True,
+                    ).data,
+                    "workspace_detail": WorkSpaceSerializer(
+                        workspace,
+                        fields=["id", "name", "slug"],
+                    ).data,
                },
                status=status.HTTP_200_OK,
            )
@@ -42,7 +42,6 @@ from plane.utils.html_processor import strip_tags


 class ServiceIssueImportSummaryEndpoint(BaseAPIView):
-
    def get(self, request, slug, service):
        try:
            if service == "github":
@@ -177,7 +176,47 @@ class ImportServiceEndpoint(BaseAPIView):
                )

                service_importer.delay(service, importer.id)
-                serializer = ImporterSerializer(importer)
+                serializer = ImporterSerializer(
+                    importer,
+                    fields=[
+                        "id",
+                        "created_by",
+                        "created_at",
+                        "updated_at",
+                        "updated_by",
+                        "workspace",
+                        "project",
+                        "service",
+                        "status",
+                        "initiated_by",
+                        "metadata",
+                        "config",
+                        "data",
+                        "token",
+                        "imported_data",
+                        {
+                            "initiated_by_detail": [
+                                "id",
+                                "first_name",
+                                "last_name",
+                                "avatar",
+                                "is_bot",
+                                "display_name",
+                            ],
+                        },
+                        {
+                            "project_detail": [
+                                "id",
+                                "name",
+                                "cover_image",
+                                "icon_prop",
+                                "emoji",
+                                "description",
+                            ]
+                        },
+                        {"workspace_detail": ["id", "name", "slug"]},
+                    ],
+                )
                return Response(serializer.data, status=status.HTTP_201_CREATED)

            if service == "jira":
@@ -213,7 +252,47 @@ class ImportServiceEndpoint(BaseAPIView):
                )

                service_importer.delay(service, importer.id)
-                serializer = ImporterSerializer(importer)
+                serializer = ImporterSerializer(
+                    importer,
+                    fields=[
+                        "id",
+                        "created_by",
+                        "created_at",
+                        "updated_at",
+                        "updated_by",
+                        "workspace",
+                        "project",
+                        "service",
+                        "status",
+                        "initiated_by",
+                        "metadata",
+                        "config",
+                        "data",
+                        "token",
+                        "imported_data",
+                        {
+                            "initiated_by_detail": [
+                                "id",
+                                "first_name",
+                                "last_name",
+                                "avatar",
+                                "is_bot",
+                                "display_name",
+                            ],
+                        },
+                        {
+                            "project_detail": [
+                                "id",
+                                "name",
+                                "cover_image",
+                                "icon_prop",
+                                "emoji",
+                                "description",
+                            ]
+                        },
+                        {"workspace_detail": ["id", "name", "slug"]},
+                    ],
+                )
                return Response(serializer.data, status=status.HTTP_201_CREATED)

            return Response(
@@ -243,7 +322,48 @@ class ImportServiceEndpoint(BaseAPIView):
                .order_by("-created_at")
                .select_related("initiated_by", "project", "workspace")
            )
-            serializer = ImporterSerializer(imports, many=True)
+            serializer = ImporterSerializer(
+                imports,
+                fields=[
+                    "id",
+                    "created_by",
+                    "created_at",
+                    "updated_at",
+                    "updated_by",
+                    "workspace",
+                    "project",
+                    "service",
+                    "status",
+                    "initiated_by",
+                    "metadata",
+                    "config",
+                    "data",
+                    "token",
+                    "imported_data",
+                    {
+                        "initiated_by_detail": [
+                            "id",
+                            "first_name",
+                            "last_name",
+                            "avatar",
+                            "is_bot",
+                            "display_name",
+                        ],
+                    },
+                    {
+                        "project_detail": [
+                            "id",
+                            "name",
+                            "cover_image",
+                            "icon_prop",
+                            "emoji",
+                            "description",
+                        ]
+                    },
+                    {"workspace_detail": ["id", "name", "slug"]},
+                ],
+                many=True,
+            )
            return Response(serializer.data)
        except Exception as e:
            capture_exception(e)
@@ -284,7 +404,49 @@ 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,
+                fields=[
+                    "id",
+                    "created_by",
+                    "created_at",
+                    "updated_at",
+                    "updated_by",
+                    "workspace",
+                    "project",
+                    "service",
+                    "status",
+                    "initiated_by",
+                    "metadata",
+                    "config",
+                    "data",
+                    "token",
+                    "imported_data",
+                    {
+                        "initiated_by_detail": [
+                            "id",
+                            "first_name",
+                            "last_name",
+                            "avatar",
+                            "is_bot",
+                            "display_name",
+                        ],
+                    },
+                    {
+                        "project_detail": [
+                            "id",
+                            "name",
+                            "cover_image",
+                            "icon_prop",
+                            "emoji",
+                            "description",
+                        ]
+                    },
+                    {"workspace_detail": ["id", "name", "slug"]},
+                ],
+                data=request.data,
+                partial=True,
+            )
            if serializer.is_valid():
                serializer.save()
                return Response(serializer.data, status=status.HTTP_200_OK)
@@ -152,7 +152,22 @@ class InboxIssueViewSet(BaseViewSet):
                    )
                )
            )
-            issues_data = IssueStateInboxSerializer(issues, many=True).data
+            issues_data = IssueStateInboxSerializer(
+                issues,
+                fields=[
+                    {
+                        "assignee_details": (
+                            "id",
+                            "first_name",
+                            "last_name",
+                            "avatar",
+                            "is_bot",
+                            "display_name",
+                        )
+                    }
+                ],
+                many=True,
+            ).data
            return Response(
                issues_data,
                status=status.HTTP_200_OK,
@@ -222,7 +237,19 @@ class InboxIssueViewSet(BaseViewSet):
                source=request.data.get("source", "in-app"),
            )

-            serializer = IssueStateInboxSerializer(issue)
+            serializer = IssueStateInboxSerializer(
+                issue,
+                nested_fields={
+                    "assignee_details": (
+                        "id",
+                        "first_name",
+                        "last_name",
+                        "avatar",
+                        "is_bot",
+                        "display_name",
+                    )
+                },
+            )
            return Response(serializer.data, status=status.HTTP_200_OK)
        except Exception as e:
            capture_exception(e)
@@ -237,10 +264,17 @@ class InboxIssueViewSet(BaseViewSet):
                pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
            )
            # Get the project member
-            project_member = ProjectMember.objects.get(workspace__slug=slug, project_id=project_id, member=request.user)
+            project_member = ProjectMember.objects.get(
+                workspace__slug=slug, project_id=project_id, member=request.user
+            )
            # Only project members admins and created_by users can access this endpoint
-            if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(request.user.id):
-                return Response({"error": "You cannot edit inbox issues"}, status=status.HTTP_400_BAD_REQUEST)
+            if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
+                request.user.id
+            ):
+                return Response(
+                    {"error": "You cannot edit inbox issues"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )

            # Get issue data
            issue_data = request.data.pop("issue", False)
@@ -251,15 +285,99 @@ class InboxIssueViewSet(BaseViewSet):
                )
                # Only allow guests and viewers to edit name and description
                if project_member.role <= 10:
-                    # viewers and guests since only viewers and guests 
+                    # viewers and guests since only viewers and guests
                    issue_data = {
                        "name": issue_data.get("name", issue.name),
-                        "description_html": issue_data.get("description_html", issue.description_html),
-                        "description": issue_data.get("description", issue.description)
+                        "description_html": issue_data.get(
+                            "description_html", issue.description_html
+                        ),
+                        "description": issue_data.get("description", issue.description),
                    }

                issue_serializer = IssueCreateSerializer(
-                    issue, data=issue_data, partial=True
+                    issue,
+                    data=issue_data,
+                    fields=[
+                        {
+                            "created_by_detail": [
+                                "id",
+                                "first_name",
+                                "last_name",
+                                "avatar",
+                                "is_bot",
+                                "display_name",
+                            ]
+                        },
+                        {
+                            "state_detail": [
+                                "id",
+                                "created_by",
+                                "created_at",
+                                "updated_at",
+                                "updated_by",
+                                "name",
+                                "description",
+                                "color",
+                                "slug",
+                                "sequence",
+                                "group",
+                                "default",
+                                "project",
+                                "workspace",
+                                {"workspace_detail": ["id", "name", "slug"]},
+                                {
+                                    "project_detail": [
+                                        "id",
+                                        "name",
+                                        "cover_image",
+                                        "icon_prop",
+                                        "emoji",
+                                        "description",
+                                    ]
+                                },
+                            ],
+                        },
+                        {
+                            "project_detail": [
+                                "id",
+                                "name",
+                                "cover_image",
+                                "icon_prop",
+                                "emoji",
+                                "description",
+                            ]
+                        },
+                        {"workspace_detail": ["id", "name", "slug"]},
+                        "id",
+                        "created_at",
+                        "created_by",
+                        "updated_at",
+                        "updated_by",
+                        "workspace",
+                        "project",
+                        "assignees_list",
+                        "blockers_list",
+                        "labels_list",
+                        "blocks_list",
+                        "PRIORITY_CHOICES",
+                        "parent",
+                        "state",
+                        "estimate_point",
+                        "name",
+                        "description",
+                        "description_html",
+                        "description_stripped",
+                        "priority",
+                        "start_date",
+                        "target_date",
+                        "assignees",
+                        "sequence_id",
+                        "labels",
+                        "sort_order",
+                        "completed_at",
+                        "archived_at",
+                    ],
+                    partial=True,
                )

                if issue_serializer.is_valid():
@@ -287,7 +405,30 @@ class InboxIssueViewSet(BaseViewSet):
            # Only project admins and members can edit inbox issue attributes
            if project_member.role > 10:
                serializer = InboxIssueSerializer(
-                    inbox_issue, data=request.data, partial=True
+                    inbox_issue,
+                    fields=[
+                        {
+                            "project_detail": [
+                                "id",
+                                "name",
+                                "cover_image",
+                                "icon_prop",
+                                "emoji",
+                                "description",
+                            ]
+                        },
+                        "id",
+                        "created_at",
+                        "updated_at",
+                        "inbox",
+                        "issue",
+                        "status",
+                        "snoozed_till",
+                        "duplicate_to",
+                        "source",
+                    ],
+                    data=request.data,
+                    partial=True,
                )

                if serializer.is_valid():
@@ -300,7 +441,9 @@ 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
@@ -318,7 +461,9 @@ 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
@@ -327,7 +472,9 @@ class InboxIssueViewSet(BaseViewSet):
                    return Response(serializer.data, status=status.HTTP_200_OK)
                return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
            else:
-                return Response(InboxIssueSerializer(inbox_issue).data, status=status.HTTP_200_OK)
+                return Response(
+                    InboxIssueSerializer(inbox_issue).data, status=status.HTTP_200_OK
+                )
        except InboxIssue.DoesNotExist:
            return Response(
                {"error": "Inbox Issue does not exist"},
@@ -348,7 +495,19 @@ class InboxIssueViewSet(BaseViewSet):
            issue = Issue.objects.get(
                pk=inbox_issue.issue_id, workspace__slug=slug, project_id=project_id
            )
-            serializer = IssueStateInboxSerializer(issue)
+            serializer = IssueStateInboxSerializer(
+                issue,
+                nested_fields={
+                    "assignee_details": (
+                        "id",
+                        "first_name",
+                        "last_name",
+                        "avatar",
+                        "is_bot",
+                        "display_name",
+                    )
+                },
+            )
            return Response(serializer.data, status=status.HTTP_200_OK)
        except Exception as e:
            capture_exception(e)
@@ -363,15 +522,25 @@ class InboxIssueViewSet(BaseViewSet):
                pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
            )
            # Get the project member
-            project_member = ProjectMember.objects.get(workspace__slug=slug, project_id=project_id, member=request.user)
+            project_member = ProjectMember.objects.get(
+                workspace__slug=slug, project_id=project_id, member=request.user
+            )

-            if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(request.user.id):
-                return Response({"error": "You cannot delete inbox issue"}, status=status.HTTP_400_BAD_REQUEST)
+            if project_member.role <= 10 and str(inbox_issue.created_by_id) != str(
+                request.user.id
+            ):
+                return Response(
+                    {"error": "You cannot delete inbox issue"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )

            inbox_issue.delete()
            return Response(status=status.HTTP_204_NO_CONTENT)
        except InboxIssue.DoesNotExist:
-            return Response({"error": "Inbox Issue does not exists"}, status=status.HTTP_400_BAD_REQUEST)
+            return Response(
+                {"error": "Inbox Issue does not exists"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
        except Exception as e:
            capture_exception(e)
            return Response(
@@ -389,7 +558,10 @@ class InboxIssuePublicViewSet(BaseViewSet):
    ]

    def get_queryset(self):
-        project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=self.kwargs.get("slug"), project_id=self.kwargs.get("project_id"))
+        project_deploy_board = ProjectDeployBoard.objects.get(
+            workspace__slug=self.kwargs.get("slug"),
+            project_id=self.kwargs.get("project_id"),
+        )
        if project_deploy_board is not None:
            return self.filter_queryset(
                super()
@@ -407,9 +579,14 @@ class InboxIssuePublicViewSet(BaseViewSet):

    def list(self, request, slug, project_id, inbox_id):
        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=slug, project_id=project_id)
+            project_deploy_board = ProjectDeployBoard.objects.get(
+                workspace__slug=slug, project_id=project_id
+            )
            if project_deploy_board.inbox is None:
-                return Response({"error": "Inbox is not enabled for this Project Board"}, status=status.HTTP_400_BAD_REQUEST)
+                return Response(
+                    {"error": "Inbox is not enabled for this Project Board"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )

            filters = issue_filters(request.query_params, "GET")
            issues = (
@@ -452,13 +629,29 @@ class InboxIssuePublicViewSet(BaseViewSet):
                    )
                )
            )
-            issues_data = IssueStateInboxSerializer(issues, many=True).data
+            issues_data = IssueStateInboxSerializer(
+                issues,
+                nested_fields={
+                    "assignee_details": (
+                        "id",
+                        "first_name",
+                        "last_name",
+                        "avatar",
+                        "is_bot",
+                        "display_name",
+                    )
+                },
+                many=True,
+            ).data
            return Response(
                issues_data,
                status=status.HTTP_200_OK,
            )
        except ProjectDeployBoard.DoesNotExist:
-            return Response({"error": "Project Deploy Board does not exist"}, status=status.HTTP_400_BAD_REQUEST)
+            return Response(
+                {"error": "Project Deploy Board does not exist"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
        except Exception as e:
            capture_exception(e)
            return Response(
@@ -468,9 +661,14 @@ class InboxIssuePublicViewSet(BaseViewSet):

    def create(self, request, slug, project_id, inbox_id):
        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=slug, project_id=project_id)
+            project_deploy_board = ProjectDeployBoard.objects.get(
+                workspace__slug=slug, project_id=project_id
+            )
            if project_deploy_board.inbox is None:
-                return Response({"error": "Inbox is not enabled for this Project Board"}, status=status.HTTP_400_BAD_REQUEST)
+                return Response(
+                    {"error": "Inbox is not enabled for this Project Board"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )

            if not request.data.get("issue", {}).get("name", False):
                return Response(
@@ -527,7 +725,19 @@ class InboxIssuePublicViewSet(BaseViewSet):
                source=request.data.get("source", "in-app"),
            )

-            serializer = IssueStateInboxSerializer(issue)
+            serializer = IssueStateInboxSerializer(
+                issue,
+                nested_fields={
+                    "assignee_details": (
+                        "id",
+                        "first_name",
+                        "last_name",
+                        "avatar",
+                        "is_bot",
+                        "display_name",
+                    )
+                },
+            )
            return Response(serializer.data, status=status.HTTP_200_OK)
        except Exception as e:
            capture_exception(e)
@@ -538,33 +748,124 @@ class InboxIssuePublicViewSet(BaseViewSet):

    def partial_update(self, request, slug, project_id, inbox_id, pk):
        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=slug, project_id=project_id)
+            project_deploy_board = ProjectDeployBoard.objects.get(
+                workspace__slug=slug, project_id=project_id
+            )
            if project_deploy_board.inbox is None:
-                return Response({"error": "Inbox is not enabled for this Project Board"}, status=status.HTTP_400_BAD_REQUEST)
+                return Response(
+                    {"error": "Inbox is not enabled for this Project Board"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )

            inbox_issue = InboxIssue.objects.get(
                pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
            )
            # Get the project member
            if str(inbox_issue.created_by_id) != str(request.user.id):
-                return Response({"error": "You cannot edit inbox issues"}, status=status.HTTP_400_BAD_REQUEST)
+                return Response(
+                    {"error": "You cannot edit inbox issues"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )

            # Get issue data
            issue_data = request.data.pop("issue", False)

-
            issue = Issue.objects.get(
                pk=inbox_issue.issue_id, workspace__slug=slug, project_id=project_id
            )
-            # viewers and guests since only viewers and guests 
+            # viewers and guests since only viewers and guests
            issue_data = {
                "name": issue_data.get("name", issue.name),
-                "description_html": issue_data.get("description_html", issue.description_html),
-                "description": issue_data.get("description", issue.description)
+                "description_html": issue_data.get(
+                    "description_html", issue.description_html
+                ),
+                "description": issue_data.get("description", issue.description),
            }

            issue_serializer = IssueCreateSerializer(
-                issue, data=issue_data, partial=True
+                issue,
+                data=issue_data,
+                fields=[
+                    {
+                        "created_by_detail": [
+                            "id",
+                            "first_name",
+                            "last_name",
+                            "avatar",
+                            "is_bot",
+                            "display_name",
+                        ]
+                    },
+                    {
+                        "state_detail": [
+                            "id",
+                            "created_by",
+                            "created_at",
+                            "updated_at",
+                            "updated_by",
+                            "name",
+                            "description",
+                            "color",
+                            "slug",
+                            "sequence",
+                            "group",
+                            "default",
+                            "project",
+                            "workspace",
+                            {"workspace_detail": ["id", "name", "slug"]},
+                            {
+                                "project_detail": [
+                                    "id",
+                                    "name",
+                                    "cover_image",
+                                    "icon_prop",
+                                    "emoji",
+                                    "description",
+                                ]
+                            },
+                        ],
+                    },
+                    {
+                        "project_detail": [
+                            "id",
+                            "name",
+                            "cover_image",
+                            "icon_prop",
+                            "emoji",
+                            "description",
+                        ]
+                    },
+                    {"workspace_detail": ["id", "name", "slug"]},
+                    "id",
+                    "created_at",
+                    "created_by",
+                    "updated_at",
+                    "updated_by",
+                    "workspace",
+                    "project",
+                    "assignees_list",
+                    "blockers_list",
+                    "labels_list",
+                    "blocks_list",
+                    "PRIORITY_CHOICES",
+                    "parent",
+                    "state",
+                    "estimate_point",
+                    "name",
+                    "description",
+                    "description_html",
+                    "description_stripped",
+                    "priority",
+                    "start_date",
+                    "target_date",
+                    "assignees",
+                    "sequence_id",
+                    "labels",
+                    "sort_order",
+                    "completed_at",
+                    "archived_at",
+                ],
+                partial=True,
            )

            if issue_serializer.is_valid():
@@ -600,17 +901,34 @@ class InboxIssuePublicViewSet(BaseViewSet):

    def retrieve(self, request, slug, project_id, inbox_id, pk):
        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=slug, project_id=project_id)
+            project_deploy_board = ProjectDeployBoard.objects.get(
+                workspace__slug=slug, project_id=project_id
+            )
            if project_deploy_board.inbox is None:
-                return Response({"error": "Inbox is not enabled for this Project Board"}, status=status.HTTP_400_BAD_REQUEST)
-        
+                return Response(
+                    {"error": "Inbox is not enabled for this Project Board"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )
+
            inbox_issue = InboxIssue.objects.get(
                pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
            )
            issue = Issue.objects.get(
                pk=inbox_issue.issue_id, workspace__slug=slug, project_id=project_id
            )
-            serializer = IssueStateInboxSerializer(issue)
+            serializer = IssueStateInboxSerializer(
+                issue,
+                nested_fields={
+                    "assignee_details": (
+                        "id",
+                        "first_name",
+                        "last_name",
+                        "avatar",
+                        "is_bot",
+                        "display_name",
+                    )
+                },
+            )
            return Response(serializer.data, status=status.HTTP_200_OK)
        except Exception as e:
            capture_exception(e)
@@ -621,25 +939,35 @@ class InboxIssuePublicViewSet(BaseViewSet):

    def destroy(self, request, slug, project_id, inbox_id, pk):
        try:
-            project_deploy_board = ProjectDeployBoard.objects.get(workspace__slug=slug, project_id=project_id)
+            project_deploy_board = ProjectDeployBoard.objects.get(
+                workspace__slug=slug, project_id=project_id
+            )
            if project_deploy_board.inbox is None:
-                return Response({"error": "Inbox is not enabled for this Project Board"}, status=status.HTTP_400_BAD_REQUEST)
+                return Response(
+                    {"error": "Inbox is not enabled for this Project Board"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )

            inbox_issue = InboxIssue.objects.get(
                pk=pk, workspace__slug=slug, project_id=project_id, inbox_id=inbox_id
            )

            if str(inbox_issue.created_by_id) != str(request.user.id):
-                return Response({"error": "You cannot delete inbox issue"}, status=status.HTTP_400_BAD_REQUEST)
+                return Response(
+                    {"error": "You cannot delete inbox issue"},
+                    status=status.HTTP_400_BAD_REQUEST,
+                )

            inbox_issue.delete()
            return Response(status=status.HTTP_204_NO_CONTENT)
        except InboxIssue.DoesNotExist:
-            return Response({"error": "Inbox Issue does not exists"}, status=status.HTTP_400_BAD_REQUEST)
+            return Response(
+                {"error": "Inbox Issue does not exists"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
        except Exception as e:
            capture_exception(e)
            return Response(
                {"error": "Something went wrong please try again later"},
                status=status.HTTP_400_BAD_REQUEST,
            )
-
@@ -39,7 +39,6 @@ from plane.utils.grouper import group_results
 from plane.utils.issue_filters import issue_filters
 from plane.utils.analytics_plot import burndown_plot

-
 class ModuleViewSet(BaseViewSet):
    model = Module
    permission_classes = [
@@ -78,63 +77,35 @@ class ModuleViewSet(BaseViewSet):
                    queryset=ModuleLink.objects.select_related("module", "created_by"),
                )
            )
-            .annotate(
-                total_issues=Count(
-                    "issue_module",
-                    filter=Q(
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
-                ),
-            )
+            .annotate(total_issues=Count("issue_module"))
            .annotate(
                completed_issues=Count(
                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="completed",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
+                    filter=Q(issue_module__issue__state__group="completed"),
                )
            )
            .annotate(
                cancelled_issues=Count(
                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="cancelled",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
+                    filter=Q(issue_module__issue__state__group="cancelled"),
                )
            )
            .annotate(
                started_issues=Count(
                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="started",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
+                    filter=Q(issue_module__issue__state__group="started"),
                )
            )
            .annotate(
                unstarted_issues=Count(
                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="unstarted",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
+                    filter=Q(issue_module__issue__state__group="unstarted"),
                )
            )
            .annotate(
                backlog_issues=Count(
                    "issue_module__issue__state__group",
-                    filter=Q(
-                        issue_module__issue__state__group="backlog",
-                        issue_module__issue__archived_at__isnull=True,
-                        issue_module__issue__is_draft=False,
-                    ),
+                    filter=Q(issue_module__issue__state__group="backlog"),
                )
            )
            .order_by(order_by, "name")
@@ -206,36 +177,18 @@ class ModuleViewSet(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"
-                )
-                .annotate(
-                    total_issues=Count(
-                        "assignee_id",
-                        filter=Q(
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
-                    )
-                )
+                .values("first_name", "last_name", "assignee_id", "avatar", "display_name")
+                .annotate(total_issues=Count("assignee_id"))
                .annotate(
                    completed_issues=Count(
                        "assignee_id",
-                        filter=Q(
-                            completed_at__isnull=False,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
+                        filter=Q(completed_at__isnull=False),
                    )
                )
                .annotate(
                    pending_issues=Count(
                        "assignee_id",
-                        filter=Q(
-                            completed_at__isnull=True,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
+                        filter=Q(completed_at__isnull=True),
                    )
                )
                .order_by("first_name", "last_name")
@@ -251,33 +204,17 @@ class ModuleViewSet(BaseViewSet):
                .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(total_issues=Count("label_id"))
                .annotate(
                    completed_issues=Count(
                        "label_id",
-                        filter=Q(
-                            completed_at__isnull=False,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
+                        filter=Q(completed_at__isnull=False),
                    )
                )
                .annotate(
                    pending_issues=Count(
                        "label_id",
-                        filter=Q(
-                            completed_at__isnull=True,
-                            archived_at__isnull=True,
-                            is_draft=False,
-                        ),
+                        filter=Q(completed_at__isnull=True),
                    )
                )
                .order_by("label_name")
@@ -371,7 +308,6 @@ class ModuleIssueViewSet(BaseViewSet):
        try:
            order_by = request.GET.get("order_by", "created_at")
            group_by = request.GET.get("group_by", False)
-            sub_group_by = request.GET.get("sub_group_by", False)
            filters = issue_filters(request.query_params, "GET")
            issues = (
                Issue.issue_objects.filter(issue_module__module_id=module_id)
@@ -410,15 +346,9 @@ class ModuleIssueViewSet(BaseViewSet):

            issues_data = IssueStateSerializer(issues, many=True).data

-            if sub_group_by and sub_group_by == group_by:
-                return Response(
-                    {"error": "Group by and sub group by cannot be same"},
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-
            if group_by:
                return Response(
-                    group_results(issues_data, group_by, sub_group_by),
+                    group_results(issues_data, group_by),
                    status=status.HTTP_200_OK,
                )

@@ -553,6 +483,7 @@ class ModuleLinkViewSet(BaseViewSet):


 class ModuleFavoriteViewSet(BaseViewSet):
+
    serializer_class = ModuleFavoriteSerializer
    model = ModuleFavorite

@@ -10,13 +10,7 @@ from plane.utils.paginator import BasePaginator

 # Module imports
 from .base import BaseViewSet, BaseAPIView
-from plane.db.models import (
-    Notification,
-    IssueAssignee,
-    IssueSubscriber,
-    Issue,
-    WorkspaceMember,
-)
+from plane.db.models import Notification, IssueAssignee, IssueSubscriber, Issue, WorkspaceMember
 from plane.api.serializers import NotificationSerializer


@@ -89,17 +83,13 @@ class NotificationViewSet(BaseViewSet, BasePaginator):

            # Created issues
            if type == "created":
-                if WorkspaceMember.objects.filter(
-                    workspace__slug=slug, member=request.user, role__lt=15
-                ).exists():
+                if WorkspaceMember.objects.filter(workspace__slug=slug, member=request.user, role__lt=15).exists():
                    notifications = Notification.objects.none()
                else:
                    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):
@@ -284,80 +274,3 @@ class UnreadNotificationEndpoint(BaseAPIView):
                {"error": "Something went wrong please try again later"},
                status=status.HTTP_400_BAD_REQUEST,
            )
-
-
-class MarkAllReadNotificationViewSet(BaseViewSet):
-    def create(self, request, slug):
-        try:
-            snoozed = request.data.get("snoozed", False)
-            archived = request.data.get("archived", False)
-            type = request.data.get("type", "all")
-
-            notifications = (
-                Notification.objects.filter(
-                    workspace__slug=slug,
-                    receiver_id=request.user.id,
-                    read_at__isnull=True,
-                )
-                .select_related("workspace", "project", "triggered_by", "receiver")
-                .order_by("snoozed_till", "-created_at")
-            )
-
-            # Filter for snoozed notifications
-            if snoozed:
-                notifications = notifications.filter(
-                    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),
-                )
-
-            # Filter for archived or unarchive
-            if archived:
-                notifications = notifications.filter(archived_at__isnull=False)
-            else:
-                notifications = notifications.filter(archived_at__isnull=True)
-
-            # Subscribed issues
-            if type == "watching":
-                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)
-
-            # 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)
-
-            # Created issues
-            if type == "created":
-                if WorkspaceMember.objects.filter(
-                    workspace__slug=slug, member=request.user, role__lt=15
-                ).exists():
-                    notifications = Notification.objects.none()
-                else:
-                    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
-                    )
-
-            updated_notifications = []
-            for notification in notifications:
-                notification.read_at = timezone.now()
-                updated_notifications.append(notification)
-            Notification.objects.bulk_update(
-                updated_notifications, ["read_at"], batch_size=100
-            )
-            return Response({"message": "Successful"}, status=status.HTTP_200_OK)
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
@@ -11,8 +11,14 @@ from django.db.models import (
    OuterRef,
    Func,
    F,
+    Max,
+    CharField,
    Func,
    Subquery,
+    Prefetch,
+    When,
+    Case,
+    Value,
 )
 from django.core.validators import validate_email
 from django.conf import settings
@@ -41,7 +47,6 @@ from plane.api.permissions import (
    ProjectBasePermission,
    ProjectEntityPermission,
    ProjectMemberPermission,
-    ProjectLitePermission,
 )

 from plane.db.models import (
@@ -66,9 +71,16 @@ from plane.db.models import (
    ModuleMember,
    Inbox,
    ProjectDeployBoard,
+    Issue,
+    IssueReaction,
+    IssueLink,
+    IssueAttachment,
+    Label,
 )

 from plane.bgtasks.project_invitation_task import project_invitation
+from plane.utils.grouper import group_results
+from plane.utils.issue_filters import issue_filters


 class ProjectViewSet(BaseViewSet):
@@ -79,10 +91,10 @@ class ProjectViewSet(BaseViewSet):
        ProjectBasePermission,
    ]

-    def get_serializer_class(self, *args, **kwargs):
-        if self.action == "update" or self.action == "partial_update":
-            return ProjectSerializer
-        return ProjectDetailSerializer
+    # def get_serializer_class(self, *args, **kwargs):
+    #     if self.action == "update" or self.action == "partial_update":
+    #         return ProjectSerializer(fields=['id', {'workspace_detail': ["id", "name", "slug"]}, 'created_at', 'updated_at', 'name', 'description', 'description_text', 'description_html', 'network', 'identifier', 'emoji', 'icon_prop', 'module_view', 'cycle_view', 'issue_views_view', 'page_view', 'inbox_view', 'cover_image', 'archive_in', 'close_in', 'created_by', 'updated_by', 'workspace', 'default_assignee', 'project_lead', 'estimate', 'default_state', 'sort_order'],)
+    #     return ProjectDetailSerializer

    def get_queryset(self):
        subquery = ProjectFavorite.objects.filter(
@@ -204,7 +216,38 @@ class ProjectViewSet(BaseViewSet):
            workspace = Workspace.objects.get(slug=slug)

            serializer = ProjectSerializer(
-                data={**request.data}, context={"workspace_id": workspace.id}
+                data={**request.data},
+                fields=[
+                    "id",
+                    {"workspace_detail": ["id", "name", "slug"]},
+                    "created_at",
+                    "updated_at",
+                    "name",
+                    "description",
+                    "description_text",
+                    "description_html",
+                    "network",
+                    "identifier",
+                    "emoji",
+                    "icon_prop",
+                    "module_view",
+                    "cycle_view",
+                    "issue_views_view",
+                    "page_view",
+                    "inbox_view",
+                    "cover_image",
+                    "archive_in",
+                    "close_in",
+                    "created_by",
+                    "updated_by",
+                    "workspace",
+                    "default_assignee",
+                    "project_lead",
+                    "estimate",
+                    "default_state",
+                    "sort_order",
+                ],
+                context={"workspace_id": workspace.id},
            )
            if serializer.is_valid():
                serializer.save()
@@ -275,10 +318,7 @@ class ProjectViewSet(BaseViewSet):
                )

                data = serializer.data
-                # Additional fields of the member
                data["sort_order"] = project_member.sort_order
-                data["member_role"] = project_member.role
-                data["is_member"] = True
                return Response(data, status=status.HTTP_201_CREATED)
            return Response(
                serializer.errors,
@@ -321,6 +361,36 @@ class ProjectViewSet(BaseViewSet):
            serializer = ProjectSerializer(
                project,
                data={**request.data},
+                fields=[
+                    "id",
+                    {"workspace_detail": ["id", "name", "slug"]},
+                    "created_at",
+                    "updated_at",
+                    "name",
+                    "description",
+                    "description_text",
+                    "description_html",
+                    "network",
+                    "identifier",
+                    "emoji",
+                    "icon_prop",
+                    "module_view",
+                    "cycle_view",
+                    "issue_views_view",
+                    "page_view",
+                    "inbox_view",
+                    "cover_image",
+                    "archive_in",
+                    "close_in",
+                    "created_by",
+                    "updated_by",
+                    "workspace",
+                    "default_assignee",
+                    "project_lead",
+                    "estimate",
+                    "default_state",
+                    "sort_order",
+                ],
                context={"workspace_id": workspace.id},
                partial=True,
            )
@@ -482,7 +552,7 @@ class UserProjectInvitationsViewset(BaseViewSet):
            # Delete joined project invites
            project_invitations.delete()

-            return Response(status=status.HTTP_204_NO_CONTENT)
+            return Response(status=status.HTTP_200_OK)
        except Exception as e:
            capture_exception(e)
            return Response(
@@ -617,7 +687,7 @@ class ProjectMemberViewSet(BaseViewSet):
            return Response(status=status.HTTP_204_NO_CONTENT)
        except ProjectMember.DoesNotExist:
            return Response(
-                {"error": "Project Member does not exist"}, status=status.HTTP_400_BAD_REQUEST
+                {"error": "Project Member does not exist"}, status=status.HTTP_400
            )
        except Exception as e:
            capture_exception(e)
@@ -924,7 +994,8 @@ class ProjectUserViewsEndpoint(BaseAPIView):

            project_member.save()

-            return Response(status=status.HTTP_204_NO_CONTENT)
+            return Response(status=status.HTTP_200_OK)
+
        except Project.DoesNotExist:
            return Response(
                {"error": "The requested resource does not exists"},
@@ -1130,78 +1201,145 @@ class ProjectDeployBoardPublicSettingsEndpoint(BaseAPIView):
            )


-class WorkspaceProjectDeployBoardEndpoint(BaseAPIView):
+class ProjectDeployBoardIssuesPublicEndpoint(BaseAPIView):
    permission_classes = [
        AllowAny,
    ]

-    def get(self, request, slug):
+    def get(self, request, slug, project_id):
        try:
-            projects = (
-                Project.objects.filter(workspace__slug=slug)
-                .annotate(
-                    is_public=Exists(
-                        ProjectDeployBoard.objects.filter(
-                            workspace__slug=slug, project_id=OuterRef("pk")
-                        )
+            project_deploy_board = ProjectDeployBoard.objects.get(
+                workspace__slug=slug, project_id=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 = (
+                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=project_id)
+                .filter(workspace__slug=slug)
+                .select_related("project", "workspace", "state", "parent")
+                .prefetch_related("assignees", "labels")
+                .prefetch_related(
+                    Prefetch(
+                        "issue_reactions",
+                        queryset=IssueReaction.objects.select_related("actor"),
                    )
                )
-                .filter(is_public=True)
-            ).values(
-                "id",
-                "identifier",
-                "name",
-                "description",
-                "emoji",
-                "icon_prop",
-                "cover_image",
-            )
-
-            return Response(projects, status=status.HTTP_200_OK)
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-
-class LeaveProjectEndpoint(BaseAPIView):
-    permission_classes = [
-        ProjectLitePermission,
-    ]
-
-    def delete(self, request, slug, project_id):
-        try:
-            project_member = ProjectMember.objects.get(
-                workspace__slug=slug,
-                member=request.user,
-                project_id=project_id,
-            )
-
-            # Only Admin case
-            if (
-                project_member.role == 20
-                and ProjectMember.objects.filter(
-                    workspace__slug=slug,
-                    role=20,
-                    project_id=project_id,
-                ).count()
-                == 1
-            ):
-                return Response(
-                    {
-                        "error": "You cannot leave the project since you are the only admin of the project you should delete the project"
-                    },
-                    status=status.HTTP_400_BAD_REQUEST,
+                .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()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
                )
-            # Delete the member from workspace
-            project_member.delete()
-            return Response(status=status.HTTP_204_NO_CONTENT)
-        except ProjectMember.DoesNotExist:
+                .annotate(
+                    attachment_count=IssueAttachment.objects.filter(
+                        issue=OuterRef("id")
+                    )
+                    .order_by()
+                    .annotate(count=Func(F("id"), function="Count"))
+                    .values("count")
+                )
+            )
+
+            # 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]
+                )
+                issue_queryset = issue_queryset.annotate(
+                    priority_order=Case(
+                        *[
+                            When(priority=p, then=Value(i))
+                            for i, p in enumerate(priority_order)
+                        ],
+                        output_field=CharField(),
+                    )
+                ).order_by("priority_order")
+
+            # State Ordering
+            elif order_by_param in [
+                "state__name",
+                "state__group",
+                "-state__name",
+                "-state__group",
+            ]:
+                state_order = (
+                    state_order
+                    if order_by_param in ["state__name", "state__group"]
+                    else state_order[::-1]
+                )
+                issue_queryset = issue_queryset.annotate(
+                    state_order=Case(
+                        *[
+                            When(state__group=state_group, then=Value(i))
+                            for i, state_group in enumerate(state_order)
+                        ],
+                        default=Value(len(state_order)),
+                        output_field=CharField(),
+                    )
+                ).order_by("state_order")
+            # assignee and label ordering
+            elif order_by_param in [
+                "labels__name",
+                "-labels__name",
+                "assignees__first_name",
+                "-assignees__first_name",
+            ]:
+                issue_queryset = issue_queryset.annotate(
+                    max_values=Max(
+                        order_by_param[1::]
+                        if order_by_param.startswith("-")
+                        else order_by_param
+                    )
+                ).order_by(
+                    "-max_values" if order_by_param.startswith("-") else "max_values"
+                )
+            else:
+                issue_queryset = issue_queryset.order_by(order_by_param)
+
+            issues = IssueLiteSerializer(issue_queryset, many=True).data
+
+            states = State.objects.filter(
+                workspace__slug=slug, project_id=project_id
+            ).values("name", "group", "color", "id")
+
+            labels = Label.objects.filter(
+                workspace__slug=slug, project_id=project_id
+            ).values("id", "name", "color", "parent")
+
+            # Grouping the results
+            group_by = request.GET.get("group_by", False)
+            if group_by:
+                issues = group_results(issues, group_by)
+
            return Response(
-                {"error": "Workspace member does not exists"},
-                status=status.HTTP_400_BAD_REQUEST,
+                {
+                    "issues": issues,
+                    "states": states,
+                    "labels": labels,
+                },
+                status=status.HTTP_200_OK,
+            )
+        except ProjectDeployBoard.DoesNotExist:
+            return Response(
+                {"error": "Board does not exists"}, status=status.HTTP_404_NOT_FOUND
            )
        except Exception as e:
            capture_exception(e)
@@ -220,7 +220,7 @@ class IssueSearchEndpoint(BaseAPIView):
            query = request.query_params.get("search", False)
            workspace_search = request.query_params.get("workspace_search", "false")
            parent = request.query_params.get("parent", "false")
-            issue_relation = request.query_params.get("issue_relation", "false")
+            blocker_blocked_by = request.query_params.get("blocker_blocked_by", "false")
            cycle = request.query_params.get("cycle", "false")
            module = request.query_params.get("module", "false")
            sub_issue = request.query_params.get("sub_issue", "false")
@@ -247,12 +247,12 @@ class IssueSearchEndpoint(BaseAPIView):
                        "parent_id", flat=True
                    )
                )
-            if issue_relation == "true" and issue_id:
+            if blocker_blocked_by == "true" and issue_id:
                issue = Issue.issue_objects.get(pk=issue_id)
                issues = issues.filter(
                    ~Q(pk=issue_id),
-                    ~Q(issue_related__issue=issue),
-                    ~Q(issue_relation__related_issue=issue),
+                    ~Q(blocked_issues__block=issue),
+                    ~Q(blocker_issues__blocked_by=issue),
                )
            if sub_issue == "true" and issue_id:
                issue = Issue.issue_objects.get(pk=issue_id)
@@ -42,7 +42,36 @@ class StateViewSet(BaseViewSet):

    def create(self, request, slug, project_id):
        try:
-            serializer = StateSerializer(data=request.data)
+            serializer = StateSerializer(
+                data=request.data,
+                fields=[
+                    "id",
+                    "created_by",
+                    "created_at",
+                    "updated_at",
+                    "updated_by",
+                    "name",
+                    "description",
+                    "color",
+                    "slug",
+                    "sequence",
+                    "group",
+                    "default",
+                    "project",
+                    "workspace",
+                    {"workspace_detail": ["id", "name", "slug"]},
+                    {
+                        "project_detail": [
+                            "id",
+                            "name",
+                            "cover_image",
+                            "icon_prop",
+                            "emoji",
+                            "description",
+                        ]
+                    },
+                ],
+            )
            if serializer.is_valid():
                serializer.save(project_id=project_id)
                return Response(serializer.data, status=status.HTTP_200_OK)
@@ -62,7 +91,37 @@ class StateViewSet(BaseViewSet):
    def list(self, request, slug, project_id):
        try:
            state_dict = dict()
-            states = StateSerializer(self.get_queryset(), many=True).data
+            states = StateSerializer(
+                self.get_queryset(),
+                fields=[
+                    "id",
+                    "created_by",
+                    "created_at",
+                    "updated_at",
+                    "updated_by",
+                    "name",
+                    "description",
+                    "color",
+                    "slug",
+                    "sequence",
+                    "group",
+                    "default",
+                    "project",
+                    "workspace",
+                    {"workspace_detail": ["id", "name", "slug"]},
+                    {
+                        "project_detail": [
+                            "id",
+                            "name",
+                            "cover_image",
+                            "icon_prop",
+                            "emoji",
+                            "description",
+                        ]
+                    },
+                ],
+                many=True,
+            ).data

            for key, value in groupby(
                sorted(states, key=lambda state: state["group"]),
@@ -82,7 +141,9 @@ class StateViewSet(BaseViewSet):
        try:
            state = State.objects.get(
                ~Q(name="Triage"),
-                pk=pk, project_id=project_id, workspace__slug=slug,
+                pk=pk,
+                project_id=project_id,
+                workspace__slug=slug,
            )

            if state.default:
@@ -137,17 +137,28 @@ class UpdateUserTourCompletedEndpoint(BaseAPIView):


 class UserActivityEndpoint(BaseAPIView, BasePaginator):
-    def get(self, request, slug):
+    def get(self, request):
        try:
-            queryset = IssueActivity.objects.filter(
-                actor=request.user, workspace__slug=slug
-            ).select_related("actor", "workspace", "issue", "project")
+            queryset = IssueActivity.objects.filter(actor=request.user).select_related(
+                "actor", "workspace", "issue", "project"
+            )

            return self.paginate(
                request=request,
                queryset=queryset,
                on_results=lambda issue_activities: IssueActivitySerializer(
-                    issue_activities, many=True
+                    issue_activities,
+                    nested_fields={
+                        "actor_detail": (
+                            "id",
+                            "first_name",
+                            "last_name",
+                            "avatar",
+                            "is_bot",
+                            "display_name",
+                        )
+                    },
+                    many=True,
                ).data,
            )
        except Exception as e:
@@ -42,12 +42,11 @@ from plane.api.serializers import (
    WorkSpaceMemberSerializer,
    TeamSerializer,
    WorkSpaceMemberInviteSerializer,
-    UserLiteSerializer,
+    UserSerializer,
    ProjectMemberSerializer,
    WorkspaceThemeSerializer,
    IssueActivitySerializer,
    IssueLiteSerializer,
-    WorkspaceMemberAdminSerializer,
 )
 from plane.api.views.base import BaseAPIView
 from . import BaseViewSet
@@ -116,7 +115,7 @@ class WorkSpaceViewSet(BaseViewSet):
        )

        issue_count = (
-            Issue.issue_objects.filter(workspace=OuterRef("id"))
+            Issue.objects.filter(workspace=OuterRef("id"))
            .order_by()
            .annotate(count=Func(F("id"), function="Count"))
            .values("count")
@@ -164,8 +163,8 @@ class WorkSpaceViewSet(BaseViewSet):
                status=status.HTTP_400_BAD_REQUEST,
            )

-        ## Handling unique integrity error for now
-        ## TODO: Extend this to handle other common errors which are not automatically handled by APIException
+        # Handling unique integrity error for now
+        # TODO: Extend this to handle other common errors which are not automatically handled by APIException
        except IntegrityError as e:
            if "already exists" in str(e):
                return Response(
@@ -203,7 +202,7 @@ class UserWorkSpacesEndpoint(BaseAPIView):
            )

            issue_count = (
-                Issue.issue_objects.filter(workspace=OuterRef("id"))
+                Issue.objects.filter(workspace=OuterRef("id"))
                .order_by()
                .annotate(count=Func(F("id"), function="Count"))
                .values("count")
@@ -300,7 +299,31 @@ class InviteWorkspaceEndpoint(BaseAPIView):
                    {
                        "error": "Some users are already member of workspace",
                        "workspace_users": WorkSpaceMemberSerializer(
-                            workspace_members, many=True
+                            workspace_members,
+                            fields=[
+                                "id",
+                                "created_by",
+                                "created_at",
+                                "updated_at",
+                                "updated_by",
+                                "name",
+                                "logo",
+                                "owner",
+                                "slug",
+                                "organization_size",
+                                {"workspace": ["id", "name", "slug"]},
+                                {
+                                    "member": [
+                                        "id",
+                                        "first_name",
+                                        "last_name",
+                                        "avatar",
+                                        "is_bot",
+                                        "display_name",
+                                    ]
+                                },
+                            ],
+                            many=True,
                        ).data,
                    },
                    status=status.HTTP_400_BAD_REQUEST,
@@ -532,7 +555,7 @@ class UserWorkspaceInvitationsEndpoint(BaseViewSet):
            # Delete joined workspace invites
            workspace_invitations.delete()

-            return Response(status=status.HTTP_204_NO_CONTENT)
+            return Response(status=status.HTTP_200_OK)
        except Exception as e:
            capture_exception(e)
            return Response(
@@ -542,7 +565,7 @@ class UserWorkspaceInvitationsEndpoint(BaseViewSet):


 class WorkSpaceMemberViewSet(BaseViewSet):
-    serializer_class = WorkspaceMemberAdminSerializer
+    serializer_class = WorkSpaceMemberSerializer
    model = WorkspaceMember

    permission_classes = [
@@ -591,7 +614,32 @@ class WorkSpaceMemberViewSet(BaseViewSet):
                )

            serializer = WorkSpaceMemberSerializer(
-                workspace_member, data=request.data, partial=True
+                workspace_member,
+                data=request.data,
+                partial=True,
+                fields=[
+                    "id",
+                    "created_by",
+                    "created_at",
+                    "updated_at",
+                    "updated_by",
+                    "name",
+                    "logo",
+                    "owner",
+                    "slug",
+                    "organization_size",
+                    {"workspace": ["id", "name", "slug"]},
+                    {
+                        "member": [
+                            "id",
+                            "first_name",
+                            "last_name",
+                            "avatar",
+                            "is_bot",
+                            "display_name",
+                        ]
+                    },
+                ],
            )

            if serializer.is_valid():
@@ -725,7 +773,18 @@ class TeamMemberViewSet(BaseViewSet):
                users = list(set(request.data.get("members", [])).difference(members))
                users = User.objects.filter(pk__in=users)

-                serializer = UserLiteSerializer(users, many=True)
+                serializer = UserSerializer(
+                    users,
+                    fields=[
+                        "id",
+                        "first_name",
+                        "last_name",
+                        "avatar",
+                        "is_bot",
+                        "display_name",
+                    ],
+                    many=True,
+                )
                return Response(
                    {
                        "error": f"{len(users)} of the member(s) are not a part of the workspace",
@@ -791,14 +850,95 @@ class UserLastProjectWithWorkspaceEndpoint(BaseAPIView):
                )

            workspace = Workspace.objects.get(pk=last_workspace_id)
-            workspace_serializer = WorkSpaceSerializer(workspace)
+            workspace_serializer = WorkSpaceSerializer(
+                workspace,
+                fields=[
+                    "id",
+                    {
+                        "owner": [
+                            "id",
+                            "first_name",
+                            "last_name",
+                            "avatar",
+                            "is_bot",
+                            "display_name",
+                        ]
+                    },
+                    "created_at",
+                    "updated_at",
+                    "name",
+                    "logo",
+                    "slug",
+                    "organization_size",
+                    "created_by",
+                    "updated_by",
+                ],
+            )

            project_member = ProjectMember.objects.filter(
                workspace_id=last_workspace_id, member=request.user
            ).select_related("workspace", "project", "member", "workspace__owner")

            project_member_serializer = ProjectMemberSerializer(
-                project_member, many=True
+                project_member,
+                fields=[
+                    "id",
+                    {
+                        "workspace": [
+                            "id",
+                            {
+                                "owner": [
+                                    "id",
+                                    "first_name",
+                                    "last_name",
+                                    "avatar",
+                                    "is_bot",
+                                    "display_name",
+                                ]
+                            },
+                            "created_at",
+                            "updated_at",
+                            "name",
+                            "logo",
+                            "slug",
+                            "organization_size",
+                            "created_by",
+                            "updated_by",
+                        ]
+                    },
+                    {
+                        "project": [
+                            "id",
+                            "identifier",
+                            "name",
+                            "cover_image",
+                            "icon_prop",
+                            "emoji",
+                            "description",
+                        ]
+                    },
+                    {
+                        "member": [
+                            "id",
+                            "first_name",
+                            "last_name",
+                            "avatar",
+                            "is_bot",
+                            "display_name",
+                        ]
+                    },
+                    "created_at",
+                    "updated_at",
+                    "comment",
+                    "role",
+                    "view_props",
+                    "default_props",
+                    "preferences",
+                    "sort_order",
+                    "created_by",
+                    "updated_by",
+                ],
+                many=True,
            )

            return Response(
@@ -825,7 +965,32 @@ class WorkspaceMemberUserEndpoint(BaseAPIView):
            workspace_member = WorkspaceMember.objects.get(
                member=request.user, workspace__slug=slug
            )
-            serializer = WorkSpaceMemberSerializer(workspace_member)
+            serializer = WorkSpaceMemberSerializer(
+                workspace_member,
+                fields=[
+                    "id",
+                    "created_by",
+                    "created_at",
+                    "updated_at",
+                    "updated_by",
+                    "name",
+                    "logo",
+                    "owner",
+                    "slug",
+                    "organization_size",
+                    {"workspace": ["id", "name", "slug"]},
+                    {
+                        "member": [
+                            "id",
+                            "first_name",
+                            "last_name",
+                            "avatar",
+                            "is_bot",
+                            "display_name",
+                        ]
+                    },
+                ],
+            )
            return Response(serializer.data, status=status.HTTP_200_OK)
        except (Workspace.DoesNotExist, WorkspaceMember.DoesNotExist):
            return Response({"error": "Forbidden"}, status=status.HTTP_403_FORBIDDEN)
@@ -846,7 +1011,7 @@ class WorkspaceMemberUserViewsEndpoint(BaseAPIView):
            workspace_member.view_props = request.data.get("view_props", {})
            workspace_member.save()

-            return Response(status=status.HTTP_204_NO_CONTENT)
+            return Response(status=status.HTTP_200_OK)
        except WorkspaceMember.DoesNotExist:
            return Response(
                {"error": "User not a member of workspace"},
@@ -1072,10 +1237,10 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
                .order_by("state_group")
            )

-            priority_order = ["urgent", "high", "medium", "low", "none"]
+            priority_order = ["urgent", "high", "medium", "low", None]

            priority_distribution = (
-                Issue.issue_objects.filter(
+                Issue.objects.filter(
                    workspace__slug=slug,
                    assignees__in=[user_id],
                    project__project_projectmember__member=request.user,
@@ -1083,7 +1248,6 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
                .filter(**filters)
                .values("priority")
                .annotate(priority_count=Count("priority"))
-                .filter(priority_count__gte=1)
                .annotate(
                    priority_order=Case(
                        *[
@@ -1100,6 +1264,7 @@ class WorkspaceUserProfileStatsEndpoint(BaseAPIView):
            created_issues = (
                Issue.issue_objects.filter(
                    workspace__slug=slug,
+                    assignees__in=[user_id],
                    project__project_projectmember__member=request.user,
                    created_by_id=user_id,
                )
@@ -1197,7 +1362,6 @@ class WorkspaceUserActivityEndpoint(BaseAPIView):
            projects = request.query_params.getlist("project", [])

            queryset = IssueActivity.objects.filter(
-                ~Q(field__in=["comment", "vote", "reaction"]),
                workspace__slug=slug,
                project__project_projectmember__member=request.user,
                actor=user_id,
@@ -1210,7 +1374,18 @@ class WorkspaceUserActivityEndpoint(BaseAPIView):
                request=request,
                queryset=queryset,
                on_results=lambda issue_activities: IssueActivitySerializer(
-                    issue_activities, many=True
+                    issue_activities,
+                    nested_fields={
+                        "actor_detail": (
+                            "id",
+                            "first_name",
+                            "last_name",
+                            "avatar",
+                            "is_bot",
+                            "display_name",
+                        )
+                    },
+                    many=True,
                ).data,
            )
        except Exception as e:
@@ -1239,21 +1414,13 @@ class WorkspaceUserProfileEndpoint(BaseAPIView):
                    .annotate(
                        created_issues=Count(
                            "project_issue",
-                            filter=Q(
-                                project_issue__created_by_id=user_id,
-                                project_issue__archived_at__isnull=True,
-                                project_issue__is_draft=False,
-                            ),
+                            filter=Q(project_issue__created_by_id=user_id),
                        )
                    )
                    .annotate(
                        assigned_issues=Count(
                            "project_issue",
-                            filter=Q(
-                                project_issue__assignees__in=[user_id],
-                                project_issue__archived_at__isnull=True,
-                                project_issue__is_draft=False,
-                            ),
+                            filter=Q(project_issue__assignees__in=[user_id]),
                        )
                    )
                    .annotate(
@@ -1262,8 +1429,6 @@ class WorkspaceUserProfileEndpoint(BaseAPIView):
                            filter=Q(
                                project_issue__completed_at__isnull=False,
                                project_issue__assignees__in=[user_id],
-                                project_issue__archived_at__isnull=True,
-                                project_issue__is_draft=False,
                            ),
                        )
                    )
@@ -1277,8 +1442,6 @@ class WorkspaceUserProfileEndpoint(BaseAPIView):
                                    "started",
                                ],
                                project_issue__assignees__in=[user_id],
-                                project_issue__archived_at__isnull=True,
-                                project_issue__is_draft=False,
                            ),
                        )
                    )
@@ -1430,7 +1593,7 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):

            issues = IssueLiteSerializer(issue_queryset, many=True).data

-            ## Grouping the results
+            # Grouping the results
            group_by = request.GET.get("group_by", False)
            if group_by:
                return Response(
@@ -1477,49 +1640,34 @@ class WorkspaceMembersEndpoint(BaseAPIView):
                workspace__slug=slug,
                member__is_bot=False,
            ).select_related("workspace", "member")
-            serialzier = WorkSpaceMemberSerializer(workspace_members, many=True)
-            return Response(serialzier.data, status=status.HTTP_200_OK)
-        except Exception as e:
-            capture_exception(e)
-            return Response(
-                {"error": "Something went wrong please try again later"},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
-
-
-class LeaveWorkspaceEndpoint(BaseAPIView):
-    permission_classes = [
-        WorkspaceEntityPermission,
-    ]
-
-    def delete(self, request, slug):
-        try:
-            workspace_member = WorkspaceMember.objects.get(
-                workspace__slug=slug, member=request.user
-            )
-
-            # Only Admin case
-            if (
-                workspace_member.role == 20
-                and WorkspaceMember.objects.filter(
-                    workspace__slug=slug, role=20
-                ).count()
-                == 1
-            ):
-                return Response(
+            serializer = WorkSpaceMemberSerializer(
+                workspace_members,
+                fields=[
+                    "id",
+                    "created_by",
+                    "created_at",
+                    "updated_at",
+                    "updated_by",
+                    "name",
+                    "logo",
+                    "owner",
+                    "slug",
+                    "organization_size",
+                    {"workspace": ["id", "name", "slug"]},
                    {
-                        "error": "You cannot leave the workspace since you are the only admin of the workspace you should delete the workspace"
+                        "member": [
+                            "id",
+                            "first_name",
+                            "last_name",
+                            "avatar",
+                            "is_bot",
+                            "display_name",
+                        ]
                    },
-                    status=status.HTTP_400_BAD_REQUEST,
-                )
-            # Delete the member from workspace
-            workspace_member.delete()
-            return Response(status=status.HTTP_204_NO_CONTENT)
-        except WorkspaceMember.DoesNotExist:
-            return Response(
-                {"error": "Workspace member does not exists"},
-                status=status.HTTP_400_BAD_REQUEST,
+                ],
+                many=True,
            )
+            return Response(serializer.data, status=status.HTTP_200_OK)
        except Exception as e:
            capture_exception(e)
            return Response(
@@ -4,7 +4,6 @@ import io
 import json
 import boto3
 import zipfile
-from urllib.parse import urlparse, urlunparse

 # Django imports
 from django.conf import settings
@@ -24,11 +23,9 @@ def dateTimeConverter(time):
    if time:
        return time.strftime("%a, %d %b %Y %I:%M:%S %Z%z")

-
 def dateConverter(time):
    if time:
-        return time.strftime("%a, %d %b %Y")
-
+        return time.strftime("%a, %d %b %Y")    

 def create_csv_file(data):
    csv_buffer = io.StringIO()
@@ -69,53 +66,28 @@ def create_zip_file(files):


 def upload_to_s3(zip_file, workspace_id, token_id, slug):
+    s3 = boto3.client(
+        "s3",
+        region_name="ap-south-1",
+        aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
+        aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
+        config=Config(signature_version="s3v4"),
+    )
    file_name = f"{workspace_id}/export-{slug}-{token_id[:6]}-{timezone.now()}.zip"
+
+    s3.upload_fileobj(
+        zip_file,
+        settings.AWS_S3_BUCKET_NAME,
+        file_name,
+        ExtraArgs={"ACL": "public-read", "ContentType": "application/zip"},
+    )
+
    expires_in = 7 * 24 * 60 * 60
-
-    if settings.DOCKERIZED and settings.USE_MINIO:
-        s3 = boto3.client(
-            "s3",
-            endpoint_url=settings.AWS_S3_ENDPOINT_URL,
-            aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
-            aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
-            config=Config(signature_version="s3v4"),
-        )
-        s3.upload_fileobj(
-            zip_file,
-            settings.AWS_STORAGE_BUCKET_NAME,
-            file_name,
-            ExtraArgs={"ACL": "public-read", "ContentType": "application/zip"},
-        )
-        presigned_url = s3.generate_presigned_url(
-            "get_object",
-            Params={"Bucket": settings.AWS_STORAGE_BUCKET_NAME, "Key": file_name},
-            ExpiresIn=expires_in,
-        )
-        # Create the new url with updated domain and protocol
-        presigned_url = presigned_url.replace(
-            "http://plane-minio:9000/uploads/",
-            f"{settings.AWS_S3_URL_PROTOCOL}//{settings.AWS_S3_CUSTOM_DOMAIN}/",
-        )
-    else:
-        s3 = boto3.client(
-            "s3",
-            region_name=settings.AWS_REGION,
-            aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
-            aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
-            config=Config(signature_version="s3v4"),
-        )
-        s3.upload_fileobj(
-            zip_file,
-            settings.AWS_S3_BUCKET_NAME,
-            file_name,
-            ExtraArgs={"ACL": "public-read", "ContentType": "application/zip"},
-        )
-
-        presigned_url = s3.generate_presigned_url(
-            "get_object",
-            Params={"Bucket": settings.AWS_S3_BUCKET_NAME, "Key": file_name},
-            ExpiresIn=expires_in,
-        )
+    presigned_url = s3.generate_presigned_url(
+        "get_object",
+        Params={"Bucket": settings.AWS_S3_BUCKET_NAME, "Key": file_name},
+        ExpiresIn=expires_in,
+    )

    exporter_instance = ExporterHistory.objects.get(token=token_id)

@@ -126,7 +98,7 @@ def upload_to_s3(zip_file, workspace_id, token_id, slug):
    else:
        exporter_instance.status = "failed"

-    exporter_instance.save(update_fields=["status", "url", "key"])
+    exporter_instance.save(update_fields=["status", "url","key"])


 def generate_table_row(issue):
@@ -173,7 +145,7 @@ def generate_json_row(issue):
        else "",
        "Labels": issue["labels__name"],
        "Cycle Name": issue["issue_cycle__cycle__name"],
-        "Cycle Start Date": dateConverter(issue["issue_cycle__cycle__start_date"]),
+        "Cycle Start Date":  dateConverter(issue["issue_cycle__cycle__start_date"]),
        "Cycle End Date": dateConverter(issue["issue_cycle__cycle__end_date"]),
        "Module Name": issue["issue_module__module__name"],
        "Module Start Date": dateConverter(issue["issue_module__module__start_date"]),
@@ -270,9 +242,7 @@ def issue_export_task(provider, workspace_id, project_ids, token_id, multiple, s
        workspace_issues = (
            (
                Issue.objects.filter(
-                    workspace__id=workspace_id,
-                    project_id__in=project_ids,
-                    project__project_projectmember__member=exporter_instance.initiated_by_id,
+                    workspace__id=workspace_id, project_id__in=project_ids
                )
                .select_related("project", "workspace", "state", "parent", "created_by")
                .prefetch_related(
@@ -305,7 +275,7 @@ def issue_export_task(provider, workspace_id, project_ids, token_id, multiple, s
                    "labels__name",
                )
            )
-            .order_by("project__identifier", "sequence_id")
+            .order_by("project__identifier","sequence_id")
            .distinct()
        )
        # CSV header
@@ -368,6 +338,7 @@ def issue_export_task(provider, workspace_id, project_ids, token_id, multiple, s
        exporter_instance.status = "failed"
        exporter_instance.reason = str(e)
        exporter_instance.save(update_fields=["status", "reason"])
+
        # Print logs if in DEBUG mode
        if settings.DEBUG:
            print(e)
@@ -21,29 +21,18 @@ def delete_old_s3_link():
    expired_exporter_history = ExporterHistory.objects.filter(
        Q(url__isnull=False) & Q(created_at__lte=timezone.now() - timedelta(days=8))
    ).values_list("key", "id")
-    if settings.DOCKERIZED and settings.USE_MINIO:
-        s3 = boto3.client(
-            "s3",
-            endpoint_url=settings.AWS_S3_ENDPOINT_URL,
-            aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
-            aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
-            config=Config(signature_version="s3v4"),
-        )
-    else:
-        s3 = boto3.client(
-            "s3",
-            region_name="ap-south-1",
-            aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
-            aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
-            config=Config(signature_version="s3v4"),
-        )
+
+    s3 = boto3.client(
+        "s3",
+        region_name="ap-south-1",
+        aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
+        aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
+        config=Config(signature_version="s3v4"),
+    )

    for file_name, exporter_id in expired_exporter_history:
        # Delete object from S3
        if file_name:
-            if settings.DOCKERIZED and settings.USE_MINIO:
-                s3.delete_object(Bucket=settings.AWS_STORAGE_BUCKET_NAME, Key=file_name)
-            else:
-                s3.delete_object(Bucket=settings.AWS_S3_BUCKET_NAME, Key=file_name)
+            s3.delete_object(Bucket=settings.AWS_S3_BUCKET_NAME, Key=file_name)

        ExporterHistory.objects.filter(id=exporter_id).update(url=None)
@@ -161,7 +161,47 @@ def service_importer(service, importer_id):
        if settings.PROXY_BASE_URL:
            headers = {"Content-Type": "application/json"}
            import_data_json = json.dumps(
-                ImporterSerializer(importer).data,
+                ImporterSerializer(
+                    importer,
+                    fields=[
+                        "id",
+                        "created_by",
+                        "created_at",
+                        "updated_at",
+                        "updated_by",
+                        "workspace",
+                        "project",
+                        "service",
+                        "status",
+                        "initiated_by",
+                        "metadata",
+                        "config",
+                        "data",
+                        "token",
+                        "imported_data",
+                        {
+                            "initiated_by_detail": [
+                                "id",
+                                "first_name",
+                                "last_name",
+                                "avatar",
+                                "is_bot",
+                                "display_name",
+                            ],
+                        },
+                        {
+                            "project_detail": [
+                                "id",
+                                "name",
+                                "cover_image",
+                                "icon_prop",
+                                "emoji",
+                                "description",
+                            ]
+                        },
+                        {"workspace_detail": ["id", "name", "slug"]},
+                    ],
+                ).data,
                cls=DjangoJSONEncoder,
            )
            res = requests.post(
@@ -24,9 +24,6 @@ from plane.db.models import (
    IssueSubscriber,
    Notification,
    IssueAssignee,
-    IssueReaction,
-    CommentReaction,
-    IssueComment,
 )
 from plane.api.serializers import IssueActivitySerializer

@@ -393,19 +390,143 @@ def track_assignees(
                )


+# Track changes in blocking issues
+def track_blocks(
+    requested_data,
+    current_instance,
+    issue_id,
+    project,
+    actor,
+    issue_activities,
+):
+    if len(requested_data.get("blocks_list")) > len(
+        current_instance.get("blocked_issues")
+    ):
+        for block in requested_data.get("blocks_list"):
+            if (
+                len(
+                    [
+                        blocked
+                        for blocked in current_instance.get("blocked_issues")
+                        if blocked.get("block") == block
+                    ]
+                )
+                == 0
+            ):
+                issue = Issue.objects.get(pk=block)
+                issue_activities.append(
+                    IssueActivity(
+                        issue_id=issue_id,
+                        actor=actor,
+                        verb="updated",
+                        old_value="",
+                        new_value=f"{issue.project.identifier}-{issue.sequence_id}",
+                        field="blocks",
+                        project=project,
+                        workspace=project.workspace,
+                        comment=f"added blocking issue {project.identifier}-{issue.sequence_id}",
+                        new_identifier=issue.id,
+                    )
+                )
+
+    # Blocked Issue Removal
+    if len(requested_data.get("blocks_list")) < len(
+        current_instance.get("blocked_issues")
+    ):
+        for blocked in current_instance.get("blocked_issues"):
+            if blocked.get("block") not in requested_data.get("blocks_list"):
+                issue = Issue.objects.get(pk=blocked.get("block"))
+                issue_activities.append(
+                    IssueActivity(
+                        issue_id=issue_id,
+                        actor=actor,
+                        verb="updated",
+                        old_value=f"{issue.project.identifier}-{issue.sequence_id}",
+                        new_value="",
+                        field="blocks",
+                        project=project,
+                        workspace=project.workspace,
+                        comment=f"removed blocking issue {project.identifier}-{issue.sequence_id}",
+                        old_identifier=issue.id,
+                    )
+                )
+
+
+# Track changes in blocked_by issues
+def track_blockings(
+    requested_data,
+    current_instance,
+    issue_id,
+    project,
+    actor,
+    issue_activities,
+):
+    if len(requested_data.get("blockers_list")) > len(
+        current_instance.get("blocker_issues")
+    ):
+        for block in requested_data.get("blockers_list"):
+            if (
+                len(
+                    [
+                        blocked
+                        for blocked in current_instance.get("blocker_issues")
+                        if blocked.get("blocked_by") == block
+                    ]
+                )
+                == 0
+            ):
+                issue = Issue.objects.get(pk=block)
+                issue_activities.append(
+                    IssueActivity(
+                        issue_id=issue_id,
+                        actor=actor,
+                        verb="updated",
+                        old_value="",
+                        new_value=f"{issue.project.identifier}-{issue.sequence_id}",
+                        field="blocking",
+                        project=project,
+                        workspace=project.workspace,
+                        comment=f"added blocked by issue {project.identifier}-{issue.sequence_id}",
+                        new_identifier=issue.id,
+                    )
+                )
+
+    # Blocked Issue Removal
+    if len(requested_data.get("blockers_list")) < len(
+        current_instance.get("blocker_issues")
+    ):
+        for blocked in current_instance.get("blocker_issues"):
+            if blocked.get("blocked_by") not in requested_data.get("blockers_list"):
+                issue = Issue.objects.get(pk=blocked.get("blocked_by"))
+                issue_activities.append(
+                    IssueActivity(
+                        issue_id=issue_id,
+                        actor=actor,
+                        verb="updated",
+                        old_value=f"{issue.project.identifier}-{issue.sequence_id}",
+                        new_value="",
+                        field="blocking",
+                        project=project,
+                        workspace=project.workspace,
+                        comment=f"removed blocked by issue {project.identifier}-{issue.sequence_id}",
+                        old_identifier=issue.id,
+                    )
+                )
+
+
 def create_issue_activity(
    requested_data, current_instance, issue_id, project, actor, issue_activities
 ):
-        issue_activities.append(
-            IssueActivity(
-                issue_id=issue_id,
-                project=project,
-                workspace=project.workspace,
-                comment=f"created the issue",
-                verb="created",
-                actor=actor,
-            )
+    issue_activities.append(
+        IssueActivity(
+            issue_id=issue_id,
+            project=project,
+            workspace=project.workspace,
+            comment=f"created the issue",
+            verb="created",
+            actor=actor,
        )
+    )


 def track_estimate_points(
@@ -508,16 +629,23 @@ def update_issue_activity(
        "parent": track_parent,
        "priority": track_priority,
        "state": track_state,
-        "description_html": track_description,
+        "description": track_description,
        "target_date": track_target_date,
        "start_date": track_start_date,
        "labels_list": track_labels,
        "assignees_list": track_assignees,
+        "blocks_list": track_blocks,
+        "blockers_list": track_blockings,
        "estimate_point": track_estimate_points,
        "archived_at": track_archive_at,
        "closed_to": track_closed_to,
    }

+    requested_data = json.loads(requested_data) if requested_data is not None else None
+    current_instance = (
+        json.loads(current_instance) if current_instance is not None else None
+    )
+
    for key in requested_data:
        func = ISSUE_ACTIVITY_MAPPER.get(key, None)
        if func is not None:
@@ -894,302 +1022,6 @@ def delete_attachment_activity(
        )
    )

-def create_issue_reaction_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities
-):
-    requested_data = json.loads(requested_data) if requested_data is not None else None
-    if requested_data and requested_data.get("reaction") is not None:
-        issue_reaction = IssueReaction.objects.filter(reaction=requested_data.get("reaction"), project=project, actor=actor).values_list('id', flat=True).first()
-        if issue_reaction is not None:
-            issue_activities.append(
-                IssueActivity(
-                    issue_id=issue_id,
-                    actor=actor,
-                    verb="created",
-                    old_value=None,
-                    new_value=requested_data.get("reaction"),
-                    field="reaction",
-                    project=project,
-                    workspace=project.workspace,
-                    comment="added the reaction",
-                    old_identifier=None,
-                    new_identifier=issue_reaction,
-                )
-            )
-
-
-def delete_issue_reaction_activity(
-        requested_data, current_instance, issue_id, project, actor, issue_activities
-):
-    current_instance = (
-        json.loads(current_instance) if current_instance is not None else None
-    )
-    if current_instance and current_instance.get("reaction") is not None:
-        issue_activities.append(
-            IssueActivity(
-                issue_id=issue_id,
-                actor=actor,
-                verb="deleted",
-                old_value=current_instance.get("reaction"),
-                new_value=None,
-                field="reaction",
-                project=project,
-                workspace=project.workspace,
-                comment="removed the reaction",
-                old_identifier=current_instance.get("identifier"),
-                new_identifier=None,
-            )
-        )
-
-
-def create_comment_reaction_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities
-):
-    requested_data = json.loads(requested_data) if requested_data is not None else None
-    if requested_data and requested_data.get("reaction") is not None:
-        comment_reaction_id, comment_id = CommentReaction.objects.filter(reaction=requested_data.get("reaction"), project=project, actor=actor).values_list('id', 'comment__id').first()
-        comment = IssueComment.objects.get(pk=comment_id,project=project)
-        if comment is not None and comment_reaction_id is not None and comment_id is not None:
-            issue_activities.append(
-                IssueActivity(
-                    issue_id=comment.issue_id,
-                    actor=actor,
-                    verb="created",
-                    old_value=None,
-                    new_value=requested_data.get("reaction"),
-                    field="reaction",
-                    project=project,
-                    workspace=project.workspace,
-                    comment="added the reaction",
-                    old_identifier=None,
-                    new_identifier=comment_reaction_id,
-                )
-            )
-
-
-def delete_comment_reaction_activity(
-        requested_data, current_instance, issue_id, project, actor, issue_activities
-):
-    current_instance = (
-        json.loads(current_instance) if current_instance is not None else None
-    )
-    if current_instance and current_instance.get("reaction") is not None:
-        issue_id = IssueComment.objects.filter(pk=current_instance.get("comment_id"), project=project).values_list('issue_id', flat=True).first()
-        if issue_id is not None:
-            issue_activities.append(
-                IssueActivity(
-                    issue_id=issue_id,
-                    actor=actor,
-                    verb="deleted",
-                    old_value=current_instance.get("reaction"),
-                    new_value=None,
-                    field="reaction",
-                    project=project,
-                    workspace=project.workspace,
-                    comment="removed the reaction",
-                    old_identifier=current_instance.get("identifier"),
-                    new_identifier=None,
-                )
-            )
-
-
-def create_issue_vote_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities
-):
-    requested_data = json.loads(requested_data) if requested_data is not None else None
-    if requested_data and requested_data.get("vote") is not None:
-        issue_activities.append(
-            IssueActivity(
-                issue_id=issue_id,
-                actor=actor,
-                verb="created",
-                old_value=None,
-                new_value=requested_data.get("vote"),
-                field="vote",
-                project=project,
-                workspace=project.workspace,
-                comment="added the vote",
-                old_identifier=None,
-                new_identifier=None,
-            )
-        )
-
-
-def delete_issue_vote_activity(
-        requested_data, current_instance, issue_id, project, actor, issue_activities
-):
-    current_instance = (
-        json.loads(current_instance) if current_instance is not None else None
-    )
-    if current_instance and current_instance.get("vote") is not None:
-        issue_activities.append(
-            IssueActivity(
-                issue_id=issue_id,
-                actor=actor,
-                verb="deleted",
-                old_value=current_instance.get("vote"),
-                new_value=None,
-                field="vote",
-                project=project,
-                workspace=project.workspace,
-                comment="removed the vote",
-                old_identifier=current_instance.get("identifier"),
-                new_identifier=None,
-            )
-        )
-
-
-def create_issue_relation_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities
-):
-    requested_data = json.loads(requested_data) if requested_data is not None else None
-    current_instance = (
-        json.loads(current_instance) if current_instance is not None else None
-    )
-    if current_instance is None and requested_data.get("related_list") is not None:
-        for issue_relation in requested_data.get("related_list"):
-            if issue_relation.get("relation_type") == "blocked_by":
-                relation_type = "blocking"
-            else:
-                relation_type = issue_relation.get("relation_type")
-            issue = Issue.objects.get(pk=issue_relation.get("issue"))
-            issue_activities.append(
-                IssueActivity(
-                    issue_id=issue_relation.get("related_issue"),
-                    actor=actor,
-                    verb="created",
-                    old_value="",
-                    new_value=f"{project.identifier}-{issue.sequence_id}",
-                    field=relation_type,
-                    project=project,
-                    workspace=project.workspace,
-                    comment=f'added {relation_type} relation',
-                    old_identifier=issue_relation.get("issue"),
-                )
-            )
-            issue = Issue.objects.get(pk=issue_relation.get("related_issue"))
-            issue_activities.append(
-                IssueActivity(
-                    issue_id=issue_relation.get("issue"),
-                    actor=actor,
-                    verb="created",
-                    old_value="",
-                    new_value=f"{project.identifier}-{issue.sequence_id}",
-                    field=f'{issue_relation.get("relation_type")}',
-                    project=project,
-                    workspace=project.workspace,
-                    comment=f'added {issue_relation.get("relation_type")} relation',
-                    old_identifier=issue_relation.get("related_issue"),
-                )
-            )
-
-
-def delete_issue_relation_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities
-):
-    requested_data = json.loads(requested_data) if requested_data is not None else None
-    current_instance = (
-        json.loads(current_instance) if current_instance is not None else None
-    )
-    if current_instance is not None and requested_data.get("related_list") is None:
-            if current_instance.get("relation_type") == "blocked_by":
-                relation_type = "blocking"
-            else:
-                relation_type = current_instance.get("relation_type")
-            issue = Issue.objects.get(pk=current_instance.get("issue"))
-            issue_activities.append(
-                IssueActivity(
-                    issue_id=current_instance.get("related_issue"),
-                    actor=actor,
-                    verb="deleted",
-                    old_value=f"{project.identifier}-{issue.sequence_id}",
-                    new_value="",
-                    field=relation_type,
-                    project=project,
-                    workspace=project.workspace,
-                    comment=f'deleted {relation_type} relation',
-                    old_identifier=current_instance.get("issue"),
-                )
-            )
-            issue = Issue.objects.get(pk=current_instance.get("related_issue"))
-            issue_activities.append(
-                IssueActivity(
-                    issue_id=current_instance.get("issue"),
-                    actor=actor,
-                    verb="deleted",
-                    old_value=f"{project.identifier}-{issue.sequence_id}",
-                    new_value="",
-                    field=f'{current_instance.get("relation_type")}',
-                    project=project,
-                    workspace=project.workspace,
-                    comment=f'deleted {current_instance.get("relation_type")} relation',
-                    old_identifier=current_instance.get("related_issue"),
-                )
-            )
-
-
-def create_draft_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities
-):
-        issue_activities.append(
-            IssueActivity(
-                issue_id=issue_id,
-                project=project,
-                workspace=project.workspace,
-                comment=f"drafted the issue",
-                field="draft",
-                verb="created",
-                actor=actor,
-            )
-        )
-
-
-def update_draft_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities
-):
-        requested_data = json.loads(requested_data) if requested_data is not None else None
-        current_instance = (
-            json.loads(current_instance) if current_instance is not None else None
-        )
-        if requested_data.get("is_draft") is not None and requested_data.get("is_draft") == False:
-            issue_activities.append(
-                IssueActivity(
-                    issue_id=issue_id,
-                    project=project,
-                    workspace=project.workspace,
-                    comment=f"created the issue",
-                    verb="updated",
-                    actor=actor,
-                )
-            )
-        else:
-            issue_activities.append(
-                IssueActivity(
-                    issue_id=issue_id,
-                    project=project,
-                    workspace=project.workspace,
-                    comment=f"updated the draft issue",
-                    field="draft",
-                    verb="updated",
-                    actor=actor,
-                )
-            )
-
-
-
-def delete_draft_issue_activity(
-    requested_data, current_instance, issue_id, project, actor, issue_activities
-):
-    issue_activities.append(
-        IssueActivity(
-            project=project,
-            workspace=project.workspace,
-            comment=f"deleted the draft issue",
-            field="draft",
-            verb="deleted",
-            actor=actor,
-        )
-    )

 # Receive message from room group
@shared_task
@@ -1213,12 +1045,6 @@ def issue_activity(
            "cycle.activity.deleted",
            "module.activity.created",
            "module.activity.deleted",
-            "issue_reaction.activity.created",
-            "issue_reaction.activity.deleted",
-            "comment_reaction.activity.created",
-            "comment_reaction.activity.deleted",
-            "issue_vote.activity.created",
-            "issue_vote.activity.deleted",
        ]:
            issue = Issue.objects.filter(pk=issue_id).first()

@@ -1254,17 +1080,6 @@ def issue_activity(
            "link.activity.deleted": delete_link_activity,
            "attachment.activity.created": create_attachment_activity,
            "attachment.activity.deleted": delete_attachment_activity,
-            "issue_relation.activity.created": create_issue_relation_activity,
-            "issue_relation.activity.deleted": delete_issue_relation_activity,
-            "issue_reaction.activity.created": create_issue_reaction_activity,
-            "issue_reaction.activity.deleted": delete_issue_reaction_activity,
-            "comment_reaction.activity.created": create_comment_reaction_activity,
-            "comment_reaction.activity.deleted": delete_comment_reaction_activity,
-            "issue_vote.activity.created": create_issue_vote_activity,
-            "issue_vote.activity.deleted": delete_issue_vote_activity,
-            "issue_draft.activity.created": create_draft_issue_activity,
-            "issue_draft.activity.updated": update_draft_issue_activity,
-            "issue_draft.activity.deleted": delete_draft_issue_activity,
        }

        func = ACTIVITY_MAPPER.get(type)
@@ -1288,7 +1103,7 @@ def issue_activity(
                    for issue_activity in issue_activities_created:
                        headers = {"Content-Type": "application/json"}
                        issue_activity_json = json.dumps(
-                            IssueActivitySerializer(issue_activity).data,
+                            IssueActivitySerializer(issue_activity,fields=[{"actor_detail":["id", "first_name", "last_name", "avatar", "is_bot", "display_name"]}]).data,
                            cls=DjangoJSONEncoder,
                        )
                        _ = requests.post(
@@ -1304,12 +1119,6 @@ def issue_activity(
            "cycle.activity.deleted",
            "module.activity.created",
            "module.activity.deleted",
-            "issue_reaction.activity.created",
-            "issue_reaction.activity.deleted",
-            "comment_reaction.activity.created",
-            "comment_reaction.activity.deleted",
-            "issue_vote.activity.created",
-            "issue_vote.activity.deleted",
        ]:
            # Create Notifications
            bulk_notifications = []
@@ -32,7 +32,7 @@ def archive_old_issues():
            archive_in = project.archive_in

            # Get all the issues whose updated_at in less that the archive_in month
-            issues = Issue.issue_objects.filter(
+            issues = Issue.objects.filter(
                Q(
                    project=project_id,
                    archived_at__isnull=True,
@@ -64,22 +64,21 @@ def archive_old_issues():
                    issues_to_update.append(issue)

                # Bulk Update the issues and log the activity
-                if issues_to_update: 
-                    updated_issues = Issue.objects.bulk_update(
-                        issues_to_update, ["archived_at"], batch_size=100
+                Issue.objects.bulk_update(
+                    issues_to_update, ["archived_at"], batch_size=100
+                )
+                [
+                    issue_activity.delay(
+                        type="issue.activity.updated",
+                        requested_data=json.dumps({"archived_at": str(issue.archived_at)}),
+                        actor_id=str(project.created_by_id),
+                        issue_id=issue.id,
+                        project_id=project_id,
+                        current_instance=None,
+                        subscriber=False,
                    )
-                    [
-                        issue_activity.delay(
-                            type="issue.activity.updated",
-                            requested_data=json.dumps({"archived_at": str(issue.archived_at)}),
-                            actor_id=str(project.created_by_id),
-                            issue_id=issue.id,
-                            project_id=project_id,
-                            current_instance=None,
-                            subscriber=False,
-                        )
-                        for issue in updated_issues
-                    ]
+                    for issue in issues_to_update
+                ]
        return
    except Exception as e:
        if settings.DEBUG:
@@ -100,7 +99,7 @@ def close_old_issues():
            close_in = project.close_in

            # Get all the issues whose updated_at in less that the close_in month
-            issues = Issue.issue_objects.filter(
+            issues = Issue.objects.filter(
                Q(
                    project=project_id,
                    archived_at__isnull=True,
@@ -137,20 +136,19 @@ def close_old_issues():
                    issues_to_update.append(issue)

                # Bulk Update the issues and log the activity
-                if issues_to_update:
-                    updated_issues = Issue.objects.bulk_update(issues_to_update, ["state"], batch_size=100)
-                    [
-                        issue_activity.delay(
-                            type="issue.activity.updated",
-                            requested_data=json.dumps({"closed_to": str(issue.state_id)}),
-                            actor_id=str(project.created_by_id),
-                            issue_id=issue.id,
-                            project_id=project_id,
-                            current_instance=None,
-                            subscriber=False,
-                        )
-                        for issue in updated_issues
-                    ]
+                Issue.objects.bulk_update(issues_to_update, ["state"], batch_size=100)
+                [
+                    issue_activity.delay(
+                        type="issue.activity.updated",
+                        requested_data=json.dumps({"closed_to": str(issue.state_id)}),
+                        actor_id=str(project.created_by_id),
+                        issue_id=issue.id,
+                        project_id=project_id,
+                        current_instance=None,
+                        subscriber=False,
+                    )
+                    for issue in issues_to_update
+                ]
        return
    except Exception as e:
        if settings.DEBUG:
@@ -1,84 +0,0 @@
-# Generated by Django 4.2.3 on 2023-09-12 07:29
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-from plane.db.models import IssueRelation
-from sentry_sdk import capture_exception
-import uuid
-
-
-def create_issue_relation(apps, schema_editor):
-    try:
-        IssueBlockerModel = apps.get_model("db", "IssueBlocker")
-        updated_issue_relation = []
-        for blocked_issue in IssueBlockerModel.objects.all():
-            updated_issue_relation.append(
-                IssueRelation(
-                    issue_id=blocked_issue.block_id,
-                    related_issue_id=blocked_issue.blocked_by_id,
-                    relation_type="blocked_by",
-                    project_id=blocked_issue.project_id,
-                    workspace_id=blocked_issue.workspace_id,
-                    created_by_id=blocked_issue.created_by_id,
-                    updated_by_id=blocked_issue.updated_by_id,
-                )
-            )
-        IssueRelation.objects.bulk_create(updated_issue_relation, batch_size=100)
-    except Exception as e:
-        print(e)
-        capture_exception(e)
-
-
-def update_issue_priority_choice(apps, schema_editor):
-    IssueModel = apps.get_model("db", "Issue")
-    updated_issues = []
-    for obj in IssueModel.objects.all():
-        if obj.priority is None:
-            obj.priority = "none"
-        updated_issues.append(obj)
-    IssueModel.objects.bulk_update(updated_issues, ["priority"], batch_size=100)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0042_alter_analyticview_created_by_and_more'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='IssueRelation',
-            fields=[
-                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
-                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
-                ('id', models.UUIDField(db_index=True, default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('relation_type', models.CharField(choices=[('duplicate', 'Duplicate'), ('relates_to', 'Relates To'), ('blocked_by', 'Blocked By')], default='blocked_by', max_length=20, verbose_name='Issue Relation Type')),
-                ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By')),
-                ('issue', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='issue_relation', to='db.issue')),
-                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_%(class)s', to='db.project')),
-                ('related_issue', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='issue_related', to='db.issue')),
-                ('updated_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_updated_by', to=settings.AUTH_USER_MODEL, verbose_name='Last Modified By')),
-                ('workspace', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='workspace_%(class)s', to='db.workspace')),
-            ],
-            options={
-                'verbose_name': 'Issue Relation',
-                'verbose_name_plural': 'Issue Relations',
-                'db_table': 'issue_relations',
-                'ordering': ('-created_at',),
-                'unique_together': {('issue', 'related_issue')},
-            },
-        ),
-        migrations.AddField(
-            model_name='issue',
-            name='is_draft',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AlterField(
-            model_name='issue',
-            name='priority',
-            field=models.CharField(choices=[('urgent', 'Urgent'), ('high', 'High'), ('medium', 'Medium'), ('low', 'Low'), ('none', 'None')], default='none', max_length=30, verbose_name='Issue Priority'),
-        ),
-        migrations.RunPython(create_issue_relation),
-        migrations.RunPython(update_issue_priority_choice),
-    ]
@@ -1,138 +0,0 @@
-# Generated by Django 4.2.3 on 2023-09-13 07:09
-
-from django.db import migrations
-
-
-def workspace_member_props(old_props):
-    new_props = {
-        "filters": {
-            "priority": old_props.get("filters", {}).get("priority", None),
-            "state": old_props.get("filters", {}).get("state", None),
-            "state_group": old_props.get("filters", {}).get("state_group", None),
-            "assignees": old_props.get("filters", {}).get("assignees", None),
-            "created_by": old_props.get("filters", {}).get("created_by", None),
-            "labels": old_props.get("filters", {}).get("labels", None),
-            "start_date": old_props.get("filters", {}).get("start_date", None),
-            "target_date": old_props.get("filters", {}).get("target_date", None),
-            "subscriber": old_props.get("filters", {}).get("subscriber", None),
-        },
-        "display_filters": {
-            "group_by": old_props.get("groupByProperty", None),
-            "order_by": old_props.get("orderBy", "-created_at"),
-            "type": old_props.get("filters", {}).get("type", None),
-            "sub_issue": old_props.get("showSubIssues", True),
-            "show_empty_groups": old_props.get("showEmptyGroups", True),
-            "layout": old_props.get("issueView", "list"),
-            "calendar_date_range": old_props.get("calendarDateRange", ""),
-        },
-        "display_properties": {
-            "assignee": old_props.get("properties", {}).get("assignee",None),
-            "attachment_count": old_props.get("properties", {}).get("attachment_count", None),
-            "created_on": old_props.get("properties", {}).get("created_on", None),
-            "due_date": old_props.get("properties", {}).get("due_date", None),
-            "estimate": old_props.get("properties", {}).get("estimate", None),
-            "key": old_props.get("properties", {}).get("key", None),
-            "labels": old_props.get("properties", {}).get("labels", None),
-            "link": old_props.get("properties", {}).get("link", None),
-            "priority": old_props.get("properties", {}).get("priority", None),
-            "start_date": old_props.get("properties", {}).get("start_date", None),
-            "state": old_props.get("properties", {}).get("state", None),
-            "sub_issue_count": old_props.get("properties", {}).get("sub_issue_count", None),
-            "updated_on": old_props.get("properties", {}).get("updated_on", None),
-        },
-    }
-    return new_props
-
-
-def project_member_props(old_props):
-    new_props = {
-        "filters": {
-            "priority": old_props.get("filters", {}).get("priority", None),
-            "state": old_props.get("filters", {}).get("state", None),
-            "state_group": old_props.get("filters", {}).get("state_group", None),
-            "assignees": old_props.get("filters", {}).get("assignees", None),
-            "created_by": old_props.get("filters", {}).get("created_by", None),
-            "labels": old_props.get("filters", {}).get("labels", None),
-            "start_date": old_props.get("filters", {}).get("start_date", None),
-            "target_date": old_props.get("filters", {}).get("target_date", None),
-            "subscriber": old_props.get("filters", {}).get("subscriber", None),
-        },
-        "display_filters": {
-            "group_by": old_props.get("groupByProperty", None),
-            "order_by": old_props.get("orderBy", "-created_at"),
-            "type": old_props.get("filters", {}).get("type", None),
-            "sub_issue": old_props.get("showSubIssues", True),
-            "show_empty_groups": old_props.get("showEmptyGroups", True),
-            "layout": old_props.get("issueView", "list"),
-            "calendar_date_range": old_props.get("calendarDateRange", ""),
-        },
-    }
-    return new_props
-
-
-def cycle_module_props(old_props):
-    new_props = {
-        "filters": {
-            "priority": old_props.get("filters", {}).get("priority", None),
-            "state": old_props.get("filters", {}).get("state", None),
-            "state_group": old_props.get("filters", {}).get("state_group", None),
-            "assignees": old_props.get("filters", {}).get("assignees", None),
-            "created_by": old_props.get("filters", {}).get("created_by", None),
-            "labels": old_props.get("filters", {}).get("labels", None),
-            "start_date": old_props.get("filters", {}).get("start_date", None),
-            "target_date": old_props.get("filters", {}).get("target_date", None),
-            "subscriber": old_props.get("filters", {}).get("subscriber", None),
-        },
-    }
-    return new_props
-     
-
-def update_workspace_member_view_props(apps, schema_editor):
-    WorkspaceMemberModel = apps.get_model("db", "WorkspaceMember")
-    updated_workspace_member = []
-    for obj in WorkspaceMemberModel.objects.all():
-            obj.view_props = workspace_member_props(obj.view_props)
-            obj.default_props = workspace_member_props(obj.default_props)
-            updated_workspace_member.append(obj)
-    WorkspaceMemberModel.objects.bulk_update(updated_workspace_member, ["view_props", "default_props"], batch_size=100)
-
-def update_project_member_view_props(apps, schema_editor):
-    ProjectMemberModel = apps.get_model("db", "ProjectMember")
-    updated_project_member = []
-    for obj in ProjectMemberModel.objects.all():
-            obj.view_props = project_member_props(obj.view_props)
-            obj.default_props = project_member_props(obj.default_props)
-            updated_project_member.append(obj)
-    ProjectMemberModel.objects.bulk_update(updated_project_member, ["view_props", "default_props"], batch_size=100)
-
-def update_cycle_props(apps, schema_editor):
-    CycleModel = apps.get_model("db", "Cycle")
-    updated_cycle = []
-    for obj in CycleModel.objects.all():
-            if "filter" in obj.view_props:
-                obj.view_props = cycle_module_props(obj.view_props)
-                updated_cycle.append(obj)
-    CycleModel.objects.bulk_update(updated_cycle, ["view_props"], batch_size=100)
-
-def update_module_props(apps, schema_editor):
-    ModuleModel = apps.get_model("db", "Module")
-    updated_module = []
-    for obj in ModuleModel.objects.all():
-            if "filter" in obj.view_props:
-                obj.view_props = cycle_module_props(obj.view_props)
-                updated_module.append(obj)
-    ModuleModel.objects.bulk_update(updated_module, ["view_props"], batch_size=100)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0043_alter_analyticview_created_by_and_more'),
-    ]
-
-    operations = [
-        migrations.RunPython(update_workspace_member_view_props),
-        migrations.RunPython(update_project_member_view_props),
-        migrations.RunPython(update_cycle_props),
-        migrations.RunPython(update_module_props),
-    ]
@@ -1,23 +0,0 @@
-# Generated by Django 4.2.3 on 2023-09-15 06:55
-
-from django.db import migrations
-
-def update_issue_activity(apps, schema_editor):
-    IssueActivityModel = apps.get_model("db", "IssueActivity")
-    updated_issue_activity = []
-    for obj in IssueActivityModel.objects.all():
-            if obj.field == "blocks":
-                obj.field = "blocked_by"
-                updated_issue_activity.append(obj)
-    IssueActivityModel.objects.bulk_update(updated_issue_activity, ["field"], batch_size=100)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('db', '0044_auto_20230913_0709'),
-    ]
-
-    operations = [
-         migrations.RunPython(update_issue_activity),
-    ]
@@ -19,7 +19,6 @@ from .project import (
    ProjectIdentifier,
    ProjectFavorite,
    ProjectDeployBoard,
-    ProjectPublicMember,
 )

 from .issue import (
@@ -32,7 +31,6 @@ from .issue import (
    IssueAssignee,
    Label,
    IssueBlocker,
-    IssueRelation,
    IssueLink,
    IssueSequence,
    IssueAttachment,
@@ -29,7 +29,6 @@ class IssueManager(models.Manager):
                | models.Q(issue_inbox__isnull=True)
            )
            .exclude(archived_at__isnull=False)
-            .exclude(is_draft=True)
        )


@@ -39,7 +38,6 @@ class Issue(ProjectBaseModel):
        ("high", "High"),
        ("medium", "Medium"),
        ("low", "Low"),
-        ("none", "None")
    )
    parent = models.ForeignKey(
        "self",
@@ -66,7 +64,8 @@ class Issue(ProjectBaseModel):
        max_length=30,
        choices=PRIORITY_CHOICES,
        verbose_name="Issue Priority",
-        default="none",
+        null=True,
+        blank=True,
    )
    start_date = models.DateField(null=True, blank=True)
    target_date = models.DateField(null=True, blank=True)
@@ -84,7 +83,6 @@ class Issue(ProjectBaseModel):
    sort_order = models.FloatField(default=65535)
    completed_at = models.DateTimeField(null=True)
    archived_at = models.DateField(null=True)
-    is_draft = models.BooleanField(default=False)

    objects = models.Manager()
    issue_objects = IssueManager()
@@ -180,37 +178,6 @@ class IssueBlocker(ProjectBaseModel):
        return f"{self.block.name} {self.blocked_by.name}"


-class IssueRelation(ProjectBaseModel):
-    RELATION_CHOICES = (
-        ("duplicate", "Duplicate"),
-        ("relates_to", "Relates To"),
-        ("blocked_by", "Blocked By"),
-    )
-        
-    issue = models.ForeignKey(
-        Issue, related_name="issue_relation", on_delete=models.CASCADE
-    )
-    related_issue = models.ForeignKey(
-        Issue, related_name="issue_related", on_delete=models.CASCADE
-    )
-    relation_type = models.CharField(
-        max_length=20,
-        choices=RELATION_CHOICES,
-        verbose_name="Issue Relation Type",
-        default="blocked_by",
-    )
-
-    class Meta:
-        unique_together = ["issue", "related_issue"]
-        verbose_name = "Issue Relation"
-        verbose_name_plural = "Issue Relations"
-        db_table = "issue_relations"
-        ordering = ("-created_at",)
-
-    def __str__(self):
-        return f"{self.issue.name} {self.related_issue.name}"    
-
-
 class IssueAssignee(ProjectBaseModel):
    issue = models.ForeignKey(
        Issue, on_delete=models.CASCADE, related_name="issue_assignee"
@@ -326,7 +293,7 @@ class IssueComment(ProjectBaseModel):
    comment_json = models.JSONField(blank=True, default=dict)
    comment_html = models.TextField(blank=True, default="<p></p>")
    attachments = ArrayField(models.URLField(), size=10, blank=True, default=list)
-    issue = models.ForeignKey(Issue, on_delete=models.CASCADE, related_name="issue_comments")
+    issue = models.ForeignKey(Issue, on_delete=models.CASCADE)
    # System can also create comment
    actor = models.ForeignKey(
        settings.AUTH_USER_MODEL,
@@ -509,12 +476,10 @@ class IssueVote(ProjectBaseModel):
        choices=(
            (-1, "DOWNVOTE"),
            (1, "UPVOTE"),
-        ),
-        default=1,
+        )
    )
-
    class Meta:
-        unique_together = ["issue", "actor",]
+        unique_together = ["issue", "actor"]
        verbose_name = "Issue Vote"
        verbose_name_plural = "Issue Votes"
        db_table = "issue_votes"
@@ -25,26 +25,13 @@ ROLE_CHOICES = (

 def get_default_props():
    return {
-        "filters": {
-            "priority": None,
-            "state": None,
-            "state_group": None,
-            "assignees": None,
-            "created_by": None,
-            "labels": None,
-            "start_date": None,
-            "target_date": None,
-            "subscriber": None,
-        },
-        "display_filters": {
-            "group_by": None,
-            "order_by": '-created_at',
-            "type": None,
-            "sub_issue": True,
-            "show_empty_groups": True,
-            "layout": "list",
-            "calendar_date_range": "",
-        },
+        "filters": {"type": None},
+        "orderBy": "-created_at",
+        "collapsed": True,
+        "issueView": "list",
+        "filterIssue": None,
+        "groupByProperty": None,
+        "showEmptyGroups": True,
    }


@@ -267,18 +254,3 @@ class ProjectDeployBoard(ProjectBaseModel):
    def __str__(self):
        """Return project and anchor"""
        return f"{self.anchor} <{self.project.name}>"
-
-
-class ProjectPublicMember(ProjectBaseModel):
-    member = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        on_delete=models.CASCADE,
-        related_name="public_project_members",
-    )
-
-    class Meta:
-        unique_together = ["project", "member"]
-        verbose_name = "Project Public Member"
-        verbose_name_plural = "Project Public Members"
-        db_table = "project_public_members"
-        ordering = ("-created_at",)
@@ -2,7 +2,6 @@
 import uuid
 import string
 import random
-import pytz

 # Django imports
 from django.db import models
@@ -10,6 +9,9 @@ from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.contrib.auth.models import AbstractBaseUser, UserManager, PermissionsMixin
 from django.utils import timezone
+from django.core.mail import EmailMultiAlternatives
+from django.template.loader import render_to_string
+from django.utils.html import strip_tags
 from django.conf import settings

 # Third party imports
@@ -64,8 +66,7 @@ class User(AbstractBaseUser, PermissionsMixin):
    billing_address = models.JSONField(null=True)
    has_billing_address = models.BooleanField(default=False)

-    USER_TIMEZONE_CHOICES = tuple(zip(pytz.all_timezones, pytz.all_timezones))
-    user_timezone = models.CharField(max_length=255, default="UTC", choices=USER_TIMEZONE_CHOICES)
+    user_timezone = models.CharField(max_length=255, default="Asia/Kolkata")

    last_active = models.DateTimeField(default=timezone.now, null=True)
    last_login_time = models.DateTimeField(null=True)
@@ -16,41 +16,26 @@ ROLE_CHOICES = (

 def get_default_props():
    return {
-        "filters": {
-            "priority": None,
-            "state": None,
-            "state_group": None,
-            "assignees": None,
-            "created_by": None,
-            "labels": None,
-            "start_date": None,
-            "target_date": None,
-            "subscriber": None,
-        },
-        "display_filters": {
-            "group_by": None,
-            "order_by": '-created_at',
-            "type": None,
-            "sub_issue": True,
-            "show_empty_groups": True,
-            "layout": "list",
-            "calendar_date_range": "",
-        },
-        "display_properties": {
+        "filters": {"type": None},
+        "groupByProperty": None,
+        "issueView": "list",
+        "orderBy": "-created_at",
+        "properties": {
            "assignee": True,
-            "attachment_count": True,
-            "created_on": True,
            "due_date": True,
-            "estimate": True,
            "key": True,
            "labels": True,
-            "link": True,
            "priority": True,
-            "start_date": True,
            "state": True,
            "sub_issue_count": True,
+            "attachment_count": True,
+            "link": True,
+            "estimate": True,
+            "created_on": True,
            "updated_on": True,
-        }
+            "start_date": True,
+        },
+        "showEmptyGroups": True,
    }


@@ -49,7 +49,7 @@ MIDDLEWARE = [
    "django.middleware.clickjacking.XFrameOptionsMiddleware",
    "crum.CurrentRequestUserMiddleware",
    "django.middleware.gzip.GZipMiddleware",
- ]
+]

 REST_FRAMEWORK = {
    "DEFAULT_AUTHENTICATION_CLASSES": (
@@ -161,7 +161,7 @@ MEDIA_URL = "/media/"

 LANGUAGE_CODE = "en-us"

-TIME_ZONE = "UTC"
+TIME_ZONE = "Asia/Kolkata"

 USE_I18N = True

@@ -96,7 +96,7 @@ def burndown_plot(queryset, slug, project_id, cycle_id=None, module_id=None):
        chart_data = {str(date): 0 for date in date_range}

        completed_issues_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                workspace__slug=slug,
                project_id=project_id,
                issue_cycle__cycle_id=cycle_id,
@@ -118,7 +118,7 @@ def burndown_plot(queryset, slug, project_id, cycle_id=None, module_id=None):
        chart_data = {str(date): 0 for date in date_range}

        completed_issues_distribution = (
-            Issue.issue_objects.filter(
+            Issue.objects.filter(
                workspace__slug=slug,
                project_id=project_id,
                issue_module__module_id=module_id,
@@ -15,7 +15,7 @@ def resolve_keys(group_keys, value):
    return value


-def group_results(results_data, group_by, sub_group_by=False):
+def group_results(results_data, group_by):
    """group results data into certain group_by

    Args:
@@ -25,140 +25,38 @@ def group_results(results_data, group_by, sub_group_by=False):
    Returns:
        obj: grouped results
    """
-    if sub_group_by:
-        main_responsive_dict = dict()
+    response_dict = dict()

-        if sub_group_by == "priority":
-            main_responsive_dict = {
-                "urgent": {},
-                "high": {},
-                "medium": {},
-                "low": {},
-                "none": {},
-            }
+    if group_by == "priority":
+        response_dict = {
+            "urgent": [],
+            "high": [],
+            "medium": [],
+            "low": [],
+            "None": [],
+        }

-        for value in results_data:
-            main_group_attribute = resolve_keys(sub_group_by, value)
-            group_attribute = resolve_keys(group_by, value)
-            if isinstance(main_group_attribute, list) and not isinstance(group_attribute, list):
-                if len(main_group_attribute):
-                    for attrib in main_group_attribute:
-                        if str(attrib) not in main_responsive_dict:
-                            main_responsive_dict[str(attrib)] = {}
-                        if str(group_attribute) in main_responsive_dict[str(attrib)]:
-                            main_responsive_dict[str(attrib)][str(group_attribute)].append(value)
-                        else:
-                            main_responsive_dict[str(attrib)][str(group_attribute)] = []
-                            main_responsive_dict[str(attrib)][str(group_attribute)].append(value)
-                else:
-                    if str(None) not in main_responsive_dict:
-                        main_responsive_dict[str(None)] = {}
-
-                    if str(group_attribute) in main_responsive_dict[str(None)]:
-                        main_responsive_dict[str(None)][str(group_attribute)].append(value)
+    for value in results_data:
+        group_attribute = resolve_keys(group_by, value)
+        if isinstance(group_attribute, list):
+            if len(group_attribute):
+                for attrib in group_attribute:
+                    if str(attrib) in response_dict:
+                        response_dict[str(attrib)].append(value)
                    else:
-                        main_responsive_dict[str(None)][str(group_attribute)] = []
-                        main_responsive_dict[str(None)][str(group_attribute)].append(value)
-
-            elif isinstance(group_attribute, list) and not isinstance(main_group_attribute, list):
-                if str(main_group_attribute) not in main_responsive_dict:
-                    main_responsive_dict[str(main_group_attribute)] = {}
-                if len(group_attribute):
-                    for attrib in group_attribute:
-                        if str(attrib) in main_responsive_dict[str(main_group_attribute)]:
-                            main_responsive_dict[str(main_group_attribute)][str(attrib)].append(value)
-                        else:
-                            main_responsive_dict[str(main_group_attribute)][str(attrib)] = []
-                            main_responsive_dict[str(main_group_attribute)][str(attrib)].append(value)
-                else:
-                    if str(None) in main_responsive_dict[str(main_group_attribute)]:
-                        main_responsive_dict[str(main_group_attribute)][str(None)].append(value)
-                    else:
-                        main_responsive_dict[str(main_group_attribute)][str(None)] = []
-                        main_responsive_dict[str(main_group_attribute)][str(None)].append(value)
-
-            elif isinstance(group_attribute, list) and isinstance(main_group_attribute, list):
-                if len(main_group_attribute):
-                    for main_attrib in main_group_attribute:
-                        if str(main_attrib) not in main_responsive_dict:
-                            main_responsive_dict[str(main_attrib)] = {}
-                        if len(group_attribute):
-                            for attrib in group_attribute:
-                                if str(attrib) in main_responsive_dict[str(main_attrib)]:
-                                    main_responsive_dict[str(main_attrib)][str(attrib)].append(value)
-                                else:
-                                    main_responsive_dict[str(main_attrib)][str(attrib)] = []
-                                    main_responsive_dict[str(main_attrib)][str(attrib)].append(value)
-                        else:
-                            if str(None) in main_responsive_dict[str(main_attrib)]:
-                                main_responsive_dict[str(main_attrib)][str(None)].append(value)
-                            else:
-                                main_responsive_dict[str(main_attrib)][str(None)] = []
-                                main_responsive_dict[str(main_attrib)][str(None)].append(value)
-                else:
-                    if str(None) not in main_responsive_dict:
-                        main_responsive_dict[str(None)] = {}
-                    if len(group_attribute):
-                        for attrib in group_attribute:
-                            if str(attrib) in main_responsive_dict[str(None)]:
-                                main_responsive_dict[str(None)][str(attrib)].append(value)
-                            else:
-                                main_responsive_dict[str(None)][str(attrib)] = []
-                                main_responsive_dict[str(None)][str(attrib)].append(value)
-                    else:
-                        if str(None) in main_responsive_dict[str(None)]:
-                            main_responsive_dict[str(None)][str(None)].append(value)
-                        else:
-                            main_responsive_dict[str(None)][str(None)] = []
-                            main_responsive_dict[str(None)][str(None)].append(value)
+                        response_dict[str(attrib)] = []
+                        response_dict[str(attrib)].append(value)
            else:
-                main_group_attribute = resolve_keys(sub_group_by, value)
-                group_attribute = resolve_keys(group_by, value)
-
-                if str(main_group_attribute) not in main_responsive_dict:
-                    main_responsive_dict[str(main_group_attribute)] = {}
-
-                if str(group_attribute) in main_responsive_dict[str(main_group_attribute)]:
-                    main_responsive_dict[str(main_group_attribute)][str(group_attribute)].append(value)
+                if str(None) in response_dict:
+                    response_dict[str(None)].append(value)
                else:
-                    main_responsive_dict[str(main_group_attribute)][str(group_attribute)] = []
-                    main_responsive_dict[str(main_group_attribute)][str(group_attribute)].append(value)   
-
-        return main_responsive_dict            
-
-    else:
-        response_dict = dict()
-
-        if group_by == "priority":
-            response_dict = {
-                "urgent": [],
-                "high": [],
-                "medium": [],
-                "low": [],
-                "none": [],
-            }
-
-        for value in results_data:
-            group_attribute = resolve_keys(group_by, value)
-            if isinstance(group_attribute, list):
-                if len(group_attribute):
-                    for attrib in group_attribute:
-                        if str(attrib) in response_dict:
-                            response_dict[str(attrib)].append(value)
-                        else:
-                            response_dict[str(attrib)] = []
-                            response_dict[str(attrib)].append(value)
-                else:
-                    if str(None) in response_dict:
-                        response_dict[str(None)].append(value)
-                    else:
-                        response_dict[str(None)] = []
-                        response_dict[str(None)].append(value)
+                    response_dict[str(None)] = []
+                    response_dict[str(None)].append(value)
+        else:
+            if str(group_attribute) in response_dict:
+                response_dict[str(group_attribute)].append(value)
            else:
-                if str(group_attribute) in response_dict:
-                    response_dict[str(group_attribute)].append(value)
-                else:
-                    response_dict[str(group_attribute)] = []
-                    response_dict[str(group_attribute)].append(value)
+                response_dict[str(group_attribute)] = []
+                response_dict[str(group_attribute)].append(value)

-        return response_dict
+    return response_dict
@@ -1,7 +1,6 @@
 from django.utils.timezone import make_aware
 from django.utils.dateparse import parse_datetime

-
 def filter_state(params, filter, method):
    if method == "GET":
        states = params.get("state").split(",")
@@ -24,6 +23,7 @@ def filter_state_group(params, filter, method):
    return filter


+
 def filter_estimate_point(params, filter, method):
    if method == "GET":
        estimate_points = params.get("estimate_point").split(",")
@@ -39,10 +39,25 @@ def filter_priority(params, filter, method):
    if method == "GET":
        priorities = params.get("priority").split(",")
        if len(priorities) and "" not in priorities:
-            filter["priority__in"] = priorities
+            if len(priorities) == 1 and "null" in priorities:
+                filter["priority__isnull"] = True
+            elif len(priorities) > 1 and "null" in priorities:
+                filter["priority__isnull"] = True
+                filter["priority__in"] = [p for p in priorities if p != "null"]
+            else:
+                filter["priority__in"] = [p for p in priorities if p != "null"]
+
    else:
        if params.get("priority", None) and len(params.get("priority")):
-            filter["priority__in"] = params.get("priority")
+            priorities = params.get("priority")
+            if len(priorities) == 1 and "null" in priorities:
+                filter["priority__isnull"] = True
+            elif len(priorities) > 1 and "null" in priorities:
+                filter["priority__isnull"] = True
+                filter["priority__in"] = [p for p in priorities if p != "null"]
+            else:
+                filter["priority__in"] = [p for p in priorities if p != "null"]
+
    return filter


@@ -214,6 +229,7 @@ def filter_issue_state_type(params, filter, method):
    return filter


+
 def filter_project(params, filter, method):
    if method == "GET":
        projects = params.get("project").split(",")
@@ -313,7 +329,7 @@ def issue_filters(query_params, method):
        "module": filter_module,
        "inbox_status": filter_inbox_status,
        "sub_issue": filter_sub_issue_toggle,
-        "subscriber": filter_subscribed_issues,
+        "subscriber":  filter_subscribed_issues,
        "start_target_date": filter_start_target_date_issues,
    }

@@ -1,36 +1,36 @@
 # base requirements

-Django==4.2.5
+Django==4.2.3
 django-braces==1.15.0
 django-taggit==4.0.0
-psycopg==3.1.10
+psycopg==3.1.9
 django-oauth-toolkit==2.3.0
 mistune==3.0.1
 djangorestframework==3.14.0
 redis==4.6.0
 django-nested-admin==4.0.2
-django-cors-headers==4.2.0
+django-cors-headers==4.1.0
 whitenoise==6.5.0
-django-allauth==0.55.2
+django-allauth==0.54.0
 faker==18.11.2
 django-filter==23.2
 jsonmodels==2.6.0
-djangorestframework-simplejwt==5.3.0
-sentry-sdk==1.30.0
+djangorestframework-simplejwt==5.2.2
+sentry-sdk==1.27.0
 django-s3-storage==0.14.0
 django-crum==0.7.9
 django-guardian==2.4.0
 dj_rest_auth==2.2.5
-google-auth==2.22.0
-google-api-python-client==2.97.0
+google-auth==2.21.0
+google-api-python-client==2.92.0
 django-redis==5.3.0
-uvicorn==0.23.2
+uvicorn==0.22.0
 channels==4.0.0
-openai==0.28.0
+openai==0.27.8
 slack-sdk==3.21.3
-celery==5.3.4
+celery==5.3.1
 django_celery_beat==2.5.0
-psycopg-binary==3.1.10
-psycopg-c==3.1.10
+psycopg-binary==3.1.9
+psycopg-c==3.1.9
 scout-apm==2.26.1
 openpyxl==3.1.2
@@ -1,11 +1,11 @@
 -r base.txt

-dj-database-url==2.1.0
-gunicorn==21.2.0
+dj-database-url==2.0.0
+gunicorn==20.1.0
 whitenoise==6.5.0
-django-storages==1.14
-boto3==1.28.40
-django-anymail==10.1
+django-storages==1.13.2
+boto3==1.27.0
+django-anymail==10.0
 django-debug-toolbar==4.1.0
 gevent==23.7.0
 psycogreen==1.0.2
@@ -1 +1 @@
-python-3.11.5
+python-3.11.4
@@ -1,4 +1,7 @@
 module.exports = {
  root: true,
  extends: ["custom"],
+  rules: {
+    "@next/next/no-img-element": "off",
+  },
 };
@@ -0,0 +1,70 @@
+FROM node:18-alpine AS builder
+RUN apk add --no-cache libc6-compat
+# Set working directory
+WORKDIR /app
+ENV NEXT_PUBLIC_API_BASE_URL=http://NEXT_PUBLIC_API_BASE_URL_PLACEHOLDER
+
+RUN yarn global add turbo
+COPY . .
+
+RUN turbo prune --scope=app --docker
+
+# Add lockfile and package.json's of isolated subworkspace
+FROM node:18-alpine AS installer
+
+RUN apk add --no-cache libc6-compat
+WORKDIR /app
+ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
+
+# First install the dependencies (as they change less often)
+COPY .gitignore .gitignore
+COPY --from=builder /app/out/json/ .
+COPY --from=builder /app/out/yarn.lock ./yarn.lock
+RUN yarn install --network-timeout 500000
+
+# Build the project
+COPY --from=builder /app/out/full/ .
+COPY turbo.json turbo.json
+COPY replace-env-vars.sh /usr/local/bin/
+USER root
+RUN chmod +x /usr/local/bin/replace-env-vars.sh
+
+RUN yarn turbo run build --filter=app
+
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
+    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+
+RUN /usr/local/bin/replace-env-vars.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_API_BASE_URL}
+
+FROM node:18-alpine AS runner
+WORKDIR /app
+
+# Don't run production as root
+RUN addgroup --system --gid 1001 plane
+RUN adduser --system --uid 1001 captain
+USER captain
+
+COPY --from=installer /app/apps/app/next.config.js .
+COPY --from=installer /app/apps/app/package.json .
+
+# Automatically leverage output traces to reduce image size
+# https://nextjs.org/docs/advanced-features/output-file-tracing
+COPY --from=installer --chown=captain:plane /app/apps/app/.next/standalone ./
+
+COPY --from=installer --chown=captain:plane /app/apps/app/.next ./apps/app/.next
+
+ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
+    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+
+USER root
+COPY replace-env-vars.sh /usr/local/bin/
+COPY start.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/replace-env-vars.sh
+RUN chmod +x /usr/local/bin/start.sh
+
+USER captain
+
+ENV NEXT_TELEMETRY_DISABLED 1
+
+EXPOSE 3000
@@ -1,13 +1,13 @@
 // nivo
 import { BarDatum } from "@nivo/bar";
 // icons
-import { PriorityIcon } from "components/icons";
+import { getPriorityIcon } from "components/icons";
 // helpers
 import { addSpaceIfCamelCase } from "helpers/string.helper";
 // helpers
 import { generateBarColor, renderMonthAndYear } from "helpers/analytics.helper";
 // types
-import { IAnalyticsParams, IAnalyticsResponse, TIssuePriorities } from "types";
+import { IAnalyticsParams, IAnalyticsResponse } from "types";
 // constants
 import { ANALYTICS_X_AXIS_VALUES, ANALYTICS_Y_AXIS_VALUES, DATE_KEYS } from "constants/analytics";

@@ -53,7 +53,7 @@ export const AnalyticsTable: React.FC<Props> = ({ analytics, barGraphData, param
                    >
                      <div className="flex items-center gap-2">
                        {params.segment === "priority" ? (
-                          <PriorityIcon priority={key as TIssuePriorities} />
+                          getPriorityIcon(key)
                        ) : (
                          <span
                            className="h-3 w-3 flex-shrink-0 rounded"
@@ -91,7 +91,7 @@ export const AnalyticsTable: React.FC<Props> = ({ analytics, barGraphData, param
                    }`}
                  >
                    {params.x_axis === "priority" ? (
-                      <PriorityIcon priority={item.name as TIssuePriorities} />
+                      getPriorityIcon(`${item.name}`)
                    ) : (
                      <span
                        className="h-3 w-3 rounded"
@@ -1,7 +1,7 @@
 // icons
 import { PlayIcon } from "@heroicons/react/24/outline";
 // types
-import { IDefaultAnalyticsResponse, TStateGroups } from "types";
+import { IDefaultAnalyticsResponse } from "types";
 // constants
 import { STATE_GROUP_COLORS } from "constants/state";

@@ -27,7 +27,7 @@ export const AnalyticsDemand: React.FC<Props> = ({ defaultAnalytics }) => (
                <span
                  className="h-2 w-2 rounded-full"
                  style={{
-                    backgroundColor: STATE_GROUP_COLORS[group.state_group as TStateGroups],
+                    backgroundColor: STATE_GROUP_COLORS[group.state_group],
                  }}
                />
                <h6 className="capitalize">{group.state_group}</h6>
@@ -42,7 +42,7 @@ export const AnalyticsDemand: React.FC<Props> = ({ defaultAnalytics }) => (
                className="absolute top-0 left-0 h-1 rounded duration-300"
                style={{
                  width: `${percentage}%`,
-                  backgroundColor: STATE_GROUP_COLORS[group.state_group as TStateGroups],
+                  backgroundColor: STATE_GROUP_COLORS[group.state_group],
                }}
              />
            </div>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
NarayanBavisetti	168823e5ba	dev: serializer updates for workspace, project, inbox etc.	2023-08-21 14:12:48 +05:30
NarayanBavisetti	ea3b9456f9	Merge branch 'develop' of github.com:makeplane/plane into chore/serializers	2023-08-18 16:05:42 +05:30
NarayanBavisetti	2058334559	fix: created dynamic serializer	2023-08-18 16:04:28 +05:30
NarayanBavisetti	e1b77d400a	Merge branch 'develop' of github.com:makeplane/plane into chore/serializers	2023-08-16 17:40:52 +05:30
NarayanBavisetti	77977d7d32	fix: changed the serializers	2023-08-16 12:42:34 +05:30