Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions apps/api/plane/app/views/analytic/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.db.models import Count, F, Sum, Q
from django.db.models.functions import ExtractMonth
from django.utils import timezone
from django.db.models.functions import Concat
from django.db.models.functions import Cast, Concat
from django.db.models import Case, When, Value, OuterRef, Func
from django.db import models

Expand Down Expand Up @@ -105,7 +105,7 @@ def get(self, request, slug):
assignees__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
"assignees__avatar_asset", # Assuming avatar_asset has an id or relevant field
Cast("assignees__avatar_asset", models.CharField()),
Value("/"),
),
),
Expand Down Expand Up @@ -299,7 +299,7 @@ def get(self, request, slug):
created_by__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
"created_by__avatar_asset", # Assuming avatar_asset has an id or relevant field
Cast("created_by__avatar_asset", models.CharField()),
Value("/"),
),
),
Expand Down Expand Up @@ -330,7 +330,7 @@ def get(self, request, slug):
assignees__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
"assignees__avatar_asset", # Assuming avatar_asset has an id or relevant field
Cast("assignees__avatar_asset", models.CharField()),
Value("/"),
),
),
Expand All @@ -355,7 +355,7 @@ def get(self, request, slug):
assignees__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
"assignees__avatar_asset", # Assuming avatar_asset has an id or relevant field
Cast("assignees__avatar_asset", models.CharField()),
Value("/"),
),
),
Expand Down
4 changes: 2 additions & 2 deletions apps/api/plane/app/views/analytic/project_analytics.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
)
from django.db import models
from django.db.models import F, Case, When, Value
from django.db.models.functions import Concat
from django.db.models.functions import Cast, Concat
from plane.utils.build_chart import build_analytics_chart
from plane.utils.date_utils import (
get_analytics_filters,
Expand Down Expand Up @@ -141,7 +141,7 @@ def get_work_items_stats(self, project_id, cycle_id=None, module_id=None) -> Dic
assignees__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
"assignees__avatar_asset", # Assuming avatar_asset has an id or relevant field
Cast("assignees__avatar_asset", models.CharField()),
Value("/"),
),
),
Expand Down
4 changes: 2 additions & 2 deletions apps/api/plane/app/views/cycle/archive.py
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ def get(self, request, slug, project_id, pk=None):
assignees__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
"assignees__avatar_asset", # Assuming avatar_asset has an id or relevant field
Cast("assignees__avatar_asset", models.CharField()),
Value("/"),
),
),
Expand Down Expand Up @@ -485,7 +485,7 @@ def get(self, request, slug, project_id, pk=None):
assignees__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
"assignees__avatar_asset", # Assuming avatar_asset has an id or relevant field
Cast("assignees__avatar_asset", models.CharField()),
Value("/"),
),
),
Expand Down
4 changes: 2 additions & 2 deletions apps/api/plane/app/views/cycle/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ def get(self, request, slug, project_id, cycle_id):
assignees__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
"assignees__avatar_asset", # Assuming avatar_asset has an id or relevant field
Cast("assignees__avatar_asset", models.CharField()),
Value("/"),
),
),
Expand Down Expand Up @@ -954,7 +954,7 @@ def get(self, request, slug, project_id, cycle_id):
assignees__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
"assignees__avatar_asset", # Assuming avatar_asset has an id or relevant field
Cast("assignees__avatar_asset", models.CharField()),
Value("/"),
),
),
Expand Down
4 changes: 2 additions & 2 deletions apps/api/plane/app/views/module/archive.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ def get(self, request, slug, project_id, pk=None):
assignees__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
"assignees__avatar_asset", # Assuming avatar_asset has an id or relevant field
Cast("assignees__avatar_asset", models.CharField()),
Value("/"),
),
),
Expand Down Expand Up @@ -446,7 +446,7 @@ def get(self, request, slug, project_id, pk=None):
assignees__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
"assignees__avatar_asset", # Assuming avatar_asset has an id or relevant field
Cast("assignees__avatar_asset", models.CharField()),
Value("/"),
),
),
Expand Down
4 changes: 2 additions & 2 deletions apps/api/plane/app/views/module/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ def retrieve(self, request, slug, project_id, pk):
assignees__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
"assignees__avatar_asset", # Assuming avatar_asset has an id or relevant field
Cast("assignees__avatar_asset", models.CharField()),
Value("/"),
),
),
Expand Down Expand Up @@ -553,7 +553,7 @@ def retrieve(self, request, slug, project_id, pk):
assignees__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
"assignees__avatar_asset", # Assuming avatar_asset has an id or relevant field
Cast("assignees__avatar_asset", models.CharField()),
Value("/"),
),
),
Expand Down
6 changes: 3 additions & 3 deletions apps/api/plane/app/views/search/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
)
from django.contrib.postgres.aggregates import ArrayAgg
from django.contrib.postgres.fields import ArrayField
from django.db.models.functions import Coalesce, Concat
from django.db.models.functions import Cast, Coalesce, Concat
from django.utils import timezone

