Some refactoring in controllers

src/config/sessions.go

@@ -8,7 +8,6 @@ import (
 var Store *session.Store
 
 func NewStore() *session.Store {
-
 	Store = session.New()
 
 	Store.RegisterType([]models.CartItem{})

src/controllers/cart/add-to-cart.go

@@ -4,7 +4,7 @@ import (
 	"strconv"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/isakgranqvist2021/dropstore/src/config"
+	"github.com/isakgranqvist2021/dropstore/src/helpers/cart"
 	"github.com/isakgranqvist2021/dropstore/src/models"
 )
 
@@ -23,27 +23,7 @@ func AddToCart(c *fiber.Ctx) error {
 
 	newItem.ID = int(productId)
 
-	sess, err := config.GetStore().Get(c)
-
-	if err != nil {
-		return c.Redirect("/error")
-	}
-
-	cartInventory := sess.Get("CART_INVENTORY")
-
-	if err != nil {
-		return c.Redirect("/error")
-	}
-
-	if cartInventory != nil {
-		cartInventory = append(cartInventory.([]models.CartItem), newItem)
-	} else {
-		cartInventory = []models.CartItem{newItem}
-	}
-
-	sess.Set("CART_INVENTORY", cartInventory)
-
-	if err := sess.Save(); err != nil {
+	if err := cart.AddToCartAndUpdateSession(c, newItem); err != nil {
 		return c.Redirect("/error")
 	}
 

src/controllers/cart/change-qty.go

@@ -4,8 +4,7 @@ import (
 	"strconv"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/isakgranqvist2021/dropstore/src/config"
-	"github.com/isakgranqvist2021/dropstore/src/models"
+	"github.com/isakgranqvist2021/dropstore/src/helpers/cart"
 )
 
 func ChangeQuantity(c *fiber.Ctx) error {
@@ -17,38 +16,11 @@ func ChangeQuantity(c *fiber.Ctx) error {
 		return c.Redirect("/error")
 	}
 
-	sess, err := config.GetStore().Get(c)
+	err = cart.ChangeQtyAndUpdateSession(c, int(productId), action)
 
 	if err != nil {
 		return c.Redirect("/error")
 	}
 
-	cartInventory := sess.Get("CART_INVENTORY").([]models.CartItem)
-
-	for i, v := range cartInventory {
-		if productId == int64(v.ID) {
-			product := &cartInventory[i]
-
-			switch action {
-			case "increment":
-				product.Quantity += 1
-			case "decrement":
-				product.Quantity -= 1
-			default:
-				return c.Redirect("/error")
-			}
-
-			if product.Quantity == 0 {
-				cartInventory = append(cartInventory[:i], cartInventory[i+1:]...)
-			}
-		}
-	}
-
-	sess.Set("CART_INVENTORY", cartInventory)
-
-	if err := sess.Save(); err != nil {
-		return c.Redirect("/error")
-	}
-
 	return c.Redirect("/checkout")
 }

src/controllers/checkout/checkout.go

@@ -24,12 +24,6 @@ func Checkout(c *fiber.Ctx) error {
 
 	products := utils.JoinCart(cartInventory)
 
-	sess.Set("GO_BACK_HREF", "/checkout")
-
-	if err := sess.Save(); err != nil {
-		return c.Redirect("/error")
-	}
-
 	return c.Render("pages/checkout", fiber.Map{
 		"Products": products,
 	})

src/helpers/alert/get-alert.go

@@ -0,0 +1 @@
+package alert

src/helpers/alert/set-alert.go

@@ -0,0 +1 @@
+package alert

src/helpers/cart/add-to-cart.go

@@ -0,0 +1,31 @@
+package cart
+
+import (
+	"github.com/gofiber/fiber/v2"
+	"github.com/isakgranqvist2021/dropstore/src/config"
+	"github.com/isakgranqvist2021/dropstore/src/models"
+)
+
+func AddToCartAndUpdateSession(c *fiber.Ctx, newItem models.CartItem) error {
+	sess, err := config.GetStore().Get(c)
+
+	if err != nil {
+		return err
+	}
+
+	cartInventory := sess.Get("CART_INVENTORY")
+
+	if cartInventory != nil {
+		cartInventory = append(cartInventory.([]models.CartItem), newItem)
+	} else {
+		cartInventory = []models.CartItem{newItem}
+	}
+
+	sess.Set("CART_INVENTORY", cartInventory)
+
+	if err := sess.Save(); err != nil {
+		return err
+	}
+
+	return nil
+}

src/helpers/cart/change-qty.go

@@ -0,0 +1,44 @@
+package cart
+
+import (
+	"github.com/gofiber/fiber/v2"
+	"github.com/isakgranqvist2021/dropstore/src/config"
+	"github.com/isakgranqvist2021/dropstore/src/models"
+)
+
+func ChangeQtyAndUpdateSession(c *fiber.Ctx, productId int, action string) error {
+	sess, err := config.GetStore().Get(c)
+
+	if err != nil {
+		return err
+	}
+
+	cartInventory := sess.Get("CART_INVENTORY").([]models.CartItem)
+
+	for i, v := range cartInventory {
+		if productId == v.ID {
+			product := &cartInventory[i]
+
+			switch action {
+			case "increment":
+				product.Quantity += 1
+			case "decrement":
+				product.Quantity -= 1
+			default:
+				return err
+			}
+
+			if product.Quantity == 0 {
+				cartInventory = append(cartInventory[:i], cartInventory[i+1:]...)
+			}
+		}
+	}
+
+	sess.Set("CART_INVENTORY", cartInventory)
+
+	if err := sess.Save(); err != nil {
+		return err
+	}
+
+	return nil
+}