record inviter on invitation

This commit is contained in:
dandds
2018-10-26 12:54:28 -04:00
parent edede87108
commit 6125041a93
5 changed files with 42 additions and 6 deletions

View File

@@ -30,8 +30,8 @@ class Invitations(object):
return invite
@classmethod
def create(cls, workspace, user):
invite = Invitation(workspace=workspace, user=user, valid=True)
def create(cls, workspace, inviter, user):
invite = Invitation(workspace=workspace, inviter=inviter, user=user, valid=True)
db.session.add(invite)
db.session.commit()

View File

@@ -12,11 +12,14 @@ class Invitation(Base, TimestampsMixin):
id = types.Id()
user_id = Column(UUID(as_uuid=True), ForeignKey("users.id"), index=True)
user = relationship("User", backref="invitations")
user = relationship("User", backref="invitations", foreign_keys=[user_id])
workspace_id = Column(UUID(as_uuid=True), ForeignKey("workspaces.id"), index=True)
workspace = relationship("Workspace", backref="invitations")
inviter_id = Column(UUID(as_uuid=True), ForeignKey("users.id"), index=True)
inviter = relationship("User", backref="sent_invites", foreign_keys=[inviter_id])
valid = Column(Boolean, default=True)
def __repr__(self):

View File

@@ -239,7 +239,7 @@ def create_member(workspace_id):
if form.validate():
try:
new_member = Workspaces.create_member(g.current_user, workspace, form.data)
invite = Invitations.create(workspace, new_member.user)
invite = Invitations.create(workspace, g.current_user, new_member.user)
send_invite_email(
g.current_user.full_name, invite.id, new_member.user.email
)