refactor(usercache): set custom ttl for cache

olexsmir · Oct 24, 2024 · 11d547e · 11d547e
1 parent 4f17e84
commit 11d547e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/.env.example b/.env.example
@@ -21,6 +21,7 @@ POSTGRESQL_DSN="postgres://$POSTGRES_USERNAME:$POSTGRES_PASSWORD@$POSTGRES_HOST:
 MIGRATION_DSN="postgres://$POSTGRES_USERNAME:$POSTGRES_PASSWORD@localhost:$POSTGRES_PORT/$POSTGRES_DATABASE?sslmode=disable"
 
 REDIS_ADDR="redis:6379"
+CACHE_USERS_TTL=1h
 
 MAILGUN_FROM=onasty@mail.com
 MAILGUN_DOMAI='<domain>'

diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -76,7 +76,7 @@ func run(ctx context.Context) error {
 	vertokrepo := vertokrepo.New(psqlDB)
 
 	userepo := userepo.New(psqlDB)
-	usercache := usercache.New(rdb)
+	usercache := usercache.New(rdb, cfg.CacheUsersTTL)
 	usersrv := usersrv.New(
 		userepo,
 		sessionrepo,

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -37,6 +37,8 @@ type Config struct {
 	RateLimiterRPS   int
 	RateLimiterBurst int
 	RateLimiterTTL   time.Duration
+
+	CacheUsersTTL time.Duration
 }
 
 func NewConfig() *Config {
@@ -75,6 +77,8 @@ func NewConfig() *Config {
 		RateLimiterRPS:   mustGetenvOrDefaultInt("RATELIMITER_RPS", 100),
 		RateLimiterBurst: mustGetenvOrDefaultInt("RATELIMITER_BURST", 10),
 		RateLimiterTTL:   mustParseDuration(getenvOrDefault("RATELIMITER_TTL", "1m")),
+
+		CacheUsersTTL: mustParseDuration(getenvOrDefault("CACHE_USERS_TTL", "1h")),
 	}
 }
 

diff --git a/internal/store/rdb/usercache/usercache.go b/internal/store/rdb/usercache/usercache.go
@@ -21,15 +21,19 @@ var _ UserCacheer = (*UserCache)(nil)
 
 type UserCache struct {
 	rdb *redis.Client
+	ttl time.Duration
 }
 
-func New(rdb *redis.Client) *UserCache {
-	return &UserCache{rdb}
+func New(rdb *redis.Client, ttl time.Duration) *UserCache {
+	return &UserCache{
+		rdb: rdb,
+		ttl: ttl,
+	}
 }
 
 func (u *UserCache) SetUserIsExists(ctx context.Context, userID string, val bool) error {
 	_, err := u.rdb.
-		Set(ctx, getKey("exists", userID), val, time.Hour).
+		Set(ctx, getKey("exists", userID), val, u.ttl).
 		Result()
 	return err
 }
@@ -46,7 +50,7 @@ func (u *UserCache) GetUserIsExists(ctx context.Context, userID string) (bool, e
 
 func (u *UserCache) SetUserIsActivated(ctx context.Context, userID string, val bool) error {
 	_, err := u.rdb.
-		Set(ctx, getKey("activated", userID), val, time.Hour).
+		Set(ctx, getKey("activated", userID), val, u.ttl).
 		Result()
 	return err
 }