Skip to content

Commit

Permalink
Update fourmolu formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
TristanCacqueray committed Aug 6, 2023
1 parent e4fe1aa commit 8216174
Show file tree
Hide file tree
Showing 26 changed files with 335 additions and 257 deletions.
20 changes: 10 additions & 10 deletions src/Database/Bloodhound/Raw.hs
Original file line number Diff line number Diff line change
Expand Up @@ -168,16 +168,16 @@ toPair (k, v) = (from k, v)

mkAgg :: [(Text, Value)] -> Maybe Value -> Maybe BH.Query -> Value
mkAgg agg docvalues query =
Aeson.object $
[ "aggregations" .= Aeson.object (toPair <$> agg)
, "size" .= Aeson.Number 0
]
<> case docvalues of
Just dv -> ["docvalue_fields" .= dv]
Nothing -> []
<> case query of
Just q -> ["query" .= Aeson.toJSON q]
Nothing -> []
Aeson.object
$ [ "aggregations" .= Aeson.object (toPair <$> agg)
, "size" .= Aeson.Number 0
]
<> case docvalues of
Just dv -> ["docvalue_fields" .= dv]
Nothing -> []
<> case query of
Just q -> ["query" .= Aeson.toJSON q]
Nothing -> []

mkTermsCompositeAgg :: Text -> Maybe Value -> (Text, Value)
mkTermsCompositeAgg term afterM =
Expand Down
21 changes: 14 additions & 7 deletions src/Lentille/Bugzilla.hs
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,20 @@ instance FromJSON BugWithScore where
Just str -> fromMaybe (error $ "score is not a number: " <> show str) $ readMaybe str
Nothing -> 0
BugWithScore
<$> v .: "id"
<*> v .: "last_change_time"
<*> v .: "keywords"
<*> v .: "summary"
<*> v .: "priority"
<*> v .: "severity"
<*> v .: "external_bugs"
<$> v
.: "id"
<*> v
.: "last_change_time"
<*> v
.: "keywords"
<*> v
.: "summary"
<*> v
.: "priority"
<*> v
.: "severity"
<*> v
.: "external_bugs"
<*> pure pmScore
parseJSON _ = mzero

Expand Down
4 changes: 2 additions & 2 deletions src/Lentille/Bugzilla/Mock.hs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ bugzillaMockServerThread sem port skt = do
Warp.runSettingsSocket settings skt bugzillaMockApplication
where
settings =
Warp.setPort port $
Warp.setBeforeMainLoop (QSem.signalQSem sem) Warp.defaultSettings
Warp.setPort port
$ Warp.setBeforeMainLoop (QSem.signalQSem sem) Warp.defaultSettings

