diff options
Diffstat (limited to 'common/src/Common/Model')
| -rw-r--r-- | common/src/Common/Model/Category.hs | 18 | ||||
| -rw-r--r-- | common/src/Common/Model/CreateCategory.hs | 8 | ||||
| -rw-r--r-- | common/src/Common/Model/CreateIncome.hs | 8 | ||||
| -rw-r--r-- | common/src/Common/Model/CreatePayment.hs | 20 | ||||
| -rw-r--r-- | common/src/Common/Model/Currency.hs | 6 | ||||
| -rw-r--r-- | common/src/Common/Model/EditCategory.hs | 12 | ||||
| -rw-r--r-- | common/src/Common/Model/EditIncome.hs | 12 | ||||
| -rw-r--r-- | common/src/Common/Model/EditPayment.hs | 24 | ||||
| -rw-r--r-- | common/src/Common/Model/Frequency.hs | 4 | ||||
| -rw-r--r-- | common/src/Common/Model/Income.hs | 22 | ||||
| -rw-r--r-- | common/src/Common/Model/Init.hs | 28 | ||||
| -rw-r--r-- | common/src/Common/Model/InitResult.hs | 8 | ||||
| -rw-r--r-- | common/src/Common/Model/Payment.hs | 28 | ||||
| -rw-r--r-- | common/src/Common/Model/PaymentCategory.hs | 20 | ||||
| -rw-r--r-- | common/src/Common/Model/SignIn.hs | 6 | ||||
| -rw-r--r-- | common/src/Common/Model/User.hs | 18 | 
16 files changed, 121 insertions, 121 deletions
diff --git a/common/src/Common/Model/Category.hs b/common/src/Common/Model/Category.hs index 53a6bdb..bbd3c33 100644 --- a/common/src/Common/Model/Category.hs +++ b/common/src/Common/Model/Category.hs @@ -5,20 +5,20 @@ module Common.Model.Category    , Category(..)    ) where -import Data.Aeson (FromJSON, ToJSON) -import Data.Int (Int64) -import Data.Text (Text) -import Data.Time (UTCTime) -import GHC.Generics (Generic) +import           Data.Aeson   (FromJSON, ToJSON) +import           Data.Int     (Int64) +import           Data.Text    (Text) +import           Data.Time    (UTCTime) +import           GHC.Generics (Generic)  type CategoryId = Int64  data Category = Category -  { _category_id :: CategoryId -  , _category_name :: Text -  , _category_color :: Text +  { _category_id        :: CategoryId +  , _category_name      :: Text +  , _category_color     :: Text    , _category_createdAt :: UTCTime -  , _category_editedAt :: Maybe UTCTime +  , _category_editedAt  :: Maybe UTCTime    , _category_deletedAt :: Maybe UTCTime    } deriving (Show, Generic) diff --git a/common/src/Common/Model/CreateCategory.hs b/common/src/Common/Model/CreateCategory.hs index bfe24c5..11d84e9 100644 --- a/common/src/Common/Model/CreateCategory.hs +++ b/common/src/Common/Model/CreateCategory.hs @@ -4,12 +4,12 @@ module Common.Model.CreateCategory    ( CreateCategory(..)    ) where -import Data.Aeson (FromJSON) -import Data.Text (Text) -import GHC.Generics (Generic) +import           Data.Aeson   (FromJSON) +import           Data.Text    (Text) +import           GHC.Generics (Generic)  data CreateCategory = CreateCategory -  { _createCategory_name :: Text +  { _createCategory_name  :: Text    , _createCategory_color :: Text    } deriving (Show, Generic) diff --git a/common/src/Common/Model/CreateIncome.hs b/common/src/Common/Model/CreateIncome.hs index 4ee3a50..583ebbb 100644 --- a/common/src/Common/Model/CreateIncome.hs +++ b/common/src/Common/Model/CreateIncome.hs @@ -4,12 +4,12 @@ module Common.Model.CreateIncome    ( CreateIncome(..)    ) where -import Data.Aeson (FromJSON) -import Data.Time.Calendar (Day) -import GHC.Generics (Generic) +import           Data.Aeson         (FromJSON) +import           Data.Time.Calendar (Day) +import           GHC.Generics       (Generic)  data CreateIncome = CreateIncome -  { _createIncome_date :: Day +  { _createIncome_date   :: Day    , _createIncome_amount :: Int    } deriving (Show, Generic) diff --git a/common/src/Common/Model/CreatePayment.hs b/common/src/Common/Model/CreatePayment.hs index b5b6256..7a283e5 100644 --- a/common/src/Common/Model/CreatePayment.hs +++ b/common/src/Common/Model/CreatePayment.hs @@ -4,19 +4,19 @@ module Common.Model.CreatePayment    ( CreatePayment(..)    ) where -import Data.Aeson (FromJSON) -import Data.Text (Text) -import Data.Time.Calendar (Day) -import GHC.Generics (Generic) +import           Data.Aeson             (FromJSON) +import           Data.Text              (Text) +import           Data.Time.Calendar     (Day) +import           GHC.Generics           (Generic) -import Common.Model.Category (CategoryId) -import Common.Model.Frequency (Frequency) +import           Common.Model.Category  (CategoryId) +import           Common.Model.Frequency (Frequency)  data CreatePayment = CreatePayment -  { _createPayment_name :: Text -  , _createPayment_cost :: Int -  , _createPayment_date :: Day -  , _createPayment_category :: CategoryId +  { _createPayment_name      :: Text +  , _createPayment_cost      :: Int +  , _createPayment_date      :: Day +  , _createPayment_category  :: CategoryId    , _createPayment_frequency :: Frequency    } deriving (Show, Generic) diff --git a/common/src/Common/Model/Currency.hs b/common/src/Common/Model/Currency.hs index 7c12545..6d74ea7 100644 --- a/common/src/Common/Model/Currency.hs +++ b/common/src/Common/Model/Currency.hs @@ -4,9 +4,9 @@ module Common.Model.Currency    ( Currency(..)    ) where -import Data.Aeson (FromJSON, ToJSON) -import Data.Text (Text) -import GHC.Generics (Generic) +import           Data.Aeson   (FromJSON, ToJSON) +import           Data.Text    (Text) +import           GHC.Generics (Generic)  newtype Currency = Currency Text deriving (Show, Generic) diff --git a/common/src/Common/Model/EditCategory.hs b/common/src/Common/Model/EditCategory.hs index 2a3a697..5b08b86 100644 --- a/common/src/Common/Model/EditCategory.hs +++ b/common/src/Common/Model/EditCategory.hs @@ -4,15 +4,15 @@ module Common.Model.EditCategory    ( EditCategory(..)    ) where -import Data.Aeson (FromJSON) -import Data.Text (Text) -import GHC.Generics (Generic) +import           Data.Aeson            (FromJSON) +import           Data.Text             (Text) +import           GHC.Generics          (Generic) -import Common.Model.Category (CategoryId) +import           Common.Model.Category (CategoryId)  data EditCategory = EditCategory -  { _editCategory_id :: CategoryId -  , _editCategory_name :: Text +  { _editCategory_id    :: CategoryId +  , _editCategory_name  :: Text    , _editCategory_color :: Text    } deriving (Show, Generic) diff --git a/common/src/Common/Model/EditIncome.hs b/common/src/Common/Model/EditIncome.hs index a55c39e..867b406 100644 --- a/common/src/Common/Model/EditIncome.hs +++ b/common/src/Common/Model/EditIncome.hs @@ -4,15 +4,15 @@ module Common.Model.EditIncome    ( EditIncome(..)    ) where -import Data.Aeson (FromJSON) -import Data.Time.Calendar (Day) -import GHC.Generics (Generic) +import           Data.Aeson          (FromJSON) +import           Data.Time.Calendar  (Day) +import           GHC.Generics        (Generic) -import Common.Model.Income (IncomeId) +import           Common.Model.Income (IncomeId)  data EditIncome = EditIncome -  { _editIncome_id :: IncomeId -  , _editIncome_date :: Day +  { _editIncome_id     :: IncomeId +  , _editIncome_date   :: Day    , _editIncome_amount :: Int    } deriving (Show, Generic) diff --git a/common/src/Common/Model/EditPayment.hs b/common/src/Common/Model/EditPayment.hs index 172c0c1..32228f0 100644 --- a/common/src/Common/Model/EditPayment.hs +++ b/common/src/Common/Model/EditPayment.hs @@ -4,21 +4,21 @@ module Common.Model.EditPayment    ( EditPayment(..)    ) where -import Data.Aeson (FromJSON) -import Data.Text (Text) -import Data.Time.Calendar (Day) -import GHC.Generics (Generic) +import           Data.Aeson             (FromJSON) +import           Data.Text              (Text) +import           Data.Time.Calendar     (Day) +import           GHC.Generics           (Generic) -import Common.Model.Category (CategoryId) -import Common.Model.Frequency (Frequency) -import Common.Model.Payment (PaymentId) +import           Common.Model.Category  (CategoryId) +import           Common.Model.Frequency (Frequency) +import           Common.Model.Payment   (PaymentId)  data EditPayment = EditPayment -  { _editPayment_id :: PaymentId -  , _editPayment_name :: Text -  , _editPayment_cost :: Int -  , _editPayment_date :: Day -  , _editPayment_category :: CategoryId +  { _editPayment_id        :: PaymentId +  , _editPayment_name      :: Text +  , _editPayment_cost      :: Int +  , _editPayment_date      :: Day +  , _editPayment_category  :: CategoryId    , _editPayment_frequency :: Frequency    } deriving (Show, Generic) diff --git a/common/src/Common/Model/Frequency.hs b/common/src/Common/Model/Frequency.hs index 7c46605..085163d 100644 --- a/common/src/Common/Model/Frequency.hs +++ b/common/src/Common/Model/Frequency.hs @@ -4,8 +4,8 @@ module Common.Model.Frequency    ( Frequency(..)    ) where -import Data.Aeson (FromJSON, ToJSON) -import GHC.Generics (Generic) +import           Data.Aeson   (FromJSON, ToJSON) +import           GHC.Generics (Generic)  data Frequency =    Punctual diff --git a/common/src/Common/Model/Income.hs b/common/src/Common/Model/Income.hs index 280812f..10b4cf2 100644 --- a/common/src/Common/Model/Income.hs +++ b/common/src/Common/Model/Income.hs @@ -5,23 +5,23 @@ module Common.Model.Income    , Income(..)    ) where -import Data.Aeson (FromJSON, ToJSON) -import Data.Int (Int64) -import Data.Time (UTCTime) -import Data.Time.Calendar (Day) -import GHC.Generics (Generic) +import           Data.Aeson         (FromJSON, ToJSON) +import           Data.Int           (Int64) +import           Data.Time          (UTCTime) +import           Data.Time.Calendar (Day) +import           GHC.Generics       (Generic) -import Common.Model.User (UserId) +import           Common.Model.User  (UserId)  type IncomeId = Int64  data Income = Income -  { _income_id :: IncomeId -  , _income_userId :: UserId -  , _income_date :: Day -  , _income_amount :: Int +  { _income_id        :: IncomeId +  , _income_userId    :: UserId +  , _income_date      :: Day +  , _income_amount    :: Int    , _income_createdAt :: UTCTime -  , _income_editedAt :: Maybe UTCTime +  , _income_editedAt  :: Maybe UTCTime    , _income_deletedAt :: Maybe UTCTime    } deriving (Show, Generic) diff --git a/common/src/Common/Model/Init.hs b/common/src/Common/Model/Init.hs index 68fcfb8..ae23bb5 100644 --- a/common/src/Common/Model/Init.hs +++ b/common/src/Common/Model/Init.hs @@ -4,24 +4,24 @@ module Common.Model.Init    ( Init(..)    ) where -import Data.Aeson (FromJSON, ToJSON) -import GHC.Generics (Generic) +import           Data.Aeson                   (FromJSON, ToJSON) +import           GHC.Generics                 (Generic) -import Common.Model.Category (Category) -import Common.Model.Currency (Currency) -import Common.Model.Income (Income) -import Common.Model.Payment (Payment) -import Common.Model.PaymentCategory (PaymentCategory) -import Common.Model.User (UserId, User) +import           Common.Model.Category        (Category) +import           Common.Model.Currency        (Currency) +import           Common.Model.Income          (Income) +import           Common.Model.Payment         (Payment) +import           Common.Model.PaymentCategory (PaymentCategory) +import           Common.Model.User            (User, UserId)  data Init = Init -  { _init_users :: [User] -  , _init_currentUser :: UserId -  , _init_payments :: [Payment] -  , _init_incomes :: [Income] -  , _init_categories :: [Category] +  { _init_users             :: [User] +  , _init_currentUser       :: UserId +  , _init_payments          :: [Payment] +  , _init_incomes           :: [Income] +  , _init_categories        :: [Category]    , _init_paymentCategories :: [PaymentCategory] -  , _init_currency :: Currency +  , _init_currency          :: Currency    } deriving (Show, Generic)  instance FromJSON Init diff --git a/common/src/Common/Model/InitResult.hs b/common/src/Common/Model/InitResult.hs index 43c16f9..12be65a 100644 --- a/common/src/Common/Model/InitResult.hs +++ b/common/src/Common/Model/InitResult.hs @@ -4,11 +4,11 @@ module Common.Model.InitResult    ( InitResult(..)    ) where -import Data.Aeson (FromJSON, ToJSON) -import Data.Text (Text) -import GHC.Generics (Generic) +import           Data.Aeson        (FromJSON, ToJSON) +import           Data.Text         (Text) +import           GHC.Generics      (Generic) -import Common.Model.Init (Init) +import           Common.Model.Init (Init)  data InitResult =    InitSuccess Init diff --git a/common/src/Common/Model/Payment.hs b/common/src/Common/Model/Payment.hs index 804b501..4741058 100644 --- a/common/src/Common/Model/Payment.hs +++ b/common/src/Common/Model/Payment.hs @@ -5,27 +5,27 @@ module Common.Model.Payment    , Payment(..)    ) where -import Data.Aeson (FromJSON, ToJSON) -import Data.Int (Int64) -import Data.Text (Text) -import Data.Time (UTCTime) -import Data.Time.Calendar (Day) -import GHC.Generics (Generic) +import           Data.Aeson             (FromJSON, ToJSON) +import           Data.Int               (Int64) +import           Data.Text              (Text) +import           Data.Time              (UTCTime) +import           Data.Time.Calendar     (Day) +import           GHC.Generics           (Generic) -import Common.Model.Frequency -import Common.Model.User (UserId) +import           Common.Model.Frequency +import           Common.Model.User      (UserId)  type PaymentId = Int64  data Payment = Payment -  { _payment_id :: PaymentId -  , _payment_user :: UserId -  , _payment_name :: Text -  , _payment_cost :: Int -  , _payment_date :: Day +  { _payment_id        :: PaymentId +  , _payment_user      :: UserId +  , _payment_name      :: Text +  , _payment_cost      :: Int +  , _payment_date      :: Day    , _payment_frequency :: Frequency    , _payment_createdAt :: UTCTime -  , _payment_editedAt :: Maybe UTCTime +  , _payment_editedAt  :: Maybe UTCTime    , _payment_deletedAt :: Maybe UTCTime    } deriving (Show, Generic) diff --git a/common/src/Common/Model/PaymentCategory.hs b/common/src/Common/Model/PaymentCategory.hs index a0e94f9..24cf9e1 100644 --- a/common/src/Common/Model/PaymentCategory.hs +++ b/common/src/Common/Model/PaymentCategory.hs @@ -5,22 +5,22 @@ module Common.Model.PaymentCategory    , PaymentCategory(..)    ) where -import Data.Aeson (FromJSON, ToJSON) -import Data.Int (Int64) -import Data.Text (Text) -import Data.Time (UTCTime) -import GHC.Generics (Generic) +import           Data.Aeson            (FromJSON, ToJSON) +import           Data.Int              (Int64) +import           Data.Text             (Text) +import           Data.Time             (UTCTime) +import           GHC.Generics          (Generic) -import Common.Model.Category (CategoryId) +import           Common.Model.Category (CategoryId)  type PaymentCategoryId = Int64  data PaymentCategory = PaymentCategory -  { _paymentCategory_id :: PaymentCategoryId -  , _paymentCategory_name :: Text -  , _paymentCategory_category :: CategoryId +  { _paymentCategory_id        :: PaymentCategoryId +  , _paymentCategory_name      :: Text +  , _paymentCategory_category  :: CategoryId    , _paymentCategory_createdAt :: UTCTime -  , _paymentCategory_editedAt :: Maybe UTCTime +  , _paymentCategory_editedAt  :: Maybe UTCTime    } deriving (Show, Generic)  instance FromJSON PaymentCategory diff --git a/common/src/Common/Model/SignIn.hs b/common/src/Common/Model/SignIn.hs index f4da97f..baccd88 100644 --- a/common/src/Common/Model/SignIn.hs +++ b/common/src/Common/Model/SignIn.hs @@ -4,9 +4,9 @@ module Common.Model.SignIn    ( SignIn(..)    ) where -import Data.Aeson (FromJSON, ToJSON) -import Data.Text (Text) -import GHC.Generics (Generic) +import           Data.Aeson   (FromJSON, ToJSON) +import           Data.Text    (Text) +import           GHC.Generics (Generic)  data SignIn = SignIn    { _signIn_email :: Text diff --git a/common/src/Common/Model/User.hs b/common/src/Common/Model/User.hs index 694c70e..e491c31 100644 --- a/common/src/Common/Model/User.hs +++ b/common/src/Common/Model/User.hs @@ -6,20 +6,20 @@ module Common.Model.User    , findUser    ) where -import Data.Aeson (FromJSON, ToJSON) -import qualified Data.List as L -import Data.Int (Int64) -import Data.Text (Text) -import Data.Time (UTCTime) -import GHC.Generics (Generic) +import           Data.Aeson   (FromJSON, ToJSON) +import           Data.Int     (Int64) +import qualified Data.List    as L +import           Data.Text    (Text) +import           Data.Time    (UTCTime) +import           GHC.Generics (Generic)  type UserId = Int64  data User = User -  { _user_id :: UserId +  { _user_id       :: UserId    , _user_creation :: UTCTime -  , _user_email :: Text -  , _user_name :: Text +  , _user_email    :: Text +  , _user_name     :: Text    } deriving (Show, Generic)  instance FromJSON User  | 
