Fixed wrong typed Entity, URLAccess is what we need

basket/model/basket.go

@@ -4,13 +4,13 @@ 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"`
 	Quantity  int       `db:"quantity" json:"quantity"`

catalog/entity/product.go

@@ -2,7 +2,7 @@ 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/product.go

@@ -4,7 +4,7 @@ import (
 	"time"
 )
 
-type ProductModel struct {
+type Product struct {
 	PID       string    `db:"pid"`
 	Name      string    `db:"name"`
 	Price     float64   `db:"price"`

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 []string `db:"roles" json:"roles"`
+	URL   string   `db:"url" json:"url"`
+}

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