fix: advanced query validate endtime > starttime

internal/controller/v2/result.go

@@ -235,7 +235,7 @@ func (c *Result) GetTrends(ctx *fiber.Ctx) error {
 // @Success  200    {object}  modelv2.AdvancedQueryResult{advanced_results=[]modelv2.DropMatrixQueryResult}  "Drop Matrix Response: when `interval` has been left undefined."
 // @Success  202    {object}  modelv2.AdvancedQueryResult{advanced_results=[]modelv2.TrendQueryResult}       "Trend Response: when `interval` has been defined a value greater than `0`. Notice that this response still responds with a status code of `200`, but due to swagger limitations, to denote a different response with the same status code is not possible. Therefore, a status code of `202` is used, only for the purpose of workaround."
 // @Failure  500    {object}  pgerr.PenguinError                                                             "An unexpected error occurred"
-// @Router   /PenguinStats/api/v2/advanced [POST]
+// @Router   /PenguinStats/api/v2/result/advanced [POST]
 func (c *Result) AdvancedQuery(ctx *fiber.Ctx) error {
 	var request types.AdvancedQueryRequest
 	if err := rekuest.ValidBody(ctx, &request); err != nil {

internal/model/types/advanced_query.go

@@ -13,6 +13,6 @@ type AdvancedQuery struct {
 	IsPersonal     null.Bool `json:"isPersonal" swaggertype:"boolean"`
 	SourceCategory string    `json:"sourceCategory" validate:"sourcecategory"`
 	StartTime      null.Int  `json:"start" swaggertype:"integer"`
-	EndTime        null.Int  `json:"end" swaggertype:"integer"`
+	EndTime        null.Int  `json:"end" validate:"gtfield=StartTime" swaggertype:"integer"`
 	Interval       null.Int  `json:"interval" swaggertype:"integer"`
 }

internal/util/validator.go

@@ -22,6 +22,7 @@ func NewValidator() *validator.Validate {
 	validate.RegisterValidation("semverprefixed", semverPrefixed)
 	validate.RegisterValidation("arkserver", arkServer)
 	validate.RegisterValidation("sourcecategory", sourceCategory)
+	validate.RegisterCustomTypeFunc(nullIntValuer, null.Int{})
 	validate.RegisterCustomTypeFunc(nullStringValuer, null.String{})
 
 	return validate
@@ -55,6 +56,14 @@ func sourceCategory(fl validator.FieldLevel) bool {
 	return val == "" || val == constant.SourceCategoryAll || val == constant.SourceCategoryAutomated || val == constant.SourceCategoryManual
 }
 
+func nullIntValuer(field reflect.Value) interface{} {
+	if valuer, ok := field.Interface().(null.Int); ok {
+		return valuer.Int64
+	}
+
+	return nil
+}
+
 func nullStringValuer(field reflect.Value) interface{} {
 	if valuer, ok := field.Interface().(null.String); ok {
 		return valuer.String

test/api_test.go

@@ -1,13 +1,16 @@
 package test
 
 import (
+	"bytes"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"sync"
 	"testing"
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/stretchr/testify/assert"
+	"github.com/tidwall/gjson"
 	"go.uber.org/fx"
 	"go.uber.org/fx/fxtest"
 
@@ -52,6 +55,30 @@ func request(t *testing.T, req *http.Request, msTimeout ...int) *http.Response {
 	return resp
 }
 
+func JsonRequestCustom(t *testing.T, req *http.Request) (*http.Response, *gjson.Result) {
+	t.Helper()
+
+	resp := request(t, req)
+
+	bodyBytes, err := io.ReadAll(resp.Body)
+	assert.NoError(t, err, "failed to read response body")
+
+	body := gjson.ParseBytes(bodyBytes)
+
+	return resp, &body
+}
+
+func JsonRequest(t *testing.T, path, body string, headers *http.Header) (*http.Response, *gjson.Result) {
+	t.Helper()
+
+	req := httptest.NewRequest(http.MethodPost, path, bytes.NewBufferString(body))
+	if headers != nil {
+		req.Header = *headers
+	}
+	req.Header.Set("Content-Type", "application/json")
+	return JsonRequestCustom(t, req)
+}
+
 func TestAPIMeta(t *testing.T) {
 	startup(t)
 	t.Parallel()

test/v2_advanced_query_test.go

@@ -0,0 +1,31 @@
+package test
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/tidwall/gjson"
+)
+
+func TestAPIV2AdvancedQuery(t *testing.T) {
+	startup(t)
+	t.Parallel()
+
+	query := func(body string, headers *http.Header) (*http.Response, *gjson.Result) {
+		t.Helper()
+		return JsonRequest(t, "/PenguinStats/api/v2/result/advanced", body, headers)
+	}
+
+	t.Run("valid body", func(t *testing.T) {
+		h, j := query(`{"queries":[{"stageId":"main_01-07","itemIds":[],"server":"CN","isPersonal":false,"sourceCategory":"all","start":1556668800000,"end":1562630400000}]}`, nil)
+		assert.Equal(t, http.StatusOK, h.StatusCode)
+		assert.NotEmpty(t, len(j.Get("advanced_results").String()))
+	})
+
+	t.Run("invalid body", func(t *testing.T) {
+		h, j := query(`{"queries":[{"stageId":"main_01-07","itemIds":[],"server":"CN","isPersonal":false,"sourceCategory":"all","start":1556668800000,"end":1556668800000}]}`, nil)
+		assert.Equal(t, http.StatusBadRequest, h.StatusCode)
+		assert.Equal(t, "invalid time range", j.Get("error").String())
+	})
+}

test/v2_report_test.go

@@ -1,10 +1,7 @@
 package test
 
 import (
-	"bytes"
-	"io"
 	"net/http"
-	"net/http/httptest"
 	"testing"
 	"time"
 
@@ -17,39 +14,14 @@ func TestAPIV2Reports(t *testing.T) {
 	startup(t)
 	t.Parallel()
 
-	// helpers
-	jsonReqCustom := func(req *http.Request) (*http.Response, *gjson.Result) {
-		t.Helper()
-
-		resp := request(t, req)
-
-		bodyBytes, err := io.ReadAll(resp.Body)
-		assert.NoError(t, err, "failed to read response body")
-
-		body := gjson.ParseBytes(bodyBytes)
-
-		return resp, &body
-	}
-
-	jsonReq := func(path, body string, headers *http.Header) (*http.Response, *gjson.Result) {
-		t.Helper()
-
-		req := httptest.NewRequest(http.MethodPost, path, bytes.NewBufferString(body))
-		if headers != nil {
-			req.Header = *headers
-		}
-		req.Header.Set("Content-Type", "application/json")
-		return jsonReqCustom(req)
-	}
-
 	report := func(body string, headers *http.Header) (*http.Response, *gjson.Result) {
 		t.Helper()
-		return jsonReq("/PenguinStats/api/v2/report", body, headers)
+		return JsonRequest(t, "/PenguinStats/api/v2/report", body, headers)
 	}
 
 	recall := func(body string, headers *http.Header) (*http.Response, *gjson.Result) {
 		t.Helper()
-		return jsonReq("/PenguinStats/api/v2/report/recall", body, headers)
+		return JsonRequest(t, "/PenguinStats/api/v2/report/recall", body, headers)
 	}
 
 	// tests