diff --git a/pkg/models/db.go b/pkg/models/db.go index 213f623..fe1ac9c 100644 --- a/pkg/models/db.go +++ b/pkg/models/db.go @@ -7,7 +7,7 @@ import ( ) type BaseModel struct { - Id string `json:"id" pg:"id,pk"` + Id string `json:"id" pg:"id,pk,notnull"` DateCreated time.Time `json:"dateCreated" pg:"date_created"` DateUpdated time.Time `json:"dateUpdated" pg:"date_updated"` } diff --git a/pkg/models/register.go b/pkg/models/register.go index d612d71..7ddef46 100644 --- a/pkg/models/register.go +++ b/pkg/models/register.go @@ -4,9 +4,9 @@ type User struct { tableName struct{} `pg:"users,alias:users"` BaseModel IsActive bool `json:"isActive" pg:"is_active" form:"isActive"` - Username string `json:"username" pg:"username" form:"username"` - Password string `json:"password" pg:"password" form:"password"` - Email string `json:"email" pg:"email" form:"email"` + Username string `json:"username" pg:"username,notnull" form:"username"` + Password string `json:"password" pg:"password,notnull" form:"password"` + Email string `json:"email" pg:"email,notnull" form:"email"` } type UserReturnInfo struct { diff --git a/pkg/models/subscriptionTypes.go b/pkg/models/subscriptionTypes.go index eb1c053..84ce657 100644 --- a/pkg/models/subscriptionTypes.go +++ b/pkg/models/subscriptionTypes.go @@ -4,7 +4,7 @@ type SubscriptionType struct { tableName struct{} `pg:"subscriptionTypes,alias:subscriptionTypes"` BaseModel Name string `json:"name" pg:"name"` - Type string `json:"type" pg:"type"` + Type string `json:"type" pg:"type,notnull"` } type NewSubscriptionTypeBody struct { diff --git a/pkg/models/subscriptions.go b/pkg/models/subscriptions.go index 4cff8f5..65a1a86 100644 --- a/pkg/models/subscriptions.go +++ b/pkg/models/subscriptions.go @@ -9,18 +9,18 @@ type Subscription struct { tableName struct{} `pg:"subscriptions,alias:subscriptions"` BaseModel Description string `json:"description" pg:"description"` - StartDate time.Time `json:"startDate" pg:"start_date", type:timestamp` - EndDate time.Time `json:"endDate" pg:"end_date", type:timestamp` + StartDate time.Time `json:"startDate" pg:"start_date", type:timestamptz` + EndDate time.Time `json:"endDate" pg:"end_date", type:timestamptz` 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"` - CustomRange int `json:"customRange", pg:"custom_range"` + CustomRange int `json:"customRange", pg:"custom_range,default:1"` WalletID string `json:"walletId", pg:"wallet_id"` 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", type:timestamp` - Amount float32 `json:"amount", pg:"amount"` + LastTransactionDate time.Time `json:"lastTransactionDate", pg:"last_transaction_date", type:timestamptz` + Amount float32 `json:"amount", pg:"amount,default:0"` } type NewSubscriptionBody struct { diff --git a/pkg/models/transactionTypes.go b/pkg/models/transactionTypes.go index db0a4b0..32f8958 100644 --- a/pkg/models/transactionTypes.go +++ b/pkg/models/transactionTypes.go @@ -4,7 +4,7 @@ type TransactionType struct { tableName struct{} `pg:"transactionTypes,alias:transactionTypes"` BaseModel Name string `json:"name" pg:"name"` - Type string `json:"type" pg:"type"` + Type string `json:"type" pg:"type,notnull"` } type NewTransactionTypeBody struct { diff --git a/pkg/models/transactions.go b/pkg/models/transactions.go index 980ff0b..6dd9de9 100644 --- a/pkg/models/transactions.go +++ b/pkg/models/transactions.go @@ -12,9 +12,9 @@ type Transaction struct { TransactionTypeID string `json:"transactionTypeId", pg:"transaction_type_id"` TransactionType *TransactionType `json:"transactionType", pg:"rel:has-one, fk:transaction_type_id"` WalletID string `json:"walletId", pg:"wallet_id"` - Amount float32 `json:"amount", pg:"amount"` + Amount float32 `json:"amount", pg:"amount,default:0"` Wallet *Wallet `json:"wallet" pg:"rel:has-one, fk:wallet_id"` - TransactionDate time.Time `json:"transactionDate" pg:"transaction_date, type:timestamp"` + TransactionDate time.Time `json:"transactionDate" pg:"transaction_date, type:timestamptz"` SubscriptionID string `json:"subscriptionId", pg:"subscription_id"` Subscription *Subscription `json:"subscription", pg:"rel:has-one, fk:subscription_id"` }