Move Neomodel class extensions to schemas.py

backend/database/models/agency.py

@@ -1,4 +1,4 @@
-from backend.database.neo_classes import JsonSerializable, PropertyEnum
+from backend.schemas import JsonSerializable, PropertyEnum
 from neomodel import (
     StructuredNode,
     StructuredRel,

backend/database/models/attachment.py

@@ -1,4 +1,4 @@
-from backend.database.neo_classes import JsonSerializable
+from backend.schemas import JsonSerializable
 from neomodel import (
     StringProperty,
     UniqueIdProperty,

backend/database/models/complaint.py

@@ -1,5 +1,5 @@
 """Define the Classes for Complaints."""
-from backend.database.neo_classes import JsonSerializable, PropertyEnum
+from backend.schemas import JsonSerializable, PropertyEnum
 from neomodel import (
     StructuredNode,
     StructuredRel,

backend/database/models/litigation.py

@@ -1,4 +1,4 @@
-from backend.database.neo_classes import JsonSerializable, PropertyEnum
+from backend.schemas import JsonSerializable, PropertyEnum
 from neomodel import (
     StructuredNode,
     StringProperty,

backend/database/models/officer.py

@@ -1,4 +1,4 @@
-from backend.database.neo_classes import JsonSerializable, PropertyEnum
+from backend.schemas import JsonSerializable, PropertyEnum
 
 from neomodel import (
     StructuredNode,

backend/database/models/partner.py

@@ -1,6 +1,6 @@
 from __future__ import annotations  # allows type hinting of class itself
 # from ..core import db, CrudMixin
-from backend.database.neo_classes import JsonSerializable, PropertyEnum
+from backend.schemas import JsonSerializable, PropertyEnum
 from datetime import datetime
 from neomodel import (
     StructuredNode, StructuredRel,
@@ -95,6 +95,10 @@ def __repr__(self):
 
 
 class Partner(StructuredNode, JsonSerializable):
+    __property_order__ = [
+        "uid", "name", "url",
+        "contact_email"
+    ]
     uid = UniqueIdProperty()
 
     name = StringProperty(unique_index=True)

backend/database/models/user.py

@@ -2,7 +2,7 @@
 
 import bcrypt
 from werkzeug.security import generate_password_hash, check_password_hash
-from backend.database.neo_classes import JsonSerializable, PropertyEnum
+from backend.schemas import JsonSerializable, PropertyEnum
 from neomodel import (
     Relationship, StructuredNode,
     StringProperty, DateProperty, BooleanProperty,
@@ -30,6 +30,13 @@ def get_value(self):
 
 # Define the User data-model.
 class User(StructuredNode, JsonSerializable):
+    __hidden_properties__ = ["password_hash"]
+    __property_order__ = [
+        "uid", "first_name", "last_name",
+        "email", "email_confirmed_at",
+        "phone_number", "role", "active"
+    ]
+
     uid = UniqueIdProperty()
     active = BooleanProperty(default=True)
 
@@ -94,6 +101,15 @@ def send_password_reset(self):
         """
         pass
 
+    @property
+    def role_enum(self) -> UserRole:
+        """
+        Get the user's role as an enum.
+        Returns:
+            UserRole: The user's role as an enum.
+        """
+        return UserRole(self.role)
+
     @classmethod
     def hash_password(cls, pw: str) -> str:
         """