From 10cfa972107091936299400606871a46b46bd72d Mon Sep 17 00:00:00 2001 From: Lucy Cifferello <12953208+elvece@users.noreply.github.com> Date: Mon, 27 Sep 2021 18:11:38 -0600 Subject: [PATCH] sort versions --- src/Handler/Marketplace.hs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Handler/Marketplace.hs b/src/Handler/Marketplace.hs index 13d26d7..a7a0c35 100644 --- a/src/Handler/Marketplace.hs +++ b/src/Handler/Marketplace.hs @@ -276,9 +276,8 @@ getPackageListR = do query <- T.filter (not . isSpace) . fromMaybe (serviceListQuery defaults) <$> lookupGetParam "query" filteredServices <- runDB $ searchServices category limit' ((page - 1) * limit') query let filteredServices' = sAppAppId . entityVal <$> filteredServices - settings <- getsYesod appSettings - packageMetadata <- runDB $ fetchPackageMetadata - $logInfo $ show packageMetadata + settings <- getsYesod appSettings + packageMetadata <- runDB $ fetchPackageMetadata serviceDetailResult <- liftIO $ mapConcurrently (getServiceDetails settings packageMetadata Nothing) filteredServices' let (_, services) = partitionEithers serviceDetailResult @@ -348,18 +347,17 @@ getServiceDetails settings metadata maybeVersion appId = do case eitherDecode $ manifest' of Left e -> pure $ Left $ "Could not parse service manifest for " <> show appId <> ": " <> show e Right m -> do - d <- liftIO $ mapConcurrently (mapDependencyMetadata domain metadata) - (HM.toList $ serviceManifestDependencies m) + d <- liftIO + $ mapConcurrently (mapDependencyMetadata domain metadata) (HM.toList $ serviceManifestDependencies m) pure $ Right $ ServiceRes { serviceResIcon = [i|https://#{domain}/package/icon/#{appId}|] , serviceResManifest = decode $ manifest' -- pass through raw JSON Value , serviceResCategories = snd packageMetadata , serviceResInstructions = [i|https://#{domain}/package/instructions/#{appId}|] , serviceResLicense = [i|https://#{domain}/package/license/#{appId}|] - , serviceResVersions = fst packageMetadata + , serviceResVersions = sortOn Down $ fst packageMetadata , serviceResDependencyInfo = HM.fromList $ snd $ partitionEithers d } - mapDependencyMetadata :: (MonadIO m) => Text -> HM.HashMap PkgId ([Version], [CategoryTitle])