From 898e7ed11ab0958fcdaf65b99b33f7b04787630a Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 24 Sep 2017 22:14:48 +0200
Subject: Bootstrap with GHCJS and reflex:

- setup login and logout,
- first draft of payment view.
---
 src/server/Model/Income.hs | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

(limited to 'src/server/Model/Income.hs')

diff --git a/src/server/Model/Income.hs b/src/server/Model/Income.hs
index c6cdb55..bbe7657 100644
--- a/src/server/Model/Income.hs
+++ b/src/server/Model/Income.hs
@@ -1,16 +1,14 @@
 {-# LANGUAGE OverloadedStrings #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Model.Income
-  ( IncomeId
-  , Income(..)
-  , list
+  ( list
   , create
   , editOwn
   , deleteOwn
   , modifiedDuring
   ) where
 
-import Data.Int (Int64)
 import Data.Maybe (listToMaybe)
 import Data.Time.Calendar (Day)
 import Data.Time.Clock (UTCTime, getCurrentTime)
@@ -18,27 +16,15 @@ import Database.SQLite.Simple (Only(Only), FromRow(fromRow))
 import Prelude hiding (id)
 import qualified Database.SQLite.Simple as SQLite
 
+import Common.Model (Income(..), IncomeId, User(..), UserId)
+
 import Model.Query (Query(Query))
-import Model.User (User, UserId)
-import qualified Model.User as User
 import Resource (Resource, resourceCreatedAt, resourceEditedAt, resourceDeletedAt)
 
-type IncomeId = Int64
-
-data Income = Income
-  { id :: IncomeId
-  , userId :: UserId
-  , date :: Day
-  , amount :: Int
-  , createdAt :: UTCTime
-  , editedAt :: Maybe UTCTime
-  , deletedAt :: Maybe UTCTime
-  } deriving Show
-
 instance Resource Income where
-  resourceCreatedAt = createdAt
-  resourceEditedAt = editedAt
-  resourceDeletedAt = deletedAt
+  resourceCreatedAt = _income_createdAt
+  resourceEditedAt = _income_editedAt
+  resourceDeletedAt = _income_deletedAt
 
 instance FromRow Income where
   fromRow = Income <$>
@@ -70,7 +56,7 @@ editOwn incomeUserId incomeId incomeDate incomeAmount =
     mbIncome <- listToMaybe <$> SQLite.query conn "SELECT * FROM income WHERE id = ?" (Only incomeId)
     case mbIncome of
       Just income ->
-        if userId income == incomeUserId
+        if _income_userId income == incomeUserId
           then do
             now <- getCurrentTime
             SQLite.execute
@@ -90,7 +76,7 @@ deleteOwn user incomeId =
     mbIncome <- listToMaybe <$> SQLite.query conn "SELECT * FROM income WHERE id = ?" (Only incomeId)
     case mbIncome of
       Just income ->
-        if userId income == User.id user
+        if _income_userId income == _user_id user
           then do
             now <- getCurrentTime
             SQLite.execute conn "UPDATE income SET deleted_at = ? WHERE id = ?" (now, incomeId)
-- 
cgit v1.2.3


From 27e11b20b06f2f2dbfb56c0998a63169b4b8abc4 Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 8 Nov 2017 23:47:26 +0100
Subject: Use a better project structure

---
 src/server/Model/Income.hs | 97 ----------------------------------------------
 1 file changed, 97 deletions(-)
 delete mode 100644 src/server/Model/Income.hs

(limited to 'src/server/Model/Income.hs')

diff --git a/src/server/Model/Income.hs b/src/server/Model/Income.hs
deleted file mode 100644
index bbe7657..0000000
--- a/src/server/Model/Income.hs
+++ /dev/null
@@ -1,97 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-{-# OPTIONS_GHC -fno-warn-orphans #-}
-
-module Model.Income
-  ( list
-  , create
-  , editOwn
-  , deleteOwn
-  , modifiedDuring
-  ) where
-
-import Data.Maybe (listToMaybe)
-import Data.Time.Calendar (Day)
-import Data.Time.Clock (UTCTime, getCurrentTime)
-import Database.SQLite.Simple (Only(Only), FromRow(fromRow))
-import Prelude hiding (id)
-import qualified Database.SQLite.Simple as SQLite
-
-import Common.Model (Income(..), IncomeId, User(..), UserId)
-
-import Model.Query (Query(Query))
-import Resource (Resource, resourceCreatedAt, resourceEditedAt, resourceDeletedAt)
-
-instance Resource Income where
-  resourceCreatedAt = _income_createdAt
-  resourceEditedAt = _income_editedAt
-  resourceDeletedAt = _income_deletedAt
-
-instance FromRow Income where
-  fromRow = Income <$>
-    SQLite.field <*>
-    SQLite.field <*>
-    SQLite.field <*>
-    SQLite.field <*>
-    SQLite.field <*>
-    SQLite.field <*>
-    SQLite.field
-
-list :: Query [Income]
-list = Query (\conn -> SQLite.query_ conn "SELECT * FROM income WHERE deleted_at IS NULL")
-
-create :: UserId -> Day -> Int -> Query IncomeId
-create incomeUserId incomeDate incomeAmount =
-  Query (\conn -> do
-    now <- getCurrentTime
-    SQLite.execute
-      conn
-      "INSERT INTO income (user_id, date, amount, created_at) VALUES (?, ?, ?, ?)"
-      (incomeUserId, incomeDate, incomeAmount, now)
-    SQLite.lastInsertRowId conn
-  )
-
-editOwn :: UserId -> IncomeId -> Day -> Int -> Query Bool
-editOwn incomeUserId incomeId incomeDate incomeAmount =
-  Query (\conn -> do
-    mbIncome <- listToMaybe <$> SQLite.query conn "SELECT * FROM income WHERE id = ?" (Only incomeId)
-    case mbIncome of
-      Just income ->
-        if _income_userId income == incomeUserId
-          then do
-            now <- getCurrentTime
-            SQLite.execute
-              conn
-              "UPDATE income SET edited_at = ?, date = ?, amount = ? WHERE id = ?"
-              (now, incomeDate, incomeAmount, incomeId)
-            return True
-          else
-            return False
-      Nothing ->
-        return False
-  )
-
-deleteOwn :: User -> IncomeId -> Query Bool
-deleteOwn user incomeId =
-  Query (\conn -> do
-    mbIncome <- listToMaybe <$> SQLite.query conn "SELECT * FROM income WHERE id = ?" (Only incomeId)
-    case mbIncome of
-      Just income ->
-        if _income_userId income == _user_id user
-          then do
-            now <- getCurrentTime
-            SQLite.execute conn "UPDATE income SET deleted_at = ? WHERE id = ?" (now, incomeId)
-            return True
-          else
-            return False
-      Nothing ->
-        return False
-  )
-
-modifiedDuring :: UTCTime -> UTCTime -> Query [Income]
-modifiedDuring start end =
-  Query (\conn ->
-    SQLite.query
-      conn
-      "SELECT * FROM income WHERE (created_at >= ? AND created_at <= ?) OR (edited_at >= ? AND edited_at <= ?) OR (deleted_at >= ? AND deleted_at <= ?)"
-      (start, end, start, end, start, end)
-  )
-- 
cgit v1.2.3