From 0625050fd0ba35b836bacf19da999b0eb34308c1 Mon Sep 17 00:00:00 2001
From: ensiouel <ensiouel@gmail.com>
Date: Mon, 18 Dec 2023 14:24:03 +0300
Subject: [PATCH] =?UTF-8?q?Revert=20"=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82?=
 =?UTF-8?q?=D1=83=D1=80=D0=B0=20Cache=20=D0=B1=D1=8B=D0=BB=D0=B0=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B0=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2e47a71570ec0603f39975cfcb9a2526becf6a42.
---
 pkg/clients/middleware/caching_middleware.go       | 4 ++--
 pkg/collaborators/middleware/caching_middleware.go | 4 ++--
 pkg/collections/middleware/caching_middleware.go   | 4 ++--
 pkg/environments/middleware/caching_middleware.go  | 4 ++--
 pkg/invitations/middleware/caching_middleware.go   | 4 ++--
 pkg/items/middleware/caching_middleware.go         | 6 +++---
 pkg/locales/middleware/caching_middleware.go       | 4 ++--
 pkg/members/middleware/caching_middleware.go       | 4 ++--
 pkg/organizations/middleware/caching_middleware.go | 4 ++--
 pkg/roles/middleware/caching_middleware.go         | 4 ++--
 pkg/spaces/middleware/caching_middleware.go        | 4 ++--
 pkg/users/middleware/caching_middleware.go         | 4 ++--
 12 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pkg/clients/middleware/caching_middleware.go b/pkg/clients/middleware/caching_middleware.go
index 08af3a47..1733c0de 100644
--- a/pkg/clients/middleware/caching_middleware.go
+++ b/pkg/clients/middleware/caching_middleware.go
@@ -12,7 +12,7 @@ func makeKey(ss ...string) string {
 	return strings.Join(ss, "-")
 }
 