# Third party imports
Expand Down Expand Up @@ -342,7 +342,7 @@ def get(self, request, slug):
member__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
"member__avatar_asset",
Cast("member__avatar_asset", CharField()),
Value("/"),
),
),
Expand Down Expand Up @@ -553,7 +553,7 @@ def get(self, request, slug):
member__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
"member__avatar_asset",
Cast("member__avatar_asset", models.CharField()),
Value("/"),
),
),
Expand Down
4 changes: 2 additions & 2 deletions apps/api/plane/bgtasks/analytic_plot_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from django.template.loader import render_to_string
from django.db.models import Q, Case, Value, When
from django.db import models
from django.db.models.functions import Concat
from django.db.models.functions import Cast, Concat

# Module imports
from plane.db.models import Issue
Expand Down Expand Up @@ -103,7 +103,7 @@ def get_assignee_details(slug, filters):
assignees__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
"assignees__avatar_asset", # Assuming avatar_asset has an id or relevant field
Cast("assignees__avatar_asset", models.CharField()),
Value("/"),
),
),
Expand Down
6 changes: 3 additions & 3 deletions apps/api/plane/space/utils/grouper.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.contrib.postgres.aggregates import ArrayAgg
from django.contrib.postgres.fields import ArrayField
from django.db.models import Q, UUIDField, Value, F, Case, When, JSONField, CharField
from django.db.models.functions import Coalesce, JSONObject, Concat
from django.db.models.functions import Cast, Coalesce, JSONObject, Concat
from django.db.models import QuerySet

from typing import List, Optional, Dict, Any, Union
Expand Down Expand Up @@ -125,7 +125,7 @@ def issue_on_results(
votes__actor__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
F("votes__actor__avatar_asset"),
Cast("votes__actor__avatar_asset", CharField()),
Value("/"),
),
),
Expand Down Expand Up @@ -159,7 +159,7 @@ def issue_on_results(
issue_reactions__actor__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
F("issue_reactions__actor__avatar_asset"),
Cast("issue_reactions__actor__avatar_asset", CharField()),
Value("/"),
),
),
Expand Down
6 changes: 3 additions & 3 deletions apps/api/plane/space/views/issue.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
CharField,
Subquery,
)
from django.db.models.functions import Concat
from django.db.models.functions import Cast, Concat

# Third Party imports
from rest_framework.response import Response
Expand Down Expand Up @@ -667,7 +667,7 @@ def get(self, request, anchor, issue_id):
votes__actor__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
F("votes__actor__avatar_asset"),
Cast("votes__actor__avatar_asset", CharField()),
Value("/"),
),
),
Expand Down Expand Up @@ -713,7 +713,7 @@ def get(self, request, anchor, issue_id):
votes__actor__avatar_asset__isnull=False,
then=Concat(
Value("/api/assets/v2/static/"),
F("votes__actor__avatar_asset"),
Cast("votes__actor__avatar_asset", CharField()),
Value("/"),
),
),
Expand Down
Loading
Loading