catalog update

http/basket.go

@@ -10,7 +10,7 @@ type GetBasketResponse struct {
 	ID        string        `json:"id"`
 	State     string        `json:"state"`
 	CreatedAt time.Duration `json:"created_at"`
-	UpdatedAt time.Duration `json:"updated_at"`
+	UpdatedAt time.Duration `json:"updated_at,omitempty"`
 }
 
 type GetBasketItemsRequest struct {
@@ -23,7 +23,7 @@ type GetBasketItemsResponse struct {
 	Quantity  int           `json:"quantity"`
 	Price     float64       `json:"price"`
 	CreatedAt time.Duration `json:"created_at"`
-	UpdatedAt time.Duration `json:"updated_at"`
+	UpdatedAt time.Duration `json:"updated_at,omitempty"`
 }
 
 type BasketCheckoutRequest struct {
@@ -31,5 +31,5 @@ type BasketCheckoutRequest struct {
 }
 
 type BasketCheckoutResponse struct {
-	ID string `json:"order_id"`
+	ID string `json:"basket_id"`
 }

http/catalog.go

@@ -1,5 +1,30 @@
 package http
 
+import (
+	"time"
+)
+
+type GetProductRequest struct {
+	ProductID int `json:"product_id"`
+}
+
+type GetProductResponse struct {
+	ID        int           `json:"id"`
+	PID       string        `json:"pid"`
+	Name      string        `json:"name"`
+	Price     float64       `json:"price"`
+	CreatedAt time.Duration `json:"created_at"`
+	UpdatedAt time.Duration `json:"updated_at,omitempty"`
+}
+
+type GetProductListRequest struct {
+	CategoryID int `json:"category_id"`
+}
+
+type GetProductListResponse struct {
+	Products []GetProductResponse `json:"-"`
+}
+
 type AddProductToBasketRequest struct {
 	ProductID int `json:"product_id"`
 	Quantity  int `json:"quantity"`

model/basket.go

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

@@ -1,2 +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"`
+}