fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(invitations): save expiresAt to DB

Browse Source
This commit is contained in:
Sarah Vaupel 2019-08-28 14:18:36 +02:00
parent 0044cea857
commit 1c2f2b7221
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
models/invitations
View File

@ -2,4 +2,5 @@ Invitation
email UserEmail email UserEmail
for Value for Value
data Value data Value
expiresAt UTCTime Maybe
UniqueInvitation email for UniqueInvitation email for

11
src/Handler/Utils/Invitations.hs
View File

@ -220,7 +220,12 @@ sinkInvitations InvitationConfig{..} = determineExists .| sinkInvitations'
jInvitationSubject <- fmap mr . mapReaderT liftHandlerT $ invitationSubject fEnt dat jInvitationSubject <- fmap mr . mapReaderT liftHandlerT $ invitationSubject fEnt dat
let jInvitationExplanation = invitationExplanation fEnt dat (toHtml . mr) ur let jInvitationExplanation = invitationExplanation fEnt dat (toHtml . mr) ur
when (is _Nothing (ephemeralInvitation @junction)) $ insert_ $ Invitation jInvitee (invRef @junction fid) (toJSON $ dat ^. _invitationDBData) when (is _Nothing (ephemeralInvitation @junction)) $ insert_ $ Invitation
{ invitationEmail = jInvitee
, invitationFor = invRef @junction fid
, invitationData = toJSON $ dat ^. _invitationDBData
, invitationExpiresAt = tokenExpiresAt token
}
queueDBJob JobInvitation{..} queueDBJob JobInvitation{..}
@ -243,9 +248,9 @@ sourceInvitations :: forall junction.
-> Source (YesodDB UniWorX) (UserEmail, InvitationDBData junction) -> Source (YesodDB UniWorX) (UserEmail, InvitationDBData junction)
sourceInvitations forKey = selectSource [InvitationFor ==. invRef @junction forKey] [] .| C.mapM decode sourceInvitations forKey = selectSource [InvitationFor ==. invRef @junction forKey] [] .| C.mapM decode
where where
decode (Entity _ (Invitation email _ invitationData)) decode (Entity _ (Invitation{invitationEmail, invitationData}))
= case fromJSON invitationData of = case fromJSON invitationData of
JSON.Success dbData -> return (email, dbData) JSON.Success dbData -> return (invitationEmail, dbData)
JSON.Error str -> fail $ "Could not decode invitationData: " <> str JSON.Error str -> fail $ "Could not decode invitationData: " <> str
sourceInvitationsList :: forall junction. sourceInvitationsList :: forall junction.