From f3b9e78fca370f9c16e89f3b552c8de9317f1fde Mon Sep 17 00:00:00 2001 From: Keagan McClelland Date: Tue, 31 May 2022 14:02:47 -0600 Subject: [PATCH] group non-categorical searches properly --- src/Database/Marketplace.hs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Database/Marketplace.hs b/src/Database/Marketplace.hs index 9af6011..6a4320c 100644 --- a/src/Database/Marketplace.hs +++ b/src/Database/Marketplace.hs @@ -103,7 +103,12 @@ searchServices Nothing query = selectSource $ do ||. (service ^. VersionRecordDescLong `ilike` (%) ++. val query ++. (%)) ||. (service ^. VersionRecordTitle `ilike` (%) ++. val query ++. (%)) ) - orderBy [desc (service ^. VersionRecordUpdatedAt)] + groupBy (service ^. VersionRecordPkgId, service ^. VersionRecordNumber) + orderBy + [ asc (service ^. VersionRecordPkgId) + , desc (service ^. VersionRecordNumber) + , desc (service ^. VersionRecordUpdatedAt) + ] pure service searchServices (Just category) query = selectSource $ do services <- from