Fixes in User Entity field names

basket/model/basket.go

@@ -4,13 +4,13 @@ import (
 	"time"
 )
 
-type Basket struct {
+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 {
+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"`

catalog/dto/product.go

@@ -5,20 +5,20 @@ import (
 )
 
 type GetProductRequestDTO struct {
-	ProductID string `json:"product_id"`
+	ProductID int `json:"product_id"`
 }
 
 type GetProductResponseDTO struct {
-	ID        string     `json:"id"`
+	ID        int           `json:"id"`
-	Name      string     `json:"name"`
+	PID       string        `json:"pid"`
-	Slug      string     `json:"slug"`
+	Name      string        `json:"name"`
-	Price     float64    `json:"price"`
+	Price     float64       `json:"price"`
-	CreatedAt time.Time  `json:"created_at"`
+	CreatedAt time.Duration `json:"created_at"`
-	UpdatedAt *time.Time `json:"updated_at"`
+	UpdatedAt time.Duration `json:"updated_at,omitempty"`
 }
 
 type GetProductListRequestDTO struct {
-	CategoryID string `json:"category_id"`
+	CategoryID int `json:"category_id"`
 }
 
 type GetProductListResponseDTO struct {
@@ -26,21 +26,21 @@ type GetProductListResponseDTO struct {
 }
 
 type AddProductToBasketRequestDTO struct {
-	ProductID string `json:"product_id"`
+	ProductID int `json:"product_id"`
-	Quantity  int    `json:"quantity"`
+	Quantity  int `json:"quantity"`
 }
 
 type AddProductToBasketResponseDTO struct {
-	ProductID string `json:"product_id"`
+	ProductID int    `json:"product_id"`
 	BasketID  string `json:"basket_id"`
 }
 
 type RemoveProductFromBasketRequestDTO struct {
-	ProductID string `json:"product_id"`
+	ProductID int `json:"product_id"`
-	Quantity  int    `json:"quantity"`
+	Quantity  int `json:"quantity"`
 }
 
 type RemoveProductFromBasketResponseDTO struct {
-	ProductID string `json:"product_id"`
+	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 {
+type ProductEntity struct {
-	ID        string     `json:"id", db:"id"`
+	ID        int              `db:"id"`
-	Slug      string     `json:"slug", db:"slug"`
+	PID       string           `db:"pid"`
-	Name      string     `json:"name", db:"name"`
+	Name      string           `db:"name"`
-	Price     float64    `json:"price", db:"price"`
+	Price     float64          `db:"price"`
-	CreatedAt time.Time  `json:"created_at", db:"created_at"`
+	CreatedAt pgtype.Timestamp `db:"created_at"`
-	UpdatedAt *time.Time `json:"updated_at", db:"updated_at, omitempty"`
+	UpdatedAt pgtype.Timestamp `db:"updated_at,omitempty"`
 }

catalog/model/product.go

@@ -4,10 +4,10 @@ import (
 	"time"
 )
 
-type Product struct {
+type ProductModel struct {
-	Name      string     `db:"name"`
+	PID       string    `db:"pid"`
-	Slug      string     `db:"slug"`
+	Name      string    `db:"name"`
-	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"`
+	UpdatedAt time.Time `db:"updated_at,omitempty"`
 }

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

order/model/order.go

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

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"`
 }