Add function to delete by record ID

digitallyinduced · Dec 2, 2020 · 11639d3 · 11639d3
1 parent 1e0a12f
commit 11639d3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/IHP/ModelSupport.hs b/IHP/ModelSupport.hs
@@ -8,7 +8,7 @@ module IHP.ModelSupport
 import IHP.HaskellSupport
 import IHP.NameSupport
 import qualified Prelude
-import ClassyPrelude hiding (UTCTime, find, ModifiedJulianDay)
+import ClassyPrelude hiding (UTCTime, find, ModifiedJulianDay, delete)
 import qualified ClassyPrelude
 import Database.PostgreSQL.Simple (Connection)
 import qualified Text.Inflections
@@ -342,14 +342,24 @@ logQuery query parameters = when queryDebuggingEnabled (putStrLn (tshow (query,
 --
 -- Use 'deleteRecords' if you want to delete multiple records.
 deleteRecord :: forall model id. (?modelContext :: ModelContext, Show id, KnownSymbol (GetTableName model), HasField "id" model id, ToField id) => model -> IO ()
-deleteRecord model = do
-    let id = getField @"id" model
+deleteRecord model = get #id model |> delete @model @id
+
+{-# INLINE deleteRecord #-}
+
+-- | Like 'deleteRecord' but using an Id
+--
+-- >>> let project :: Id Project = ...
+-- >>> delete projectId
+-- DELETE FROM projects WHERE id = '..'
+--
+delete :: forall model id. (?modelContext :: ModelContext, Show id, KnownSymbol (GetTableName model), HasField "id" model id, ToField id) => id -> IO ()
+delete id = do
     let theQuery = "DELETE FROM " <> tableName @model <> " WHERE id = ?"
     let theParameters = (PG.Only id)
     logQuery theQuery theParameters
     sqlExec (PG.Query . cs $! theQuery) theParameters
     pure ()
-{-# INLINE deleteRecord #-}
+{-# INLINE delete #-}
 
 -- | Runs a @DELETE@ query for a list of records.
 --
@@ -588,10 +598,10 @@ trackTableRead tableName = case get #trackTableReadCallback ?modelContext of
 -- > withTableReadTracker do
 -- >     project <- query @Project |> fetchOne
 -- >     user <- query @User |> fetchOne
--- >     
+-- >
 -- >     tables <- readIORef ?touchedTables
 -- >     -- tables = Set.fromList ["projects", "users"]
--- > 
+-- >
 withTableReadTracker :: (?modelContext :: ModelContext) => ((?modelContext :: ModelContext, ?touchedTables :: IORef (Set Text)) => IO ()) -> IO ()
 withTableReadTracker trackedSection = do
     touchedTablesVar <- newIORef Set.empty

diff --git a/IHP/Prelude.hs b/IHP/Prelude.hs
@@ -46,7 +46,7 @@ import qualified Prelude
 import qualified Data.Text as Text
 import Data.Proxy (Proxy (Proxy))
 import Control.Monad (when, unless, mapM, mapM_, forM, forM_, sequence, sequence_, join, forever)
-import Data.List hiding (head, last, unwords, unlines, words, lines, isPrefixOf, isSuffixOf, isInfixOf, intercalate, intersperse, (++), splitAt, null)
+import Data.List hiding (head, last, unwords, unlines, words, lines, isPrefixOf, isSuffixOf, isInfixOf, intercalate, intersperse, (++), splitAt, null, delete)
 import qualified Data.List as List
 import Data.String.Conversions (ConvertibleStrings (convertString), cs)
 import Data.Time.Clock
@@ -90,4 +90,4 @@ last list = Just (List.last list)
 lastMay :: [a] -> Maybe a
 lastMay = last
 
-plain = Data.String.Interpolate.i
+plain = Data.String.Interpolate.i