♻️ refactor: updated codebase #2

Author: pnguyen215

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/go-playground/universal-translator v0.18.1
 	github.com/go-playground/validator/v10 v10.14.0
 	github.com/go-redis/redis v6.15.9+incompatible
-	github.com/sivaosorg/govm v1.2.6
+	github.com/sivaosorg/govm v1.2.7
 	github.com/sivaosorg/mysqlconn v1.0.3
 	github.com/sivaosorg/postgresconn v1.0.5
 	github.com/sivaosorg/redisconn v1.0.2

go.sum

@@ -120,8 +120,8 @@ github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUA
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/sivaosorg/govm v1.2.6 h1:BCUCNk/yy/rFZ+clMF7ftfw99ZQFO+4QSFV/xe2mWfA=
-github.com/sivaosorg/govm v1.2.6/go.mod h1:rXfPCNGc4ddPf1+VRX8Ytw/5xqehfPRrCr53Oi+cwpw=
+github.com/sivaosorg/govm v1.2.7 h1:r2HZJDMmU4+BLkQ5h6aC6tn2JZ4A7p6S+khd1a23GAk=
+github.com/sivaosorg/govm v1.2.7/go.mod h1:rXfPCNGc4ddPf1+VRX8Ytw/5xqehfPRrCr53Oi+cwpw=
 github.com/sivaosorg/mysqlconn v1.0.3 h1:UoxFe0abN6jibkk+bH3rvsIh+vOacujgJDvSSgTk2kY=
 github.com/sivaosorg/mysqlconn v1.0.3/go.mod h1:NqGtpFwM1E09oTK9G5LOHx0nbtFUjHPTo5V9ob1xCto=
 github.com/sivaosorg/postgresconn v1.0.5 h1:/dWZrGdh09QIj7xjFjxs99SpBHk0RanIincazjdWSnU=

pkg/utils/collection.go

@@ -3,20 +3,17 @@ package utils
 import (
 	"bytes"
 	"io/ioutil"
-	"strings"
 
 	"github.com/gin-gonic/gin"
+
+	"github.com/sivaosorg/govm/charge"
 )
 
 // SnapshotRequestBodyWith reads the request body and handles both form data and other types.
 // It returns the raw body as a byte slice.
 func SnapshotRequestBodyWith(ctx *gin.Context) ([]byte, error) {
 	// Check if the request has a form content type
-	if IsPostForm(ctx) {
-		// err := ctx.Request.ParseForm()
-		// if err != nil {
-		// 	return nil, err
-		// }
+	if charge.IsPostForms(ctx.Request) {
 		ctx.MultipartForm()
 		// Form data is already parsed, so you can access it using ctx.Request.PostForm
 		// Example: formData := ctx.Request.PostForm
@@ -32,18 +29,7 @@ func SnapshotRequestBodyWith(ctx *gin.Context) ([]byte, error) {
 	return raw, err
 }
 
-func IsPostForm(ctx *gin.Context) bool {
-	value := ctx.Request.Header.Get("Content-Type")
-	return value == "application/x-www-form-urlencoded" || strings.Contains(value, "multipart/form-data")
-}
-
-func GetPostFromValues(ctx *gin.Context) map[string]string {
+func GetPostForms(ctx *gin.Context) map[string]string {
 	ctx.MultipartForm()
-	formValues := make(map[string]string)
-	for key, values := range ctx.Request.PostForm {
-		if len(values) > 0 {
-			formValues[key] = values[0]
-		}
-	}
-	return formValues
+	return charge.GetPostForms(ctx.Request)
 }