fix: wrong InjectValidBody

penguin-statistics · Feb 19, 2023 · e21eb2d · e21eb2d
1 parent 6721d64
commit e21eb2d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/internal/controller/v2/report.go b/internal/controller/v2/report.go
@@ -48,8 +48,8 @@ func RegisterReport(v2 *svr.V2, c Report) {
 		Storage: fiberstore.NewRedis(c.Redis, constant.ReportIdempotencyRedisHashKey),
 		RedSync: c.RedSync,
 	}), middlewares.InjectValidBody[types.SingularReportRequest](), c.MiddlewareGetOrCreateAccount, c.SingularReport)
-	v2.Post("/report/recall", c.RecallSingularReport)
-	v2.Post("/report/recognition", middlewares.InjectValidBody[types.SingularReportRecallRequest](), c.MiddlewareGetOrCreateAccount, c.RecognitionReport)
+	v2.Post("/report/recall", middlewares.InjectValidBody[types.SingularReportRecallRequest](), c.RecallSingularReport)
+	v2.Post("/report/recognition", c.MiddlewareGetOrCreateAccount, c.RecognitionReport)
 }
 
 func (c *Report) MiddlewareGetOrCreateAccount(ctx *fiber.Ctx) error {

diff --git a/test/v2_report_test.go b/test/v2_report_test.go
@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"testing"
+	"time"
 
 	"github.com/dchest/uniuri"
 	"github.com/stretchr/testify/assert"
@@ -17,7 +18,7 @@ func TestAPIV2Reports(t *testing.T) {
 	t.Parallel()
 
 	// helpers
-	reportCustom := func(req *http.Request) (*http.Response, *gjson.Result) {
+	jsonReqCustom := func(req *http.Request) (*http.Response, *gjson.Result) {
 		t.Helper()
 
 		resp := request(t, req)
@@ -30,15 +31,25 @@ func TestAPIV2Reports(t *testing.T) {
 		return resp, &body
 	}
 
-	report := func(body string, headers *http.Header) (*http.Response, *gjson.Result) {
+	jsonReq := func(path, body string, headers *http.Header) (*http.Response, *gjson.Result) {
 		t.Helper()
 
-		req := httptest.NewRequest(http.MethodPost, "/PenguinStats/api/v2/report", bytes.NewBufferString(body))
+		req := httptest.NewRequest(http.MethodPost, path, bytes.NewBufferString(body))
 		if headers != nil {
 			req.Header = *headers
 		}
 		req.Header.Set("Content-Type", "application/json")
-		return reportCustom(req)
+		return jsonReqCustom(req)
+	}
+
+	report := func(body string, headers *http.Header) (*http.Response, *gjson.Result) {
+		t.Helper()
+		return jsonReq("/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)
 	}
 
 	// tests
@@ -127,4 +138,21 @@ func TestAPIV2Reports(t *testing.T) {
 			assert.Equal(t, "hit", h.Header.Get("X-Penguin-Idempotency"), "idempotency key should be hit on duplicate request")
 		})
 	})
+
+	t.Run("recall", func(t *testing.T) {
+		t.Run("basic", func(t *testing.T) {
+			var reportHash string
+			{
+				h, j := report(ReportValidBody, nil)
+				assert.Equal(t, http.StatusOK, h.StatusCode)
+				assert.Equal(t, len(j.Get("reportHash").String()), ReportHashLen)
+				reportHash = j.Get("reportHash").String()
+			}
+			time.Sleep(time.Second * 2) // FIXME: wait for the report to be consumed
+			{
+				h, j := recall(`{"reportHash":"`+reportHash+`"}`, nil)
+				assert.Equal(t, http.StatusOK, h.StatusCode, j.String())
+			}
+		})
+	})
 }