nochill/naise_pos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjust with product category

Browse Source
This commit is contained in:
nochill 2023-03-16 20:37:20 +07:00
parent caf41e81e0
commit 9a22afe984
8 changed files with 130 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
api/product.go
View File

@ -13,11 +13,11 @@ import (
) )
type createProductRequest struct { type createProductRequest struct {
MerchantID uuid.UUID `json:"merchant_id" binding:"required"` Name string `json:"name" binding:"required"`
Name string `json:"name" binding:"required"` SellingPrice float64 `json:"selling_price" binding:"required"`
SellingPrice float64 `json:"selling_price" binding:"required"` PurchasePrice float64 `json:"purchase_price" binding:"required"`
PurchasePrice float64 `json:"purchase_price" binding:"required"` ProductCategoryID string `json:"product_category_id" binding:"required,uuid"`
Stock float64 `json:"stock" binding:"number"` Stock float64 `json:"stock" binding:"number"`
} }
func (server *Server) createProduct(ctx *gin.Context) { func (server *Server) createProduct(ctx *gin.Context) {
@ -30,11 +30,12 @@ func (server *Server) createProduct(ctx *gin.Context) {
authPayload := ctx.MustGet(authorizationPayloadKey).(*token.Payload) authPayload := ctx.MustGet(authorizationPayloadKey).(*token.Payload)
arg := db.CreateProductParams{ arg := db.CreateProductParams{
MerchantID: authPayload.MerchantID, MerchantID: authPayload.MerchantID,
Name: req.Name, Name: req.Name,
SellingPrice: req.SellingPrice, SellingPrice: req.SellingPrice,
PurchasePrice: req.PurchasePrice, PurchasePrice: req.PurchasePrice,
Stock: req.Stock, ProductCategoryID: uuid.MustParse(req.ProductCategoryID),
Stock: req.Stock,
} }
product, err := server.store.CreateProduct(ctx, arg) product, err := server.store.CreateProduct(ctx, arg)

4
api/product_category_test.go
View File

@ -19,7 +19,7 @@ import (
) )
func TestCreateProductCategory(t *testing.T) { func TestCreateProductCategory(t *testing.T) {
productCategory := createRandomProductCategory(t) productCategory := createRandomProductCategory()
testCases := []struct { testCases := []struct {
name string name string
@ -80,7 +80,7 @@ func TestCreateProductCategory(t *testing.T) {
} }
} }
func createRandomProductCategory(t *testing.T) db.ProductCategory { func createRandomProductCategory() db.ProductCategory {
return db.ProductCategory{ return db.ProductCategory{
ID: uuid.New(), ID: uuid.New(),
MerchantID: uuid.MustParse("a848090f-0409-4386-9caa-929ae6874dbb"), MerchantID: uuid.MustParse("a848090f-0409-4386-9caa-929ae6874dbb"),

100
api/product_test.go
View File

@ -15,14 +15,16 @@ import (
db "git.nochill.in/nochill/naice_pos/db/sqlc" db "git.nochill.in/nochill/naice_pos/db/sqlc"
"git.nochill.in/nochill/naice_pos/token" "git.nochill.in/nochill/naice_pos/token"
"git.nochill.in/nochill/naice_pos/util" "git.nochill.in/nochill/naice_pos/util"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock" "github.com/golang/mock/gomock"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
var MERCHANTID = "a848090f-0409-4386-9caa-929ae6874dbb"
func TestGetProductApi(t *testing.T) { func TestGetProductApi(t *testing.T) {
merchantID := "f9ca13cf-8ab3-4ee3-9530-521ae505caa2" product := randomProduct(MERCHANTID)
product := randomProduct(merchantID)
testCases := []struct { testCases := []struct {
name string name string
@ -41,11 +43,10 @@ func TestGetProductApi(t *testing.T) {
Return(product, nil) Return(product, nil)
}, },
setupAuth: func(t *testing.T, request *http.Request, tokenMaker token.Maker) { setupAuth: func(t *testing.T, request *http.Request, tokenMaker token.Maker) {
addAuthorization(t, request, tokenMaker, authorizationTypeBearer, "email", merchantID, time.Minute) addAuthorization(t, request, tokenMaker, authorizationTypeBearer, "email", MERCHANTID, time.Minute)
}, },
checkResponse: func(t *testing.T, recorder *httptest.ResponseRecorder) { checkResponse: func(t *testing.T, recorder *httptest.ResponseRecorder) {
require.Equal(t, http.StatusOK, recorder.Code) require.Equal(t, http.StatusOK, recorder.Code)
requireBodyMatchAccount(t, recorder.Body, product)
}, },
}, },
{ {
@ -58,7 +59,7 @@ func TestGetProductApi(t *testing.T) {
Return(db.Product{}, sql.ErrNoRows) Return(db.Product{}, sql.ErrNoRows)
}, },
setupAuth: func(t *testing.T, request *http.Request, tokenMaker token.Maker) { setupAuth: func(t *testing.T, request *http.Request, tokenMaker token.Maker) {
addAuthorization(t, request, tokenMaker, authorizationTypeBearer, "email", merchantID, time.Minute) addAuthorization(t, request, tokenMaker, authorizationTypeBearer, "email", MERCHANTID, time.Minute)
}, },
checkResponse: func(t *testing.T, recorder *httptest.ResponseRecorder) { checkResponse: func(t *testing.T, recorder *httptest.ResponseRecorder) {
require.Equal(t, http.StatusNotFound, recorder.Code) require.Equal(t, http.StatusNotFound, recorder.Code)
@ -104,7 +105,7 @@ func TestGetProductApi(t *testing.T) {
Return(db.Product{}, sql.ErrConnDone) Return(db.Product{}, sql.ErrConnDone)
}, },
setupAuth: func(t *testing.T, request *http.Request, tokenMaker token.Maker) { setupAuth: func(t *testing.T, request *http.Request, tokenMaker token.Maker) {
addAuthorization(t, request, tokenMaker, authorizationTypeBearer, "email", merchantID, time.Minute) addAuthorization(t, request, tokenMaker, authorizationTypeBearer, "email", MERCHANTID, time.Minute)
}, },
checkResponse: func(t *testing.T, recorder *httptest.ResponseRecorder) { checkResponse: func(t *testing.T, recorder *httptest.ResponseRecorder) {
require.Equal(t, http.StatusInternalServerError, recorder.Code) require.Equal(t, http.StatusInternalServerError, recorder.Code)
@ -119,7 +120,7 @@ func TestGetProductApi(t *testing.T) {
Times(0) Times(0)
}, },
setupAuth: func(t *testing.T, request *http.Request, tokenMaker token.Maker) { setupAuth: func(t *testing.T, request *http.Request, tokenMaker token.Maker) {
addAuthorization(t, request, tokenMaker, authorizationTypeBearer, "email", merchantID, time.Minute) addAuthorization(t, request, tokenMaker, authorizationTypeBearer, "email", MERCHANTID, time.Minute)
}, },
checkResponse: func(t *testing.T, recorder *httptest.ResponseRecorder) { checkResponse: func(t *testing.T, recorder *httptest.ResponseRecorder) {
require.Equal(t, http.StatusBadRequest, recorder.Code) require.Equal(t, http.StatusBadRequest, recorder.Code)
@ -153,14 +154,87 @@ func TestGetProductApi(t *testing.T) {
} }
} }
func TestCreateProductApi(t *testing.T) {
product := randomProduct(MERCHANTID)
testCases := []struct {
name string
body gin.H
buildStubs func(store *mockdb.MockStore)
setupAuth func(t *testing.T, request *http.Request, tokenMaker token.Maker)
checkResponse func(t *testing.T, recorder *httptest.ResponseRecorder)
}{
{
name: "OK",
body: gin.H{
"name": product.Name,
"selling_price": product.SellingPrice,
"purchase_price": product.PurchasePrice,
"product_category_id": product.ProductCategoryID,
"stock": product.Stock,
},
buildStubs: func(store *mockdb.MockStore) {
arg := db.CreateProductParams{
MerchantID: product.MerchantID,
Name: product.Name,
SellingPrice: product.SellingPrice,
PurchasePrice: product.PurchasePrice,
ProductCategoryID: product.ProductCategoryID,
Stock: product.Stock,
}
store.EXPECT().
CreateProduct(gomock.Any(), gomock.Eq(arg)).
Times(1).
Return(product, nil)
},
setupAuth: func(t *testing.T, request *http.Request, tokenMaker token.Maker) {
addAuthorization(t, request, tokenMaker, authorizationTypeBearer, "email", MERCHANTID, time.Minute)
},
checkResponse: func(t *testing.T, recorder *httptest.ResponseRecorder) {
require.Equal(t, http.StatusOK, recorder.Code)
},
},
}
for i := range testCases {
tc := testCases[i]
t.Run(tc.name, func(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()
store := mockdb.NewMockStore(ctrl)
tc.buildStubs(store)
data, err := json.Marshal(tc.body)
require.NoError(t, err)
server := newTestServer(t, store)
recorder := httptest.NewRecorder()
url := "/api/products"
request, err := http.NewRequest(http.MethodPost, url, bytes.NewReader(data))
require.NoError(t, err)
tc.setupAuth(t, request, server.tokenMaker)
server.router.ServeHTTP(recorder, request)
tc.checkResponse(t, recorder)
})
}
}
func randomProduct(merchantID string) db.Product { func randomProduct(merchantID string) db.Product {
productCategory := createRandomProductCategory()
return db.Product{ return db.Product{
ID: uuid.New(), ID: uuid.New(),
MerchantID: uuid.MustParse("f9ca13cf-8ab3-4ee3-9530-521ae505caa2"), MerchantID: uuid.MustParse(MERCHANTID),
Name: util.RandomString(5), Name: util.RandomString(5),
SellingPrice: util.RandomFloat(1000, 99999), SellingPrice: util.RandomFloat(1000, 99999),
PurchasePrice: util.RandomFloat(999, 9999), PurchasePrice: util.RandomFloat(999, 9999),
Stock: util.RandomFloat(100, 99999), ProductCategoryID: productCategory.ID,
Stock: util.RandomFloat(100, 99999),
} }
} }

1
db/migrations/000004_alter_products_category_id.down.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE "products" ALTER COLUMN "product_category_id" SET DEFAULT gen_random_uuid();

1
db/migrations/000004_alter_products_category_id.up.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE products ALTER COLUMN product_category_id DROP DEFAULT;

5
db/query/products.sql → db/query/product.sql
View File

@ -4,9 +4,10 @@ INSERT INTO products (
name, name,
selling_price, selling_price,
purchase_price, purchase_price,
product_category_id,
stock stock
) VALUES ( ) VALUES (
$1, $2, $3, $4, $5 $1, $2, $3, $4, $5, $6
) )
RETURNING *; RETURNING *;
@ -34,7 +35,7 @@ OFFSET $3;
-- name: UpdateProduct :one -- name: UpdateProduct :one
UPDATE products UPDATE products
SET name = $2, selling_price = $3, purchase_price = $4, updated_at = $5 SET name = $2, selling_price = $3, purchase_price = $4, product_category_id = $5, updated_at = $6
WHERE id = $1 WHERE id = $1
RETURNING *; RETURNING *;

31
db/sqlc/products.sql.go → db/sqlc/product.sql.go
View File

@ -1,7 +1,7 @@
// Code generated by sqlc. DO NOT EDIT. // Code generated by sqlc. DO NOT EDIT.
// versions: // versions:
// sqlc v1.17.2 // sqlc v1.17.2
// source: products.sql // source: product.sql
package db package db
@ -18,19 +18,21 @@ INSERT INTO products (
name, name,
selling_price, selling_price,
purchase_price, purchase_price,
product_category_id,
stock stock
) VALUES ( ) VALUES (
$1, $2, $3, $4, $5 $1, $2, $3, $4, $5, $6
) )
RETURNING id, merchant_id, index_id, name, selling_price, purchase_price, stock, created_at, updated_at, product_category_id RETURNING id, merchant_id, index_id, name, selling_price, purchase_price, stock, created_at, updated_at, product_category_id
` `
type CreateProductParams struct { type CreateProductParams struct {
MerchantID uuid.UUID `json:"merchant_id"` MerchantID uuid.UUID `json:"merchant_id"`
Name string `json:"name"` Name string `json:"name"`
SellingPrice float64 `json:"selling_price"` SellingPrice float64 `json:"selling_price"`
PurchasePrice float64 `json:"purchase_price"` PurchasePrice float64 `json:"purchase_price"`
Stock float64 `json:"stock"` ProductCategoryID uuid.UUID `json:"product_category_id"`
Stock float64 `json:"stock"`
} }
func (q *Queries) CreateProduct(ctx context.Context, arg CreateProductParams) (Product, error) { func (q *Queries) CreateProduct(ctx context.Context, arg CreateProductParams) (Product, error) {
@ -39,6 +41,7 @@ func (q *Queries) CreateProduct(ctx context.Context, arg CreateProductParams) (P
arg.Name, arg.Name,
arg.SellingPrice, arg.SellingPrice,
arg.PurchasePrice, arg.PurchasePrice,
arg.ProductCategoryID,
arg.Stock, arg.Stock,
) )
var i Product var i Product
@ -164,17 +167,18 @@ func (q *Queries) ListProducts(ctx context.Context, arg ListProductsParams) ([]P
const updateProduct = `-- name: UpdateProduct :one const updateProduct = `-- name: UpdateProduct :one
UPDATE products UPDATE products
SET name = $2, selling_price = $3, purchase_price = $4, updated_at = $5 SET name = $2, selling_price = $3, purchase_price = $4, product_category_id = $5, updated_at = $6
WHERE id = $1 WHERE id = $1
RETURNING id, merchant_id, index_id, name, selling_price, purchase_price, stock, created_at, updated_at, product_category_id RETURNING id, merchant_id, index_id, name, selling_price, purchase_price, stock, created_at, updated_at, product_category_id
` `
type UpdateProductParams struct { type UpdateProductParams struct {
ID uuid.UUID `json:"id"` ID uuid.UUID `json:"id"`
Name string `json:"name"` Name string `json:"name"`
SellingPrice float64 `json:"selling_price"` SellingPrice float64 `json:"selling_price"`
PurchasePrice float64 `json:"purchase_price"` PurchasePrice float64 `json:"purchase_price"`
UpdatedAt sql.NullTime `json:"updated_at"` ProductCategoryID uuid.UUID `json:"product_category_id"`
UpdatedAt sql.NullTime `json:"updated_at"`
} }
func (q *Queries) UpdateProduct(ctx context.Context, arg UpdateProductParams) (Product, error) { func (q *Queries) UpdateProduct(ctx context.Context, arg UpdateProductParams) (Product, error) {
@ -183,6 +187,7 @@ func (q *Queries) UpdateProduct(ctx context.Context, arg UpdateProductParams) (P
arg.Name, arg.Name,
arg.SellingPrice, arg.SellingPrice,
arg.PurchasePrice, arg.PurchasePrice,
arg.ProductCategoryID,
arg.UpdatedAt, arg.UpdatedAt,
) )
var i Product var i Product

12
db/sqlc/products_test.go → db/sqlc/product_test.go
View File

@ -16,13 +16,15 @@ func createRandomProduct(t *testing.T) (Product, CreateProductParams) {
sellingPrice := util.RandomFloat(999, 99999) sellingPrice := util.RandomFloat(999, 99999)
purchasePrice := util.RandomFloat(999, 9999) purchasePrice := util.RandomFloat(999, 9999)
stock := util.RandomFloat(10, 10000) stock := util.RandomFloat(10, 10000)
productCategory := createRandomProductCategory(t)
arg := CreateProductParams{ arg := CreateProductParams{
MerchantID: uuid.MustParse("a848090f-0409-4386-9caa-929ae6874dbb"), MerchantID: uuid.MustParse("a848090f-0409-4386-9caa-929ae6874dbb"),
Name: util.RandomString(10), Name: util.RandomString(10),
SellingPrice: sellingPrice, SellingPrice: sellingPrice,
PurchasePrice: purchasePrice, PurchasePrice: purchasePrice,
Stock: stock, ProductCategoryID: productCategory.ID,
Stock: stock,
} }
product, err := testQueries.CreateProduct(context.Background(), arg) product, err := testQueries.CreateProduct(context.Background(), arg)