Browse Source

Add username property to Member model

pull/1644/head
Hironsan 3 years ago
parent
commit
58bc941f11
2 changed files with 7 additions and 2 deletions
  1. 4
      backend/members/models.py
  2. 5
      backend/metrics/views.py

4
backend/members/models.py

@ -61,5 +61,9 @@ class Member(models.Model):
message = 'This user is already assigned to a role in this project.'
raise ValidationError(message)
@property
def username(self):
return self.user.username
class Meta:
unique_together = ('user', 'project')

5
backend/metrics/views.py

@ -7,6 +7,7 @@ from rest_framework.response import Response
from rest_framework.views import APIView
from api.models import Example, ExampleState, Project, Annotation, Label, Category, CategoryType, Span, SpanType
from members.models import Member
from members.permissions import IsInProjectReadOnlyOrAdmin
@ -24,9 +25,9 @@ class MemberProgressAPI(APIView):
permission_classes = [IsAuthenticated & IsInProjectReadOnlyOrAdmin]
def get(self, request, *args, **kwargs):
project = get_object_or_404(Project, pk=self.kwargs['project_id'])
examples = Example.objects.filter(project=self.kwargs['project_id']).values('id')
data = ExampleState.objects.measure_member_progress(examples, project.users.all())
members = Member.objects.filter(project=self.kwargs['project_id'])
data = ExampleState.objects.measure_member_progress(examples, members)
return Response(data=data, status=status.HTTP_200_OK)

Loading…
Cancel
Save