From 5c6aad39cd44949898a9df75768a1804d020fc96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=20Jurmanovi=C4=87?= Date: Sun, 27 Jun 2021 10:29:22 +0200 Subject: [PATCH] use timestamp instead of timestamptz --- pkg/models/subscriptions.go | 6 +++--- pkg/models/transactions.go | 2 +- pkg/services/subscriptions.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/models/subscriptions.go b/pkg/models/subscriptions.go index e4bd06e..4cff8f5 100644 --- a/pkg/models/subscriptions.go +++ b/pkg/models/subscriptions.go @@ -9,8 +9,8 @@ type Subscription struct { tableName struct{} `pg:"subscriptions,alias:subscriptions"` BaseModel Description string `json:"description" pg:"description"` - StartDate time.Time `json:"startDate" pg:"start_date"` - EndDate time.Time `json:"endDate" pg:"end_date"` + StartDate time.Time `json:"startDate" pg:"start_date", type:timestamp` + EndDate time.Time `json:"endDate" pg:"end_date", type:timestamp` HasEnd bool `json:"hasEnd" pg:"hasEnd"` SubscriptionTypeID string `json:"subscriptionTypeId" pg:"subscription_type_id"` SubscriptionType *SubscriptionType `json:"subscriptionType", pg:"rel:has-one, fk:subscription_type_id"` @@ -19,7 +19,7 @@ type Subscription struct { Wallet *Wallet `json:"wallet" pg:"rel:has-one, fk:wallet_id"` TransactionTypeID string `json:"transactionTypeId", pg:"transaction_type_id"` TransactionType *TransactionType `json:"transactionType", pg:"rel:has-one, fk:transaction_type_id"` - LastTransactionDate time.Time `json:"lastTransactionDate", pg:"last_transaction_date"` + LastTransactionDate time.Time `json:"lastTransactionDate", pg:"last_transaction_date", type:timestamp` Amount float32 `json:"amount", pg:"amount"` } diff --git a/pkg/models/transactions.go b/pkg/models/transactions.go index c30c266..980ff0b 100644 --- a/pkg/models/transactions.go +++ b/pkg/models/transactions.go @@ -14,7 +14,7 @@ type Transaction struct { WalletID string `json:"walletId", pg:"wallet_id"` Amount float32 `json:"amount", pg:"amount"` Wallet *Wallet `json:"wallet" pg:"rel:has-one, fk:wallet_id"` - TransactionDate time.Time `json:"transactionDate" pg:"transaction_date"` + TransactionDate time.Time `json:"transactionDate" pg:"transaction_date, type:timestamp"` SubscriptionID string `json:"subscriptionId", pg:"subscription_id"` Subscription *Subscription `json:"subscription", pg:"rel:has-one, fk:subscription_id"` } diff --git a/pkg/services/subscriptions.go b/pkg/services/subscriptions.go index 9bfabd3..2f5dd81 100644 --- a/pkg/services/subscriptions.go +++ b/pkg/services/subscriptions.go @@ -24,9 +24,9 @@ func (as *SubscriptionService) New(body *models.NewSubscriptionBody) *models.Sub tm.SubscriptionTypeID = body.SubscriptionTypeID tm.CustomRange = int(customRange) tm.Description = body.Description - tm.StartDate = body.StartDate + tm.StartDate = body.StartDate.Local() tm.HasEnd = body.HasEnd - tm.EndDate = body.EndDate + tm.EndDate = body.EndDate.Local() tm.Amount = float32(math.Round(amount*100) / 100) if body.StartDate.IsZero() {