From 51c57d3707c684bb908195f419e53f4ed164ba3b Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Mon, 22 Feb 2021 08:23:04 +0200
Subject: Update nominations viewset GET and POST to make this working with
 2-table system

---
 pydis_site/apps/api/viewsets/bot/nomination.py | 119 ++++++++++++++++++++-----
 1 file changed, 96 insertions(+), 23 deletions(-)

(limited to 'pydis_site/apps/api/viewsets')

diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py
index cf6e262f..8775515c 100644
--- a/pydis_site/apps/api/viewsets/bot/nomination.py
+++ b/pydis_site/apps/api/viewsets/bot/nomination.py
@@ -15,7 +15,8 @@ from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet
 
 from pydis_site.apps.api.models.bot import Nomination
-from pydis_site.apps.api.serializers import NominationSerializer
+from pydis_site.apps.api.models.bot.nomination import NominationEntry
+from pydis_site.apps.api.serializers import NominationEntrySerializer, NominationSerializer
 
 
 class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, GenericViewSet):
@@ -29,7 +30,6 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
 
     #### Query parameters
     - **active** `bool`: whether the nomination is still active
-    - **actor__id** `int`: snowflake of the user who nominated the user
     - **user__id** `int`: snowflake of the user who received the nomination
     - **ordering** `str`: comma-separated sequence of fields to order the returned results
 
@@ -40,12 +40,18 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
     ...     {
     ...         'id': 1,
     ...         'active': false,
-    ...         'actor': 336843820513755157,
-    ...         'reason': 'They know how to explain difficult concepts',
     ...         'user': 336843820513755157,
     ...         'inserted_at': '2019-04-25T14:02:37.775587Z',
     ...         'end_reason': 'They were helpered after a staff-vote',
-    ...         'ended_at': '2019-04-26T15:12:22.123587Z'
+    ...         'ended_at': '2019-04-26T15:12:22.123587Z',
+    ...         'entries': [
+    ...             {
+    ...                'actor': 336843820513755157,
+    ...                'reason': 'They know how to explain difficult concepts',
+    ...                'inserted_at': '2019-04-25T14:02:37.775587Z'
+    ...             }
+    ...         ],
+    ...         'reviewed': true
     ...     }
     ... ]
 
@@ -59,12 +65,18 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
     >>> {
     ...     'id': 1,
     ...     'active': true,
-    ...     'actor': 336843820513755157,
-    ...     'reason': 'They know how to explain difficult concepts',
     ...     'user': 336843820513755157,
     ...     'inserted_at': '2019-04-25T14:02:37.775587Z',
     ...     'end_reason': 'They were helpered after a staff-vote',
-    ...     'ended_at': '2019-04-26T15:12:22.123587Z'
+    ...     'ended_at': '2019-04-26T15:12:22.123587Z',
+    ...     'entries': [
+    ...         {
+    ...             'actor': 336843820513755157,
+    ...             'reason': 'They know how to explain difficult concepts',
+    ...             'inserted_at': '2019-04-25T14:02:37.775587Z'
+    ...         }
+    ...     ],
+    ...     'reviewed': false
     ... }
 
     ### Status codes
@@ -75,8 +87,9 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
     Create a new, active nomination returns the created nominations.
     The `user`, `reason` and `actor` fields are required and the `user`
     and `actor` need to know by the site. Providing other valid fields
