From ba62b07c344ac61cfbd274972bf4dd29e53ad0a8 Mon Sep 17 00:00:00 2001
From: Anton Sattarov <dirty.mew@gmail.com>
Date: Fri, 28 Jun 2024 19:31:31 +0200
Subject: [PATCH] fix
---
pkg/items/middleware/caching_middleware.go | 54 +++++++++++-----------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/pkg/items/middleware/caching_middleware.go b/pkg/items/middleware/caching_middleware.go
index 15419367..7360e543 100644
--- a/pkg/items/middleware/caching_middleware.go
+++ b/pkg/items/middleware/caching_middleware.go
@@ -43,12 +43,12 @@ func (m cachingMiddleware) Get(ctx context.Context, spaceId, envId, collectionId
if err != nil {
return nil, err
}
- m.cache.Set(makeKey(itm.SpaceID, env.ID, itm.CollectionID, itm.ID), itm.Clone())
+ _ = m.cache.Set(makeKey(itm.SpaceID, env.ID, itm.CollectionID, itm.ID), itm)
for _, al := range env.Aliases {
- m.cache.Set(makeKey(itm.SpaceID, al, itm.CollectionID, itm.ID), itm.Clone())
+ _ = m.cache.Set(makeKey(itm.SpaceID, al, itm.CollectionID, itm.ID), itm)
}
}
- return itm, err
+ return itm.Clone(), err
}
func (m cachingMiddleware) Update(ctx context.Context, item *service.Item, options ...*service.UpdateOptions) (err error) {
@@ -59,11 +59,11 @@ func (m cachingMiddleware) Update(ctx context.Context, item *service.Item, optio
if err != nil {
return err
}
- m.cache.Remove(makeKey(item.SpaceID, env.ID, item.CollectionID, item.ID))
- m.cachePublished.Remove(makeKey(item.SpaceID, env.ID, item.CollectionID, item.ID))
+ _ = m.cache.Remove(makeKey(item.SpaceID, env.ID, item.CollectionID, item.ID))
+ _ = m.cachePublished.Remove(makeKey(item.SpaceID, env.ID, item.CollectionID, item.ID))
for _, al := range env.Aliases {
- m.cache.Remove(makeKey(item.SpaceID, al, item.CollectionID, item.ID))
- m.cachePublished.Remove(makeKey(item.SpaceID, al, item.CollectionID, item.ID))
+ _ = m.cache.Remove(makeKey(item.SpaceID, al, item.CollectionID, item.ID))
+ _ = m.cachePublished.Remove(makeKey(item.SpaceID, al, item.CollectionID, item.ID))
}
}
return err
@@ -77,11 +77,11 @@ func (m cachingMiddleware) Delete(ctx context.Context, del *service.Item, option
if err != nil {
return err
}
- m.cache.Remove(makeKey(del.SpaceID, env.ID, del.CollectionID, del.ID))
- m.cachePublished.Remove(makeKey(del.SpaceID, env.ID, del.CollectionID, del.ID))
+ _ = m.cache.Remove(makeKey(del.SpaceID, env.ID, del.CollectionID, del.ID))
+ _ = m.cachePublished.Remove(makeKey(del.SpaceID, env.ID, del.CollectionID, del.ID))
for _, al := range env.Aliases {
- m.cache.Remove(makeKey(del.SpaceID, al, del.CollectionID, del.ID))
- m.cachePublished.Remove(makeKey(del.SpaceID, al, del.CollectionID, del.ID))
+ _ = m.cache.Remove(makeKey(del.SpaceID, al, del.CollectionID, del.ID))
+ _ = m.cachePublished.Remove(makeKey(del.SpaceID, al, del.CollectionID, del.ID))
}
}
@@ -96,11 +96,11 @@ func (m cachingMiddleware) Publish(ctx context.Context, item *service.Item, opti
if err != nil {
return err
}
- m.cache.Remove(makeKey(item.SpaceID, env.ID, item.CollectionID, item.ID))
- m.cachePublished.Remove(makeKey(item.SpaceID, env.ID, item.CollectionID, item.ID))
+ _ = m.cache.Remove(makeKey(item.SpaceID, env.ID, item.CollectionID, item.ID))
+ _ = m.cachePublished.Remove(makeKey(item.SpaceID, env.ID, item.CollectionID, item.ID))
for _, al := range env.Aliases {
- m.cache.Remove(makeKey(item.SpaceID, al, item.CollectionID, item.ID))
- m.cachePublished.Remove(makeKey(item.SpaceID, al, item.CollectionID, item.ID))
+ _ = m.cache.Remove(makeKey(item.SpaceID, al, item.CollectionID, item.ID))
+ _ = m.cachePublished.Remove(makeKey(item.SpaceID, al, item.CollectionID, item.ID))
}
}
return err
@@ -114,11 +114,11 @@ func (m cachingMiddleware) Unpublish(ctx context.Context, item *service.Item, op
if err != nil {
return err
}
- m.cache.Remove(makeKey(item.SpaceID, env.ID, item.CollectionID, item.ID))
- m.cachePublished.Remove(makeKey(item.SpaceID, env.ID, item.CollectionID, item.ID))
+ _ = m.cache.Remove(makeKey(item.SpaceID, env.ID, item.CollectionID, item.ID))
+ _ = m.cachePublished.Remove(makeKey(item.SpaceID, env.ID, item.CollectionID, item.ID))
for _, al := range env.Aliases {
- m.cache.Remove(makeKey(item.SpaceID, al, item.CollectionID, item.ID))
- m.cachePublished.Remove(makeKey(item.SpaceID, al, item.CollectionID, item.ID))
+ _ = m.cache.Remove(makeKey(item.SpaceID, al, item.CollectionID, item.ID))
+ _ = m.cachePublished.Remove(makeKey(item.SpaceID, al, item.CollectionID, item.ID))
}
}
return err
@@ -147,14 +147,14 @@ func (m cachingMiddleware) GetPublished(ctx context.Context, spaceId, envId, col
if val != nil {
value = val.(map[string]*service.Item)
}
- value[opts.LocaleID] = itm.Clone()
- m.cachePublished.Set(makeKey(itm.SpaceID, env.ID, itm.CollectionID, itm.ID), value)
+ value[opts.LocaleID] = itm
+ _ = m.cachePublished.Set(makeKey(itm.SpaceID, env.ID, itm.CollectionID, itm.ID), value)
for _, al := range env.Aliases {
- m.cachePublished.Set(makeKey(itm.SpaceID, al, itm.CollectionID, itm.ID), value)
+ _ = m.cachePublished.Set(makeKey(itm.SpaceID, al, itm.CollectionID, itm.ID), value)
}
}
- return itm, err
+ return itm.Clone(), err
}
func (m cachingMiddleware) Archive(ctx context.Context, item *service.Item, options ...*service.ArchiveOptions) (err error) {
@@ -165,11 +165,11 @@ func (m cachingMiddleware) Archive(ctx context.Context, item *service.Item, opti
if err != nil {
return err
}
- m.cache.Remove(makeKey(item.SpaceID, env.ID, item.CollectionID, item.ID))
- m.cachePublished.Remove(makeKey(item.SpaceID, env.ID, item.CollectionID, item.ID))
+ _ = m.cache.Remove(makeKey(item.SpaceID, env.ID, item.CollectionID, item.ID))
+ _ = m.cachePublished.Remove(makeKey(item.SpaceID, env.ID, item.CollectionID, item.ID))
for _, al := range env.Aliases {
- m.cache.Remove(makeKey(item.SpaceID, al, item.CollectionID, item.ID))
- m.cachePublished.Remove(makeKey(item.SpaceID, al, item.CollectionID, item.ID))
+ _ = m.cache.Remove(makeKey(item.SpaceID, al, item.CollectionID, item.ID))
+ _ = m.cachePublished.Remove(makeKey(item.SpaceID, al, item.CollectionID, item.ID))
}
}
return err
--
GitLab