Skip to content

Progress Bar API updated #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
7 changes: 6 additions & 1 deletion task/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@ class TaskSerializer(serializers.ModelSerializer):
task_status = serializers.SerializerMethodField()

def get_task_status(self, instance):
return instance.get_task_status
user = self.context['request'].user
return instance.get_task_status(user)

class Meta:
model = Task
fields = ["task_name", "team", "detail", "task_status"]


class ProgressSerializer(serializers.Serializer):
progress = serializers.FloatField()
5 changes: 3 additions & 2 deletions task/urls.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from django.urls import path

from .views import TaskListCreateAPIView
from .views import TaskListCreateAPIView, ProgressAPIView

app_name = 'task'

urlpatterns = [
path('', TaskListCreateAPIView.as_view(), name='topic-list-create')
path('', TaskListCreateAPIView.as_view(), name='topic-list-create'),
path('progress/', ProgressAPIView.as_view(), name='task_progress'),
]
26 changes: 23 additions & 3 deletions task/views.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from rest_framework import generics
from rest_framework_simplejwt.authentication import JWTAuthentication

from .models import Task
from .serializers import TaskSerializer
from .models import Task, TaskStatus
from .serializers import TaskSerializer, ProgressSerializer
from user.models import Member
from user.apis.permissions import CustomPermissionMixin

Expand All @@ -24,4 +24,24 @@ def get_queryset(self):
return queryset.filter(team=team)


#Task Status cannot be created. It can only be updated.
#Task Status cannot be created. It can only be updated.

class ProgressAPIView(CustomPermissionMixin, generics.RetrieveAPIView):
authentication_classes = [JWTAuthentication]
serializer_class = ProgressSerializer

def get_object(self):
user = self.request.user
try:
member = Member.objects.get(user=user.id, acceptance_status=True)
team = member.team
except Member.DoesNotExist:
return {'progress': 0}

total_tasks = Task.objects.filter(team=team).count()
if total_tasks == 0:
return {'progress': 0}

verified_tasks = TaskStatus.objects.filter(member=member, status=TaskStatus.Choices.VERIFIED).count()
progress = (verified_tasks / total_tasks) * 100
return {'progress': progress}