-    is not allowed and invalid fields are ignored. A `user` is only
-    allowed one active nomination at a time.
+    is not allowed and invalid fields are ignored. If `user` already have
+    active nomination, new nomination entry will be created assigned to
+    active nomination.
 
     #### Request body
     >>> {
@@ -91,7 +104,6 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
     #### Status codes
     - 201: returned on success
     - 400: returned on failure for one of the following reasons:
-        - A user already has an active nomination;
         - The `user` or `actor` are unknown to the site;
         - The request contained a field that cannot be set at creation.
 
@@ -148,10 +160,44 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
     serializer_class = NominationSerializer
     queryset = Nomination.objects.all()
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
-    filter_fields = ('user__id', 'actor__id', 'active')
-    frozen_fields = ('id', 'actor', 'inserted_at', 'user', 'ended_at')
+    filter_fields = ('user__id', 'active')
+    frozen_fields = ('id', 'inserted_at', 'user', 'ended_at')
     frozen_on_create = ('ended_at', 'end_reason', 'active', 'inserted_at')
 
+    def list(self, request: HttpRequest, *args, **kwargs) -> Response:
+        """
+        DRF method for listing Nominations.
+
+        Called by the Django Rest Framework in response to the corresponding HTTP request.
+        """
+        queryset = self.filter_queryset(self.get_queryset())
+        data = NominationSerializer(queryset, many=True).data
+
+        for i, nomination in enumerate(data):
+            entries = NominationEntrySerializer(
+                NominationEntry.objects.filter(nomination_id=nomination["id"]),
+                many=True
+            ).data
+            data[i]["entries"] = entries
+
+        return Response(data)
+
+    def retrieve(self, request: HttpRequest, *args, **kwargs) -> Response:
+        """
+        DRF method for retrieving a Nomination.
+
+        Called by the Django Rest Framework in response to the corresponding HTTP request.
+        """
+        nomination = self.get_object()
+
+        data = NominationSerializer(nomination).data
+        data["entries"] = NominationEntrySerializer(
+            NominationEntry.objects.filter(nomination_id=nomination.id),
+            many=True
+        ).data
+
+        return Response(data)
+
     def create(self, request: HttpRequest, *args, **kwargs) -> Response:
         """
         DRF method for creating a Nomination.
@@ -163,19 +209,46 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
                 raise ValidationError({field: ['This field cannot be set at creation.']})
 
         user_id = request.data.get("user")
-        if Nomination.objects.filter(active=True, user__id=user_id).exists():
-            raise ValidationError({'active': ['There can only be one active nomination.']})
+        nomination_filter = Nomination.objects.filter(active=True, user__id=user_id)
+
+        if not nomination_filter.exists():
+            serializer = NominationSerializer(
+                data=ChainMap(
+                    request.data,
+                    {"active": True}
+                )
+            )
+            serializer.is_valid(raise_exception=True)
+            nomination = Nomination.objects.create(**serializer.validated_data)
 
-        serializer = self.get_serializer(
-            data=ChainMap(
-                request.data,
-                {"active": True}
+            # Serializer truncate unnecessary data away
+            entry_serializer = NominationEntrySerializer(
+                data=ChainMap(request.data, {"nomination": nomination.id})
             )
+            entry_serializer.is_valid(raise_exception=True)
+
+            entry = NominationEntry.objects.create(**entry_serializer.validated_data)
+
+            data = NominationSerializer(nomination).data
+            data["entries"] = NominationEntrySerializer([entry], many=True).data
+
+            headers = self.get_success_headers(data)
+            return Response(data, status=status.HTTP_201_CREATED, headers=headers)
+
+        entry_serializer = NominationEntrySerializer(
+            data=ChainMap(request.data, {"nomination": nomination_filter[0].id})
         )
-        serializer.is_valid(raise_exception=True)
-        self.perform_create(serializer)
-        headers = self.get_success_headers(serializer.data)
-        return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
+        entry_serializer.is_valid(raise_exception=True)
+        NominationEntry.objects.create(**entry_serializer.validated_data)
+
+        data = NominationSerializer(nomination_filter[0]).data
+        data["entries"] = NominationEntrySerializer(
+            NominationEntry.objects.filter(nomination_id=nomination_filter[0].id),
+            many=True
+        ).data
+
+        headers = self.get_success_headers(data)
+        return Response(data, status=status.HTTP_201_CREATED, headers=headers)
 
     def partial_update(self, request: HttpRequest, *args, **kwargs) -> Response:
         """
-- 
cgit v1.2.3


From e17da1f2e991710beaabd37701ce06a57f7b4a77 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Mon, 22 Feb 2021 09:01:18 +0200
Subject: Migrate PATCH request for 2-table nominations system

---
 pydis_site/apps/api/viewsets/bot/nomination.py | 70 ++++++++++++++++++++++----
 1 file changed, 60 insertions(+), 10 deletions(-)

(limited to 'pydis_site/apps/api/viewsets')

diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py
index 8775515c..14dee9bc 100644
--- a/pydis_site/apps/api/viewsets/bot/nomination.py
+++ b/pydis_site/apps/api/viewsets/bot/nomination.py
@@ -112,18 +112,20 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
 
     The PATCH route can be used for three distinct operations:
     1. Updating the `reason` of `active` nomination;
-    2. Ending an `active` nomination;
-    3. Updating the `end_reason` or `reason` field of an `inactive` nomination.
+    2. Updating `reviewed` field of `active` nomination.
+    3. Ending an `active` nomination;
+    4. Updating the `end_reason` or `reason` field of an `inactive` nomination.
 
     While the response format and status codes are the same for all three operations (see
     below), the request bodies vary depending on the operation. For all operations it holds
     that providing other valid fields is not allowed and invalid fields are ignored.
 
-    ### 1. Updating the `reason` of `active` nomination
+    ### 1. Updating the `reason` of `active` nomination. Actor field is required.
 
     #### Request body
     >>> {
     ...     'reason': 'He would make a great helper',
+    ...     'actor': 409107086526644234
     ... }
 
     #### Response format
@@ -134,7 +136,16 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
     - 400: if a field in the request body is invalid or disallowed
     - 404: if an infraction with the given `id` could not be found
 
-    ### 2. Ending an `active` nomination
+    ### 2. Setting nomination `reviewed`
+
+    #### Request body
+    >>> {
+    ...     'reviewed': True
+    ... }
+
+    See operation 1 for the response format and status codes.
+
+    ### 3. Ending an `active` nomination
 
     #### Request body
     >>> {
@@ -144,11 +155,13 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
 
     See operation 1 for the response format and status codes.
 
-    ### 3. Updating the `end_reason` or `reason` field of an `inactive` nomination.
+    ### 4. Updating the `end_reason` or `reason` field of an `inactive` nomination.
+    Actor field is required when updating reason.
 
     #### Request body
     >>> {
     ...     'reason': 'Updated reason for this nomination',
+    ...     'actor': 409107086526644234,
     ...     'end_reason': 'Updated end_reason for this nomination',
     ... }
 
@@ -162,7 +175,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
     filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
     filter_fields = ('user__id', 'active')
     frozen_fields = ('id', 'inserted_at', 'user', 'ended_at')
-    frozen_on_create = ('ended_at', 'end_reason', 'active', 'inserted_at')
+    frozen_on_create = ('ended_at', 'end_reason', 'active', 'inserted_at', 'reviewed')
 
     def list(self, request: HttpRequest, *args, **kwargs) -> Response:
         """
@@ -274,8 +287,20 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
                     {'end_reason': ["An active nomination can't have an end reason."]}
                 )
 
+        elif 'reviewed' in data:
+            # 2. We're setting nomination reviewed
+            if not instance.active:
+                raise ValidationError(
+                    {'reviewed': 'This field cannot be set if nomination is inactive.'}
+                )
+
+            if 'active' in data:
+                raise ValidationError(
+                    {'active': 'This field cannot be set same time than ending nomination.'}
+                )
+
         elif instance.active and not data['active']:
-            # 2. We're ending an active nomination.
+            # 3. We're ending an active nomination.
             if 'reason' in data:
                 raise ValidationError(
                     {'reason': ['This field cannot be set when ending a nomination.']}
@@ -289,11 +314,36 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
             instance.ended_at = timezone.now()
 
         elif 'active' in data:
-            # 3. The `active` field is only allowed when ending a nomination.
+            # 4. The `active` field is only allowed when ending a nomination.
             raise ValidationError(
                 {'active': ['This field can only be used to end a nomination']}
             )
 
-        serializer.save()
+        if 'reason' in request.data:
+            if 'actor' not in request.data:
+                raise ValidationError(
+                    {'actor': 'This field is required when editing reason.'}
+                )
+
+            entry_filter = NominationEntry.objects.filter(
+                nomination_id=instance.id,
+                actor__id=request.data['actor']
+            )
+
+            if not entry_filter.exists():
+                raise ValidationError(
+                    {'actor': "Actor don't exist or have not nominated user."}
+                )
+
+            entry = entry_filter[0]
+            entry.reason = request.data['reason']
+            entry.save()
+
+        nomination = serializer.save()
+        return_data = NominationSerializer(nomination).data
+        return_data["entries"] = NominationEntrySerializer(
+            NominationEntry.objects.filter(nomination_id=nomination.id),
+            many=True
+        ).data
 
-        return Response(serializer.data)
+        return Response(return_data)
-- 
cgit v1.2.3


From 0ae69d9892db73029336e7b9ca95164dd80f828f Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Mon, 22 Feb 2021 09:05:54 +0200
Subject: Disable creating multiple nomination entries of one nomination for
 one actor

---
 pydis_site/apps/api/viewsets/bot/nomination.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'pydis_site/apps/api/viewsets')

diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py
index 14dee9bc..81fb43f7 100644
--- a/pydis_site/apps/api/viewsets/bot/nomination.py
+++ b/pydis_site/apps/api/viewsets/bot/nomination.py
@@ -252,6 +252,16 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
             data=ChainMap(request.data, {"nomination": nomination_filter[0].id})
         )
         entry_serializer.is_valid(raise_exception=True)
+
+        # Don't allow user creating many nomination entries for one nomination
+        if NominationEntry.objects.filter(
+                nomination_id=nomination_filter[0].id,
+                actor__id=entry_serializer.validated_data["actor"].id
+        ).exists():
+            raise ValidationError(
+                {'actor': 'This actor have already created nomination entry for this nomination.'}
+            )
+
         NominationEntry.objects.create(**entry_serializer.validated_data)
 
         data = NominationSerializer(nomination_filter[0]).data
-- 
cgit v1.2.3


From 698cbc17405a49fe42669fedd6054ab6c9008a4a Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Mon, 22 Feb 2021 09:37:12 +0200
Subject: Wrap validation errors to []

---
 pydis_site/apps/api/viewsets/bot/nomination.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pydis_site/apps/api/viewsets')

diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py
index 81fb43f7..c4600425 100644
--- a/pydis_site/apps/api/viewsets/bot/nomination.py
+++ b/pydis_site/apps/api/viewsets/bot/nomination.py
@@ -259,7 +259,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
                 actor__id=entry_serializer.validated_data["actor"].id
         ).exists():
             raise ValidationError(
-                {'actor': 'This actor have already created nomination entry for this nomination.'}
+                {'actor': ['This actor have already created nomination entry for this nomination.']}
             )
 
         NominationEntry.objects.create(**entry_serializer.validated_data)
@@ -301,12 +301,12 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
             # 2. We're setting nomination reviewed
             if not instance.active:
                 raise ValidationError(
-                    {'reviewed': 'This field cannot be set if nomination is inactive.'}
+                    {'reviewed': ['This field cannot be set if nomination is inactive.']}
                 )
 
             if 'active' in data:
                 raise ValidationError(
-                    {'active': 'This field cannot be set same time than ending nomination.'}
+                    {'active': ['This field cannot be set same time than ending nomination.']}
                 )
 
         elif instance.active and not data['active']:
@@ -332,7 +332,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
         if 'reason' in request.data:
             if 'actor' not in request.data:
                 raise ValidationError(
-                    {'actor': 'This field is required when editing reason.'}
+                    {'actor': ['This field is required when editing reason.']}
                 )
 
             entry_filter = NominationEntry.objects.filter(
@@ -342,7 +342,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
 
             if not entry_filter.exists():
                 raise ValidationError(
-                    {'actor': "Actor don't exist or have not nominated user."}
+                    {'actor': ["Actor don't exist or have not nominated user."]}
                 )
 
             entry = entry_filter[0]
-- 
cgit v1.2.3


From 3907122c9e76f78bd7bfd07028e9eb79b43d65b3 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Mon, 22 Feb 2021 11:37:33 +0200
Subject: Small improvements in nomination viewset

---
 pydis_site/apps/api/viewsets/bot/nomination.py | 62 +++++++++++++-------------
 1 file changed, 31 insertions(+), 31 deletions(-)

(limited to 'pydis_site/apps/api/viewsets')

diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py
index c4600425..7820ca0d 100644
--- a/pydis_site/apps/api/viewsets/bot/nomination.py
+++ b/pydis_site/apps/api/viewsets/bot/nomination.py
@@ -14,8 +14,7 @@ from rest_framework.mixins import (
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet
 
-from pydis_site.apps.api.models.bot import Nomination
-from pydis_site.apps.api.models.bot.nomination import NominationEntry
+from pydis_site.apps.api.models.bot import Nomination, NominationEntry
 from pydis_site.apps.api.serializers import NominationEntrySerializer, NominationSerializer
 
 
@@ -112,9 +111,9 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
 
     The PATCH route can be used for three distinct operations:
     1. Updating the `reason` of `active` nomination;
-    2. Updating `reviewed` field of `active` nomination.
-    3. Ending an `active` nomination;
-    4. Updating the `end_reason` or `reason` field of an `inactive` nomination.
+    2. Ending an `active` nomination;
+    3. Updating the `end_reason` or `reason` field of an `inactive` nomination.
+    4. Updating `reviewed` field of `active` nomination.
 
     While the response format and status codes are the same for all three operations (see
     below), the request bodies vary depending on the operation. For all operations it holds
@@ -136,16 +135,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
     - 400: if a field in the request body is invalid or disallowed
     - 404: if an infraction with the given `id` could not be found
 
-    ### 2. Setting nomination `reviewed`
-
-    #### Request body
-    >>> {
-    ...     'reviewed': True
-    ... }
-
-    See operation 1 for the response format and status codes.
-
-    ### 3. Ending an `active` nomination
+    ### 2. Ending an `active` nomination
 
     #### Request body
     >>> {
@@ -155,7 +145,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
 
     See operation 1 for the response format and status codes.
 
-    ### 4. Updating the `end_reason` or `reason` field of an `inactive` nomination.
+    ### 3. Updating the `end_reason` or `reason` field of an `inactive` nomination.
     Actor field is required when updating reason.
 
     #### Request body
@@ -167,6 +157,15 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
 
     Note: The request body may contain either or both fields.
 
+    See operation 1 for the response format and status codes.
+
+    ### 4. Setting nomination `reviewed`
+
+    #### Request body
+    >>> {
+    ...     'reviewed': True
+    ... }
+
     See operation 1 for the response format and status codes.
     """
 
@@ -297,21 +296,9 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
                     {'end_reason': ["An active nomination can't have an end reason."]}
                 )
 
-        elif 'reviewed' in data:
-            # 2. We're setting nomination reviewed
-            if not instance.active:
-                raise ValidationError(
-                    {'reviewed': ['This field cannot be set if nomination is inactive.']}
-                )
-
-            if 'active' in data:
-                raise ValidationError(
-                    {'active': ['This field cannot be set same time than ending nomination.']}
-                )
-
         elif instance.active and not data['active']:
-            # 3. We're ending an active nomination.
-            if 'reason' in data:
+            # 2. We're ending an active nomination.
+            if 'reason' in request.data:
                 raise ValidationError(
                     {'reason': ['This field cannot be set when ending a nomination.']}
                 )
@@ -321,14 +308,27 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
                     {'end_reason': ['This field is required when ending a nomination.']}
                 )
 
