feat: allow admins to bypass approval flow when joining networks

gatehouse_app/models/zerotier/device.py

@@ -2,7 +2,7 @@
 
 from gatehouse_app.extensions import db
 from gatehouse_app.models.base import BaseModel
-from gatehouse_app.utils.constants import DeviceStatus
+from gatehouse_app.utils.constants import ApprovalState, DeviceStatus
 
 
 class Device(BaseModel):
@@ -55,8 +55,8 @@ class Device(BaseModel):
     # Relationships
     user = db.relationship("User", backref="devices")
     organization = db.relationship("Organization", backref="devices")
-    memberships = db.relationship(
-        "DeviceNetworkMembership",
+    network_access_requests = db.relationship(
+        "NetworkAccessRequest",
         back_populates="device",
         cascade="all, delete-orphan",
     )
@@ -73,7 +73,7 @@ class Device(BaseModel):
         data = super().to_dict(exclude=exclude)
         data["display_name"] = self.display_name
         data["active_membership_count"] = sum(
-            1 for m in self.memberships
-            if m.state == "active_authorized" and m.deleted_at is None
+            1 for r in self.network_access_requests
+            if r.active and r.status == ApprovalState.APPROVED and r.deleted_at is None
         )
         return data