fix: query not using key

isd-sgcu · Dec 18, 2023 · cb5d6ee · cb5d6ee
1 parent d2c2e58
commit cb5d6ee
Showing 5 changed files with 32 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,12 +4,17 @@ All notable changes to this project will be documented in this file.
 
 ## [unreleased]
 
+### Bug Fixes
+
+- Query not using key
+
 ### Features
 
 - Init
 
 ### Miscellaneous Tasks
 
 - Setup `CHANGELOG.md`
+- Update contribution
 
 <!-- generated by git-cliff -->
diff --git a/di/wire.go b/di/wire.go
@@ -38,6 +38,7 @@ func Init() (Container, error) {
 		database.New, cache.New,
 		featureflag.NewHandler,
 		featureflag.NewService,
+		featureflag.NewRepository,
 		logger.InitLogger,
 	)
 

diff --git a/di/wire_gen.go b/di/wire_gen.go
diff --git a/internal/feature_flag/feature_flag.repository.go b/internal/feature_flag/feature_flag.repository.go
@@ -0,0 +1,20 @@
+package featureflag
+
+import "gorm.io/gorm"
+
+type Repository interface {
+	FindOneByKey(result *FeatureFlag, key string) error
+}
+
+type repositoryImpl struct {
+	db *gorm.DB
+}
+
+func NewRepository(db *gorm.DB) Repository {
+	return &repositoryImpl{
+		db,
+	}
+}
+func (r *repositoryImpl) FindOneByKey(result *FeatureFlag, key string) error {
+	return r.db.Model(result).First(result, "key = ?", key).Error
+}
diff --git a/internal/feature_flag/feature_flag.service.go b/internal/feature_flag/feature_flag.service.go
@@ -15,16 +15,16 @@ type Service interface {
 	GetFlag(ctx context.Context, key string) (bool, *apperror.AppError)
 }
 
-func NewService(db *gorm.DB, redis *redis.Client, logger *zap.Logger) Service {
+func NewService(repo Repository, redis *redis.Client, logger *zap.Logger) Service {
 	return &serviceImpl{
-		db,
+		repo,
 		redis,
 		logger,
 	}
 }
 
 type serviceImpl struct {
-	db     *gorm.DB
+	repo   Repository
 	redis  *redis.Client
 	logger *zap.Logger
 }
@@ -33,7 +33,7 @@ func (h *serviceImpl) GetFlag(ctx context.Context, key string) (bool, *apperror.
 	res, err := h.redis.Get(ctx, key).Result()
 	if err == redis.Nil {
 		var res FeatureFlag
-		if err := h.db.First(&res).Error; errors.Is(err, gorm.ErrRecordNotFound) {
+		if err := h.repo.FindOneByKey(&res, key); errors.Is(err, gorm.ErrRecordNotFound) {
 			return false, apperror.InvalidFeatureFlagKey
 		} else if err != nil {
 			h.logger.Error("unable to query feature flag value from database", zap.String("key", key))