chore(gomall/tutorial): save ch11 change after course

cloudwego · Jun 5, 2024 · 8fab191 · 8fab191
1 parent 7bf3344
commit 8fab191
Show file tree

Hide file tree

Showing 209 changed files with 3,424 additions and 3,732 deletions.
diff --git a/gomall/tutorial/ch11/.gitignore b/gomall/tutorial/ch11/.gitignore
@@ -0,0 +1,3 @@
+app/*/tmp
+app/*/.env
+app/*/log
diff --git a/gomall/tutorial/ch12/.gitignore b/gomall/tutorial/ch12/.gitignore
@@ -0,0 +1,3 @@
+app/*/tmp
+app/*/.env
+app/*/log
diff --git a/gomall/tutorial/ch12/Makefile b/gomall/tutorial/ch12/Makefile
@@ -1,19 +1,19 @@
 export ROOT_MOD=github.com/cloudwego/biz-demo/gomall
 .PHONY: gen-demo-proto
 gen-demo-proto:
-	@cd demo/demo_proto && cwgo server -I ../../idl --module github.com/cloudwego/biz-demo/gomall/demo/demo_proto --service demo_proto --idl ../../idl/echo.proto
+	@cd demo/demo_proto && cwgo server -I ../../idl --module ${ROOT_MOD}/demo/demo_proto --service demo_proto --idl ../../idl/echo.proto
 
 .PHONY: gen-demo-thrift
 gen-demo-thrift:
-	@cd demo/demo_thrift && cwgo server --module github.com/cloudwego/biz-demo/gomall/demo/demo_thrift --service demo_thrift --idl ../../idl/echo.thrift
+	@cd demo/demo_thrift && cwgo server --module  ${ROOT_MOD}/demo/demo_thrift --service demo_thrift --idl ../../idl/echo.thrift
 
 .PHONY: demo-link-fix
 demo-link-fix:
 	cd demo/demo_proto && golangci-lint run -E gofumpt --path-prefix=. --fix --timeout=5m
 
 .PHONY: gen-frontend
 gen-frontend:
-	@cd app/frontend && cwgo server -I ../../idl --type HTTP --service frontend --module github.com/cloudwego/biz-demo/gomall/app/frontend --idl ../../idl/frontend/checkout_page.proto
+	@cd app/frontend && cwgo server -I ../../idl --type HTTP --service frontend --module ${ROOT_MOD}/app/frontend --idl ../../idl/frontend/checkout_page.proto
 
 .PHONY: gen-user
 gen-user: 
@@ -25,20 +25,18 @@ gen-product:
 	@cd rpc_gen && cwgo client --type RPC --service product --module ${ROOT_MOD}/rpc_gen  -I ../idl  --idl ../idl/product.proto
 	@cd app/product && cwgo server --type RPC --service product --module ${ROOT_MOD}/app/product --pass "-use ${ROOT_MOD}/rpc_gen/kitex_gen"  -I ../../idl  --idl ../../idl/product.proto
 
-
 .PHONY: gen-cart
 gen-cart: 
 	@cd rpc_gen && cwgo client --type RPC --service cart --module ${ROOT_MOD}/rpc_gen  -I ../idl  --idl ../idl/cart.proto
 	@cd app/cart && cwgo server --type RPC --service cart --module ${ROOT_MOD}/app/cart --pass "-use ${ROOT_MOD}/rpc_gen/kitex_gen"  -I ../../idl  --idl ../../idl/cart.proto
 
 
-.PHONY: gen-checkout
-gen-checkout: 
-	@cd rpc_gen && cwgo client --type RPC --service checkout --module ${ROOT_MOD}/rpc_gen  -I ../idl  --idl ../idl/checkout.proto
-	@cd app/checkout && cwgo server --type RPC --service checkout --module ${ROOT_MOD}/app/checkout --pass "-use ${ROOT_MOD}/rpc_gen/kitex_gen"  -I ../../idl  --idl ../../idl/checkout.proto
-
-
 .PHONY: gen-payment
 gen-payment: 
 	@cd rpc_gen && cwgo client --type RPC --service payment --module ${ROOT_MOD}/rpc_gen  -I ../idl  --idl ../idl/payment.proto
