Skip to content

Commit 7c8444c

Browse files
committed
Fix the cache
1 parent 2cb7aa3 commit 7c8444c

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

api/pkg/di/container.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,21 +1321,21 @@ func (container *Container) UserRepository() repositories.UserRepository {
13211321
return repositories.NewGormUserRepository(
13221322
container.Logger(),
13231323
container.Tracer(),
1324-
container.RistrettoCache(),
1324+
container.UserRistrettoCache(),
13251325
container.DB(),
13261326
)
13271327
}
13281328

1329-
// RistrettoCache creates an in-memory *ristretto.Cache
1330-
func (container *Container) RistrettoCache() (cache *ristretto.Cache) {
1329+
// UserRistrettoCache creates an in-memory *ristretto.Cache[string, entities.AuthUser]
1330+
func (container *Container) UserRistrettoCache() (cache *ristretto.Cache[string, entities.AuthUser]) {
13311331
container.logger.Debug(fmt.Sprintf("creating %T", cache))
1332-
ristrettoCache, err := ristretto.NewCache(&ristretto.Config{
1332+
ristrettoCache, err := ristretto.NewCache[string, entities.AuthUser](&ristretto.Config[string, entities.AuthUser]{
13331333
MaxCost: 5000,
13341334
NumCounters: 5000 * 10,
13351335
BufferItems: 64,
13361336
})
13371337
if err != nil {
1338-
container.logger.Fatal(stacktrace.Propagate(err, "cannot create ristretto cache"))
1338+
container.logger.Fatal(stacktrace.Propagate(err, "cannot create user ristretto cache"))
13391339
}
13401340
return ristrettoCache
13411341
}

api/pkg/repositories/gorm_user_repository.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ import (
2323
type gormUserRepository struct {
2424
logger telemetry.Logger
2525
tracer telemetry.Tracer
26-
cache *ristretto.Cache
26+
cache *ristretto.Cache[string, entities.AuthUser]
2727
db *gorm.DB
2828
}
2929

3030
// NewGormUserRepository creates the GORM version of the UserRepository
3131
func NewGormUserRepository(
3232
logger telemetry.Logger,
3333
tracer telemetry.Tracer,
34-
cache *ristretto.Cache,
34+
cache *ristretto.Cache[string, entities.AuthUser],
3535
db *gorm.DB,
3636
) UserRepository {
3737
return &gormUserRepository{
@@ -119,8 +119,8 @@ func (repository *gormUserRepository) LoadAuthUser(ctx context.Context, apiKey s
119119
defer span.End()
120120

121121
if authUser, found := repository.cache.Get(apiKey); found {
122-
ctxLogger.Info(fmt.Sprintf("cache hit for user with ID [%s]", authUser.(entities.AuthUser).ID))
123-
return authUser.(entities.AuthUser), nil
122+
ctxLogger.Info(fmt.Sprintf("cache hit for user with ID [%s]", authUser.ID))
123+
return authUser, nil
124124
}
125125

126126
user := new(entities.User)

0 commit comments

Comments
 (0)