categories refactor

src/Database/Marketplace.hs

@@ -0,0 +1,56 @@
+{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE TypeApplications #-}
+{-# LANGUAGE DeriveGeneric #-}
+
+module Database.Marketplace where
+
+import Startlude hiding ((%), from, on)
+import Database.Esqueleto.Experimental
+import Lib.Types.Category
+import Model
+import qualified Database.Persist as P
+import Data.HashMap.Strict
+import Data.Version
+import Data.Aeson
+
+searchServices :: MonadIO m => CategoryTitle -> Int64 ->  Int64 -> Text -> ReaderT SqlBackend m [P.Entity SApp]
+searchServices ANY pageItems offset' query = select $ do
+        service <- from $ table @SApp
+        where_ ((service ^. SAppDescShort `ilike` (%) ++. val query ++. (%)) 
+            ||. (service ^. SAppDescLong `ilike` (%) ++. val query ++. (%))
+            ||. (service ^. SAppTitle `ilike` (%) ++. val query ++. (%))
+            ||. (service ^. SAppAppId `ilike` (%) ++. val query ++. (%)))
+        orderBy [ desc (service ^. SAppUpdatedAt) ]
+        limit pageItems
+        offset offset'
+        pure service
+searchServices category pageItems offset' query = select $ do
+    services <- from
+        (do
+            (service :& sc) <-
+                from $ table @SApp
+                `innerJoin` table @ServiceCategory
+                `on` (\(s :& sc) ->
+                        sc ^. ServiceCategoryServiceId ==. s ^. SAppId)
+            where_ $ sc ^. ServiceCategoryCategoryName ==. val category
+                &&. ((service ^. SAppDescShort `ilike` (%) ++. val query ++. (%)) 
+                    ||. (service ^. SAppDescLong `ilike` (%) ++. val query ++. (%))
+                    ||. (service ^. SAppTitle `ilike` (%) ++. val query ++. (%))
+                    ||. (service ^. SAppAppId `ilike` (%) ++. val query ++. (%))
+                    )
+            pure service
+        )
+    orderBy [ desc (services ^. SAppUpdatedAt) ]
+    limit pageItems
+    offset offset'
+    pure services
+
+newtype VersionsWithReleaseNotes = VersionsWithReleaseNotes (HashMap Version Text) deriving (Eq, Show, Generic)
+instance FromJSON VersionsWithReleaseNotes
+instance PersistField VersionsWithReleaseNotes where
+    fromPersistValue = fromPersistValueJSON
+    toPersistValue = PersistText . show
+
+-- in progress attempt to do postgres aggregation with raw sql in esqueleto
+-- getServiceVersionsWithReleaseNotes :: MonadIO m => Text -> ReaderT SqlBackend m (Entity SApp)
+-- getServiceVersionsWithReleaseNotes appId = rawSql "SELECT ??, json_agg(json_build_object(v.number, v.release_notes)) as versions FROM s_app s LEFT JOIN version v ON v.app_id = s.id WHERE s.app_id = ? GROUP BY s.id;" [PersistText appId]

src/Database/Queries.hs

@@ -35,5 +35,5 @@ createAppVersion sId VersionInfo {..} = do
 
 createMetric :: MonadIO m => Key SApp -> Key SVersion -> ReaderT SqlBackend m ()
 createMetric appId versionId = do
-    time <- liftIO $ getCurrentTime
+    time <- liftIO getCurrentTime
     insert_ $ Metric time appId versionId