refactor: from and to validation

api/handler/event.go

@@ -4,10 +4,6 @@ import (
 	"fmt"
 	"net/http"
 	"regexp"
-	"strconv"
-	"time"
-
-	"github.com/go-graphite/carbonapi/date"
 
 	"github.com/go-chi/chi"
 	"github.com/go-chi/render"
@@ -52,23 +48,18 @@ func getEventsList(writer http.ResponseWriter, request *http.Request) {
 	page := middleware.GetPage(request)
 	fromStr := middleware.GetFromStr(request)
 	toStr := middleware.GetToStr(request)
+	var err error
 
-	if fromStr != "-inf" {
-		from := date.DateParamToEpoch(fromStr, "UTC", 0, time.UTC)
-		if from == 0 {
-			render.Render(writer, request, api.ErrorInvalidRequest(fmt.Errorf("can not parse from: %s", fromStr))) //nolint
-			return
-		}
-		fromStr = strconv.FormatInt(from, 10)
+	fromStr, err = validateFromStr(fromStr)
+	if err != nil {
+		render.Render(writer, request, api.ErrorInvalidRequest(err)) //nolint
+		return
 	}
 
-	if toStr != "+inf" {
-		to := date.DateParamToEpoch(toStr, "UTC", 0, time.UTC)
-		if to == 0 {
-			render.Render(writer, request, api.ErrorInvalidRequest(fmt.Errorf("can not parse to: %v", to))) //nolint
-			return
-		}
-		toStr = strconv.FormatInt(to, 10)
+	toStr, err = validateToStr(toStr)
+	if err != nil {
+		render.Render(writer, request, api.ErrorInvalidRequest(err)) //nolint
+		return
 	}
 
 	metricStr := middleware.GetMetric(request)
@@ -80,9 +71,9 @@ func getEventsList(writer http.ResponseWriter, request *http.Request) {
 
 	states := middleware.GetStates(request)
 
-	eventsList, err := controller.GetTriggerEvents(database, triggerID, page, size, fromStr, toStr, metricRegexp, states)
+	eventsList, errRsp := controller.GetTriggerEvents(database, triggerID, page, size, fromStr, toStr, metricRegexp, states)
 	if err != nil {
-		render.Render(writer, request, err) //nolint
+		render.Render(writer, request, errRsp) //nolint
 		return
 	}
 	if err := render.Render(writer, request, eventsList); err != nil {

api/handler/triggers.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-graphite/carbonapi/date"
 	prometheus "github.com/prometheus/client_golang/api/prometheus/v1"
 
 	"github.com/go-chi/chi"
@@ -434,22 +433,18 @@ func getTriggerNoisiness(writer http.ResponseWriter, request *http.Request) {
 	toStr := middleware.GetToStr(request)
 	sort := middleware.GetSortOrder(request)
 
-	if fromStr != "-inf" {
-		from := date.DateParamToEpoch(fromStr, "UTC", 0, time.UTC)
-		if from == 0 {
-			render.Render(writer, request, api.ErrorInvalidRequest(fmt.Errorf("can not parse from: %s", fromStr))) //nolint
-			return
-		}
-		fromStr = strconv.FormatInt(from, 10)
+	var err error
+
+	fromStr, err = validateFromStr(fromStr)
+	if err != nil {
+		render.Render(writer, request, api.ErrorInvalidRequest(err)) //nolint
+		return
 	}
 
-	if toStr != "+inf" {
-		to := date.DateParamToEpoch(toStr, "UTC", 0, time.UTC)
-		if to == 0 {
-			render.Render(writer, request, api.ErrorInvalidRequest(fmt.Errorf("can not parse to: %v", to))) //nolint
-			return
-		}
-		toStr = strconv.FormatInt(to, 10)
+	toStr, err = validateToStr(toStr)
+	if err != nil {
+		render.Render(writer, request, api.ErrorInvalidRequest(err)) //nolint
+		return
 	}
 
 	triggersNoisinessList, errorResponse := controller.GetTriggerNoisiness(database, page, size, fromStr, toStr, sort)

api/handler/validate.go

@@ -0,0 +1,33 @@
+package handler
+
+import (
+	"fmt"
+	"strconv"
+	"time"
+
+	"github.com/go-graphite/carbonapi/date"
+)
+
+func validateFromStr(fromStr string) (string, error) {
+	if fromStr != "-inf" {
+		from := date.DateParamToEpoch(fromStr, "UTC", 0, time.UTC)
+		if from == 0 {
+			return "", fmt.Errorf("can not parse from: %s", fromStr)
+		}
+		fromStr = strconv.FormatInt(from, 10)
+	}
+
+	return fromStr, nil
+}
+
+func validateToStr(toStr string) (string, error) {
+	if toStr != "+inf" {
+		to := date.DateParamToEpoch(toStr, "UTC", 0, time.UTC)
+		if to == 0 {
+			return "", fmt.Errorf("can not parse to: %v", to)
+		}
+		toStr = strconv.FormatInt(to, 10)
+	}
+
+	return toStr, nil
+}