Merge pull request #13 from kenshin579/feat/#12-empty

[#12] not to cache if all value of fields are empty

Author: kenshin579

cache.go

@@ -296,15 +296,49 @@ func isAllFieldsEmpty(inter any) bool {
 		return true
 	}
 
-	if val.Kind() != reflect.Struct {
-		return false
-	}
+	switch val.Kind() {
+	case reflect.Struct:
+		for i := 0; i < val.NumField(); i++ {
+			field := val.Field(i)
+			zeroValue := reflect.Zero(field.Type())
+			if reflect.DeepEqual(field.Interface(), zeroValue.Interface()) {
+				continue
+			}
+			return false
+		}
+	case reflect.Slice:
+		var dataMap map[string]any
 
-	for i := 0; i < val.NumField(); i++ {
-		field := val.Field(i)
-		if !field.IsZero() {
+		if err := json.Unmarshal(inter.([]byte), &dataMap); err != nil {
+			fmt.Printf("fail to unmarshal json. err:%v\n", err)
 			return false
 		}
+		return isMapEmpty(dataMap)
+	}
+
+	return true
+}
+
+func isMapEmpty(m map[string]any) bool {
+	for _, v := range m {
+		switch val := v.(type) {
+		case string:
+			if val != "" {
+				return false
+			}
+		case int:
+			if val != 0 {
+				return false
+			}
+		case float64:
+			if val != 0 {
+				return false
+			}
+		case bool:
+			if val == false {
+				return false
+			}
+		}
 	}
 	return true
 }

cache_test.go

@@ -279,3 +279,44 @@ func Test_sortURLParams(t *testing.T) {
 		})
 	}
 }
+
+func Test_isAllFieldsEmpty(t *testing.T) {
+	type person struct {
+		Name    string `json:"name"`
+		Age     int    `json:"age"`
+		Address struct {
+			City string `json:"city"`
+			Zip  int    `json:"zip"`
+		} `json:"address"`
+	}
+
+	p1 := person{
+		Address: struct {
+			City string `json:"city"`
+			Zip  int    `json:"zip"`
+		}{
+			City: "seoul",
+		},
+	}
+
+	p2 := person{}
+	p3 := person{
+		Name: "",
+		Age:  0,
+		Address: struct {
+			City string `json:"city"`
+			Zip  int    `json:"zip"`
+		}{
+			City: "",
+			Zip:  0,
+		},
+	}
+
+	assert.False(t, isAllFieldsEmpty(p1))
+	assert.True(t, isAllFieldsEmpty(p2))
+	assert.True(t, isAllFieldsEmpty(p3))
+	assert.False(t, isAllFieldsEmpty([]byte(`{"a":"","b":"","c":1}`)))
+	assert.False(t, isAllFieldsEmpty([]byte(`{"a":"","b":"b","c":0}`)))
+	assert.True(t, isAllFieldsEmpty([]byte(`{"a":"","b":"","c":0}`)))
+	assert.True(t, isAllFieldsEmpty([]byte(`{"a":"","b":"","c":0.0}`)))
+}

redis_test.go

@@ -74,10 +74,14 @@ func (suite *cacheRedisStoreTestSuite) Test_Echo_CacheWithConfig() {
 		return c.String(http.StatusOK, "test")
 	})
 
-	suite.echo.GET("/empty", func(c echo.Context) error {
+	suite.echo.GET("/empty/string", func(c echo.Context) error {
 		return c.String(http.StatusOK, "")
 	})
 
+	suite.echo.GET("/empty/json", func(c echo.Context) error {
+		return c.String(http.StatusOK, `{"symbolId":"","type":"","price":0.0}`)
+	})
+
 	suite.Run("GET /test with non empty body", func() {
 		req := httptest.NewRequest(http.MethodGet, "/test", nil)
 		rec := httptest.NewRecorder()
@@ -97,16 +101,30 @@ func (suite *cacheRedisStoreTestSuite) Test_Echo_CacheWithConfig() {
 		suite.Equal("test", string(cacheResponse.Value))
 	})
 
-	suite.Run("GET /empty", func() {
-		req := httptest.NewRequest(http.MethodGet, "/empty", nil)
+	suite.Run("GET /empty/string", func() {
+		req := httptest.NewRequest(http.MethodGet, "/empty/string", nil)
 		rec := httptest.NewRecorder()
 
 		suite.echo.ServeHTTP(rec, req)
 
 		suite.Equal(http.StatusOK, rec.Code)
 		suite.Equal("", rec.Body.String())
 
-		key := generateKey(http.MethodGet, "/empty")
+		key := generateKey(http.MethodGet, "/empty/string")
+		_, ok := suite.cacheStore.Get(key)
+		suite.False(ok)
+	})
+
+	suite.Run("GET /empty/json", func() {
+		req := httptest.NewRequest(http.MethodGet, "/empty/json", nil)
+		rec := httptest.NewRecorder()
+
+		suite.echo.ServeHTTP(rec, req)
+
+		suite.Equal(http.StatusOK, rec.Code)
+		suite.Equal(`{"symbolId":"","type":"","price":0.0}`, rec.Body.String())
+
+		key := generateKey(http.MethodGet, "/empty2")
 		_, ok := suite.cacheStore.Get(key)
 		suite.False(ok)
 	})