From e1cdc9150c5ea9013beab26dd29959b9874087e4 Mon Sep 17 00:00:00 2001
From: Tore Brede <Tore.Brede@uib.no>
Date: Tue, 9 Nov 2021 13:18:57 +0100
Subject: [PATCH] GREG-94: Fixing formatting
---
gregui/api/views/invitation.py | 6 +++---
gregui/mailutils.py | 4 ++--
gregui/tests/api/test_invite_guest.py | 28 +++++++++++++--------------
3 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/gregui/api/views/invitation.py b/gregui/api/views/invitation.py
index a73ba024..17f37f60 100644
--- a/gregui/api/views/invitation.py
+++ b/gregui/api/views/invitation.py
@@ -71,8 +71,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)
@@ -277,7 +277,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/mailutils.py b/gregui/mailutils.py
index e51a31ec..6929afda 100644
--- a/gregui/mailutils.py
+++ b/gregui/mailutils.py
@@ -13,7 +13,7 @@ logger = logging.getLogger(__name__)
def prepare_arguments(
- template: EmailTemplate, context: dict[str, str], mail_to: str
+ template: EmailTemplate, context: dict[str, str], mail_to: str
) -> dict[str, Union[str, list[str]]]:
"""Combine input to a dict ready for use as arguments ti django's send_mail"""
return {
@@ -25,7 +25,7 @@ def prepare_arguments(
def registration_template(
- institution: str, sponsor: str, mail_to: str
+ institution: str, sponsor: str, mail_to: str
) -> dict[str, Union[str, list[str]]]:
"""
Prepare email for registration
diff --git a/gregui/tests/api/test_invite_guest.py b/gregui/tests/api/test_invite_guest.py
index c708275a..9447535e 100644
--- a/gregui/tests/api/test_invite_guest.py
+++ b/gregui/tests/api/test_invite_guest.py
@@ -13,19 +13,17 @@ from gregui.api.views.invitation import InvitationView
@pytest.mark.django_db
def test_invite_guest(client, user_sponsor, unit_foo, role_type_foo, mocker):
# Mock function to avoid exception because there are no e-mail templates in the database
- mocker.patch(
- "gregui.api.views.invitation.send_invite_mail"
- )
+ mocker.patch("gregui.api.views.invitation.send_invite_mail")
data = {
"first_name": "Foo",
"last_name": "Bar",
"email": "test@example.com",
"role": {
"start_date": (
- datetime.datetime.today() + datetime.timedelta(days=1)
+ datetime.datetime.today() + datetime.timedelta(days=1)
).strftime("%Y-%m-%d"),
"end_date": (
- datetime.datetime.today() + datetime.timedelta(days=10)
+ datetime.datetime.today() + datetime.timedelta(days=10)
).strftime("%Y-%m-%d"),
"orgunit": unit_foo.id,
"type": role_type_foo.id,
@@ -59,7 +57,7 @@ def test_invite_guest(client, user_sponsor, unit_foo, role_type_foo, mocker):
@pytest.mark.django_db
def test_invite_cancel(
- client, invitation_link, invitation, role, log_in, sponsor_guy, user_sponsor
+ client, invitation_link, invitation, role, log_in, sponsor_guy, user_sponsor
):
# TODO: Should all sponsors be allowed to delete arbitrary invitations?
log_in(user_sponsor)
@@ -79,14 +77,14 @@ def test_invite_cancel(
@pytest.mark.django_db
def test_invite_resend_existing_invite_active(
- client,
- log_in,
- user_sponsor,
- person,
- invitation,
- invitation_link,
- invitation_link_expired,
- mocker,
+ client,
+ log_in,
+ user_sponsor,
+ person,
+ invitation,
+ invitation_link,
+ invitation_link_expired,
+ mocker,
):
send_invite_mock_function = mocker.patch(
"gregui.api.views.invitation.send_invite_mail"
@@ -123,7 +121,7 @@ def test_invite_resend_existing_invite_active(
@pytest.mark.django_db
def test_invite_resend_existing_invite_not_active(
- client, log_in, user_sponsor, person, invitation_link_expired, mocker
+ client, log_in, user_sponsor, person, invitation_link_expired, mocker
):
send_invite_mock_function = mocker.patch(
"gregui.api.views.invitation.send_invite_mail", return_value=10
--
GitLab