-- | Create a WARP server and return its URL
bugzillaMockServer :: IO Text
Expand Down
8 changes: 5 additions & 3 deletions src/Lentille/Gerrit.hs
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,9 @@ streamChange' env identCB serverUrl query prefixM = go 0
toIdent
(getHostFromURL serverUrl)
identCB
$ name <> "/" <> show aAccountId
$ name
<> "/"
<> show aAccountId
where
name = fromMaybe nobody aName
toMEvents :: ChangePB.Change -> [GerritChangeMessage] -> [ChangePB.ChangeEvent]
Expand Down Expand Up @@ -293,8 +295,8 @@ streamChange' env identCB serverUrl query prefixM = go 0
where
toReviewEvent GerritChangeMessage {..} = case P.parseOnly approvalsParser mMessage of
Right approvals ->
Just $
commentBasedEvent
Just
$ commentBasedEvent
(ChangePB.ChangeEventTypeChangeReviewed . ChangePB.ChangeReviewedEvent $ V.fromList $ from <$> approvals)
("approval_" <> from mId)
mAuthor
Expand Down
6 changes: 4 additions & 2 deletions src/Lentille/GitHub/PullRequests.hs
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,10 @@ transformResponse host identCB result = do
, changeApprovals = fromList $ maybe [] ((: []) . from . toApprovals) reviewDecision
, changeDraft = isDraft
, changeOptionalSelfMerged =
Just . ChangeOptionalSelfMergedSelfMerged $
(getPRAuthor <$> author) == (getPRMergedBy <$> mergedBy)
Just
. ChangeOptionalSelfMergedSelfMerged
$ (getPRAuthor <$> author)
== (getPRMergedBy <$> mergedBy)
}
in Just
( change
Expand Down
6 changes: 4 additions & 2 deletions src/Lentille/GitHub/UserPullRequests.hs
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,10 @@ transformResponse host identCB result = do
, changeApprovals = fromList $ maybe [] ((: []) . from . toApprovals) reviewDecision
, changeDraft = isDraft
, changeOptionalSelfMerged =
Just . ChangeOptionalSelfMergedSelfMerged $
(getPRAuthor <$> author) == (getPRMergedBy <$> mergedBy)
Just
. ChangeOptionalSelfMergedSelfMerged
$ (getPRAuthor <$> author)
== (getPRMergedBy <$> mergedBy)
}
in Just
( change
Expand Down
36 changes: 18 additions & 18 deletions src/Lentille/GitHub/Utils.hs
Original file line number Diff line number Diff line change
Expand Up @@ -131,36 +131,36 @@ toMaybeMergedOrAbandonedEvent change eId getIdent actor createdAt =

toMaybeReviewEvent :: Change -> ID -> (Text -> Ident) -> Text -> DateTime -> PullRequestReviewState -> Maybe ChangeEvent
toMaybeReviewEvent change eId getIdent actor createdAt reviewState =
Just $
( baseEvent
(ChangeEventTypeChangeReviewed $ ChangeReviewedEvent $ fromList [from $ toApproval reviewState])
(from $ getID eId)
change
)
Just
$ ( baseEvent
(ChangeEventTypeChangeReviewed $ ChangeReviewedEvent $ fromList [from $ toApproval reviewState])
(from $ getID eId)
change
)
{ changeEventAuthor = Just $ getIdent actor
, changeEventCreatedAt = Just $ from createdAt
}

toMaybeForcePushedEvent :: Change -> ID -> (Text -> Ident) -> Text -> DateTime -> Maybe ChangeEvent
toMaybeForcePushedEvent change eId getIdent actor createdAt =
Just $
( baseEvent
(ChangeEventTypeChangeCommitForcePushed ChangeCommitForcePushedEvent)
(from $ getID eId)
change
)
Just
$ ( baseEvent
(ChangeEventTypeChangeCommitForcePushed ChangeCommitForcePushedEvent)
(from $ getID eId)
change
)
{ changeEventAuthor = Just $ getIdent actor
, changeEventCreatedAt = Just $ from createdAt
}

toMaybeCommentEvent :: Change -> ID -> (Text -> Ident) -> Text -> DateTime -> Maybe ChangeEvent
toMaybeCommentEvent change eId getIdent actor createdAt =
Just $
( baseEvent
(ChangeEventTypeChangeCommented ChangeCommentedEvent)
(from $ getID eId)
change
)
Just
$ ( baseEvent
(ChangeEventTypeChangeCommented ChangeCommentedEvent)
(from $ getID eId)
change
)
{ changeEventAuthor = Just $ getIdent actor
, changeEventCreatedAt = Just $ from createdAt
}
Expand Down
5 changes: 3 additions & 2 deletions src/Lentille/GitLab/MergeRequests.hs
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,9 @@ transformResponse host getIdentIdCB result =
changeRepositoryShortname = from shortName
changeAuthor = Just (maybe (ghostIdent host) (toIdent' . getAuthorUsername) author)
changeOptionalMergedBy =
( Just . ChangeOptionalMergedByMergedBy $
maybe (ghostIdent host) (toIdent' . getMergerUsername) mergeUser
( Just
. ChangeOptionalMergedByMergedBy
$ maybe (ghostIdent host) (toIdent' . getMergerUsername) mergeUser
)
changeBranch = from sourceBranch
changeTargetBranch = from targetBranch
Expand Down
27 changes: 14 additions & 13 deletions src/Lentille/GraphQL.hs
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ doRequest ::
Eff es (GraphResp a)
doRequest client mkArgs retryCheck depthM pageInfoM =
retryingDynamic policy (const retryCheck) $ \rs -> do
when (rs.rsIterNumber > 0) $
logWarn "Faulty response" ["num" .= rs.rsIterNumber]
when (rs.rsIterNumber > 0)
$ logWarn "Faulty response" ["num" .= rs.rsIterNumber]
runFetch rs.rsIterNumber
where
delay = 1_100_000 -- 1.1 seconds
Expand Down Expand Up @@ -217,23 +217,24 @@ streamFetch client@GraphClient {..} mkArgs StreamFetchOptParams {..} transformRe
in Right (rateLimitM, (pageInfo, rateLimitM, decodingErrors, xs))

logStep pageInfo rateLimitM xs totalFetched = do
lift . logInfo "Fetched from current page" $
["count" .= length xs, "total" .= (totalFetched + length xs), "pageInfo" .= pageInfo, "ratelimit" .= rateLimitM]
lift
. logInfo "Fetched from current page"
$ ["count" .= length xs, "total" .= (totalFetched + length xs), "pageInfo" .= pageInfo, "ratelimit" .= rateLimitM]

retryDelay = 1_100_000

startFetch = do
--- Perform a pre GraphQL request to gather rateLimit
fpRespE <- case fpGetRatelimit of
Just getRateLimit -> lift $
E.modifyMVar rateLimitMVar $
const do
rlE <- getRateLimit client
case rlE of
Left err -> do
logWarn_ "Could not fetch the current rate limit"
pure (Nothing, Just err)
Right rl -> pure (rl, Nothing)
Just getRateLimit -> lift
$ E.modifyMVar rateLimitMVar
$ const do
rlE <- getRateLimit client
case rlE of
Left err -> do
logWarn_ "Could not fetch the current rate limit"
pure (Nothing, Just err)
Right rl -> pure (rl, Nothing)
Nothing -> pure Nothing

case fpRespE of
Expand Down
4 changes: 3 additions & 1 deletion src/Lentille/Jira.hs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ runJiraEffects manager = runEff . E.runRetry . E.runPrometheus . E.runLoggerEffe

httpJSONRequest :: JiraEffects es => HTTP.Request -> Eff es (Either Text Value)
httpJSONRequest request =
either (Left . from) Right . eitherDecode . HTTP.responseBody
either (Left . from) Right
. eitherDecode
. HTTP.responseBody
<$> httpRetry (decodeUtf8 request.path) (httpRequest request)

jiraRequest :: JiraEffects es => JiraClient -> Text -> ByteString -> HTTP.RequestBody -> Eff es (Either Text Value)
Expand Down
9 changes: 5 additions & 4 deletions src/Macroscope/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,11 @@ getClientBZ :: Text -> Secret -> GetClient es BugzillaSession
getClientBZ url token = do
clients <- gets clientsBugzilla
(client, newClients) <-
mapMutate clients (url, token) . pure $
getBugzillaSession url $
Just $
getApikey token
mapMutate clients (url, token)
. pure
$ getBugzillaSession url
$ Just
$ getApikey token
modify $ \s -> s {clientsBugzilla = newClients}
pure (url, client)

Expand Down
8 changes: 4 additions & 4 deletions src/Macroscope/Test.hs
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ testTaskDataMacroscope = withTestApi appEnv $ \client -> testAction client
[ let name = from crawlerName
update_since = "2000-01-01"
provider =
Config.BugzillaProvider $
Config.Bugzilla
Config.BugzillaProvider
$ Config.Bugzilla
{ bugzilla_products = Just ["fake_product"]
, bugzilla_token = Nothing
, bugzilla_url = ""
Expand Down Expand Up @@ -142,8 +142,8 @@ testRunCrawlers = do
expected = ["gl1", "gl2", "gr", "gl1", "gl2", "gr"]

withClient "http://localhost" Nothing $ \client ->
runLentilleM client $
Macroscope.runCrawlers' 10_000 70_000 25_000 isReload streams
runLentilleM client
$ Macroscope.runCrawlers' 10_000 70_000 25_000 isReload streams

got <- reverse <$> readTVarIO logs
assertEqual "Stream ran" expected got
Expand Down
4 changes: 2 additions & 2 deletions src/Macroscope/Worker.hs
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ runStreamError startTime apiKey indexName (CrawlerName crawlerName) documentStre
in S.map (fmap DTTaskData) (s oldestAge td)
where
extractEntityValue prism =
fromMaybe (error $ "Entity is not the right shape: " <> show entity) $
preview prism entity
fromMaybe (error $ "Entity is not the right shape: " <> show entity)
$ preview prism entity

-- 'mkRequest' creates the 'AddDocRequests' for a given oldest entity and a list of documenttype
-- this is used by the processBatch function.
Expand Down
4 changes: 2 additions & 2 deletions src/Monocle/Api/Jwt.hs
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ newtype LoginInUser = LoginInUser {liRedirectURI :: Text} deriving (Show)

instance ToMarkup LoginInUser where
toMarkup LoginInUser {..} = H.docTypeHtml do
H.head $
H.title "Redirecting after a successful login ..."
H.head
$ H.title "Redirecting after a successful login ..."
H.body do
H.script (H.toHtml ("window.location='" <> liRedirectURI <> "';"))

Expand Down
Loading

0 comments on commit 8216174

Please sign in to comment.