From 5c1720aad812a69515514dc2af0a6d5c9f57aa13 Mon Sep 17 00:00:00 2001 From: Lucy Cifferello <12953208+elvece@users.noreply.github.com> Date: Fri, 21 Jul 2023 10:55:19 -0400 Subject: [PATCH] augment test manifest and fix ram query --- src/Database/Queries.hs | 3 ++- src/Lib/Types/Manifest.hs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Database/Queries.hs b/src/Database/Queries.hs index 231acc6..fe9d2d9 100644 --- a/src/Database/Queries.hs +++ b/src/Database/Queries.hs @@ -116,6 +116,7 @@ import Startlude ( ($>), (<$>), Int, ) +import Database.Esqueleto.Experimental ((>.)) serviceQuerySource :: (MonadResource m, MonadIO m) => @@ -149,7 +150,7 @@ serviceQuerySource mCat query mOsArch mRam = selectSource $ do where_ $ cat ^. CategoryName ==. val category &&. queryInMetadata query service where_ (service ^. VersionRecordNumber ==. vp ^. VersionPlatformVersionNumber) where_ (vp ^. VersionPlatformArch ==. val mOsArch) - where_ (vp ^. VersionPlatformRam ==. val mRam) + where_ (vp ^. VersionPlatformRam >. val mRam) where_ (pr ^. PkgRecordHidden ==. val False) pure service groupBy (service ^. VersionRecordPkgId, service ^. VersionRecordNumber) diff --git a/src/Lib/Types/Manifest.hs b/src/Lib/Types/Manifest.hs index 8bfeb1c..8cd87ae 100644 --- a/src/Lib/Types/Manifest.hs +++ b/src/Lib/Types/Manifest.hs @@ -111,8 +111,8 @@ testManifest = }, "hardware-requirements" { "device": { - processor: "", - display: "" + processor: "intel", + display: "r'^{.*}$'" }, "ram": "8"