Add token projects column which points to creating user's projects; update is_owned_by

Author: acrellin

cesium_app/models.py

@@ -9,11 +9,18 @@
 from cesium import featurize
 
 
-def is_owned_by(self, user):
-    if hasattr(self, 'users'):
-        return (user in self.users)
+def is_owned_by(self, user_or_token):
+    if hasattr(self, 'tokens'):
+        return (user_or_token in self.tokens)
     elif hasattr(self, 'project'):
-        return (user in self.project.users)
+        return self.project in user_or_token.projects
+    elif hasattr(self, 'projects'):
+        return bool(set(self.projects) & set(user_or_token.projects))
+    elif hasattr(self, 'users'):
+        if hasattr(user_or_token, 'created_by'):
+            if user_or_token.created_by in self.users:
+                return True
+        return (user_or_token in self.users)
     else:
         raise NotImplementedError(f"{type(self).__name__} object has no owner")
 Base.is_owned_by = is_owned_by
@@ -62,6 +69,11 @@ class Project(Base):
                              back_populates='users', cascade='all')
 UserProjects = join_model('user_projects', User, Project)
 
+@property
+def token_projects(self):
+    return self.created_by.projects
+Token.projects = token_projects
+
 
 class Featureset(Base):
     project_id = sa.Column(sa.ForeignKey('projects.id', ondelete='CASCADE'),