Fixes in User Entity field names

basket/dto/basket.go

@@ -7,44 +7,23 @@ type GetBasketRequestDTO struct {
 }
 
 type GetBasketResponseDTO struct {
-	ID        string     `json:"id"`
-	State     string     `json:"state"`
-	CreatedAt time.Time  `json:"created_at"`
-	UpdatedAt *time.Time `json:"updated_at,omitempty"`
+	ID        string        `json:"id"`
+	State     string        `json:"state"`
+	CreatedAt time.Duration `json:"created_at"`
+	UpdatedAt time.Duration `json:"updated_at,omitempty"`
 }
 
 type GetBasketItemsRequestDTO struct {
-	BasketID string `json:"basket_id"`
 }
 
 type GetBasketItemsResponseDTO struct {
-	ID        string     `json:"id"`
-	BasketID  string     `json:"basket_id"`
-	ProductID string     `json:"product_id"`
-	Quantity  int        `json:"quantity"`
-	Price     float64    `json:"price"`
-	CreatedAt time.Time  `json:"created_at"`
-	UpdatedAt *time.Time `json:"updated_at,omitempty"`
-}
-
-type AddProductToBasketRequestDTO struct {
-	BasketID  string `json:"basket_id"`
-	ProductID string `json:"product_id"`
-	Quantity  int    `json:"quantity"`
-}
-
-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"`
+	ID        string        `json:"id"`
+	BasketID  string        `json:"basket_id"`
+	ProductID int           `json:"product_id"`
+	Quantity  int           `json:"quantity"`
+	Price     float64       `json:"price"`
+	CreatedAt time.Duration `json:"created_at"`
+	UpdatedAt time.Duration `json:"updated_at,omitempty"`
 }
 
 type BasketCheckoutRequestDTO struct {

basket/entity/basket.go

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

basket/model/basket.go

@@ -4,17 +4,17 @@ import (
 	"time"
 )
 
-type Basket struct {
-	State     string     `db:"state" json:"state"`
-	CreatedAt time.Time  `db:"created_at" json:"created_at"`
-	UpdatedAt *time.Time `db:"updated_at" json:"updated_at,omitempty"`
+type BasketModel struct {
+	State     string    `db:"state" json:"state"`
+	CreatedAt time.Time `db:"created_at" json:"created_at"`
+	UpdatedAt time.Time `db:"updated_at" json:"updated_at,omitempty"`
 }
 
-type BasketItem struct {
-	BasketID  string     `db:"basket_id" json:"basket_id"`
-	ProductID string     `db:"product_id" json:"product_id"`
-	Quantity  int        `db:"quantity" json:"quantity"`
-	Price     float64    `db:"price" json:"price"`
-	CreatedAt time.Time  `db:"created_at" json:"created_at"`
-	UpdatedAt *time.Time `db:"updated_at" json:"updated_at,omitempty"`
+type BasketItemModel struct {
+	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 time.Time `db:"created_at" json:"created_at"`
+	UpdatedAt time.Time `db:"updated_at" json:"updated_at,omitempty"`
 }

catalog/dto/product.go

@@ -5,27 +5,42 @@ import (
 )
 
 type GetProductRequestDTO struct {
-	ProductID string `json:"product_id"`
+	ProductID int `json:"product_id"`
 }
 
 type GetProductResponseDTO struct {
-	ID        string     `json:"id"`
-	Name      string     `json:"name"`
-	Slug      string     `json:"slug"`
-	Price     float64    `json:"price"`
-	CreatedAt time.Time  `json:"created_at"`
-	UpdatedAt *time.Time `json:"updated_at,omitempty"`
+	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 GetProductListRequestDTO struct {
+	CategoryID int `json:"category_id"`
 }
 
 type GetProductListResponseDTO struct {
 	Products []GetProductResponseDTO `json:"products"`
 }
 
-type GetProductDetailsResponseDTO struct {
-	ID        string     `json:"id"`
-	SLug      string     `json:"slug"`
-	Name      string     `json:"name"`
-	Price     string     `json:"price"`
-	CreatedAt time.Time  `json:"created_at"`
-	UpdatedAt *time.Time `json:"updated_at,omitempty"`
+type AddProductToBasketRequestDTO struct {
+	ProductID int `json:"product_id"`
+	Quantity  int `json:"quantity"`
+}
+
+type AddProductToBasketResponseDTO struct {
+	ProductID int    `json:"product_id"`
+	BasketID  string `json:"basket_id"`
+}
+
+type RemoveProductFromBasketRequestDTO struct {
+	ProductID int `json:"product_id"`
+	Quantity  int `json:"quantity"`
+}
+
+type RemoveProductFromBasketResponseDTO struct {
+	ProductID int    `json:"product_id"`
+	BasketID  string `json:"basket_id"`
 }

catalog/entity/product.go

@@ -1,12 +1,12 @@
 package catalog
 
-import "time"
+import "github.com/jackc/pgtype"
 
-type Product struct {
-	ID        string     `json:"id" db:"id"`
-	Slug      string     `json:"slug" db:"slug"`
-	Name      string     `json:"name" db:"name"`
-	Price     float64    `json:"price" db:"price"`
-	CreatedAt time.Time  `json:"created_at" db:"created_at"`
-	UpdatedAt *time.Time `json:"updated_at" db:"updated_at, omitempty"`
+type ProductEntity struct {
+	ID        int              `db:"id"`
+	PID       string           `db:"pid"`
+	Name      string           `db:"name"`
+	Price     float64          `db:"price"`
+	CreatedAt pgtype.Timestamp `db:"created_at"`
+	UpdatedAt pgtype.Timestamp `db:"updated_at,omitempty"`
 }

catalog/model/product.go

@@ -4,10 +4,10 @@ import (
 	"time"
 )
 
-type Product struct {
-	Name      string     `db:"name"`
-	Slug      string     `db:"slug"`
-	Price     float64    `db:"price"`
-	CreatedAt time.Time  `db:"created_at"`
-	UpdatedAt *time.Time `db:"updated_at"`
+type ProductModel struct {
+	PID       string    `db:"pid"`
+	Name      string    `db:"name"`
+	Price     float64   `db:"price"`
+	CreatedAt time.Time `db:"created_at"`
+	UpdatedAt time.Time `db:"updated_at,omitempty"`
 }

go.mod

@@ -1,6 +1,6 @@
 module git.ego.freeddns.org/egommerce/api-entities
 
-go 1.24
+go 1.19
 
 require github.com/jackc/pgtype v1.14.3
 

identity/dto/header.go

@@ -1,5 +0,0 @@
-package identity
-
-type AuthorizationHeaderDTO struct {
-	Authorization string `reqHeader:"authorization"`
-}

identity/entity/role.go

@@ -1,8 +0,0 @@
-package identity
-
-type Role struct {
-	ID          string `db:"id" json:"id"`
-	Name        string `db:"name" json:"name"`
-	DisplayName string `db:"display_name" json:"display_name"`
-	URL         string `db:"url" json:"url"`
-}

identity/entity/url_access.go

@@ -1,8 +0,0 @@
-package identity
-
-type URLAccess struct {
-	ID      string   `db:"id" json:"id"`
-	Roles   []string `db:"roles" json:"roles"`
-	URL     string   `db:"url" json:"url"`
-	Service string   `db:"service" json:"service"`
-}

identity/entity/user.go

@@ -3,10 +3,17 @@ package identity
 import "time"
 
 type User struct {
-	ID        string     `db:"id" json:"id"`
-	Email     string     `db:"email" json:"email"`
-	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"`
+	ID         int       `db:"id" json:"id"`
+	Email      string    `db:"email" json:"email"`
+	Username   string    `db:"username" json:"username"`
+	Password   string    `db:"password" json:"password"`
+	CreatedAt  time.Time `db:"created_at" json:"created_at"`
+	ModifiedAt time.Time `db:"modified_at" json:"modified_at"` // FIXME: zero-value issue
 }
+
+// var TestUser = &User{
+// 	ID:         1,
+// 	Username:   "test",
+// 	Password:   "test",
+// 	CreateDate: time.Now(),
+// }

order/entity/order.go

@@ -1,22 +1,20 @@
 package order
 
-import (
-	"time"
-)
+import "github.com/jackc/pgtype"
 
 type OrderEntity struct {
-	ID        string     `db:"id" json:"id"`
-	State     string     `db:"state" json:"state"`
-	CreatedAt time.Time  `db:"created_at" json:"created_at"`
-	UpdatedAt *time.Time `db:"updated_at" json:"updated_at,omitempty"`
+	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 OrderItemEntity 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 time.Time  `db:"created_at" json:"created_at"`
-	UpdatedAt *time.Time `db:"updated_at" json:"updated_at,omitempty"`
+	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"`
 }

order/model/order.go

@@ -2,17 +2,17 @@ package order
 
 import "time"
 
-type Order struct {
-	State     string     `db:"state" json:"state"`
-	CreatedAt time.Time  `db:"created_at" json:"created_at"`
-	UpdatedAt *time.Time `db:"updated_at" json:"updated_at,omitempty"`
+type OrderModel struct {
+	State     string    `db:"state" json:"state"`
+	CreatedAt time.Time `db:"created_at" json:"created_at"`
+	UpdatedAt time.Time `db:"updated_at" json:"updated_at,omitempty"`
 }
 
-type OrderItem struct {
-	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 time.Time  `db:"created_at" json:"created_at"`
-	UpdatedAt *time.Time `db:"updated_at" json:"updated_at,omitempty"`
+type OrderItemModel struct {
+	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 time.Time `db:"created_at" json:"created_at"`
+	UpdatedAt time.Time `db:"updated_at" json:"updated_at,omitempty"`
 }

pricing/model/product_price.go

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