From fe01de3668672324ef11615d462c43ca1799e8c0 Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Wed, 22 Nov 2023 12:16:24 -0500 Subject: [PATCH] More testing tweaks. Signed-off-by: Cliff Hill --- app/models.py | 12 ++++++++---- tests/app/test_model.py | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/models.py b/app/models.py index a90ab65dc..d141d8c29 100644 --- a/app/models.py +++ b/app/models.py @@ -448,13 +448,17 @@ class Organization(db.Model): @property def agreement_active(self): - return ( - self.agreement.status == AgreementStatus.active if self.agreement else False - ) + try: + return self.agreement.status == AgreementStatus.ACTIVE + except AttributeError: + return False @property def has_mou(self): - return self.agreement.type == AgreementType.MOU if self.agreement else False + try: + return self.agreement.type == AgreementType.MOU + except AttributeError: + return False def serialize(self): return { diff --git a/tests/app/test_model.py b/tests/app/test_model.py index c314c656c..faab07182 100644 --- a/tests/app/test_model.py +++ b/tests/app/test_model.py @@ -452,7 +452,7 @@ def test_organization_agreement_active(notify_db_session, agreement_status, expe agree.type = AgreementType.IAA organization = create_organization(name="Something") organization.agreements.append(agree) - assert organization.active == expected + assert organization.agreement_active == expected def test_agreement_serialize():