Merge pull request #16 from Moranilt/feature/handler-vars-and-query

feat: change decoder config for vars and query variables

handler/handler.go

@@ -93,11 +93,23 @@ func (h *HandlerMaker[ReqT, RespT]) WithVars() *HandlerMaker[ReqT, RespT] {
 		return h
 	}
 	vars := mux.Vars(h.request)
-	err := mapstructure.Decode(vars, &h.requestBody)
+	cfg := &mapstructure.DecoderConfig{
+		WeaklyTypedInput: true,
+		Result:           &h.requestBody,
+	}
+
+	decoder, err := mapstructure.NewDecoder(cfg)
 	if err != nil {
 		h.setError(ErrNotValidBodyFormat, err.Error())
 		return h
 	}
+
+	err = decoder.Decode(vars)
+	if err != nil {
+		h.setError(ErrNotValidBodyFormat, err.Error())
+		return h
+	}
+
 	return h
 }
 
@@ -123,11 +135,24 @@ func (h *HandlerMaker[ReqT, RespT]) WithQuery() *HandlerMaker[ReqT, RespT] {
 	for name, q := range query {
 		queryVars[name] = q[0]
 	}
-	err := mapstructure.Decode(queryVars, &h.requestBody)
+
+	cfg := &mapstructure.DecoderConfig{
+		WeaklyTypedInput: true,
+		Result:           &h.requestBody,
+	}
+
+	decoder, err := mapstructure.NewDecoder(cfg)
 	if err != nil {
 		h.setError(ErrNotValidBodyFormat, err.Error())
 		return h
 	}
+
+	err = decoder.Decode(queryVars)
+	if err != nil {
+		h.setError(ErrNotValidBodyFormat, err.Error())
+		return h
+	}
+
 	return h
 }
 

handler/handler_test.go

@@ -23,6 +23,7 @@ type mockRequest struct {
 	Name    string `json:"name,omitempty" mapstructure:"name"`
 	Phone   string `json:"phone,omitempty" mapstructure:"phone"`
 	Message string `json:"message,omitempty" mapstructure:"message"`
+	Age     int    `json:"age,omitempty" mapstructure:"age"`
 }
 
 type mockRecipient struct {
@@ -146,9 +147,10 @@ func TestHandler(t *testing.T) {
 	})
 
 	t.Run("Run with Vars request", func(t *testing.T) {
-		routePath := "/test-route/{phone}"
+		routePath := "/test-route/{phone}/{age}"
 		vars := map[string]string{
 			"{phone}": "phone_number",
+			"{age}":   "10",
 		}
 
 		testHandler := makeMockedFunction(func(request mockRequest) *mockResponse {
@@ -158,6 +160,12 @@ func TestHandler(t *testing.T) {
 				}
 			}
 
+			if request.Age != 10 {
+				return &mockResponse{
+					Info: "age is not 10",
+				}
+			}
+
 			return &mockResponse{
 				Info: successInfo,
 			}
@@ -190,6 +198,12 @@ func TestHandler(t *testing.T) {
 				}
 			}
 
+			if request.Age != 10 {
+				return &mockResponse{
+					Info: "age is not 10",
+				}
+			}
+
 			return &mockResponse{
 				Info: successInfo,
 			}
@@ -210,15 +224,17 @@ func TestHandler(t *testing.T) {
 
 		query := url.Values{}
 		query.Set("phone", "phone_number")
+		query.Set("age", "10")
 
 		test := newTestHandleController(routePath, testHandler, responseValidator, nil, nil, query, nil)
 		test.Run(t, logger)
 	})
 
 	t.Run("Run with Json and Vars request", func(t *testing.T) {
-		routePath := "/test-route/{phone}"
+		routePath := "/test-route/{phone}/{age}"
 		vars := map[string]string{
 			"{phone}": "phone_number",
+			"{age}":   "10",
 		}
 
 		testHandler := makeMockedFunction(func(request mockRequest) *mockResponse {
@@ -228,6 +244,12 @@ func TestHandler(t *testing.T) {
 				}
 			}
 
+			if request.Age != 10 {
+				return &mockResponse{
+					Info: "age is not 10",
+				}
+			}
+
 			if request.Name == "" {
 				return &mockResponse{
 					Info: errNameRequired,
@@ -282,6 +304,12 @@ func TestHandler(t *testing.T) {
 				}
 			}
 
+			if request.Age != 10 {
+				return &mockResponse{
+					Info: "age is not 10",
+				}
+			}
+
 			if request.Name == "" {
 				return &mockResponse{
 					Info: errNameRequired,
@@ -332,6 +360,7 @@ func TestHandler(t *testing.T) {
 
 		query := url.Values{}
 		query.Set("message", "message")
+		query.Set("age", "10")
 
 		test := newTestHandleController(routePath, testHandler, responseValidator, body, vars, query, nil)
 		test.Run(t, logger)