Generate a mail that contains both birthdays today and birthdays next week

1 files changed, 17 insertions, 21 deletions

diff --git a/src/Notification.hs b/src/Notification.hs
index de4a591..e5abe45 100644
--- a/src/Notification.hs
+++ b/src/Notification.hs
@@ -1,8 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 
 module Notification
-  ( today
-  , nextWeek
+  ( todayAndNextWeek
   ) where
 
 import qualified Data.Text as T
@@ -15,35 +14,32 @@ import Model.Birthdate (Birthdate, filterBirthdayAt, filterBirthdayBetween)
 import Model.Mail (mailSubject, mailBody)
 import Model.Config
 
-today :: [Birthdate] -> Config -> IO ()
-today birthdates config = do
+todayAndNextWeek :: [Birthdate] -> Config -> IO ()
+todayAndNextWeek birthdates config = do
   currentDate <- getCurrentDate
-  let birthdays = filterBirthdayAt currentDate birthdates
-  if not (null birthdays)
+  birthdaysToday <- filterBirthdaysToday birthdates
+  birthdaysNextWeek <- filterBirthdaysNextWeek birthdates config
+  if length birthdaysToday > 0 || length birthdaysNextWeek > 0
     then
       sendMail
         (mailTo config)
         (mailFrom config)
-        (mailSubject birthdays)
-        (mailBody currentDate birthdays)
+        (mailSubject birthdaysToday birthdaysNextWeek)
+        (mailBody currentDate birthdaysToday birthdaysNextWeek)
     else
       return ()
 
-nextWeek :: [Birthdate] -> Config -> IO ()
-nextWeek birthdates config = do
+filterBirthdaysToday :: [Birthdate] -> IO [Birthdate]
+filterBirthdaysToday birthdates = do
+  currentDate <- getCurrentDate
+  return (filterBirthdayAt currentDate birthdates)
+
+filterBirthdaysNextWeek :: [Birthdate] -> Config -> IO [Birthdate]
+filterBirthdaysNextWeek birthdates config = do
   currentDayOfWeek <- formatCurrentLocale "%A"
   if T.toLower currentDayOfWeek == T.toLower (dayForNextWeekNotification config)
     then do
       (begin, end) <- getNextWeek
-      let birthdays = filterBirthdayBetween begin end birthdates
-      if not (null birthdays)
-        then
-          sendMail
-            (mailTo config)
-            (mailFrom config)
-            ""
-            ""
-        else
-          return ()
+      return (filterBirthdayBetween begin end birthdates)
     else
-      return ()
+      return []