From 2df393b15150c191835d803567e30e35fccee28a Mon Sep 17 00:00:00 2001
From: Tore Brede <Tore.Brede@uib.no>
Date: Mon, 22 Nov 2021 11:31:19 +0100
Subject: [PATCH] GREG-113: Fixing linting and formatting errors
---
gregui/api/serializers/guest.py | 12 +++--
gregui/api/views/invitation.py | 16 +++----
gregui/tests/api/views/test_invitation.py | 56 ++++++++++++-----------
3 files changed, 46 insertions(+), 38 deletions(-)
diff --git a/gregui/api/serializers/guest.py b/gregui/api/serializers/guest.py
index 866dd829..6d93031f 100644
--- a/gregui/api/serializers/guest.py
+++ b/gregui/api/serializers/guest.py
@@ -5,7 +5,7 @@ from rest_framework import serializers
from greg.models import Identity, Person
from gregui.validation import (
validate_phone_number,
- validate_norwegian_national_id_number
+ validate_norwegian_national_id_number,
)
@@ -65,7 +65,11 @@ class GuestRegisterSerializer(serializers.ModelSerializer):
today = datetime.date.today()
# Check that the date of birth is between the interval starting about 100 years ago and last year
- if not (today - datetime.timedelta(weeks=100 * 52) < value < today - datetime.timedelta(weeks=52)):
+ if (
+ not today - datetime.timedelta(weeks=100 * 52)
+ < value
+ < today - datetime.timedelta(weeks=52)
+ ):
raise serializers.ValidationError("Invalid date of birth")
class Meta:
@@ -78,13 +82,13 @@ class GuestRegisterSerializer(serializers.ModelSerializer):
"mobile_phone",
"fnr",
"passport",
- "date_of_birth"
+ "date_of_birth",
)
read_only_fields = ("id",)
def create_identity_or_update(
- identity_type: Identity.IdentityType, value: str, person: Person
+ identity_type: Identity.IdentityType, value: str, person: Person
):
existing_identity = person.identities.filter(type=identity_type).first()
if not existing_identity:
diff --git a/gregui/api/views/invitation.py b/gregui/api/views/invitation.py
index 7082894f..7072b940 100644
--- a/gregui/api/views/invitation.py
+++ b/gregui/api/views/invitation.py
@@ -72,8 +72,8 @@ class InvitationView(CreateAPIView, DestroyAPIView):
person = serializer.save()
for invitationlink in InvitationLink.objects.filter(
- invitation__role__person_id=person.id,
- invitation__role__sponsor_id=sponsor_user.sponsor_id,
+ invitation__role__person_id=person.id,
+ invitation__role__sponsor_id=sponsor_user.sponsor_id,
):
send_invite_mail(invitationlink)
@@ -150,7 +150,7 @@ class InvitedGuestView(GenericAPIView):
"fnr",
"mobile_phone",
"passport",
- "date_of_birth"
+ "date_of_birth",
]
fields_allowed_to_update_if_feide = ["mobile_phone"]
@@ -243,10 +243,10 @@ class InvitedGuestView(GenericAPIView):
# If there is a Feide ID registered with the guest, assume that the name is also coming from there
feide_id = self._get_identity_or_none(person, Identity.IdentityType.FEIDE_ID)
if not self._only_allowed_fields_in_request(
- data,
- self.fields_allowed_to_update_if_invite
- if feide_id is None
- else self.fields_allowed_to_update_if_feide,
+ data,
+ self.fields_allowed_to_update_if_invite
+ if feide_id is None
+ else self.fields_allowed_to_update_if_feide,
):
return Response(status=status.HTTP_400_BAD_REQUEST)
@@ -296,7 +296,7 @@ class InvitedGuestView(GenericAPIView):
@staticmethod
def _get_identity_or_none(
- person: Person, identity_type: Identity.IdentityType
+ person: Person, identity_type: Identity.IdentityType
) -> Optional[str]:
try:
return person.identities.get(type=identity_type).value
diff --git a/gregui/tests/api/views/test_invitation.py b/gregui/tests/api/views/test_invitation.py
index 3bf201aa..42d6706a 100644
--- a/gregui/tests/api/views/test_invitation.py
+++ b/gregui/tests/api/views/test_invitation.py
@@ -56,7 +56,7 @@ def test_get_invited_info_no_session(client, invitation_link):
@pytest.mark.django_db
def test_get_invited_info_session_okay(
- client, invited_person, sponsor_foo_data, role_type_foo, unit_foo
+ client, invited_person, sponsor_foo_data, role_type_foo, unit_foo
):
person, invitation_link = invited_person
# get a session
@@ -91,7 +91,7 @@ def test_get_invited_info_session_okay(
@pytest.mark.django_db
def test_get_invited_info_expired_link(
- client, invitation_link, invitation_expired_date
+ client, invitation_link, invitation_expired_date
):
# Get a session while link is valid
client.get(reverse("gregui-v1:invite-verify"), data={"uuid": invitation_link.uuid})
@@ -134,7 +134,7 @@ def test_invited_guest_can_post_information(client: APIClient, invited_person):
@pytest.mark.django_db
def test_post_invited_info_expired_session(
- client, invitation_link, invitation_expired_date
+ client, invitation_link, invitation_expired_date
):
# get a session
client.post(reverse("gregui-v1:invite-verify"), data={"uuid": invitation_link.uuid})
@@ -246,10 +246,10 @@ def test_register_passport(client, invited_person):
session.save()
assert (
- Identity.objects.filter(
- person__id=person.id, type=Identity.IdentityType.PASSPORT_NUMBER
- ).count()
- == 0
+ Identity.objects.filter(
+ person__id=person.id, type=Identity.IdentityType.PASSPORT_NUMBER
+ ).count()
+ == 0
)
response = client.post(url, data, format="json")
@@ -266,15 +266,15 @@ def test_register_passport(client, invited_person):
@pytest.mark.django_db
def test_name_update_not_allowed_if_feide_identity_is_present(
- client: APIClient,
- person_foo,
- sponsor_foo,
- unit_foo,
- role_type_foo,
- create_role,
- create_invitation,
- create_invitation_link,
- invitation_valid_date,
+ client: APIClient,
+ person_foo,
+ sponsor_foo,
+ unit_foo,
+ role_type_foo,
+ create_role,
+ create_invitation,
+ create_invitation_link,
+ invitation_valid_date,
):
# This person has a Feide ID, so the name is assumed to come from there as well
# and the guest should not be allowed to update it
@@ -310,15 +310,15 @@ def test_name_update_not_allowed_if_feide_identity_is_present(
@pytest.mark.django_db
def test_name_update_allowed_if_feide_identity_is_not_present(
- client: APIClient,
- create_person,
- sponsor_foo,
- unit_foo,
- role_type_foo,
- create_role,
- create_invitation,
- create_invitation_link,
- invitation_valid_date,
+ client: APIClient,
+ create_person,
+ sponsor_foo,
+ unit_foo,
+ role_type_foo,
+ create_role,
+ create_invitation,
+ create_invitation_link,
+ invitation_valid_date,
):
# This person does not have a Feide ID, so he will be viewed as someone whose name was entered manually
# by the sponsor, and in it that case the guest can update it
@@ -408,7 +408,11 @@ def test_date_of_birth_stored(client, invited_person_verified_nin):
assert response.status_code == status.HTTP_200_OK
person = Person.objects.get()
- assert person.date_of_birth == datetime.datetime.strptime(date_of_birth, "%Y-%m-%d").date()
+ assert (
+ person.date_of_birth
+ == datetime.datetime.strptime(date_of_birth, "%Y-%m-%d").date()
+ )
+
@pytest.mark.django_db
def test_invalid_date_of_birth_rejected(client, invited_person_verified_nin):
--
GitLab