thunderstrike/plane
thunderstrike/plane
2
0
Fork 0
forked from github/plane
Code Pull Requests Activity

fix: dashboard issues filters (#519)

Browse Source 
* fix: upcoming issues filters

* dev: update dashboard endpoint to return correct month
This commit is contained in:
pablohashescobar 2023-03-25 11:13:14 +05:30 committed by GitHub
parent 28b3c999ae
commit c6ba93da72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apiserver/plane/api/views/workspace.py
View File

@ -11,8 +11,15 @@ from django.utils import timezone
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.core.validators import validate_email from django.core.validators import validate_email
from django.contrib.sites.shortcuts import get_current_site from django.contrib.sites.shortcuts import get_current_site
from django.db.models import CharField, Count, OuterRef, Func, F, Q from django.db.models import (
from django.db.models.functions import Cast, ExtractWeek CharField,
Count,
OuterRef,
Func,
F,
Q,
)
from django.db.models.functions import ExtractWeek, Cast, ExtractDay
from django.db.models.fields import DateField from django.db.models.fields import DateField
# Third party modules # Third party modules
@ -636,6 +643,11 @@ class UserIssueCompletedGraphEndpoint(BaseAPIView):
) )
class WeekInMonth(Func):
function = "FLOOR"
template = "(((%(expressions)s - 1) / 7) + 1)::INTEGER"
class UserWorkspaceDashboardEndpoint(BaseAPIView): class UserWorkspaceDashboardEndpoint(BaseAPIView):
def get(self, request, slug): def get(self, request, slug):
try: try:
@ -652,6 +664,7 @@ class UserWorkspaceDashboardEndpoint(BaseAPIView):
) )
month = request.GET.get("month", 1) month = request.GET.get("month", 1)
completed_issues = ( completed_issues = (
Issue.objects.filter( Issue.objects.filter(
assignees__in=[request.user], assignees__in=[request.user],
@ -659,11 +672,11 @@ class UserWorkspaceDashboardEndpoint(BaseAPIView):
completed_at__month=month, completed_at__month=month,
completed_at__isnull=False, completed_at__isnull=False,
) )
.annotate(completed_week=ExtractWeek("completed_at")) .annotate(day_of_month=ExtractDay("completed_at"))
.annotate(week=F("completed_week") % 4) .annotate(week_in_month=WeekInMonth(F("day_of_month")))
.values("week") .values("week_in_month")
.annotate(completed_count=Count("completed_week")) .annotate(completed_count=Count("id"))
.order_by("week") .order_by("week_in_month")
) )
assigned_issues = Issue.objects.filter( assigned_issues = Issue.objects.filter(
@ -710,7 +723,7 @@ class UserWorkspaceDashboardEndpoint(BaseAPIView):
upcoming_issues = Issue.objects.filter( upcoming_issues = Issue.objects.filter(
~Q(state__group__in=["completed", "cancelled"]), ~Q(state__group__in=["completed", "cancelled"]),
~Q(target_date__gte=timezone.now()), target_date__gte=timezone.now(),
workspace__slug=slug, workspace__slug=slug,
assignees__in=[request.user], assignees__in=[request.user],
completed_at__isnull=True, completed_at__isnull=True,