RedisCommander初期化時にクライアントを取得するがそこでクライアントのnil判定は行わないように修正

app/adapter/query_service/task_query_service.go → app/adapter/queryservice/task_queryservice.go

@@ -7,7 +7,6 @@ import (
 	taskUsecase "github.com/kakkky/app/application/usecase/task"
 	"github.com/kakkky/app/domain/errors"
 	taskDomain "github.com/kakkky/app/domain/task"
-	// "github.com/kakkky/app/infrastructure/db/sqlc"
 )
 
 type taskQueryService struct {

app/application/usecase/task/interface_task_query_service.go → app/application/usecase/task/interface_task_queryservice.go

@@ -2,7 +2,7 @@ package task
 
 import "context"
 
-//go:generate mockgen -package=task -source=./interface_task_query_service.go -destination=./mock_task_query_service.go
+//go:generate mockgen -package=task -source=./interface_task_queryservice.go -destination=./mock_task_queryservice.go
 type TaskQueryService interface {
 	FetchTaskById(ctx context.Context, id string) (*FetchTaskDTO, error)
 	FetchUserTasks(ctx context.Context, userId string) ([]*FetchTaskDTO, error)

app/infrastructure/db/sqlc/sqlc_querier.go

@@ -3,7 +3,7 @@ package sqlc
 import (
 	"context"
 
-	queryservice "github.com/kakkky/app/adapter/query_service"
+	"github.com/kakkky/app/adapter/queryservice"
 	"github.com/kakkky/app/adapter/repository"
 	"github.com/kakkky/app/infrastructure/db"
 )

app/infrastructure/kvs/redis_commander.go

@@ -2,40 +2,41 @@ package kvs
 
 import (
 	"context"
-	"errors"
 
 	"time"
 
+	"github.com/kakkky/app/domain/errors"
 	"github.com/redis/go-redis/v9"
 )
 
 type RedisCommander struct {
+	cli *redis.Client
 }
 
 func NewRedisCommander() *RedisCommander {
-	return &RedisCommander{}
+	return &RedisCommander{
+		cli: GetRedisClient(),
+	}
 }
 
 func (rc *RedisCommander) Save(ctx context.Context, duration time.Duration, userID, jwtID string) error {
-	cli := GetRedisClient()
 	// Redis クライアントが nil の場合はエラーを返す
-	if cli == nil {
+	if rc.cli == nil {
 		return errors.New("failed to get Redis client")
 	}
-	status := cli.Set(ctx, userID, jwtID, duration)
+	status := rc.cli.Set(ctx, userID, jwtID, duration)
 	if status.Err() != nil {
 		return status.Err()
 	}
 	return nil
 }
 
 func (rc *RedisCommander) Load(ctx context.Context, userID string) (string, error) {
-	cli := GetRedisClient()
 	// Redis クライアントが nil の場合はエラーを返す
-	if cli == nil {
+	if rc.cli == nil {
 		return "", errors.New("failed to get Redis client")
 	}
-	status := cli.Get(ctx, userID)
+	status := rc.cli.Get(ctx, userID)
 	if status.Err() != nil {
 		// nilだったら空文字を返す
 		if status.Err() == redis.Nil {
@@ -47,12 +48,11 @@ func (rc *RedisCommander) Load(ctx context.Context, userID string) (string, erro
 }
 
 func (rc *RedisCommander) Delete(ctx context.Context, userID string) error {
-	cli := GetRedisClient()
 	// Redis クライアントが nil の場合はエラーを返す
-	if cli == nil {
+	if rc.cli == nil {
 		return errors.New("failed to get Redis client")
 	}
-	status := cli.Del(ctx, userID)
+	status := rc.cli.Del(ctx, userID)
 	if status.Err() != nil {
 		if status.Err() == redis.Nil {
 			return nil

app/infrastructure/queryservice_test/task_query_service_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	queryservice "github.com/kakkky/app/adapter/query_service"
+	"github.com/kakkky/app/adapter/queryservice"
 	"github.com/kakkky/app/application/usecase/task"
 	"github.com/kakkky/app/domain/errors"
 	"github.com/kakkky/app/infrastructure/db/sqlc"

app/infrastructure/router/handle_task.go

@@ -5,7 +5,7 @@ import (
 
 	taskHandler "github.com/kakkky/app/adapter/presentation/handler/task"
 	"github.com/kakkky/app/adapter/presentation/middleware"
-	queryservice "github.com/kakkky/app/adapter/query_service"
+	"github.com/kakkky/app/adapter/queryservice"
 	"github.com/kakkky/app/adapter/repository"
 	"github.com/kakkky/app/application/usecase/auth"
 	taskUsecase "github.com/kakkky/app/application/usecase/task"

app/infrastructure/router/handle_user.go

@@ -15,8 +15,7 @@ import (
 )
 
 func handleUser(mux *http.ServeMux) {
-	sqlc := sqlc.NewSqlcQuerier()
-	userRepository := repository.NewUserRepository(sqlc)
+	userRepository := repository.NewUserRepository(sqlc.NewSqlcQuerier())
 	authorization := middleware.Authorication(
 		auth.NewAuthorizationUsecase(
 			authInfra.NewJWTAuthenticator(),