From bfd377f426ae31d1c37d99b8341c27260665716a Mon Sep 17 00:00:00 2001
From: mohammadaminmg10 <ghorbannezhadm2@gmail.com>
Date: Wed, 27 Sep 2023 14:07:38 +0330
Subject: [PATCH] fixing the query issue and also the removing from redis issue

---
 cache.go | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/cache.go b/cache.go
index 6613452..1e566f0 100644
--- a/cache.go
+++ b/cache.go
@@ -1,3 +1,5 @@
+package cache
+
 /*
 MIT License
 
@@ -22,8 +24,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-package cache
-
 import (
 	"bufio"
 	"bytes"
@@ -116,6 +116,7 @@ type Adapter interface {
 func (client *Client) Middleware() echo.MiddlewareFunc {
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
+			c.Request().URL.ForceQuery = false
 			if !client.isAllowedPathToCache(c.Request().URL.String()) {
 				next(c)
 				return nil
@@ -142,7 +143,6 @@ func (client *Client) Middleware() echo.MiddlewareFunc {
 					c.Request().URL.RawQuery = params.Encode()
 					key = generateKey(c.Request().URL.String())
 
-					client.adapter.Release(key)
 				} else {
 					b, ok := client.adapter.Get(key)
 					response := BytesToResponse(b)
@@ -160,8 +160,6 @@ func (client *Client) Middleware() echo.MiddlewareFunc {
 							c.Response().Write(response.Value)
 							return nil
 						}
-
-						client.adapter.Release(key)
 					}
 				}
 
@@ -185,6 +183,7 @@ func (client *Client) Middleware() echo.MiddlewareFunc {
 						LastAccess: now,
 						Frequency:  1,
 					}
+					client.adapter.Release(key)
 					client.adapter.Set(key, response.Bytes(), response.Expiration)
 				}
 				//for k, v := range writer.Header() {