workspace role marked as accepted when user accepts invitation

atst/domain/workspace_users.py

@@ -63,7 +63,7 @@ class WorkspaceUsers(object):
             new_workspace_role.role = role
         except NoResultFound:
             new_workspace_role = WorkspaceRole(
-                user=user, role_id=role.id, workspace_id=workspace_id
+                user=user, role_id=role.id, workspace_id=workspace_id, accepted=False
             )
 
         user.workspace_roles.append(new_workspace_role)

atst/domain/workspaces/query.py

@@ -25,9 +25,19 @@ class WorkspacesQuery(Query):
             db.session.query(Workspace)
             .join(WorkspaceRole)
             .filter(WorkspaceRole.user == user)
+            .filter(WorkspaceRole.accepted == True)
             .all()
         )
 
     @classmethod
     def create_workspace_role(cls, user, role, workspace):
         return WorkspaceRole(user=user, role=role, workspace=workspace)
+
+    @classmethod
+    def get_role_for_workspace_and_user(cls, workspace, user):
+        return (
+            db.session.query(WorkspaceRole)
+            .filter(WorkspaceRole.user == user)
+            .filter(WorkspaceRole.workspace == workspace)
+            .one()
+        )

atst/domain/workspaces/workspaces.py

@@ -119,3 +119,11 @@ class Workspaces(object):
             workspace.name = new_data["name"]
 
         WorkspacesQuery.add_and_commit(workspace)
+
+    @classmethod
+    def accept_workspace_role(cls, user, workspace):
+        workspace_role = WorkspacesQuery.get_role_for_workspace_and_user(
+            workspace, user
+        )
+        workspace_role.accepted = True
+        WorkspacesQuery.add_and_commit(workspace_role)

atst/models/workspace_role.py

@@ -1,4 +1,4 @@
-from sqlalchemy import Index, ForeignKey, Column
+from sqlalchemy import Index, ForeignKey, Column, Boolean
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import relationship
 
@@ -22,6 +22,8 @@ class WorkspaceRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
         UUID(as_uuid=True), ForeignKey("users.id"), index=True, nullable=False
     )
 
+    accepted = Column(Boolean)
+
     def __repr__(self):
         return "<WorkspaceRole(role='{}', workspace='{}', user_id='{}', id='{}')>".format(
             self.role.name, self.workspace.name, self.user_id, self.id

atst/routes/workspaces.py

@@ -341,6 +341,7 @@ def update_member(workspace_id, member_id):
 @bp.route("/workspaces/invitation/<invite_id>", methods=["GET"])
 def accept_invitation(invite_id):
     invite = Invitations.accept(invite_id)
+    Workspaces.accept_workspace_role(invite.user, invite.workspace)
 
     return redirect(
         url_for("workspaces.show_workspace", workspace_id=invite.workspace.id)