From a82b6812e3a0c69f79e2d9a98d19f3d9868dd1d8 Mon Sep 17 00:00:00 2001
From: Diana <diana.navarrete@oohrd.com>
Date: Sat, 28 Sep 2024 17:40:42 -0500
Subject: [PATCH] get body request, validator fix

---
 context.go   | 30 ++++++++++++++++++++++++++++++
 validator.go | 12 ++++--------
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/context.go b/context.go
index 30c750b..3d21cbc 100644
--- a/context.go
+++ b/context.go
@@ -68,6 +68,36 @@ func (c *Context) RequestParamExists(key string) bool {
 	return c.Request.httpRequest.Form.Has(key)
 }
 
+func (c *Context) GetRequesForm() interface{} {
+	return c.Request.httpRequest.Form
+}
+
+func (c *Context) GetRequesBodyMap() map[string]interface{} {
+	var dat map[string]any
+	body := c.Request.httpRequest.Body
+	if body != nil {
+		if content, err := io.ReadAll(body); err == nil {
+			json.Unmarshal(content, &dat)
+		}
+	}
+	return dat
+}
+
+// get json body and bind to dest interface
+func (c *Context) GetRequesBodyStruct(dest interface{}) error {
+	body := c.Request.httpRequest.Body
+	if body != nil {
+		value := reflect.ValueOf(dest)
+		if value.Kind() != reflect.Ptr {
+			fmt.Println("dest is not a pointer")
+			return errors.New("dest is not a pointer")
+		}
+		err := json.NewDecoder(body).Decode(dest)
+		return err
+	}
+	return nil
+}
+
 func (c *Context) GetHeader(key string) string {
 	return c.Request.httpRequest.Header.Get(key)
 }
diff --git a/validator.go b/validator.go
index 7d8eac8..ba4d8a2 100644
--- a/validator.go
+++ b/validator.go
@@ -33,18 +33,14 @@ func (v *Validator) Validate(data map[string]interface{}, rules map[string]inter
 	vr = validationResult{}
 	vr.hasFailed = false
 	res := map[string]string{}
-	for key, val := range data {
-		_, ok := rules[key]
-		if !ok {
-			continue
-		}
-		rls, err := parseRules(rules[key])
+	for rule_key, rule_val := range rules {
+		rls, err := parseRules(rule_val)
 		if err != nil {
 			panic(err.Error())
 		}
-		err = validation.Validate(val, rls...)
+		err = validation.Validate(data[rule_key], rls...)
 		if err != nil {
-			res[key] = fmt.Sprintf("%v: %v", key, err.Error())
+			res[rule_key] = fmt.Sprintf("%v: %v", rule_key, err.Error())
 
 		}
 	}