+            if 'reviewed' in request.data:
+                raise ValidationError(
+                    {'reviewed': ['This field cannot be set same time than ending nomination.']}
+                )
+
             instance.ended_at = timezone.now()
 
         elif 'active' in data:
-            # 4. The `active` field is only allowed when ending a nomination.
+            # 3. The `active` field is only allowed when ending a nomination.
             raise ValidationError(
                 {'active': ['This field can only be used to end a nomination']}
             )
 
+        # This is actually covered, but for some reason coverage don't think so.
+        elif 'reviewed' in request.data:  # pragma: no cover
+            # 4. We're setting nomination reviewed
+            if not instance.active:
+                raise ValidationError(
+                    {'reviewed': ['This field cannot be set if nomination is inactive.']}
+                )
+
         if 'reason' in request.data:
             if 'actor' not in request.data:
                 raise ValidationError(
-- 
cgit v1.2.3


From 3edb416ba86c62d62c0258d4c69f967e47765186 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Wed, 24 Feb 2021 08:38:13 +0200
Subject: Simplify nominations viewset

After moving entries to nomination serializer we can get rid
from GET request handlers and let DRF handle this.
Also PATCH and POST handlers got some simplification by
removing manual entries setting.
---
 pydis_site/apps/api/viewsets/bot/nomination.py | 51 ++------------------------
 1 file changed, 3 insertions(+), 48 deletions(-)

(limited to 'pydis_site/apps/api/viewsets')

diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py
index 7820ca0d..e3e71ca2 100644
--- a/pydis_site/apps/api/viewsets/bot/nomination.py
+++ b/pydis_site/apps/api/viewsets/bot/nomination.py
@@ -176,40 +176,6 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
     frozen_fields = ('id', 'inserted_at', 'user', 'ended_at')
     frozen_on_create = ('ended_at', 'end_reason', 'active', 'inserted_at', 'reviewed')
 
-    def list(self, request: HttpRequest, *args, **kwargs) -> Response:
-        """
-        DRF method for listing Nominations.
-
-        Called by the Django Rest Framework in response to the corresponding HTTP request.
-        """
-        queryset = self.filter_queryset(self.get_queryset())
-        data = NominationSerializer(queryset, many=True).data
-
-        for i, nomination in enumerate(data):
-            entries = NominationEntrySerializer(
-                NominationEntry.objects.filter(nomination_id=nomination["id"]),
-                many=True
-            ).data
-            data[i]["entries"] = entries
-
-        return Response(data)
-
-    def retrieve(self, request: HttpRequest, *args, **kwargs) -> Response:
-        """
-        DRF method for retrieving a Nomination.
-
-        Called by the Django Rest Framework in response to the corresponding HTTP request.
-        """
-        nomination = self.get_object()
-
-        data = NominationSerializer(nomination).data
-        data["entries"] = NominationEntrySerializer(
-            NominationEntry.objects.filter(nomination_id=nomination.id),
-            many=True
-        ).data
-
-        return Response(data)
-
     def create(self, request: HttpRequest, *args, **kwargs) -> Response:
         """
         DRF method for creating a Nomination.
@@ -238,11 +204,9 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
                 data=ChainMap(request.data, {"nomination": nomination.id})
             )
             entry_serializer.is_valid(raise_exception=True)
-
-            entry = NominationEntry.objects.create(**entry_serializer.validated_data)
+            NominationEntry.objects.create(**entry_serializer.validated_data)
 
             data = NominationSerializer(nomination).data
-            data["entries"] = NominationEntrySerializer([entry], many=True).data
 
             headers = self.get_success_headers(data)
             return Response(data, status=status.HTTP_201_CREATED, headers=headers)
@@ -264,10 +228,6 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
         NominationEntry.objects.create(**entry_serializer.validated_data)
 
         data = NominationSerializer(nomination_filter[0]).data
-        data["entries"] = NominationEntrySerializer(
-            NominationEntry.objects.filter(nomination_id=nomination_filter[0].id),
-            many=True
-        ).data
 
         headers = self.get_success_headers(data)
         return Response(data, status=status.HTTP_201_CREATED, headers=headers)
@@ -349,11 +309,6 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
             entry.reason = request.data['reason']
             entry.save()
 
-        nomination = serializer.save()
-        return_data = NominationSerializer(nomination).data
-        return_data["entries"] = NominationEntrySerializer(
-            NominationEntry.objects.filter(nomination_id=nomination.id),
-            many=True
-        ).data
+        serializer.save()
 
-        return Response(return_data)
+        return Response(serializer.data)
-- 
cgit v1.2.3


From 54eca6da46d83d8872746b89b95a22f7cf0c2b52 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Fri, 5 Mar 2021 07:48:32 +0200
Subject: Fix grammar of nomination endpoints documentation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Leon Sandøy <leon.haland@gmail.com>
Co-authored-by: Joe Banks <joseph@josephbanks.me>
---
 pydis_site/apps/api/viewsets/bot/nomination.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'pydis_site/apps/api/viewsets')

diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py
index e3e71ca2..c208df46 100644
--- a/pydis_site/apps/api/viewsets/bot/nomination.py
+++ b/pydis_site/apps/api/viewsets/bot/nomination.py
@@ -86,8 +86,8 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
     Create a new, active nomination returns the created nominations.
     The `user`, `reason` and `actor` fields are required and the `user`
     and `actor` need to know by the site. Providing other valid fields
-    is not allowed and invalid fields are ignored. If `user` already have
-    active nomination, new nomination entry will be created assigned to
+    is not allowed and invalid fields are ignored. If `user` already has an
+    active nomination, a new nomination entry will be created and assigned as the
     active nomination.
 
     #### Request body
@@ -119,7 +119,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
     below), the request bodies vary depending on the operation. For all operations it holds
     that providing other valid fields is not allowed and invalid fields are ignored.
 
-    ### 1. Updating the `reason` of `active` nomination. Actor field is required.
+    ### 1. Updating the `reason` of `active` nomination. The `actor` field is required.
 
     #### Request body
     >>> {
@@ -199,7 +199,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
             serializer.is_valid(raise_exception=True)
             nomination = Nomination.objects.create(**serializer.validated_data)
 
-            # Serializer truncate unnecessary data away
+            # The serializer will truncate and get rid of excessive data
             entry_serializer = NominationEntrySerializer(
                 data=ChainMap(request.data, {"nomination": nomination.id})
             )
@@ -283,7 +283,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
 
         # This is actually covered, but for some reason coverage don't think so.
         elif 'reviewed' in request.data:  # pragma: no cover
-            # 4. We're setting nomination reviewed
+            # 4. We are altering the reviewed state of the nomination.
             if not instance.active:
                 raise ValidationError(
                     {'reviewed': ['This field cannot be set if nomination is inactive.']}
-- 
cgit v1.2.3


From 72693a6b72332c1ca9411f73ae14d395c5dd8933 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Fri, 5 Mar 2021 07:49:46 +0200
Subject: Replace double quotes with single quotes

Co-authored-by: Joe Banks <joseph@josephbanks.me>
---
 pydis_site/apps/api/viewsets/bot/nomination.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/api/viewsets')

diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py
index c208df46..ef7d1dab 100644
--- a/pydis_site/apps/api/viewsets/bot/nomination.py
+++ b/pydis_site/apps/api/viewsets/bot/nomination.py
@@ -302,7 +302,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
 
             if not entry_filter.exists():
                 raise ValidationError(
-                    {'actor': ["Actor don't exist or have not nominated user."]}
+                    {'actor': ['Actor don't exist or have not nominated user.']}
                 )
 
             entry = entry_filter[0]
-- 
cgit v1.2.3


From 9075231a5fd68986b0845327d6a2bffe70447fc8 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Fri, 5 Mar 2021 08:18:17 +0200
Subject: Use double quotes instead apostrophe because string contain "don't"

---
 pydis_site/apps/api/viewsets/bot/nomination.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/api/viewsets')

diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py
index ef7d1dab..c208df46 100644
--- a/pydis_site/apps/api/viewsets/bot/nomination.py
+++ b/pydis_site/apps/api/viewsets/bot/nomination.py
@@ -302,7 +302,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
 
             if not entry_filter.exists():
                 raise ValidationError(
-                    {'actor': ['Actor don't exist or have not nominated user.']}
+                    {'actor': ["Actor don't exist or have not nominated user."]}
                 )
 
             entry = entry_filter[0]
-- 
cgit v1.2.3


From d8751ad37ed5a493554575ea3adb264def342664 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Fri, 5 Mar 2021 08:23:28 +0200
Subject: Fix grammar of error messages and change tests to match with changes

---
 pydis_site/apps/api/tests/test_nominations.py  | 8 ++++----
 pydis_site/apps/api/viewsets/bot/nomination.py | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'pydis_site/apps/api/viewsets')

diff --git a/pydis_site/apps/api/tests/test_nominations.py b/pydis_site/apps/api/tests/test_nominations.py
index 1daa6f3f..c07679c5 100644
--- a/pydis_site/apps/api/tests/test_nominations.py
+++ b/pydis_site/apps/api/tests/test_nominations.py
@@ -78,7 +78,7 @@ class CreationTests(APISubdomainTestCase):
         response2 = self.client.post(url, data=data)
         self.assertEqual(response2.status_code, 400)
         self.assertEqual(response2.json(), {
-            'actor': ['This actor have already created nomination entry for this nomination.']
+            'actor': ['This actor has already endorsed this nomination.']
         })
 
     def test_returns_400_for_missing_user(self):
@@ -498,7 +498,7 @@ class NominationTests(APISubdomainTestCase):
         response = self.client.patch(url, data=data)
         self.assertEqual(response.status_code, 400)
         self.assertEqual(response.json(), {
-            'reviewed': ['This field cannot be set if nomination is inactive.']
+            'reviewed': ['This field cannot be set if the nomination is inactive.']
         })
 
     def test_patch_nomination_set_reviewed_and_end(self):
@@ -508,7 +508,7 @@ class NominationTests(APISubdomainTestCase):
         response = self.client.patch(url, data=data)
         self.assertEqual(response.status_code, 400)
         self.assertEqual(response.json(), {
-            'reviewed': ['This field cannot be set same time than ending nomination.']
+            'reviewed': ['This field cannot be set while you are ending a nomination.']
         })
 
     def test_modifying_reason_without_actor(self):
@@ -518,7 +518,7 @@ class NominationTests(APISubdomainTestCase):
         response = self.client.patch(url, data=data)
         self.assertEqual(response.status_code, 400)
         self.assertEqual(response.json(), {
-            'actor': ['This field is required when editing reason.']
+            'actor': ['This field is required when editing the reason.']
         })
 
     def test_modifying_reason_with_unknown_actor(self):
diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py
index c208df46..451264f4 100644
--- a/pydis_site/apps/api/viewsets/bot/nomination.py
+++ b/pydis_site/apps/api/viewsets/bot/nomination.py
@@ -222,7 +222,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
                 actor__id=entry_serializer.validated_data["actor"].id
         ).exists():
             raise ValidationError(
-                {'actor': ['This actor have already created nomination entry for this nomination.']}
+                {'actor': ['This actor has already endorsed this nomination.']}
             )
 
         NominationEntry.objects.create(**entry_serializer.validated_data)
@@ -270,7 +270,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
 
             if 'reviewed' in request.data:
                 raise ValidationError(
-                    {'reviewed': ['This field cannot be set same time than ending nomination.']}
+                    {'reviewed': ['This field cannot be set while you are ending a nomination.']}
                 )
 
             instance.ended_at = timezone.now()
@@ -286,13 +286,13 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
             # 4. We are altering the reviewed state of the nomination.
             if not instance.active:
                 raise ValidationError(
-                    {'reviewed': ['This field cannot be set if nomination is inactive.']}
+                    {'reviewed': ['This field cannot be set if the nomination is inactive.']}
                 )
 
         if 'reason' in request.data:
             if 'actor' not in request.data:
                 raise ValidationError(
-                    {'actor': ['This field is required when editing reason.']}
+                    {'actor': ['This field is required when editing the reason.']}
                 )
 
             entry_filter = NominationEntry.objects.filter(
-- 
cgit v1.2.3


From ce5a082458d8cc1433ce623d3b666fb6e0f82672 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 6 Mar 2021 14:11:56 +0200
Subject: Change as -> to in nomination viewset docs

---
 pydis_site/apps/api/viewsets/bot/nomination.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/api/viewsets')

diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py
index 451264f4..9b9aa280 100644
--- a/pydis_site/apps/api/viewsets/bot/nomination.py
+++ b/pydis_site/apps/api/viewsets/bot/nomination.py
@@ -87,7 +87,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
     The `user`, `reason` and `actor` fields are required and the `user`
     and `actor` need to know by the site. Providing other valid fields
     is not allowed and invalid fields are ignored. If `user` already has an
-    active nomination, a new nomination entry will be created and assigned as the
+    active nomination, a new nomination entry will be created and assigned to the
     active nomination.
 
     #### Request body
-- 
cgit v1.2.3


From 9202d92d3cb27111eaf5d3cc1aee859f9cbe8918 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 6 Mar 2021 14:12:56 +0200
Subject: Fix grammar of nomination viewset command about single entry for user

---
 pydis_site/apps/api/viewsets/bot/nomination.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site/apps/api/viewsets')

diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py
index 9b9aa280..0792a2a6 100644
--- a/pydis_site/apps/api/viewsets/bot/nomination.py
+++ b/pydis_site/apps/api/viewsets/bot/nomination.py
@@ -216,7 +216,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
         )
         entry_serializer.is_valid(raise_exception=True)
 
-        # Don't allow user creating many nomination entries for one nomination
+        # Don't allow a user to create many nomination entries in a single nomination
         if NominationEntry.objects.filter(
                 nomination_id=nomination_filter[0].id,
                 actor__id=entry_serializer.validated_data["actor"].id
-- 
cgit v1.2.3


From 48eff5d27715acd658f6284f4d4e1cdbbf71bee6 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Sat, 6 Mar 2021 14:13:50 +0200
Subject: Fix grammar of unknown actor error and change tests

---
 pydis_site/apps/api/tests/test_nominations.py  | 2 +-
 pydis_site/apps/api/viewsets/bot/nomination.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'pydis_site/apps/api/viewsets')

diff --git a/pydis_site/apps/api/tests/test_nominations.py b/pydis_site/apps/api/tests/test_nominations.py
index c07679c5..9cefbd8f 100644
--- a/pydis_site/apps/api/tests/test_nominations.py
+++ b/pydis_site/apps/api/tests/test_nominations.py
@@ -528,5 +528,5 @@ class NominationTests(APISubdomainTestCase):
         response = self.client.patch(url, data=data)
         self.assertEqual(response.status_code, 400)
         self.assertEqual(response.json(), {
-            'actor': ["Actor don't exist or have not nominated user."]
+            'actor': ["The actor doesn't exist or has not nominated the user."]
         })
diff --git a/pydis_site/apps/api/viewsets/bot/nomination.py b/pydis_site/apps/api/viewsets/bot/nomination.py
index 0792a2a6..144daab0 100644
--- a/pydis_site/apps/api/viewsets/bot/nomination.py
+++ b/pydis_site/apps/api/viewsets/bot/nomination.py
@@ -302,7 +302,7 @@ class NominationViewSet(CreateModelMixin, RetrieveModelMixin, ListModelMixin, Ge
 
             if not entry_filter.exists():
                 raise ValidationError(
-                    {'actor': ["Actor don't exist or have not nominated user."]}
+                    {'actor': ["The actor doesn't exist or has not nominated the user."]}
                 )
 
             entry = entry_filter[0]
-- 
cgit v1.2.3