-func CachingMiddleware(cache cache.Cache) Middleware {
+func CachingMiddleware(cache *cache.Cache) Middleware {
 	return func(next service.Clients) service.Clients {
 		return &cachingMiddleware{
 			cache: cache,
@@ -22,7 +22,7 @@ func CachingMiddleware(cache cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache cache.Cache
+	cache *cache.Cache
 	next  service.Clients
 }
 
diff --git a/pkg/collaborators/middleware/caching_middleware.go b/pkg/collaborators/middleware/caching_middleware.go
index 7533ae55..ea595919 100644
--- a/pkg/collaborators/middleware/caching_middleware.go
+++ b/pkg/collaborators/middleware/caching_middleware.go
@@ -12,7 +12,7 @@ func makeKey(ss ...string) string {
 	return strings.Join(ss, "-")
 }
 
-func CachingMiddleware(cache cache.Cache) Middleware {
+func CachingMiddleware(cache *cache.Cache) Middleware {
 	return func(next service.Collaborators) service.Collaborators {
 		return &cachingMiddleware{
 			cache: cache,
@@ -22,7 +22,7 @@ func CachingMiddleware(cache cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache cache.Cache
+	cache *cache.Cache
 	next  service.Collaborators
 }
 
diff --git a/pkg/collections/middleware/caching_middleware.go b/pkg/collections/middleware/caching_middleware.go
index de34d42a..469c39df 100644
--- a/pkg/collections/middleware/caching_middleware.go
+++ b/pkg/collections/middleware/caching_middleware.go
@@ -19,7 +19,7 @@ func makeKey(spaceId, envId, collectionId string, disableSchemaIncludes bool) st
 	return s
 }
 
-func CachingMiddleware(cache cache.Cache, envs envService.Environments) Middleware {
+func CachingMiddleware(cache *cache.Cache, envs envService.Environments) Middleware {
 	return func(next service.Collections) service.Collections {
 		return &cachingMiddleware{
 			cache: cache,
@@ -30,7 +30,7 @@ func CachingMiddleware(cache cache.Cache, envs envService.Environments) Middlewa
 }
 
 type cachingMiddleware struct {
-	cache cache.Cache
+	cache *cache.Cache
 	next  service.Collections
 	envs  envService.Environments
 }
diff --git a/pkg/environments/middleware/caching_middleware.go b/pkg/environments/middleware/caching_middleware.go
index 0801730a..dfe5b927 100644
--- a/pkg/environments/middleware/caching_middleware.go
+++ b/pkg/environments/middleware/caching_middleware.go
@@ -12,7 +12,7 @@ func makeKey(ss ...string) string {
 	return strings.Join(ss, "-")
 }
 
-func CachingMiddleware(cache cache.Cache) Middleware {
+func CachingMiddleware(cache *cache.Cache) Middleware {
 	return func(next service.Environments) service.Environments {
 		return &cachingMiddleware{
 			cache: cache,
@@ -22,7 +22,7 @@ func CachingMiddleware(cache cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache cache.Cache
+	cache *cache.Cache
 	next  service.Environments
 }
 
diff --git a/pkg/invitations/middleware/caching_middleware.go b/pkg/invitations/middleware/caching_middleware.go
index 5f2a1086..651514a5 100644
--- a/pkg/invitations/middleware/caching_middleware.go
+++ b/pkg/invitations/middleware/caching_middleware.go
@@ -8,7 +8,7 @@ import (
 	services "git.perx.ru/perxis/perxis-go/pkg/options"
 )
 
-func CachingMiddleware(cache cache.Cache) Middleware {
+func CachingMiddleware(cache *cache.Cache) Middleware {
 	return func(next service.Invitations) service.Invitations {
 		return &cachingMiddleware{
 			cache: cache,
@@ -18,7 +18,7 @@ func CachingMiddleware(cache cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache cache.Cache
+	cache *cache.Cache
 	next  service.Invitations
 }
 
diff --git a/pkg/items/middleware/caching_middleware.go b/pkg/items/middleware/caching_middleware.go
index 6b118513..2d76f215 100644
--- a/pkg/items/middleware/caching_middleware.go
+++ b/pkg/items/middleware/caching_middleware.go
@@ -13,7 +13,7 @@ func makeKey(ss ...string) string {
 	return strings.Join(ss, "-")
 }
 
-func CachingMiddleware(cache, cachePublished cache.Cache, envs envService.Environments) Middleware {
+func CachingMiddleware(cache, cachePublished *cache.Cache, envs envService.Environments) Middleware {
 	return func(next service.Items) service.Items {
 		return &cachingMiddleware{
 			cache:          cache,
@@ -25,8 +25,8 @@ func CachingMiddleware(cache, cachePublished cache.Cache, envs envService.Enviro
 }
 
 type cachingMiddleware struct {
-	cache          cache.Cache
-	cachePublished cache.Cache
+	cache          *cache.Cache
+	cachePublished *cache.Cache
 	envs           envService.Environments
 	service.Items
 }
diff --git a/pkg/locales/middleware/caching_middleware.go b/pkg/locales/middleware/caching_middleware.go
index 13928a51..9d162495 100644
--- a/pkg/locales/middleware/caching_middleware.go
+++ b/pkg/locales/middleware/caching_middleware.go
@@ -7,7 +7,7 @@ import (
 	service "git.perx.ru/perxis/perxis-go/pkg/locales"
 )
 
-func CachingMiddleware(cache cache.Cache) Middleware {
+func CachingMiddleware(cache *cache.Cache) Middleware {
 	return func(next service.Locales) service.Locales {
 		return &cachingMiddleware{
 			cache: cache,
@@ -17,7 +17,7 @@ func CachingMiddleware(cache cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache cache.Cache
+	cache *cache.Cache
 	next  service.Locales
 }
 
diff --git a/pkg/members/middleware/caching_middleware.go b/pkg/members/middleware/caching_middleware.go
index 0af3f76f..cffbc7c4 100644
--- a/pkg/members/middleware/caching_middleware.go
+++ b/pkg/members/middleware/caching_middleware.go
@@ -12,7 +12,7 @@ func makeKey(ss ...string) string {
 	return strings.Join(ss, "-")
 }
 
-func CachingMiddleware(cache cache.Cache) Middleware {
+func CachingMiddleware(cache *cache.Cache) Middleware {
 	return func(next service.Members) service.Members {
 		return &cachingMiddleware{
 			cache: cache,
@@ -22,7 +22,7 @@ func CachingMiddleware(cache cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache cache.Cache
+	cache *cache.Cache
 	next  service.Members
 }
 
diff --git a/pkg/organizations/middleware/caching_middleware.go b/pkg/organizations/middleware/caching_middleware.go
index 18649df9..8350fb92 100644
--- a/pkg/organizations/middleware/caching_middleware.go
+++ b/pkg/organizations/middleware/caching_middleware.go
@@ -8,7 +8,7 @@ import (
 	service "git.perx.ru/perxis/perxis-go/pkg/organizations"
 )
 
-func CachingMiddleware(cache cache.Cache) Middleware {
+func CachingMiddleware(cache *cache.Cache) Middleware {
 	return func(next service.Organizations) service.Organizations {
 		return &cachingMiddleware{
 			cache: cache,
@@ -18,7 +18,7 @@ func CachingMiddleware(cache cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache cache.Cache
+	cache *cache.Cache
 	next  service.Organizations
 }
 
diff --git a/pkg/roles/middleware/caching_middleware.go b/pkg/roles/middleware/caching_middleware.go
index 3f46087e..86725074 100644
--- a/pkg/roles/middleware/caching_middleware.go
+++ b/pkg/roles/middleware/caching_middleware.go
@@ -12,7 +12,7 @@ func makeKey(ss ...string) string {
 	return strings.Join(ss, "-")
 }
 
-func CachingMiddleware(cache cache.Cache) Middleware {
+func CachingMiddleware(cache *cache.Cache) Middleware {
 	return func(next service.Roles) service.Roles {
 		return &cachingMiddleware{
 			cache: cache,
@@ -22,7 +22,7 @@ func CachingMiddleware(cache cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache cache.Cache
+	cache *cache.Cache
 	next  service.Roles
 }
 
diff --git a/pkg/spaces/middleware/caching_middleware.go b/pkg/spaces/middleware/caching_middleware.go
index f99e21a1..99c50a90 100644
--- a/pkg/spaces/middleware/caching_middleware.go
+++ b/pkg/spaces/middleware/caching_middleware.go
@@ -9,7 +9,7 @@ import (
 
 func orgKey(orgID string) string { return "org-" + orgID }
 
-func CachingMiddleware(cache cache.Cache) Middleware {
+func CachingMiddleware(cache *cache.Cache) Middleware {
 	return func(next service.Spaces) service.Spaces {
 		m := &cachingMiddleware{
 			cache: cache,
@@ -21,7 +21,7 @@ func CachingMiddleware(cache cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache cache.Cache
+	cache *cache.Cache
 	next  service.Spaces
 }
 
diff --git a/pkg/users/middleware/caching_middleware.go b/pkg/users/middleware/caching_middleware.go
index 8397bfd3..c5674b82 100644
--- a/pkg/users/middleware/caching_middleware.go
+++ b/pkg/users/middleware/caching_middleware.go
@@ -8,7 +8,7 @@ import (
 	service "git.perx.ru/perxis/perxis-go/pkg/users"
 )
 
-func CachingMiddleware(cache cache.Cache) Middleware {
+func CachingMiddleware(cache *cache.Cache) Middleware {
 	return func(next service.Users) service.Users {
 		return &cachingMiddleware{
 			cache: cache,
@@ -18,7 +18,7 @@ func CachingMiddleware(cache cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache cache.Cache
+	cache *cache.Cache
 	next  service.Users
 }
 
-- 
GitLab