Add income

6 files changed, 84 insertions, 11 deletions

diff --git a/server/server.cabal b/server/server.cabal
index 426f521..022d496 100644
--- a/server/server.cabal
+++ b/server/server.cabal
@@ -94,7 +94,9 @@ Executable server
     Job.WeeklyReport
     Json
     LoginSession
+    Model.CreateIncome
     Model.CreatePayment
+    Model.EditIncome
     Model.EditPayment
     Model.IncomeResource
     Model.Mail
@@ -113,6 +115,7 @@ Executable server
     Secure
     SendMail
     Util.Time
+    Validation.Income
     Validation.Payment
     View.Mail.SignIn
     View.Mail.WeeklyReport
diff --git a/server/src/Controller/Income.hs b/server/src/Controller/Income.hs
index ed58ac8..e013849 100644
--- a/server/src/Controller/Income.hs
+++ b/server/src/Controller/Income.hs
@@ -5,21 +5,32 @@ module Controller.Income
   ) where
 
 import           Control.Monad.IO.Class    (liftIO)
+import           Data.Validation           (Validation (Failure, Success))
 import qualified Network.HTTP.Types.Status as Status
 import           Web.Scotty                hiding (delete)
 
-import           Common.Model              (CreateIncome (..), EditIncome (..),
-                                            IncomeId, User (..))
+import           Common.Model              (CreateIncomeForm (..),
+                                            EditIncome (..), IncomeId,
+                                            User (..))
 
-import           Json                      (jsonId)
+import qualified Controller.Helper         as ControllerHelper
+import           Model.CreateIncome        (CreateIncome (..))
 import qualified Model.Query               as Query
 import qualified Persistence.Income        as IncomePersistence
 import qualified Secure
+import qualified Validation.Income         as IncomeValidation
 
-create :: CreateIncome -> ActionM ()
-create (CreateIncome date amount) =
+create :: CreateIncomeForm -> ActionM ()
+create form =
   Secure.loggedAction (\user ->
-    (liftIO . Query.run $ IncomePersistence.create (_user_id user) date amount) >>= jsonId
+    (liftIO . Query.run $ do
+      case IncomeValidation.createIncome form of
+        Success (CreateIncome amount date) -> do
+          Right <$> (IncomePersistence.create (_user_id user) date amount)
+
+        Failure validationError ->
+          return $ Left validationError
+    ) >>= ControllerHelper.jsonOrBadRequest
   )
 
 edit :: EditIncome -> ActionM ()
diff --git a/server/src/Model/CreateIncome.hs b/server/src/Model/CreateIncome.hs
new file mode 100644
index 0000000..82451d2
--- /dev/null
+++ b/server/src/Model/CreateIncome.hs
@@ -0,0 +1,10 @@
+module Model.CreateIncome
+  ( CreateIncome(..)
+  ) where
+
+import           Data.Time.Calendar (Day)
+
+data CreateIncome = CreateIncome
+  { _createIncome_amount :: Int
+  , _createIncome_date   :: Day
+  } deriving (Show)
diff --git a/server/src/Model/EditIncome.hs b/server/src/Model/EditIncome.hs
new file mode 100644
index 0000000..ac3d311
--- /dev/null
+++ b/server/src/Model/EditIncome.hs
@@ -0,0 +1,13 @@
+module Model.EditIncome
+  ( EditIncome(..)
+  ) where
+
+import           Data.Time.Calendar (Day)
+
+import           Common.Model       (IncomeId)
+
+data EditIncome = EditIncome
+  { _editIncome_id     :: IncomeId
+  , _editIncome_amount :: Int
+  , _editIncome_date   :: Day
+  } deriving (Show)
diff --git a/server/src/Persistence/Income.hs b/server/src/Persistence/Income.hs
index cee9892..a0c3bbf 100644
--- a/server/src/Persistence/Income.hs
+++ b/server/src/Persistence/Income.hs
@@ -36,15 +36,24 @@ list =
       SQLite.query_ conn "SELECT * FROM income WHERE deleted_at IS NULL"
   )
 
-create :: UserId -> Day -> Int -> Query IncomeId
-create incomeUserId incomeDate incomeAmount =
+create :: UserId -> Day -> Int -> Query Income
+create userId date amount =
   Query (\conn -> do
-    now <- getCurrentTime
+    createdAt <- getCurrentTime
     SQLite.execute
       conn
       "INSERT INTO income (user_id, date, amount, created_at) VALUES (?, ?, ?, ?)"
-      (incomeUserId, incomeDate, incomeAmount, now)
-    SQLite.lastInsertRowId conn
+      (userId, date, amount, createdAt)
+    incomeId <- SQLite.lastInsertRowId conn
+    return $ Income
+      { _income_id        = incomeId
+      , _income_userId    = userId
+      , _income_date      = date
+      , _income_amount    = amount
+      , _income_createdAt = createdAt
+      , _income_editedAt  = Nothing
+      , _income_deletedAt = Nothing
+      }
   )
 
 edit :: UserId -> IncomeId -> Day -> Int -> Query Bool
diff --git a/server/src/Validation/Income.hs b/server/src/Validation/Income.hs
new file mode 100644
index 0000000..5e034d1
--- /dev/null
+++ b/server/src/Validation/Income.hs
@@ -0,0 +1,27 @@
+module Validation.Income
+  ( createIncome
+  , editIncome
+  ) where
+
+import           Data.Text                (Text)
+import           Data.Validation          (Validation)
+import qualified Data.Validation          as V
+
+import           Common.Model             (CreateIncomeForm (..),
+                                           EditIncomeForm (..))
+import qualified Common.Validation.Income as IncomeValidation
+import           Model.CreateIncome       (CreateIncome (..))
+import           Model.EditIncome         (EditIncome (..))
+
+createIncome :: CreateIncomeForm -> Validation Text CreateIncome
+createIncome form =
+  CreateIncome
+    <$> IncomeValidation.amount (_createIncomeForm_amount form)
+    <*> IncomeValidation.date (_createIncomeForm_date form)
+
+editIncome :: EditIncomeForm -> Validation Text EditIncome
+editIncome form =
+  EditIncome
+    <$> V.Success (_editIncomeForm_id form)
+    <*> IncomeValidation.amount (_editIncomeForm_amount form)
+    <*> IncomeValidation.date (_editIncomeForm_date form)