-	@cd app/payment && cwgo server --type RPC --service payment --module ${ROOT_MOD}/app/payment --pass "-use ${ROOT_MOD}/rpc_gen/kitex_gen"  -I ../../idl  --idl ../../idl/payment.proto
+	@cd app/payment && cwgo server --type RPC --service payment --module ${ROOT_MOD}/app/payment --pass "-use ${ROOT_MOD}/rpc_gen/kitex_gen"  -I ../../idl  --idl ../../idl/payment.proto
+
+.PHONY: gen-checkout
+gen-checkout: 
+	@cd rpc_gen && cwgo client --type RPC --service checkout --module ${ROOT_MOD}/rpc_gen  -I ../idl  --idl ../idl/checkout.proto
+	@cd app/checkout && cwgo server --type RPC --service checkout --module ${ROOT_MOD}/app/checkout --pass "-use ${ROOT_MOD}/rpc_gen/kitex_gen"  -I ../../idl  --idl ../../idl/checkout.proto
diff --git a/gomall/tutorial/ch12/app/cart/.env.example b/gomall/tutorial/ch12/app/cart/.env.example
@@ -1,5 +1,3 @@
-MYSQL_USER=root
-MYSQL_PASSWORD=root
-MYSQL_HOST=127.0.0.1
-OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://127.0.0.1:4317
-OTEL_EXPORTER_OTLP_INSECURE=true
+MYSQL_USER="root"
+MYSQL_PASSWORD="root"
+MYSQL_HOST="127.0.0.1"
diff --git a/gomall/tutorial/ch12/app/cart/biz/dal/init.go b/gomall/tutorial/ch12/app/cart/biz/dal/init.go
@@ -19,6 +19,6 @@ import (
 )
 
 func Init() {
-	// redis.Init()
+	//redis.Init()
 	mysql.Init()
 }
diff --git a/gomall/tutorial/ch12/app/cart/biz/dal/mysql/init.go b/gomall/tutorial/ch12/app/cart/biz/dal/mysql/init.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/cloudwego/biz-demo/gomall/app/cart/biz/model"
 	"github.com/cloudwego/biz-demo/gomall/app/cart/conf"
