From ee597098d012dced116016109ed4f56e34704509 Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke@nordu.net>
Date: Tue, 1 Aug 2023 17:55:42 +0200
Subject: [PATCH] Fix auth_model uuid with sqlite
---
compendium_v2/db/auth_model.py | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/compendium_v2/db/auth_model.py b/compendium_v2/db/auth_model.py
index 36f354d6..c8bf5541 100644
--- a/compendium_v2/db/auth_model.py
+++ b/compendium_v2/db/auth_model.py
@@ -25,7 +25,7 @@ class ROLES(Enum):
user = "user"
-uuid_pk = Annotated[UUID, mapped_column(primary_key=True, default=lambda _: str(uuid4()))]
+uuid_pk = Annotated[UUID, mapped_column(primary_key=True, default=lambda _: uuid4())]
int_pk_fkNREN = Annotated[int, mapped_column(ForeignKey("nren.id"), primary_key=True)]
# TODO: active should be default False and require admin approval
@@ -71,3 +71,13 @@ class User(UserMixin, db.Model):
@property
def is_active(self):
return self.active
+
+ @property
+ def is_admin(self):
+ return self.roles == ROLES.admin
+
+ @property
+ def nren(self):
+ if len(self.nrens) == 0:
+ return None
+ return self.nrens[0]
--
GitLab