Merge branch 'Rahuls_ValidationMDL_Fixes' into 'devbranch'

Validation module fixes

See merge request !5

validationmdl/validationmdl.go

 package validationmdl
 
 import (
-	"fmt"
 	"net/http"
 	"net/url"
 
@@ -11,11 +10,8 @@ import (
 //ValidateRequest func validates the given model
 func ValidateRequest(httpRequest *http.Request, validationRules, validationMessages govalidator.MapData) map[string]interface{} {
 
-	// fmt.Println("Data received : ", httpRequest.Body)
-
 	//Get the content type of the request as validations for content types are different
 	contentType := httpRequest.Header.Get("Content-Type")
-	fmt.Println("Content type : ", contentType)
 
 	//Initialize the validation errors as blank
 	var validationErrors url.Values
@@ -31,22 +27,16 @@ func ValidateRequest(httpRequest *http.Request, validationRules, validationMessa
 		opts.Messages = validationMessages
 	}
 
-	data := make(map[string]interface{}, 0)
-
-	//Validate request type json and text (RAW data from request)
+	
 	if contentType == "application/json" || contentType == "text/plain" {
-		fmt.Println("Inside if")
-
+		//Validate request type json and text (RAW data from request)
+		data := make(map[string]interface{}, 0)
 		opts.Data = &data
-
 		validator := govalidator.New(opts)
 		validationErrors = validator.ValidateJSON()
 
 	} else {
-		fmt.Println("Inside else2")
-		opts.Data = &data
 		//Validate request type form-data, form-urlencoded
-		//		loggermdl.LogVars("opts : ", opts)
 		validator := govalidator.New(opts)
 		validationErrors = validator.Validate()
 	}

validationmdl/validationmdl_test.go

@@ -205,20 +205,6 @@ func TestValidateRequest(t *testing.T) {
 
 }
 
-// func TestTestingMethod(t *testing.T) {
-
-// 	blankEmailDataFormEnc := RequestBodyData{Email: "", Password: "ytyttt"}
-// 	blankEmailByteArrayFormEnc, _ := ffjson.Marshal(&blankEmailDataFormEnc)
-// 	blankEmailHTTPRequestFormEnc, _ := http.NewRequest("POST", "test.com", bytes.NewBufferString(string(blankEmailByteArrayFormEnc)))
-// 	blankEmailExpectedResultFormEnc := map[string]interface{}{
-// 		"validationErrors": url.Values{
-// 			"email": []string{"Email required", "Email min len", "Invalid email"},
-// 		},
-// 	}
-// 	got := ValidateRequest(blankEmailHTTPRequestFormEnc, validationRules, validationMessages)
-// 	assert.Equal(t, blankEmailExpectedResultFormEnc, got, "Same pahije ")
-// }
-
 func BenchmarkValidationTest(b *testing.B) {
 
 	for i := 0; i < b.N; i++ {
@@ -261,17 +247,16 @@ func BenchmarkValidationTestAgainstYQL(b *testing.B) {
 		Age int64 `json:"age"`
 	}
 
-	for i := 0; i < b.N; i++ {
+	validationRules := govalidator.MapData{
+		"age": []string{"required", "min:23"},
+	}
 
-		validationRules := govalidator.MapData{
-			"age": []string{"required", "min:23"},
-		}
+	sunnyDayData := TestData{Age: 24}
+	sunnyDayByteArray, _ := ffjson.Marshal(&sunnyDayData)
+	sunnyDayHTTPRequest, _ := http.NewRequest("POST", "test.com", bytes.NewBufferString(string(sunnyDayByteArray)))
+	sunnyDayHTTPRequest.Header.Set("Content-Type", "application/json")
 
-		sunnyDayData := TestData{Age: 24}
-		sunnyDayByteArray, _ := ffjson.Marshal(&sunnyDayData)
-		sunnyDayHTTPRequest, _ := http.NewRequest("POST", "test.com", bytes.NewBufferString(string(sunnyDayByteArray)))
-		sunnyDayHTTPRequest.Header.Set("Content-Type", "application/json")
+	for i := 0; i < b.N; i++ {
 		ValidateRequest(sunnyDayHTTPRequest, validationRules, nil)
-
 	}
 }