break out expiration method in Invitations domain

This commit is contained in:
dandds 2018-10-25 10:41:20 -04:00
parent 370b037d99
commit 8f146b2fee

View File

@ -39,7 +39,7 @@ class Invitations(object):
@classmethod @classmethod
def accept(cls, invite_id): def accept(cls, invite_id):
invite = Invitations._get(invite_id) invite = Invitations._get(invite_id)
valid = Invitations._is_valid(invite) valid = Invitations.is_valid(invite)
invite.valid = False invite.valid = False
db.session.add(invite) db.session.add(invite)
@ -51,12 +51,13 @@ class Invitations(object):
return invite return invite
@classmethod @classmethod
def _is_valid(cls, invite): def is_valid(cls, invite):
if not invite.valid: return invite.valid and not Invitations.is_expired(invite)
return False
else: @classmethod
def is_expired(cls, invite):
time_created = invite.time_created time_created = invite.time_created
expiration = datetime.datetime.now( expiration = datetime.datetime.now(time_created.tzinfo) - datetime.timedelta(
time_created.tzinfo minutes=Invitations.EXPIRATION_LIMIT
) - datetime.timedelta(minutes=Invitations.EXPIRATION_LIMIT) )
return invite.time_created > expiration return invite.time_created < expiration