Added Setting entity

basket/dto/basket.go

@@ -14,6 +14,7 @@ type GetBasketResponseDTO struct {
 }
 
 type GetBasketItemsRequestDTO struct {
+	BasketID string `json:"basket_id"`
 }
 
 type GetBasketItemsResponseDTO struct {
@@ -36,6 +37,16 @@ type AddProductToBasketResponseDTO struct {
 	BasketID string `json:"basket_id"`
 }
 
+type RemoveFromBasketRequestDTO struct {
+	BasketID  string `json:"basket_id"`
+	ProductID string `json:"product_id"`
+	Quantity  int    `json:"quantity"`
+}
+
+type RemoveFromBasketResponseDTO struct {
+	BasketID string `json:"basket_id"`
+}
+
 type BasketCheckoutRequestDTO struct {
 	BasketID string `json:"basket_id"`
 }

basket/entity/basket.go

@@ -1,22 +1,20 @@
 package basket
 
-import (
+import "time"
-	"github.com/jackc/pgtype"
-)
 
-type BasketEntity struct {
+type Basket struct {
-	ID        string           `db:"id" json:"id"`
+	ID        string     `db:"id" json:"id"`
-	State     string           `db:"state" json:"state"`
+	State     string     `db:"state" json:"state"`
-	CreatedAt pgtype.Timestamp `db:"created_at" json:"created_at"`
+	CreatedAt time.Time  `db:"created_at" json:"created_at"`
-	UpdatedAt pgtype.Timestamp `db:"updated_at" json:"updated_at,omitempty"`
+	UpdatedAt *time.Time `db:"updated_at" json:"updated_at,omitempty"`
 }
 
-type BasketItemEntity struct {
+type BasketItem struct {
-	ID        string           `db:"id" json:"id"`
+	ID        string     `db:"id" json:"id"`
-	BasketID  string           `db:"basket_id" json:"basket_id"`
+	BasketID  string     `db:"basket_id" json:"basket_id"`
-	ProductID string           `db:"product_id" json:"product_id"`
+	ProductID string     `db:"product_id" json:"product_id"`
-	Quantity  int              `db:"quantity" json:"quantity"`
+	Quantity  int        `db:"quantity" json:"quantity"`
-	Price     float64          `db:"price" json:"price"`
+	Price     float64    `db:"price" json:"price"`
-	CreatedAt pgtype.Timestamp `db:"created_at" json:"created_at"`
+	CreatedAt time.Time  `db:"created_at" json:"created_at"`
-	UpdatedAt pgtype.Timestamp `db:"updated_at" json:"updated_at,omitempty"`
+	UpdatedAt *time.Time `db:"updated_at" json:"updated_at,omitempty"`
 }

basket/model/basket.go

@@ -5,16 +5,16 @@ import (
 )
 
 type Basket struct {
-	State     string    `db:"state" json:"state"`
+	State     string     `db:"state" json:"state"`
-	CreatedAt time.Time `db:"created_at" json:"created_at"`
+	CreatedAt time.Time  `db:"created_at" json:"created_at"`
-	UpdatedAt time.Time `db:"updated_at" json:"updated_at,omitempty"`
+	UpdatedAt *time.Time `db:"updated_at" json:"updated_at,omitempty"`
 }
 
 type BasketItem struct {
-	BasketID  string    `db:"basket_id" json:"basket_id"`
+	BasketID  string     `db:"basket_id" json:"basket_id"`
-	ProductID string    `db:"product_id" json:"product_id"`
+	ProductID string     `db:"product_id" json:"product_id"`
-	Quantity  int       `db:"quantity" json:"quantity"`
+	Quantity  int        `db:"quantity" json:"quantity"`
-	Price     float64   `db:"price" json:"price"`
+	Price     float64    `db:"price" json:"price"`
-	CreatedAt time.Time `db:"created_at" json:"created_at"`
+	CreatedAt time.Time  `db:"created_at" json:"created_at"`
-	UpdatedAt time.Time `db:"updated_at" json:"updated_at,omitempty"`
+	UpdatedAt *time.Time `db:"updated_at" json:"updated_at,omitempty"`
 }

catalog/entity/product.go

@@ -3,10 +3,10 @@ package catalog
 import "time"
 
 type Product struct {
-	ID        string     `json:"id", db:"id"`
+	ID        string     `json:"id" db:"id"`
-	Slug      string     `json:"slug", db:"slug"`
+	Slug      string     `json:"slug" db:"slug"`
-	Name      string     `json:"name", db:"name"`
+	Name      string     `json:"name" db:"name"`
-	Price     float64    `json:"price", db:"price"`
+	Price     float64    `json:"price" db:"price"`
-	CreatedAt time.Time  `json:"created_at", db:"created_at"`
+	CreatedAt time.Time  `json:"created_at" db:"created_at"`
-	UpdatedAt *time.Time `json:"updated_at", db:"updated_at, omitempty"`
+	UpdatedAt *time.Time `json:"updated_at" db:"updated_at, omitempty"`
 }

config/entity/setting.go

@@ -0,0 +1,7 @@
+package config
+
+type Setting struct {
+	ID    string `db:"id" json:"id"`
+	Name  string `db:"name" json:"name"`
+	Value string `db:"value" json:"value"`
+}

identity/entity/user.go

@@ -8,12 +8,5 @@ type User struct {
 	Username  string     `db:"username" json:"username"`
 	Password  string     `db:"password" json:"password"`
 	CreatedAt time.Time  `db:"created_at" json:"created_at"`
-	UpdatedAt *time.Time `db:"updated_at,omitempty" json:"updated_at,omitempty"` // FIXME: zero-value issue
+	UpdatedAt *time.Time `db:"updated_at,omitempty" json:"updated_at,omitempty"`
 }
-
-// var TestUser = &User{
-// 	ID:         1,
-// 	Username:   "test",
-// 	Password:   "test",
-// 	CreateDate: time.Now(),
-// }

order/entity/order.go

@@ -1,20 +1,22 @@
 package order
 
-import "github.com/jackc/pgtype"
+import (
+	"time"
+)
 
-type OrderEntity struct {
+type Order struct {
-	ID        string           `db:"id" json:"id"`
+	ID        string     `db:"id" json:"id"`
-	State     string           `db:"state" json:"state"`
+	State     string     `db:"state" json:"state"`
-	CreatedAt pgtype.Timestamp `db:"created_at" json:"created_at"`
+	CreatedAt time.Time  `db:"created_at" json:"created_at"`
-	UpdatedAt pgtype.Timestamp `db:"updated_at" json:"updated_at,omitempty"`
+	UpdatedAt *time.Time `db:"updated_at" json:"updated_at,omitempty"`
 }
 
-type OrderItemEntity struct {
+type OrderItem struct {
-	ID        string           `db:"id" json:"id"`
+	ID        string     `db:"id" json:"id"`
-	OrderID   string           `db:"order_id" json:"order_id"`
+	OrderID   string     `db:"order_id" json:"order_id"`
-	ProductID int              `db:"product_id" json:"product_id"`
+	ProductID int        `db:"product_id" json:"product_id"`
-	Quantity  int              `db:"quantity" json:"quantity"`
+	Quantity  int        `db:"quantity" json:"quantity"`
-	Price     float64          `db:"price" json:"price"`
+	Price     float64    `db:"price" json:"price"`
-	CreatedAt pgtype.Timestamp `db:"created_at" json:"created_at"`
+	CreatedAt time.Time  `db:"created_at" json:"created_at"`
-	UpdatedAt pgtype.Timestamp `db:"updated_at" json:"updated_at,omitempty"`
+	UpdatedAt *time.Time `db:"updated_at" json:"updated_at,omitempty"`
 }

order/model/order.go

@@ -3,16 +3,16 @@ package order
 import "time"
 
 type Order struct {
-	State     string    `db:"state" json:"state"`
+	State     string     `db:"state" json:"state"`
-	CreatedAt time.Time `db:"created_at" json:"created_at"`
+	CreatedAt time.Time  `db:"created_at" json:"created_at"`
-	UpdatedAt time.Time `db:"updated_at" json:"updated_at,omitempty"`
+	UpdatedAt *time.Time `db:"updated_at" json:"updated_at,omitempty"`
 }
 
 type OrderItem struct {
-	OrderID   string    `db:"order_id" json:"order_id"`
+	OrderID   string     `db:"order_id" json:"order_id"`
-	ProductID int       `db:"product_id" json:"product_id"`
+	ProductID int        `db:"product_id" json:"product_id"`
-	Quantity  int       `db:"quantity" json:"quantity"`
+	Quantity  int        `db:"quantity" json:"quantity"`
-	Price     float64   `db:"price" json:"price"`
+	Price     float64    `db:"price" json:"price"`
-	CreatedAt time.Time `db:"created_at" json:"created_at"`
+	CreatedAt time.Time  `db:"created_at" json:"created_at"`
-	UpdatedAt time.Time `db:"updated_at" json:"updated_at,omitempty"`
+	UpdatedAt *time.Time `db:"updated_at" json:"updated_at,omitempty"`
 }

pricing/entity/product_price.go

@@ -1,6 +1,6 @@
 package pricing
 
-type ProductPriceEntity struct {
+type ProductPrice struct {
 	ID    int    `db:"id"`
 	PID   string `db:"pid"`
 	Price int    `db:"price"`