Fixed wrong typed Entity, URLAccess is what we need

basket/model/basket.go

@@ -0,0 +1,20 @@
+package basket
+
+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 BasketItem 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"`
+}

basket/model/model.go

@@ -1,22 +0,0 @@
-package basket
-
-import (
-	"github.com/jackc/pgtype"
-)
-
-type BasketModel 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 BasketItemModel struct {
-	// 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"`
-}

catalog/dto/product.go

@@ -1,14 +1,14 @@
-package dto
+package catalog
 
 import (
 	"time"
 )
 
-type GetProductRequest struct {
+type GetProductRequestDTO struct {
 	ProductID int `json:"product_id"`
 }
 
-type GetProductResponse struct {
+type GetProductResponseDTO struct {
 	ID        int           `json:"id"`
 	PID       string        `json:"pid"`
 	Name      string        `json:"name"`
@@ -17,30 +17,30 @@ type GetProductResponse struct {
 	UpdatedAt time.Duration `json:"updated_at,omitempty"`
 }
 
-type GetProductListRequest struct {
+type GetProductListRequestDTO struct {
 	CategoryID int `json:"category_id"`
 }
 
-type GetProductListResponse struct {
+type GetProductListResponseDTO struct {
-	Products []GetProductResponse `json:"products"`
+	Products []GetProductResponseDTO `json:"products"`
 }
 
-type AddProductToBasketRequest struct {
+type AddProductToBasketRequestDTO struct {
 	ProductID int `json:"product_id"`
 	Quantity  int `json:"quantity"`
 }
 
-type AddProductToBasketResponse struct {
+type AddProductToBasketResponseDTO struct {
 	ProductID int    `json:"product_id"`
 	BasketID  string `json:"basket_id"`
 }
 
-type RemoveProductFromBasketRequest struct {
+type RemoveProductFromBasketRequestDTO struct {
 	ProductID int `json:"product_id"`
 	Quantity  int `json:"quantity"`
 }
 
-type RemoveProductFromBasketResponse struct {
+type RemoveProductFromBasketResponseDTO struct {
 	ProductID int    `json:"product_id"`
 	BasketID  string `json:"basket_id"`
 }

catalog/entity/product.go

@@ -1,8 +1,8 @@
-package entity
+package catalog
 
 import "github.com/jackc/pgtype"
 
-type ProductEntity struct {
+type Product struct {
 	ID        int              `db:"id"`
 	PID       string           `db:"pid"`
 	Name      string           `db:"name"`

catalog/model/model.go

@@ -1,12 +0,0 @@
-package model
-
-import "github.com/jackc/pgtype"
-
-type ProductModel 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

@@ -0,0 +1,13 @@
+package catalog
+
+import (
+	"time"
+)
+
+type Product 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"`
+}

common/dto/error.go

@@ -1,9 +1,9 @@
-package dto
+package common
 
 type ErrorResponseDTO struct {
 	Error string `json:"error"`
 }
 
-func Error(err string) *ErrorResponseDTO { // FIXME Can DTOs have functions?
+func NewError(err string) *ErrorResponseDTO { // FIXME Can DTOs have functions?
 	return &ErrorResponseDTO{err}
 }

common/dto/health.go

@@ -1,4 +1,4 @@
-package dto
+package common
 
 type HealthResponseDTO struct {
 	Status string `json:"status"`

common/vo/currency.go

@@ -1,4 +1,4 @@
-package vo
+package common
 
 import "strings"
 
@@ -34,7 +34,7 @@ func (c *Currency) Get() *Currency {
 		return curr
 	}
 
-	return c.getDefault()
+	return c.Default()
 }
 
 func (c *Currency) Equals(oc *Currency) bool {

common/vo/money.go

@@ -1,4 +1,4 @@
-package vo
+package common
 
 type Money struct {
 }

go.mod

@@ -1,4 +1,4 @@
-module git.ego.cloudns.be/egommerce/api-entities
+module git.ego.freeddns.org/egommerce/api-entities
 
 go 1.19
 

identity/dto/auth.go

@@ -0,0 +1,28 @@
+package identity
+
+type AuthLoginRequestDTO struct {
+	Username string `json:"username"`
+	Password string `json:"password"`
+}
+
+type AuthLoginResponseDTO struct {
+	Token string `json:"token"`
+}
+
+type AuthRefreshTokenRequestDTO struct {
+	AccessToken string `json:"access_token"`
+}
+
+type AuthRefreshTokenResponseDTO struct {
+	Token string `json:"token"`
+}
+
+type AuthRegisterRequestDTO struct {
+	Email    string `json:"email"`
+	Username string `json:"username"`
+	Password string `json:"password"`
+}
+
+type AuthRegisterResponseDTO struct {
+	ID string `json:"id"`
+}

identity/dto/dto.go

@@ -1,10 +0,0 @@
-package identity
-
-type AuthLoginRequestDTO struct {
-	Username string `json:"username"`
-	Password string `json:"password"`
-}
-
-type AuthLoginResponseDTO struct {
-	Token string `json:"jwt_token"`
-}

identity/entity/role.go

@@ -0,0 +1,7 @@
+package identity
+
+type Role struct {
+	ID    string `db:"id" json:"id"`
+	Roles []byte `db:"roles" json:"roles"`
+	URL   string `db:"url" json:"url"`
+}

identity/entity/url_access.go

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

identity/entity/user.go

@@ -0,0 +1,19 @@
+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"`
+	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/model/model.go

@@ -1,20 +0,0 @@
-package order
-
-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"`
-}

order/model/order.go

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

pricing/model/product_price.go

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