feat: added db operations for PackageGroup and refactored relevant …

…migrations

flora.cabal

@@ -27,13 +27,13 @@ flag prod
 
 common common-extensions
   default-extensions:
+    NoStarIsType
     DataKinds
     DeriveAnyClass
     DerivingStrategies
     DerivingVia
     DuplicateRecordFields
     LambdaCase
-    NoStarIsType
     OverloadedLabels
     OverloadedRecordDot
     OverloadedStrings
@@ -119,6 +119,9 @@ library
     Flora.Model.Package.Query
     Flora.Model.Package.Types
     Flora.Model.Package.Update
+    Flora.Model.PackageGroup.Query
+    Flora.Model.PackageGroup.Types
+    Flora.Model.PackageGroup.Update
     Flora.Model.PackageIndex.Query
     Flora.Model.PackageIndex.Types
     Flora.Model.PackageIndex.Update
@@ -314,7 +317,7 @@ library flora-web
     , mtl
     , network-uri
     , odd-jobs
-    , one-time-password ==3.0.0.0
+    , one-time-password         ==3.0.0.0
     , openapi3
     , optics-core
     , pg-entity

migrations/20240927141418_create_package_groups.sql

@@ -1,4 +1,4 @@
 CREATE TABLE IF NOT EXISTS package_groups (
-    id uuid PRIMARY KEY
+    package_group_id uuid PRIMARY KEY
   , group_name varchar(255) NOT NULL
 )

migrations/20240927142245_create_package_group_packages.sql

@@ -1,5 +1,11 @@
 CREATE TABLE IF NOT EXISTS package_group_packages (
-    package_group_id uuid NOT NULL REFERENCES package_groups (id)
-  , package_id uuid NOT NULL REFERENCES packages (package_id)
-  , PRIMARY KEY (package_group_id, package_id)
-)
+    package_group_package_id uuid PRIMARY KEY
+  , package_group_id uuid NOT NULL REFERENCES package_groups
+  , package_id uuid NOT NULL REFERENCES packages
+);
+
+CREATE INDEX package_group_packages_package_id_fkey
+  ON package_group_packages (package_id);
+
+CREATE INDEX package_group_packages_package_group_id_fkey
+  ON package_group_packages (package_group_id);

src/core/Flora/Model/PackageGroup/Query.hs

@@ -0,0 +1 @@
+module Flora.Model.PackageGroup.Query where

src/core/Flora/Model/PackageGroup/Types.hs

@@ -0,0 +1,59 @@
+module Flora.Model.PackageGroup.Types where
+
+import Flora.Model.Package.Types
+
+import GHC.Generics
+
+import Control.DeepSeq (NFData)
+import Data.Aeson
+import Data.Text (Text)
+import Data.Text.Display
+import Data.UUID
+import Database.PostgreSQL.Entity
+import Database.PostgreSQL.Entity.Types (GenericEntity, TableName)
+import Database.PostgreSQL.Simple (FromRow)
+import Database.PostgreSQL.Simple.FromField (FromField (..))
+import Database.PostgreSQL.Simple.ToField (ToField (..))
+import Database.PostgreSQL.Simple.ToRow (ToRow)
+
+newtype PackageGroupId = PackageGroupId {getPackageGroupId :: UUID}
+  deriving
+    (Eq, Ord, Show, FromField, ToField, FromJSON, ToJSON, NFData)
+    via UUID
+  deriving
+    (Display)
+    via ShowInstance UUID
+
+newtype PackageGroupPackageId = PackageGroupPackageId {getPackageGroupPackageId :: UUID}
+  deriving
+    (Eq, Ord, Show, FromField, ToField, FromJSON, ToJSON, NFData)
+    via UUID
+  deriving
+    (Display)
+    via ShowInstance UUID
+
+data PackageGroup
+  = PackageGroup
+  { packageGroupId :: PackageGroupId
+  , groupName :: Text
+  }
+  deriving stock
+    (Eq, Ord, Show, Generic)
+  deriving anyclass
+    (FromRow, ToRow, FromJSON, ToJSON, NFData)
+  deriving
+    (Entity)
+    via (GenericEntity '[TableName "package_groups"] PackageGroup)
+
+data PackageGroupPackage = PackageGroupPackage
+  { packageGroupPackageId :: PackageGroupPackageId
+  , packageId :: PackageId
+  , packageGroupId :: PackageGroupId
+  }
+  deriving stock
+    (Eq, Ord, Show, Generic)
+  deriving anyclass
+    (FromRow, ToRow, FromJSON, ToJSON, NFData)
+  deriving
+    (Entity)
+    via (GenericEntity '[TableName "package_group_packages"] PackageGroupPackage)

src/core/Flora/Model/PackageGroup/Update.hs

@@ -0,0 +1,23 @@
+module Flora.Model.PackageGroup.Update
+  ( insertPackageGroup
+  , addPackageToPackageGroup
+  , removePackageFromPackageGroup
+  ) where
+
+import Control.Monad (void)
+import Database.PostgreSQL.Entity (delete, insert)
+import Effectful
+import Effectful.PostgreSQL.Transact.Effect (DB, dbtToEff)
+import Flora.Model.PackageGroup.Types
+
+insertPackageGroup :: DB :> es => PackageGroup -> Eff es ()
+insertPackageGroup packageGroup = do
+  void $ dbtToEff $ insert @PackageGroup packageGroup
+
+addPackageToPackageGroup :: DB :> es => PackageGroupPackage -> Eff es ()
+addPackageToPackageGroup packageGroupPackage =
+  void $ dbtToEff $ insert @PackageGroupPackage packageGroupPackage
+
+removePackageFromPackageGroup :: DB :> es => PackageGroupPackage -> Eff es ()
+removePackageFromPackageGroup packageGroupPackage =
+  void $ dbtToEff $ delete @PackageGroupPackage packageGroupPackage