Compare commits

...
4 Commits
2 changed files with 13 additions and 8 deletions
+12 -7
View File
@@ -73,20 +73,24 @@ func (c *BaseClient) Query(queryContent string, queryVariables interface{}, quer
var queryHash string
var cachedResponse []byte
cbc := reflect.ValueOf(*c).Interface().(BaseClient)
cacheBaseClient := &cbc
cacheBaseClient := c
defer func() {
cacheBaseClient = nil
}()
query := cacheBaseClient.NewQuery(queryContent, queryVariables)
// Check for library specific headers
if len(queryHeaders) > 0 {
queryHeadersModified := cacheBaseClient.parseQueryHeaders(queryHeaders)
queryHeadersModified, cache_enabled := cacheBaseClient.parseQueryHeaders(queryHeaders)
// compare if there are any changes
if !reflect.DeepEqual(queryHeadersModified, queryHeaders) {
if cacheBaseClient.cache.enabled != c.cache.enabled && cacheBaseClient.cache.enabled {
if queryHeadersModified["gqlcache"] != nil && c.cache.enabled != cache_enabled {
cacheBaseClient.Logger.Debug(cacheBaseClient, "Switching cache on as per single-request header")
c.enableCache()
cbc := reflect.ValueOf(*c).Interface().(BaseClient)
cacheBaseClient := &cbc
cacheBaseClient.enableCache()
}
}
}
@@ -147,11 +151,12 @@ func (c *BaseClient) decodeResponse(jsonData []byte) any {
}
}
func (c *BaseClient) parseQueryHeaders(queryHeaders map[string]interface{}) (returnHeaders map[string]interface{}) {
func (c *BaseClient) parseQueryHeaders(queryHeaders map[string]interface{}) (returnHeaders map[string]interface{}, cache_enabled bool) {
returnHeaders = make(map[string]interface{})
for k, v := range queryHeaders {
if k == "gqlcache" {
c.cache.enabled, _ = strconv.ParseBool(fmt.Sprintf("%v", v))
cache_enabled = true
continue
}
if k == "gqlretries" {
@@ -160,5 +165,5 @@ func (c *BaseClient) parseQueryHeaders(queryHeaders map[string]interface{}) (ret
}
returnHeaders[k] = v
}
return returnHeaders
return returnHeaders, cache_enabled
}
+1 -1
View File
@@ -334,7 +334,7 @@ func TestBaseClient_parseQueryHeaders(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
c := NewConnection()
if gotReturnHeaders := c.parseQueryHeaders(tt.args.queryHeaders); !reflect.DeepEqual(gotReturnHeaders, tt.wantReturnHeaders) {
if gotReturnHeaders, _ := c.parseQueryHeaders(tt.args.queryHeaders); !reflect.DeepEqual(gotReturnHeaders, tt.wantReturnHeaders) {
t.Errorf("BaseClient.parseQueryHeaders() = %v, want %v", gotReturnHeaders, tt.wantReturnHeaders)
}
})