1 files changed, 24 insertions, 35 deletions

diff --git a/src/server/Model/Payment.hs b/src/server/Model/Payment.hs
index 5414d18..5b576c5 100644
--- a/src/server/Model/Payment.hs
+++ b/src/server/Model/Payment.hs
@@ -1,8 +1,8 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings    #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Model.Payment
-  ( PaymentId
-  , Payment(..)
+  ( Payment(..)
   , find
   , list
   , listMonthly
@@ -13,7 +13,6 @@ module Model.Payment
   , modifiedDuring
   ) where
 
-import Data.Int (Int64)
 import Data.Maybe (listToMaybe)
 import Data.Text (Text)
 import Data.Time (UTCTime)
@@ -24,29 +23,19 @@ import Database.SQLite.Simple.ToField (ToField(toField))
 import Prelude hiding (id)
 import qualified Database.SQLite.Simple as SQLite
 
-import Model.Frequency
+import Common.Model.Frequency
+import Common.Model.Payment (Payment(..))
+import Common.Model.User (UserId)
+import Common.Model.Payment (PaymentId)
+
+import Model.Frequency ()
 import Model.Query (Query(Query))
-import Model.User (UserId)
 import Resource (Resource, resourceCreatedAt, resourceEditedAt, resourceDeletedAt)
 
-type PaymentId = Int64
-
-data Payment = Payment
-  { id :: PaymentId
-  , userId :: UserId
-  , name :: Text
-  , cost :: Int
-  , date :: Day
-  , frequency :: Frequency
-  , createdAt :: UTCTime
-  , editedAt :: Maybe UTCTime
-  , deletedAt :: Maybe UTCTime
-  } deriving Show
-
 instance Resource Payment where
-  resourceCreatedAt = createdAt
-  resourceEditedAt = editedAt
-  resourceDeletedAt = deletedAt
+  resourceCreatedAt = _payment_createdAt
+  resourceEditedAt = _payment_editedAt
+  resourceDeletedAt = _payment_deletedAt
 
 instance FromRow Payment where
   fromRow = Payment <$>
@@ -62,12 +51,12 @@ instance FromRow Payment where
 
 instance ToRow Payment where
   toRow p =
-    [ toField (userId p)
-    , toField (name p)
-    , toField (cost p)
-    , toField (date p)
-    , toField (frequency p)
-    , toField (createdAt p)
+    [ toField (_payment_user p)
+    , toField (_payment_name p)
+    , toField (_payment_cost p)
+    , toField (_payment_date p)
+    , toField (_payment_frequency p)
+    , toField (_payment_createdAt p)
     ]
 
 find :: PaymentId -> Query (Maybe Payment)
@@ -92,13 +81,13 @@ listMonthly =
   )
 
 create :: UserId -> Text -> Int -> Day -> Frequency -> Query PaymentId
-create paymentUserId paymentName paymentCost paymentDate paymentFrequency =
+create userId paymentName paymentCost paymentDate paymentFrequency =
   Query (\conn -> do
     now <- getCurrentTime
     SQLite.execute
       conn
       "INSERT INTO payment (user_id, name, cost, date, frequency, created_at) VALUES (?, ?, ?, ?, ?, ?)"
-      (paymentUserId, paymentName, paymentCost, paymentDate, paymentFrequency, now)
+      (userId, paymentName, paymentCost, paymentDate, paymentFrequency, now)
     SQLite.lastInsertRowId conn
   )
 
@@ -112,13 +101,13 @@ createMany payments =
   )
 
 editOwn :: UserId -> PaymentId -> Text -> Int -> Day -> Frequency -> Query Bool
-editOwn paymentUserId paymentId paymentName paymentCost paymentDate paymentFrequency =
+editOwn userId paymentId paymentName paymentCost paymentDate paymentFrequency =
   Query (\conn -> do
     mbPayment <- listToMaybe <$>
       SQLite.query conn "SELECT * FROM payment WHERE id = ?" (Only paymentId)
     case mbPayment of
       Just payment ->
-        if userId payment == paymentUserId
+        if _payment_user payment == userId
           then do
             now <- getCurrentTime
             SQLite.execute
@@ -133,13 +122,13 @@ editOwn paymentUserId paymentId paymentName paymentCost paymentDate paymentFrequ
   )
 
 deleteOwn :: UserId -> PaymentId -> Query Bool
-deleteOwn paymentUserId paymentId =
+deleteOwn userId paymentId =
   Query (\conn -> do
     mbPayment <- listToMaybe <$>
       SQLite.query conn "SELECT * FROM payment WHERE id = ?" (Only paymentId)
     case mbPayment of
       Just payment ->
-        if userId payment == paymentUserId
+        if _payment_user payment == userId
           then do
             now <- getCurrentTime
             SQLite.execute