From 33ebdd87c692b60e22c56029ddd2e0d6d7a364d7 Mon Sep 17 00:00:00 2001 From: Tore Brede <Tore.Brede@uib.no> Date: Tue, 23 Nov 2021 08:44:14 +0100 Subject: [PATCH] Adding feide_id identity as property on person --- greg/models.py | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/greg/models.py b/greg/models.py index 90d54ca0..4fc4f711 100644 --- a/greg/models.py +++ b/greg/models.py @@ -91,6 +91,13 @@ class Person(BaseModel): type=Identity.IdentityType.PASSPORT_NUMBER ).first() + @property + def feide_id(self) -> Optional["Identity"]: + """The person's Feide ID if they have one registered. """ + return self.identities.filter( + type=Identity.IdentityType.FEIDE_ID + ).first() + @property def is_registered(self) -> bool: """ @@ -111,8 +118,8 @@ class Person(BaseModel): """ # registration_completed_date is set only after accepting consents return ( - self.registration_completed_date is not None - and self.registration_completed_date <= date.today() + self.registration_completed_date is not None + and self.registration_completed_date <= date.today() ) @staticmethod @@ -153,15 +160,15 @@ class Person(BaseModel): authenticity, or trust level of the guest's associated identities. """ return ( - self.identities.filter( - type__in=[ - Identity.IdentityType.NORWEGIAN_NATIONAL_ID_NUMBER, - Identity.IdentityType.PASSPORT_NUMBER, - ], - verified_at__isnull=False, - verified_at__lte=timezone.now(), - ).count() - >= 1 + self.identities.filter( + type__in=[ + Identity.IdentityType.NORWEGIAN_NATIONAL_ID_NUMBER, + Identity.IdentityType.PASSPORT_NUMBER, + ], + verified_at__isnull=False, + verified_at__lte=timezone.now(), + ).count() + >= 1 ) @property -- GitLab