Merge pull request #4 from pangolin-do-golang/http-request-to-services

feature: adding cleanup and loadcart

Author: lzfrs

.air.toml

@@ -5,7 +5,7 @@ tmp_dir = "tmp"
 [build]
   args_bin = []
   bin = "./tmp/main"
-  cmd = "go build -o ./tmp/main ./cmd/rest/main.go"
+  cmd = "go build -o ./tmp/main ./cmd/http/main.go"
   delay = 1000
   exclude_dir = ["assets", "tmp", "vendor", "testdata"]
   exclude_file = []

.github/workflows/BuildApp.yaml

@@ -6,8 +6,7 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
+    types: [opened, synchronize, reopened]
 
 
 jobs:
@@ -24,19 +23,32 @@ jobs:
         with:
           length: 7
 
+      - name: Setup GoLang
+        uses: actions/setup-go@v3
+        with:
+          go-version: '1.23.3'
+
+      - name: Build And Test
+        shell: bash
+        run: |
+          go test -cover ./internal/... -covermode=atomic -coverprofile=coverage.out
+
       - name: SonarCloud Scan
         uses: SonarSource/sonarcloud-github-action@master
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
           SHA: ${{ steps.short-sha.outputs.sha }}
         with:
+          projectBaseDir: ./
           args: >
             -Dsonar.organization=pangolin-golang
             -Dsonar.projectKey=pangolin-do-golang_tech-challenge-cart-api
             -Dsonar.projectVersion=${{ env.SHA }}
+            -Dsonar.language=go
             -Dsonar.qualitygate.wait=true
             -Dsonar.tests=internal/
+            -Dsonar.go.coverage.reportPaths=coverage.out            
             -Dsonar.verbose=true
 
       - name: Login to GitHub Container Registry

internal/adapters/rest/controller/cart_controller.go

@@ -1,9 +1,10 @@
 package controller
 
 import (
+	"net/http"
+
 	"github.com/pangolin-do-golang/tech-challenge-cart-api/internal/core/cart"
 	"github.com/pangolin-do-golang/tech-challenge-cart-api/internal/errutil"
-	"net/http"
 
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
@@ -154,3 +155,51 @@ func (ctrl CartController) Overview(c *gin.Context) {
 
 	c.JSON(http.StatusOK, fullcart)
 }
+
+type CleanupPayload struct {
+	ClientID uuid.UUID `json:"client_id" binding:"required" format:"uuid"`
+}
+
+func (ctrl CartController) Cleanup(c *gin.Context) {
+	payload := &CleanupPayload{}
+
+	err := c.BindJSON(payload)
+
+	if err != nil {
+		ctrl.Error(c, errutil.NewInputError(err))
+		return
+	}
+
+	err = ctrl.service.Cleanup(payload.ClientID)
+
+	if err != nil {
+		ctrl.Error(c, err)
+		return
+	}
+
+	c.Status(http.StatusOK)
+}
+
+type LoadCardPayload struct {
+	ClientID uuid.UUID `json:"client_id" binding:"required" format:"uuid"`
+}
+
+func (ctrl CartController) LoadCart(c *gin.Context) {
+	payload := &LoadCardPayload{}
+
+	err := c.BindJSON(payload)
+
+	if err != nil {
+		ctrl.Error(c, errutil.NewInputError(err))
+		return
+	}
+
+	cart, err := ctrl.service.LoadCart(payload.ClientID)
+
+	if err != nil {
+		ctrl.Error(c, err)
+		return
+	}
+
+	c.JSON(http.StatusOK, cart)
+}

internal/adapters/rest/controller/product_controller.go

@@ -1,11 +1,12 @@
 package controller
 
 import (
+	"net/http"
+
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 	"github.com/pangolin-do-golang/tech-challenge-cart-api/internal/core/product"
 	"github.com/pangolin-do-golang/tech-challenge-cart-api/internal/errutil"
-	"net/http"
 )
 
 type ProductController struct {
@@ -67,3 +68,21 @@ func (ctrl *ProductController) Delete(c *gin.Context) {
 
 	c.JSON(http.StatusNoContent, gin.H{})
 }
+
+func (ctrl *ProductController) GetById(c *gin.Context) {
+	id, err := uuid.Parse(c.Param("id"))
+
+	if err != nil {
+		ctrl.Error(c, errutil.NewInputError(err))
+		return
+	}
+
+	product, err := ctrl.service.GetByID(id)
+
+	if err != nil {
+		ctrl.Error(c, err)
+		return
+	}
+
+	c.JSON(http.StatusOK, product)
+}

internal/adapters/rest/handler/cart.go

@@ -13,4 +13,7 @@ func RegisterCartHandlers(router *gin.Engine, service cart.IService) {
 	router.POST("/cart/add-product", cartController.AddProduct)
 	router.POST("/cart/remove-product", cartController.RemoveProduct)
 	router.POST("/cart/edit-product", cartController.EditProduct)
+	router.POST("/cart/cleanup", cartController.Cleanup)
+	router.POST("/cart/loadcart", cartController.LoadCart)
+
 }

internal/adapters/rest/handler/product.go

@@ -10,6 +10,7 @@ func RegisterProductHandlers(router *gin.Engine, service product.IProductService
 	productController := controller.NewProductController(service)
 
 	router.GET("/product", productController.Search)
+	router.GET("product/:id", productController.GetById)
 
 	router.DELETE("/product/:id")
 }