Added DTO for RemoveFromBasket action

basket/dto/basket.go

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

basket/entity/basket.go

@@ -14,7 +14,7 @@ type BasketEntity struct {
 type BasketItemEntity struct {
 	ID        string           `db:"id" json:"id"`
 	BasketID  string           `db:"basket_id" json:"basket_id"`
-	ProductID int              `db:"product_id" json:"product_id"`
+	ProductID string           `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"`

basket/model/basket.go

@@ -4,15 +4,15 @@ import (
 	"time"
 )
 
-type BasketModel struct {
+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 BasketItemModel struct {
+type BasketItem struct {
 	BasketID  string    `db:"basket_id" json:"basket_id"`
-	ProductID int       `db:"product_id" json:"product_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"`

catalog/dto/product.go

@@ -5,42 +5,27 @@ import (
 )
 
 type GetProductRequestDTO struct {
-	ProductID int `json:"product_id"`
+	ProductID string `json:"product_id"`
 }
 
 type GetProductResponseDTO struct {
-	ID        int           `json:"id"`
+	ID        string     `json:"id"`
-	PID       string        `json:"pid"`
+	Name      string     `json:"name"`
-	Name      string        `json:"name"`
+	Slug      string     `json:"slug"`
-	Price     float64       `json:"price"`
+	Price     float64    `json:"price"`
-	CreatedAt time.Duration `json:"created_at"`
+	CreatedAt time.Time  `json:"created_at"`
-	UpdatedAt time.Duration `json:"updated_at,omitempty"`
+	UpdatedAt *time.Time `json:"updated_at,omitempty"`
-}
-
-type GetProductListRequestDTO struct {
-	CategoryID int `json:"category_id"`
 }
 
 type GetProductListResponseDTO struct {
 	Products []GetProductResponseDTO `json:"products"`
 }
 
-type AddProductToBasketRequestDTO struct {
+type GetProductDetailsResponseDTO struct {
-	ProductID int `json:"product_id"`
+	ID        string     `json:"id"`
-	Quantity  int `json:"quantity"`
+	SLug      string     `json:"slug"`
-}
+	Name      string     `json:"name"`
-
+	Price     string     `json:"price"`
-type AddProductToBasketResponseDTO struct {
+	CreatedAt time.Time  `json:"created_at"`
-	ProductID int    `json:"product_id"`
+	UpdatedAt *time.Time `json:"updated_at,omitempty"`
-	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 "github.com/jackc/pgtype"
+import "time"
 
-type ProductEntity struct {
+type Product struct {
-	ID        int              `db:"id"`
+	ID        string     `json:"id", db:"id"`
-	PID       string           `db:"pid"`
+	Slug      string     `json:"slug", db:"slug"`
-	Name      string           `db:"name"`
+	Name      string     `json:"name", db:"name"`
-	Price     float64          `db:"price"`
+	Price     float64    `json:"price", db:"price"`
-	CreatedAt pgtype.Timestamp `db:"created_at"`
+	CreatedAt time.Time  `json:"created_at", db:"created_at"`
-	UpdatedAt pgtype.Timestamp `db:"updated_at,omitempty"`
+	UpdatedAt *time.Time `json:"updated_at", db:"updated_at, omitempty"`
 }

catalog/model/product.go

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

go.mod

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

identity/dto/auth.go

@@ -6,7 +6,15 @@ type AuthLoginRequestDTO struct {
 }
 
 type AuthLoginResponseDTO struct {
-	Token string `json:"jwt_token"`
+	Token string `json:"token"`
+}
+
+type AuthRefreshTokenRequestDTO struct {
+	AccessToken string `json:"access_token"`
+}
+
+type AuthRefreshTokenResponseDTO struct {
+	Token string `json:"token"`
 }
 
 type AuthRegisterRequestDTO struct {

identity/dto/headers.go

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

identity/entity/role.go

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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,12 +3,12 @@ package identity
 import "time"
 
 type User struct {
-	ID         int       `json:"id"`
+	ID        string     `db:"id" json:"id"`
-	Email      string    `json:"email"`
+	Email     string     `db:"email" json:"email"`
-	Username   string    `json:"username"`
+	Username  string     `db:"username" json:"username"`
-	Password   string    `json:"password"`
+	Password  string     `db:"password" json:"password"`
-	CreateDate time.Time `json:"create_date"`
+	CreatedAt time.Time  `db:"created_at" json:"created_at"`
-	ModifyDate time.Time `json:"modify_date"` // FIXME: zero-value issue
+	UpdatedAt *time.Time `db:"updated_at,omitempty" json:"updated_at,omitempty"` // FIXME: zero-value issue
 }
 
 // var TestUser = &User{

order/model/order.go

@@ -2,13 +2,13 @@ package order
 
 import "time"
 
-type OrderModel struct {
+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 OrderItemModel struct {
+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"`

pricing/model/product_price.go

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