Show total incom by month in statistics

2 files changed, 23 insertions, 10 deletions

diff --git a/common/src/Common/Model/PaymentStats.hs b/common/src/Common/Model/PaymentStats.hs
deleted file mode 100644
index 2dea640..0000000
--- a/common/src/Common/Model/PaymentStats.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-module Common.Model.PaymentStats
-  ( PaymentStats
-  ) where
-
-import           Data.Map              (Map)
-import           Data.Time.Calendar    (Day)
-
-import           Common.Model.Category (CategoryId)
-
-type PaymentStats = [(Day, Map CategoryId Int)]
diff --git a/common/src/Common/Model/Stats.hs b/common/src/Common/Model/Stats.hs
new file mode 100644
index 0000000..86e6ab9
--- /dev/null
+++ b/common/src/Common/Model/Stats.hs
@@ -0,0 +1,23 @@
+module Common.Model.Stats
+  ( Stats
+  , MonthStats(..)
+  ) where
+
+import           Data.Aeson            (FromJSON, ToJSON)
+import           Data.Map              (Map)
+import           Data.Time.Calendar    (Day)
+import           GHC.Generics          (Generic)
+
+import           Common.Model.Category (CategoryId)
+import           Common.Model.User     (UserId)
+
+type Stats = [MonthStats]
+
+data MonthStats = MonthStats
+  { _monthStats_start              :: Day
+  , _monthStats_paymentsByCategory :: Map CategoryId Int
+  , _monthStats_incomeByUser       :: Map UserId Int
+  } deriving (Eq, Show, Generic)
+
+instance FromJSON MonthStats
+instance ToJSON MonthStats