+
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 )
@@ -30,7 +31,8 @@ var (
 )
 
 func Init() {
-	DB, err = gorm.Open(mysql.Open(fmt.Sprintf(conf.GetConf().MySQL.DSN, os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASSWORD"), os.Getenv("MYSQL_HOST"))),
+	dsn := fmt.Sprintf(conf.GetConf().MySQL.DSN, os.Getenv("MYSQL_USER"), os.Getenv("MYSQL_PASSWORD"), os.Getenv("MYSQL_HOST"))
+	DB, err = gorm.Open(mysql.Open(dsn),
 		&gorm.Config{
 			PrepareStmt:            true,
 			SkipDefaultTransaction: true,
@@ -39,10 +41,11 @@ func Init() {
 	if err != nil {
 		panic(err)
 	}
+
 	if os.Getenv("GO_ENV") != "online" {
-		//nolint:errcheck
-		DB.AutoMigrate(
-			&model.Cart{},
-		)
+		err = DB.AutoMigrate(&model.Cart{})
+		if err != nil {
+			panic(err)
+		}
 	}
 }
diff --git a/gomall/tutorial/ch12/app/cart/biz/model/base.go b/gomall/tutorial/ch12/app/cart/biz/model/base.go
diff --git a/gomall/tutorial/ch12/app/cart/biz/model/cart.go b/gomall/tutorial/ch12/app/cart/biz/model/cart.go
@@ -22,38 +22,47 @@ import (
 )
 
 type Cart struct {
-	Base
-	UserId    uint32 `json:"user_id"`
-	ProductId uint32 `json:"product_id"`
-	Qty       uint32 `json:"qty"`
+	gorm.Model
+	UserId    uint32 `gorm:"type:int(11);not null;index:idx_user_id"`
+	ProductId uint32 `gorm:"type:int(11);not null;"`
+	Qty       uint32 `gorm:"type:int(11);not null;"`
 }
 
-func (c Cart) TableName() string {
+func (Cart) TableName() string {
 	return "cart"
 }
 
-func GetCartByUserId(db *gorm.DB, ctx context.Context, userId uint32) (cartList []*Cart, err error) {
-	err = db.Debug().WithContext(ctx).Model(&Cart{}).Find(&cartList, "user_id = ?", userId).Error
-	return cartList, err
-}
-
-func AddCart(db *gorm.DB, ctx context.Context, c *Cart) error {
-	var find Cart
-	err := db.WithContext(ctx).Model(&Cart{}).Where(&Cart{UserId: c.UserId, ProductId: c.ProductId}).First(&find).Error
+func AddItem(ctx context.Context, db *gorm.DB, item *Cart) error {
+	var row Cart
+	err := db.WithContext(ctx).
+		Model(&Cart{}).
+		Where(&Cart{UserId: item.UserId, ProductId: item.ProductId}).
+		First(&row).Error
 	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		return err
 	}
-	if find.ID != 0 {
-		err = db.WithContext(ctx).Model(&Cart{}).Where(&Cart{UserId: c.UserId, ProductId: c.ProductId}).UpdateColumn("qty", gorm.Expr("qty+?", c.Qty)).Error
-	} else {
-		err = db.WithContext(ctx).Model(&Cart{}).Create(c).Error
+	if row.ID > 0 {
+		return db.WithContext(ctx).
+			Model(&Cart{}).
+			Where(&Cart{UserId: item.UserId, ProductId: item.ProductId}).
+			UpdateColumn("qty", gorm.Expr("qty+?", item.Qty)).Error
 	}
-	return err
+
+	return db.WithContext(ctx).Create(item).Error
 }
 
-func EmptyCart(db *gorm.DB, ctx context.Context, userId uint32) error {
+func EmptyCart(ctx context.Context, db *gorm.DB, userId uint32) error {
 	if userId == 0 {
-		return errors.New("user_is is required")
+		return errors.New("user id is required")
 	}
 	return db.WithContext(ctx).Delete(&Cart{}, "user_id = ?", userId).Error
 }
+
+func GetCartByUserId(ctx context.Context, db *gorm.DB, userId uint32) ([]*Cart, error) {
+	var rows []*Cart
+	err := db.WithContext(ctx).
+		Model(&Cart{}).
+		Where(&Cart{UserId: userId}).
+		Find(&rows).Error
+	return rows, err
+}
diff --git a/gomall/tutorial/ch12/app/cart/biz/model/cart_test.go b/gomall/tutorial/ch12/app/cart/biz/model/cart_test.go
diff --git a/gomall/tutorial/ch12/app/cart/biz/service/add_item.go b/gomall/tutorial/ch12/app/cart/biz/service/add_item.go
@@ -20,7 +20,6 @@ import (
 	"github.com/cloudwego/biz-demo/gomall/app/cart/biz/dal/mysql"
 	"github.com/cloudwego/biz-demo/gomall/app/cart/biz/model"
 	"github.com/cloudwego/biz-demo/gomall/app/cart/infra/rpc"
-
 	cart "github.com/cloudwego/biz-demo/gomall/rpc_gen/kitex_gen/cart"
 	"github.com/cloudwego/biz-demo/gomall/rpc_gen/kitex_gen/product"
 	"github.com/cloudwego/kitex/pkg/kerrors"
@@ -36,21 +35,21 @@ func NewAddItemService(ctx context.Context) *AddItemService {
 // Run create note info
 func (s *AddItemService) Run(req *cart.AddItemReq) (resp *cart.AddItemResp, err error) {
 	// Finish your business logic.
-	getProduct, err := rpc.ProductClient.GetProduct(s.ctx, &product.GetProductReq{Id: req.Item.GetProductId()})
+	productResp, err := rpc.ProductClient.GetProduct(s.ctx, &product.GetProductReq{Id: req.Item.ProductId})
 	if err != nil {
 		return nil, err
 	}
-
-	if getProduct.Product == nil || getProduct.Product.Id == 0 {
-		return nil, kerrors.NewBizStatusError(40004, "product not exist")
+	if productResp == nil || productResp.Product.Id == 0 {
+		return nil, kerrors.NewBizStatusError(40004, "product not found")
 	}
 
-	err = model.AddCart(mysql.DB, s.ctx, &model.Cart{
+	cartItem := &model.Cart{
 		UserId:    req.UserId,
 		ProductId: req.Item.ProductId,
-		Qty:       uint32(req.Item.Quantity),
-	})
+		Qty:       req.Item.Quantity,
+	}
 
+	err = model.AddItem(s.ctx, mysql.DB, cartItem)
 	if err != nil {
 		return nil, kerrors.NewBizStatusError(50000, err.Error())
 	}

diff --git a/gomall/tutorial/ch12/app/cart/biz/service/add_item_test.go b/gomall/tutorial/ch12/app/cart/biz/service/add_item_test.go
@@ -15,8 +15,22 @@
 package service
 
 import (
+	"context"
 	"testing"
+
+	cart "github.com/cloudwego/biz-demo/gomall/rpc_gen/kitex_gen/cart"
 )
 
 func TestAddItem_Run(t *testing.T) {
+	ctx := context.Background()
+	s := NewAddItemService(ctx)
+	// init req and assert value
+
+	req := &cart.AddItemReq{}
+	resp, err := s.Run(req)
+	t.Logf("err: %v", err)
+	t.Logf("resp: %v", resp)
+
+	// todo: edit your unit test
+
 }
diff --git a/gomall/tutorial/ch12/app/cart/biz/service/empty_cart.go b/gomall/tutorial/ch12/app/cart/biz/service/empty_cart.go
@@ -33,10 +33,9 @@ func NewEmptyCartService(ctx context.Context) *EmptyCartService {
 // Run create note info
 func (s *EmptyCartService) Run(req *cart.EmptyCartReq) (resp *cart.EmptyCartResp, err error) {
 	// Finish your business logic.
-	err = model.EmptyCart(mysql.DB, s.ctx, req.GetUserId())
+	err = model.EmptyCart(s.ctx, mysql.DB, req.UserId)
 	if err != nil {
-		return &cart.EmptyCartResp{}, kerrors.NewBizStatusError(50001, "empty cart error")
+		return nil, kerrors.NewBizStatusError(50001, err.Error())
 	}
-
 	return &cart.EmptyCartResp{}, nil
 }
diff --git a/gomall/tutorial/ch12/app/cart/biz/service/empty_cart_test.go b/gomall/tutorial/ch12/app/cart/biz/service/empty_cart_test.go
@@ -15,8 +15,22 @@
 package service
 
 import (
+	"context"
 	"testing"
+
+	cart "github.com/cloudwego/biz-demo/gomall/rpc_gen/kitex_gen/cart"
 )
 
 func TestEmptyCart_Run(t *testing.T) {
+	ctx := context.Background()
+	s := NewEmptyCartService(ctx)
+	// init req and assert value
+
+	req := &cart.EmptyCartReq{}
+	resp, err := s.Run(req)
+	t.Logf("err: %v", err)
+	t.Logf("resp: %v", resp)
+
+	// todo: edit your unit test
+
 }
diff --git a/gomall/tutorial/ch12/app/cart/biz/service/get_cart.go b/gomall/tutorial/ch12/app/cart/biz/service/get_cart.go
@@ -32,16 +32,17 @@ func NewGetCartService(ctx context.Context) *GetCartService {
 
 // Run create note info
 func (s *GetCartService) Run(req *cart.GetCartReq) (resp *cart.GetCartResp, err error) {
-	// resp = &cart.Cart{}
 	// Finish your business logic.
-	carts, err := model.GetCartByUserId(mysql.DB, s.ctx, req.GetUserId())
+	list, err := model.GetCartByUserId(s.ctx, mysql.DB, req.UserId)
 	if err != nil {
-		return nil, kerrors.NewBizStatusError(50000, err.Error())
+		return nil, kerrors.NewBizStatusError(50002, err.Error())
 	}
 	var items []*cart.CartItem
-	for _, v := range carts {
-		items = append(items, &cart.CartItem{ProductId: v.ProductId, Quantity: int32(v.Qty)})
+	for _, item := range list {
+		items = append(items, &cart.CartItem{
+			ProductId: item.ProductId,
+			Quantity:  item.Qty,
+		})
 	}
-
-	return &cart.GetCartResp{Cart: &cart.Cart{UserId: req.GetUserId(), Items: items}}, nil
+	return &cart.GetCartResp{Items: items}, nil
 }
diff --git a/gomall/tutorial/ch12/app/cart/biz/service/get_cart_test.go b/gomall/tutorial/ch12/app/cart/biz/service/get_cart_test.go
@@ -15,8 +15,22 @@
 package service
 
 import (
+	"context"
 	"testing"
+
+	cart "github.com/cloudwego/biz-demo/gomall/rpc_gen/kitex_gen/cart"
 )
 
 func TestGetCart_Run(t *testing.T) {
+	ctx := context.Background()
+	s := NewGetCartService(ctx)
+	// init req and assert value
+
+	req := &cart.GetCartReq{}
+	resp, err := s.Run(req)
+	t.Logf("err: %v", err)
+	t.Logf("resp: %v", resp)
+
+	// todo: edit your unit test
+
 }
diff --git a/gomall/tutorial/ch12/app/cart/conf/conf.go b/gomall/tutorial/ch12/app/cart/conf/conf.go
@@ -52,7 +52,6 @@ type Redis struct {
 type Kitex struct {
 	Service         string `yaml:"service"`
 	Address         string `yaml:"address"`
-	MetricsPort     string `yaml:"metrics_port"`
 	EnablePprof     bool   `yaml:"enable_pprof"`
 	EnableGzip      bool   `yaml:"enable_gzip"`
 	EnableAccessLog bool   `yaml:"enable_access_log"`

diff --git a/gomall/tutorial/ch12/app/cart/conf/dev/conf.yaml b/gomall/tutorial/ch12/app/cart/conf/dev/conf.yaml
@@ -1,7 +1,6 @@
 kitex:
   service: "cart"
   address: ":8883"
-  metrics_port: ":9993"
   log_level: info
   log_file_name: "log/kitex.log"
   log_max_size: 10
@@ -15,7 +14,7 @@ registry:
   password: ""
 
 mysql:
-  dsn: "%s:%s@tcp(%s:3306)/product?charset=utf8mb4&parseTime=True&loc=Local"
+  dsn: "%s:%s@tcp(%s:3306)/cart?charset=utf8mb4&parseTime=True&loc=Local"
 
 redis:
   address: "127.0.0.1:6379"