adjust with product category

api/product.go

@@ -13,10 +13,10 @@ import (
 )
 
 type createProductRequest struct {
-	MerchantID    uuid.UUID `json:"merchant_id" binding:"required"`
 	Name              string  `json:"name" binding:"required"`
 	SellingPrice      float64 `json:"selling_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"`
 }
 
@@ -34,6 +34,7 @@ func (server *Server) createProduct(ctx *gin.Context) {
 		Name:              req.Name,
 		SellingPrice:      req.SellingPrice,
 		PurchasePrice:     req.PurchasePrice,
+		ProductCategoryID: uuid.MustParse(req.ProductCategoryID),
 		Stock:             req.Stock,
 	}
 

api/product_category_test.go

@@ -19,7 +19,7 @@ import (
 )
 
 func TestCreateProductCategory(t *testing.T) {
-	productCategory := createRandomProductCategory(t)
+	productCategory := createRandomProductCategory()
 
 	testCases := []struct {
 		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{
 		ID:         uuid.New(),
 		MerchantID: uuid.MustParse("a848090f-0409-4386-9caa-929ae6874dbb"),

api/product_test.go

@@ -15,14 +15,16 @@ import (
 	db "git.nochill.in/nochill/naice_pos/db/sqlc"
 	"git.nochill.in/nochill/naice_pos/token"
 	"git.nochill.in/nochill/naice_pos/util"
+	"github.com/gin-gonic/gin"
 	"github.com/golang/mock/gomock"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 )
 
+var MERCHANTID = "a848090f-0409-4386-9caa-929ae6874dbb"
+
 func TestGetProductApi(t *testing.T) {
-	merchantID := "f9ca13cf-8ab3-4ee3-9530-521ae505caa2"
+	product := randomProduct(MERCHANTID)
-	product := randomProduct(merchantID)
 
 	testCases := []struct {
 		name          string
@@ -41,11 +43,10 @@ func TestGetProductApi(t *testing.T) {
 					Return(product, nil)
 			},
 			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) {
 				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)
 			},
 			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) {
 				require.Equal(t, http.StatusNotFound, recorder.Code)
@@ -104,7 +105,7 @@ func TestGetProductApi(t *testing.T) {
 					Return(db.Product{}, sql.ErrConnDone)
 			},
 			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) {
 				require.Equal(t, http.StatusInternalServerError, recorder.Code)
@@ -119,7 +120,7 @@ func TestGetProductApi(t *testing.T) {
 					Times(0)
 			},
 			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) {
 				require.Equal(t, http.StatusBadRequest, recorder.Code)
@@ -153,13 +154,86 @@ 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 {
+	productCategory := createRandomProductCategory()
 	return db.Product{
 		ID:                uuid.New(),
-		MerchantID:    uuid.MustParse("f9ca13cf-8ab3-4ee3-9530-521ae505caa2"),
+		MerchantID:        uuid.MustParse(MERCHANTID),
 		Name:              util.RandomString(5),
 		SellingPrice:      util.RandomFloat(1000, 99999),
 		PurchasePrice:     util.RandomFloat(999, 9999),
+		ProductCategoryID: productCategory.ID,
 		Stock:             util.RandomFloat(100, 99999),
 	}
 }

db/migrations/000004_alter_products_category_id.down.sql

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

db/migrations/000004_alter_products_category_id.up.sql

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

db/query/product.sql

@@ -4,9 +4,10 @@ INSERT INTO products (
   name,
   selling_price,
   purchase_price,
+  product_category_id,
   stock
 ) VALUES (
-  $1, $2, $3, $4, $5
+  $1, $2, $3, $4, $5, $6
 )
 RETURNING *;
 
@@ -34,7 +35,7 @@ OFFSET $3;
 
 -- name: UpdateProduct :one
 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
 RETURNING *;
 

db/sqlc/product.sql.go

@@ -1,7 +1,7 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
 //   sqlc v1.17.2
-// source: products.sql
+// source: product.sql
 
 package db
 
@@ -18,9 +18,10 @@ INSERT INTO products (
   name,
   selling_price,
   purchase_price,
+  product_category_id,
   stock
 ) 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
 `
@@ -30,6 +31,7 @@ type CreateProductParams struct {
 	Name              string    `json:"name"`
 	SellingPrice      float64   `json:"selling_price"`
 	PurchasePrice     float64   `json:"purchase_price"`
+	ProductCategoryID uuid.UUID `json:"product_category_id"`
 	Stock             float64   `json:"stock"`
 }
 
@@ -39,6 +41,7 @@ func (q *Queries) CreateProduct(ctx context.Context, arg CreateProductParams) (P
 		arg.Name,
 		arg.SellingPrice,
 		arg.PurchasePrice,
+		arg.ProductCategoryID,
 		arg.Stock,
 	)
 	var i Product
@@ -164,7 +167,7 @@ func (q *Queries) ListProducts(ctx context.Context, arg ListProductsParams) ([]P
 
 const updateProduct = `-- name: UpdateProduct :one
 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
 RETURNING id, merchant_id, index_id, name, selling_price, purchase_price, stock, created_at, updated_at, product_category_id
 `
@@ -174,6 +177,7 @@ type UpdateProductParams struct {
 	Name              string       `json:"name"`
 	SellingPrice      float64      `json:"selling_price"`
 	PurchasePrice     float64      `json:"purchase_price"`
+	ProductCategoryID uuid.UUID    `json:"product_category_id"`
 	UpdatedAt         sql.NullTime `json:"updated_at"`
 }
 
@@ -183,6 +187,7 @@ func (q *Queries) UpdateProduct(ctx context.Context, arg UpdateProductParams) (P
 		arg.Name,
 		arg.SellingPrice,
 		arg.PurchasePrice,
+		arg.ProductCategoryID,
 		arg.UpdatedAt,
 	)
 	var i Product

db/sqlc/product_test.go

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