models update

model/basket.go

@@ -5,17 +5,18 @@ import (
 )
 
 type BasketModel struct {
-	ID        string           `db:"id"`
-	CreatedAt pgtype.Timestamp `db:"created_at"`
-	UpdatedAt pgtype.Timestamp `db:"updated_at"`
+	ID        string           `db:"id" json:"id"`
+	State     string           `db:"state" json:"state"`
+	CreatedAt pgtype.Timestamp `db:"created_at" json:"created_at"`
+	UpdatedAt pgtype.Timestamp `db:"updated_at" json:"updated_at,omitempty"`
 }
 
 type BasketItemModel struct {
-	ID        string           `db:"id"`
-	BasketID  string           `db:"basket_id"`
-	ProductID string           `db:"product_id"`
-	Quantity  int              `db:"quantity"`
-	Price     float64          `db:"price"`
-	CreatedAt pgtype.Timestamp `db:"created_at"`
-	UpdatedAt pgtype.Timestamp `db:"updated_at"`
+	ID        string           `db:"id" json:"id"`
+	BasketID  string           `db:"basket_id" json:"basket_id"`
+	ProductID int              `db:"product_id" json:"product_id"`
+	Quantity  int              `db:"quantity" json:"quantity"`
+	Price     float64          `db:"price" json:"price"`
+	CreatedAt pgtype.Timestamp `db:"created_at" json:"created_at"`
+	UpdatedAt pgtype.Timestamp `db:"updated_at" json:"updated_at,omitempty"`
 }

model/catalog.go

@@ -8,5 +8,5 @@ type ProductModel struct {
 	Name      string           `db:"name"`
 	Price     float64          `db:"price"`
 	CreatedAt pgtype.Timestamp `db:"created_at"`
-	UpdatedAt pgtype.Timestamp `db:"updated_at"`
+	UpdatedAt pgtype.Timestamp `db:"updated_at,omitempty"`
 }

model/order.go

@@ -0,0 +1,20 @@
+package model
+
+import "github.com/jackc/pgtype"
+
+type OrderModel struct {
+	ID        string           `db:"id" json:"id"`
+	State     string           `db:"state" json:"state"`
+	CreatedAt pgtype.Timestamp `db:"created_at" json:"created_at"`
+	UpdatedAt pgtype.Timestamp `db:"updated_at" json:"updated_at,omitempty"`
+}
+
+type OrderItemModel struct {
+	ID        string           `db:"id" json:"id"`
+	OrderID   string           `db:"order_id" json:"order_id"`
+	ProductID int              `db:"product_id" json:"product_id"`
+	Quantity  int              `db:"quantity" json:"quantity"`
+	Price     float64          `db:"price" json:"price"`
+	CreatedAt pgtype.Timestamp `db:"created_at" json:"created_at"`
+	UpdatedAt pgtype.Timestamp `db:"updated_at" json:"updated_at,omitempty"`
+}