From e3ceb27899334779bd6fdbbb89aee9bbefb00d94 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sat, 4 Jun 2022 14:10:00 +0200 Subject: [PATCH] refactor: hlint --- src/Handler/Workflow/Workflow/Workflow.hs | 2 +- src/Model/Migration/Definitions.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Handler/Workflow/Workflow/Workflow.hs b/src/Handler/Workflow/Workflow/Workflow.hs index 99fe42538..97516fd6b 100644 --- a/src/Handler/Workflow/Workflow/Workflow.hs +++ b/src/Handler/Workflow/Workflow/Workflow.hs @@ -100,7 +100,7 @@ workflowR rScope cID = workflowsDisabledWarning title heading $ do archiveAfter <- MaybeT . getsYesod $ view _appWorkflowWorkflowArchiveAfter let WorkflowAction{wpTo,wpTime} = last nState WGN{wgnFinal} <- hoistMaybe $ Map.lookup wpTo wgNodes - return $ const (archiveAfter `addUTCTime` wpTime) <$> wgnFinal + return $ (archiveAfter `addUTCTime` wpTime) <$ wgnFinal update wwId [ WorkflowWorkflowState =. view _DBWorkflowState nState , WorkflowWorkflowArchived =. wwArchived diff --git a/src/Model/Migration/Definitions.hs b/src/Model/Migration/Definitions.hs index 80e97dd07..afa049943 100644 --- a/src/Model/Migration/Definitions.hs +++ b/src/Model/Migration/Definitions.hs @@ -1073,10 +1073,10 @@ customMigrations = mapF $ \case let mArchiveAfter = Just (5270400 :: NominalDiffTime) [executeQQ| ALTER TABLE "workflow_workflow" ADD "archived" timestamp with time zone; |] let getWorkflows = [queryQQ| SELECT "workflow_workflow"."id", "workflow_workflow"."state"->-1->'time', "workflow_workflow"."state"->-1->'to', "shared_workflow_graph"."graph" FROM "workflow_workflow" INNER JOIN "shared_workflow_graph" ON "workflow_workflow"."graph" = "shared_workflow_graph"."hash"; |] - migrateArchived [ fromPersistValue -> Right (wwId :: WorkflowWorkflowId), fmap Aeson.fromJSON . fromPersistValue -> Right (Aeson.Success wpTime), fmap Aeson.fromJSON . fromPersistValue -> Right (Aeson.Success wpTo), fromPersistValue -> Right (wGraph :: DBWorkflowGraph) ] = maybeT (return ()) $ do + migrateArchived [ fromPersistValue -> Right (wwId :: WorkflowWorkflowId), fmap Aeson.fromJSON . fromPersistValue -> Right (Aeson.Success wpTime), fmap Aeson.fromJSON . fromPersistValue -> Right (Aeson.Success wpTo), fromPersistValue -> Right (wGraph :: DBWorkflowGraph) ] = maybeT_ $ do archiveAfter <- hoistMaybe mArchiveAfter WGN{wgnFinal} <- hoistMaybe . Map.lookup wpTo $ wgNodes wGraph - let wwArchived = const (max now $ archiveAfter `addUTCTime` wpTime) <$> wgnFinal + let wwArchived = max now (archiveAfter `addUTCTime` wpTime) <$ wgnFinal lift [executeQQ| UPDATE "workflow_workflow" SET "archived" = #{wwArchived} WHERE "id" = #{wwId}; |] migrateArchived _ = return () in runConduit $ getWorkflows .| C.mapM_ migrateArchived