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

---
 server/src/Job/Daemon.hs | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 server/src/Job/Daemon.hs

(limited to 'server/src/Job/Daemon.hs')

diff --git a/server/src/Job/Daemon.hs b/server/src/Job/Daemon.hs
new file mode 100644
index 0000000..0bc6f6e
--- /dev/null
+++ b/server/src/Job/Daemon.hs
@@ -0,0 +1,36 @@
+module Job.Daemon
+  ( runDaemons
+  ) where
+
+import Control.Concurrent (threadDelay, forkIO, ThreadId)
+import Control.Monad (forever)
+import Data.Time.Clock (UTCTime)
+
+import Conf (Conf)
+import Job.Frequency (Frequency(..), microSeconds)
+import Job.Kind (Kind(..))
+import Job.Model (getLastExecution, actualizeLastCheck, actualizeLastExecution)
+import Job.MonthlyPayment (monthlyPayment)
+import Job.WeeklyReport (weeklyReport)
+import qualified Model.Query as Query
+import Utils.Time (belongToCurrentMonth, belongToCurrentWeek)
+
+runDaemons :: Conf -> IO ()
+runDaemons conf = do
+  _ <- runDaemon MonthlyPayment EveryHour (fmap not . belongToCurrentMonth) monthlyPayment
+  _ <- runDaemon WeeklyReport EveryHour (fmap not . belongToCurrentWeek) (weeklyReport conf)
+  return ()
+
+runDaemon :: Kind -> Frequency -> (UTCTime -> IO Bool) -> (Maybe UTCTime -> IO UTCTime) -> IO ThreadId
+runDaemon kind frequency isLastExecutionTooOld runJob =
+  forkIO . forever $ do
+    mbLastExecution <- Query.run $ do
+      actualizeLastCheck kind
+      getLastExecution kind
+    hasToRun <- case mbLastExecution of
+      Just lastExecution -> isLastExecutionTooOld lastExecution
+      Nothing -> return True
+    if hasToRun
+      then runJob mbLastExecution >>= (Query.run . actualizeLastExecution kind)
+      else return ()
+    threadDelay . microSeconds $ frequency
-- 
cgit v1.2.3


From 5a63f7be9375e3ab888e4232dd7ef72c2f1ffae1 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 13 Nov 2017 23:56:40 +0100
Subject: Setup stylish-haskell

---
 server/src/Job/Daemon.hs | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'server/src/Job/Daemon.hs')

diff --git a/server/src/Job/Daemon.hs b/server/src/Job/Daemon.hs
index 0bc6f6e..26977d1 100644
--- a/server/src/Job/Daemon.hs
+++ b/server/src/Job/Daemon.hs
@@ -2,18 +2,19 @@ module Job.Daemon
   ( runDaemons
   ) where
 
-import Control.Concurrent (threadDelay, forkIO, ThreadId)
-import Control.Monad (forever)
-import Data.Time.Clock (UTCTime)
+import           Control.Concurrent (ThreadId, forkIO, threadDelay)
+import           Control.Monad      (forever)
+import           Data.Time.Clock    (UTCTime)
 
-import Conf (Conf)
-import Job.Frequency (Frequency(..), microSeconds)
-import Job.Kind (Kind(..))
-import Job.Model (getLastExecution, actualizeLastCheck, actualizeLastExecution)
-import Job.MonthlyPayment (monthlyPayment)
-import Job.WeeklyReport (weeklyReport)
-import qualified Model.Query as Query
-import Utils.Time (belongToCurrentMonth, belongToCurrentWeek)
+import           Conf               (Conf)
+import           Job.Frequency      (Frequency (..), microSeconds)
+import           Job.Kind           (Kind (..))
+import           Job.Model          (actualizeLastCheck, actualizeLastExecution,
+                                     getLastExecution)
+import           Job.MonthlyPayment (monthlyPayment)
+import           Job.WeeklyReport   (weeklyReport)
+import qualified Model.Query        as Query
+import           Utils.Time         (belongToCurrentMonth, belongToCurrentWeek)
 
 runDaemons :: Conf -> IO ()
 runDaemons conf = do
@@ -29,7 +30,7 @@ runDaemon kind frequency isLastExecutionTooOld runJob =
       getLastExecution kind
     hasToRun <- case mbLastExecution of
       Just lastExecution -> isLastExecutionTooOld lastExecution
-      Nothing -> return True
+      Nothing            -> return True
     if hasToRun
       then runJob mbLastExecution >>= (Query.run . actualizeLastExecution kind)
       else return ()
-- 
cgit v1.2.3


From 7194cddb28656c721342c2ef604f9f9fb0692960 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 19 Nov 2017 00:20:25 +0100
Subject: Show payment count and partition

- Also fixes exceedingPayer in back by using only punctual payments
---
 server/src/Job/Daemon.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server/src/Job/Daemon.hs')

diff --git a/server/src/Job/Daemon.hs b/server/src/Job/Daemon.hs
index 26977d1..d8cd522 100644
--- a/server/src/Job/Daemon.hs
+++ b/server/src/Job/Daemon.hs
@@ -14,7 +14,7 @@ import           Job.Model          (actualizeLastCheck, actualizeLastExecution,
 import           Job.MonthlyPayment (monthlyPayment)
 import           Job.WeeklyReport   (weeklyReport)
 import qualified Model.Query        as Query
-import           Utils.Time         (belongToCurrentMonth, belongToCurrentWeek)
+import           Util.Time          (belongToCurrentMonth, belongToCurrentWeek)
 
 runDaemons :: Conf -> IO ()
 runDaemons conf = do
-- 
cgit v1.2.3