Update to use db.Transaction() (#16)

* Update Repository method의 파라미터에 db를 주입하도록 * Update gormfx 실행 시 ping check하도록 * Update db.Transaction() 사용하도록 반영
BOAZ-LKVK · Nov 14, 2024 · b17c769 · b17c769
1 parent c0988be
commit b17c769
Show file tree

Hide file tree

Showing 12 changed files with 233 additions and 173 deletions.
diff --git a/pkg/fx/gormfx/config.go b/pkg/fx/gormfx/config.go
@@ -1,21 +1,27 @@
 package gormfx
 
 type Config struct {
-	DBDriver   string `envconfig:"DB_DRIVER" default:""`
-	DBUser     string `envconfig:"DB_USER" default:""`
-	DBPassword string `envconfig:"DB_PASSWORD" default:""`
-	DBHost     string `envconfig:"DB_HOST" default:""`
-	DBName     string `envconfig:"DB_NAME" default:""`
-	DBPort     string `envconfig:"DB_PORT" default:""`
+	DBDriver               string `envconfig:"DB_DRIVER" default:""`
+	DBUser                 string `envconfig:"DB_USER" default:""`
+	DBPassword             string `envconfig:"DB_PASSWORD" default:""`
+	DBHost                 string `envconfig:"DB_HOST" default:""`
+	DBName                 string `envconfig:"DB_NAME" default:""`
+	DBPort                 string `envconfig:"DB_PORT" default:""`
+	ConnMaxLifetimeSeconds int64  `envconfig:"DB_CONN_MAX_LIFETIME_SECONDS" default:"0"`
+	MaxIdleConns           int    `envconfig:"DB_MAX_IDLE_CONNS" default:"0"`
+	MaxOpenConns           int    `envconfig:"DB_MAX_OPEN_CONNS" default:"0"`
 }
 
 func parseConfig() *Config {
 	return &Config{
-		DBDriver:   "mysql",
-		DBUser:     "root",
-		DBPassword: "password",
-		DBHost:     "localhost",
-		DBName:     "dittodining",
-		DBPort:     "3306",
+		DBDriver:               "mysql",
+		DBUser:                 "root",
+		DBPassword:             "password",
+		DBHost:                 "localhost",
+		DBName:                 "dittodining",
+		DBPort:                 "3306",
+		ConnMaxLifetimeSeconds: 1800,
+		MaxIdleConns:           10, // TODO: DB 스펙에 따라 적절치로 조정
+		MaxOpenConns:           10,
 	}
 }
diff --git a/pkg/fx/gormfx/gormfx.go b/pkg/fx/gormfx/gormfx.go
@@ -1,10 +1,12 @@
 package gormfx
 
 import (
+	"context"
 	"fmt"
 	"go.uber.org/fx"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
+	"time"
 )
 
 type Params struct {
@@ -22,7 +24,6 @@ type Result struct {
 var Module = fx.Module("gorm",
 	fx.Provide(parseConfig),
 	fx.Provide(New),
-	fx.Invoke(connectDB),
 )
 
 func New(lc fx.Lifecycle, p Params) (Result, error) {
@@ -45,7 +46,29 @@ func New(lc fx.Lifecycle, p Params) (Result, error) {
 		return Result{}, err
 	}
 
+	lc.Append(
+		fx.Hook{
+			OnStart: func(ctx context.Context) error {
+				sqlDB, err := db.DB()
+				if err != nil {
+					return err
+				}
+
+				ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+				defer cancel()
+
+				if err := sqlDB.PingContext(ctx); err != nil {
+					return fmt.Errorf("database connection timeout: %w", err)
+				}
+
+				sqlDB.SetConnMaxLifetime(time.Duration(p.Config.ConnMaxLifetimeSeconds) * time.Second)
+				sqlDB.SetMaxIdleConns(p.Config.MaxIdleConns)
+				sqlDB.SetMaxOpenConns(p.Config.MaxOpenConns)
+
+				return nil
+			},
+		},
+	)
+
 	return Result{DB: db}, nil
 }
-
-func connectDB(db *gorm.DB) {}
diff --git a/server/api/recommendation/recommendation_api.go b/server/api/recommendation/recommendation_api.go
@@ -64,6 +64,7 @@ func (c *RecommendationAPIController) requestRestaurantRecommendation() fiber.Ha
 		}
 
 		result, err := c.restaurantRecommendationService.RequestRestaurantRecommendation(
+			ctx.UserContext(),
 			nil,
 			recommendation.UserLocation{
 				Latitude:  (*request).UserLocation.Latitude.Decimal,
@@ -115,6 +116,7 @@ func (c *RecommendationAPIController) listRecommendedRestaurants() fiber.Handler
 		}
 
 		listRecommendedRestaurantsResult, err := c.restaurantRecommendationService.ListRecommendedRestaurants(
+			ctx.UserContext(),
 			int64(restaurantRecommendationRequestID),
 			cursorRestaurantRecommendationID,
 			lo.ToPtr(int64(limit)),
@@ -147,7 +149,7 @@ func (c *RecommendationAPIController) selectRestaurantRecommendations() fiber.Ha
 			}
 		}
 
-		if _, err := c.restaurantRecommendationService.SelectRestaurantRecommendation(int64(restaurantRecommendationRequestID), request.RestaurantRecommendationIDs); err != nil {
+		if _, err := c.restaurantRecommendationService.SelectRestaurantRecommendation(ctx.UserContext(), int64(restaurantRecommendationRequestID), request.RestaurantRecommendationIDs); err != nil {
 			return err
 		}
 
@@ -165,7 +167,7 @@ func (c *RecommendationAPIController) getRestaurantRecommendationResult() fiber.
 			}
 		}
 
-		result, err := c.restaurantRecommendationService.GetRestaurantRecommendationResult(int64(restaurantRecommendationRequestID))
+		result, err := c.restaurantRecommendationService.GetRestaurantRecommendationResult(ctx.UserContext(), int64(restaurantRecommendationRequestID))
 		if err != nil {
 			return err
 		}
@@ -186,7 +188,7 @@ func (c *RecommendationAPIController) getRestaurantRecommendation() fiber.Handle
 			}
 		}
 
-		result, err := c.restaurantRecommendationService.GetRestaurantRecommendation(int64(restaurantRecommendationID))
+		result, err := c.restaurantRecommendationService.GetRestaurantRecommendation(ctx.UserContext(), int64(restaurantRecommendationID))
 		if err != nil {
 			if errors.Is(err, restaurant_repository.ErrRestaurantNotFound) {
 				return &customerrors.ApplicationError{

diff --git a/server/repository/recommendation/restaurant_recommendation_repository.go b/server/repository/recommendation/restaurant_recommendation_repository.go
@@ -1,6 +1,7 @@
 package recommendation
 
 import (
+	"context"
 	"github.com/BOAZ-LKVK/LKVK-server/server/domain/recommendation"
 	"github.com/pkg/errors"
 	"gorm.io/gorm"
@@ -9,21 +10,21 @@ import (
 var ErrRestaurantRecommendationNotFound = errors.New("restaurant recommendation not found")
 
 type RestaurantRecommendationRepository interface {
-	FindAllByRestaurantRecommendationRequestID(restaurantRecommendationRequestID int64, cursorRestaurantRecommendationRequestID *int64, limit *int64) ([]*recommendation.RestaurantRecommendation, error)
-	FindAllByIDs(restaurantRecommendationIDs []int64) ([]*recommendation.RestaurantRecommendation, error)
-	FindByID(restaurantRecommendationID int64) (*recommendation.RestaurantRecommendation, error)
-	SaveAll(recommendations []*recommendation.RestaurantRecommendation) error
+	FindAllByRestaurantRecommendationRequestID(ctx context.Context, db *gorm.DB, restaurantRecommendationRequestID int64, cursorRestaurantRecommendationRequestID *int64, limit *int64) ([]*recommendation.RestaurantRecommendation, error)
+	FindAllByIDs(ctx context.Context, db *gorm.DB, restaurantRecommendationIDs []int64) ([]*recommendation.RestaurantRecommendation, error)
+	FindByID(ctx context.Context, db *gorm.DB, restaurantRecommendationID int64) (*recommendation.RestaurantRecommendation, error)
+	SaveAll(ctx context.Context, db *gorm.DB, recommendations []*recommendation.RestaurantRecommendation) error
 }
 
-func NewRestaurantRecommendationRepository(db *gorm.DB) RestaurantRecommendationRepository {
-	return &restaurantRecommendationRepository{db: db}
+func NewRestaurantRecommendationRepository() RestaurantRecommendationRepository {
+	return &restaurantRecommendationRepository{}
 }
 
-type restaurantRecommendationRepository struct {
-	db *gorm.DB
-}
+type restaurantRecommendationRepository struct{}
 
 func (r *restaurantRecommendationRepository) FindAllByRestaurantRecommendationRequestID(
+	ctx context.Context,
+	db *gorm.DB,
 	restaurantRecommendationRequestID int64,
 	cursorRestaurantRecommendationID *int64,
 	limit *int64,
@@ -40,7 +41,7 @@ func (r *restaurantRecommendationRepository) FindAllByRestaurantRecommendationRe
 		limitQuery = int(*limit)
 	}
 
-	result := r.db.
+	result := db.
 		Where(
 			recommendation.RestaurantRecommendation{
 				RestaurantRecommendationRequestID: restaurantRecommendationRequestID,
@@ -56,10 +57,14 @@ func (r *restaurantRecommendationRepository) FindAllByRestaurantRecommendationRe
 	return recommendations, nil
 }
 
-func (r *restaurantRecommendationRepository) FindAllByIDs(restaurantRecommendationIDs []int64) ([]*recommendation.RestaurantRecommendation, error) {
+func (r *restaurantRecommendationRepository) FindAllByIDs(
+	ctx context.Context,
+	db *gorm.DB,
+	restaurantRecommendationIDs []int64,
+) ([]*recommendation.RestaurantRecommendation, error) {
 	var recommendations []*recommendation.RestaurantRecommendation
 
-	result := r.db.
+	result := db.
 		Where("restaurant_recommendation_id IN ?", restaurantRecommendationIDs).
 		Find(&recommendations)
 	if result.Error != nil {
@@ -69,10 +74,14 @@ func (r *restaurantRecommendationRepository) FindAllByIDs(restaurantRecommendati
 	return recommendations, nil
 }
 
-func (r *restaurantRecommendationRepository) FindByID(restaurantRecommendationID int64) (*recommendation.RestaurantRecommendation, error) {
+func (r *restaurantRecommendationRepository) FindByID(
+	ctx context.Context,
+	db *gorm.DB,
+	restaurantRecommendationID int64,
+) (*recommendation.RestaurantRecommendation, error) {
 	var existingRecommendation recommendation.RestaurantRecommendation
 
-	result := r.db.
+	result := db.
 		Where(&recommendation.RestaurantRecommendation{
 			RestaurantRecommendationID: restaurantRecommendationID,
 		}).
@@ -88,8 +97,12 @@ func (r *restaurantRecommendationRepository) FindByID(restaurantRecommendationID
 	return &existingRecommendation, nil
 }
 
-func (r *restaurantRecommendationRepository) SaveAll(recommendations []*recommendation.RestaurantRecommendation) error {
-	result := r.db.Save(recommendations)
+func (r *restaurantRecommendationRepository) SaveAll(
+	ctx context.Context,
+	db *gorm.DB,
+	recommendations []*recommendation.RestaurantRecommendation,
+) error {
+	result := db.Save(recommendations)
 	if result.Error != nil {
 		return result.Error
 	}

diff --git a/server/repository/recommendation/restaurant_recommendation_request_repository.go b/server/repository/recommendation/restaurant_recommendation_request_repository.go
@@ -1,6 +1,7 @@
 package recommendation
 
 import (
+	"context"
 	"errors"
 	"github.com/BOAZ-LKVK/LKVK-server/server/domain/recommendation"
 	"gorm.io/gorm"
@@ -9,28 +10,28 @@ import (
 var ErrRestaurantRecommendationRequestNotFound = errors.New("restaurant recommendation request not found")
 
 type RestaurantRecommendationRequestRepository interface {
-	Save(request *recommendation.RestaurantRecommendationRequest) (*recommendation.RestaurantRecommendationRequest, error)
-	FindByID(restaurantRecommendationRequestID int64) (*recommendation.RestaurantRecommendationRequest, error)
+	Save(ctx context.Context, db *gorm.DB, request *recommendation.RestaurantRecommendationRequest) (*recommendation.RestaurantRecommendationRequest, error)
+	FindByID(ctx context.Context, db *gorm.DB, restaurantRecommendationRequestID int64) (*recommendation.RestaurantRecommendationRequest, error)
 }
 
-func NewRestaurantRecommendationRequestRepository(db *gorm.DB) RestaurantRecommendationRequestRepository {
-	return &restaurantRecommendationRequestRepository{db: db}
+func NewRestaurantRecommendationRequestRepository() RestaurantRecommendationRequestRepository {
+	return &restaurantRecommendationRequestRepository{}
 }
 
 type restaurantRecommendationRequestRepository struct {
 	db *gorm.DB
 }
 
-func (r *restaurantRecommendationRequestRepository) Save(request *recommendation.RestaurantRecommendationRequest) (*recommendation.RestaurantRecommendationRequest, error) {
-	result := r.db.Create(request)
+func (r *restaurantRecommendationRequestRepository) Save(ctx context.Context, db *gorm.DB, request *recommendation.RestaurantRecommendationRequest) (*recommendation.RestaurantRecommendationRequest, error) {
+	result := db.Create(request)
 	if result.Error != nil {
 		return nil, result.Error
 	}
 
 	return request, nil
 }
 
-func (r *restaurantRecommendationRequestRepository) FindByID(restaurantRecommendationRequestID int64) (*recommendation.RestaurantRecommendationRequest, error) {
+func (r *restaurantRecommendationRequestRepository) FindByID(ctx context.Context, db *gorm.DB, restaurantRecommendationRequestID int64) (*recommendation.RestaurantRecommendationRequest, error) {
 	var request *recommendation.RestaurantRecommendationRequest
 
 	result := r.db.Where(recommendation.RestaurantRecommendationRequest{

diff --git a/server/repository/recommendation/selected_restaurant_recommendation_repository.go b/server/repository/recommendation/selected_restaurant_recommendation_repository.go
@@ -1,35 +1,36 @@
 package recommendation
 
 import (
+	"context"
 	recommendation_domain "github.com/BOAZ-LKVK/LKVK-server/server/domain/recommendation"
 	"gorm.io/gorm"
 )
 
 type SelectedRestaurantRecommendationRepository interface {
-	SaveAll(selectedRestaurantRecommendations []*recommendation_domain.SelectedRestaurantRecommendation) error
-	FindAllByRestaurantRecommendationRequestID(restaurantRecommendationRequestID int64) ([]*recommendation_domain.SelectedRestaurantRecommendation, error)
+	SaveAll(ctx context.Context, db *gorm.DB, selectedRestaurantRecommendations []*recommendation_domain.SelectedRestaurantRecommendation) error
+	FindAllByRestaurantRecommendationRequestID(ctx context.Context, db *gorm.DB, restaurantRecommendationRequestID int64) ([]*recommendation_domain.SelectedRestaurantRecommendation, error)
 }
 
-func NewSelectedRestaurantRecommendationRepository(db *gorm.DB) SelectedRestaurantRecommendationRepository {
-	return &selectedRestaurantRecommendationRepository{db: db}
+func NewSelectedRestaurantRecommendationRepository() SelectedRestaurantRecommendationRepository {
+	return &selectedRestaurantRecommendationRepository{}
 }
 
 type selectedRestaurantRecommendationRepository struct {
 	db *gorm.DB
 }
 
-func (r *selectedRestaurantRecommendationRepository) SaveAll(selectedRestaurantRecommendations []*recommendation_domain.SelectedRestaurantRecommendation) error {
-	result := r.db.Save(selectedRestaurantRecommendations)
+func (r *selectedRestaurantRecommendationRepository) SaveAll(ctx context.Context, db *gorm.DB, selectedRestaurantRecommendations []*recommendation_domain.SelectedRestaurantRecommendation) error {
+	result := db.Save(selectedRestaurantRecommendations)
 	if result.Error != nil {
 		return result.Error
 	}
 
 	return nil
 }
 
-func (r *selectedRestaurantRecommendationRepository) FindAllByRestaurantRecommendationRequestID(restaurantRecommendationRequestID int64) ([]*recommendation_domain.SelectedRestaurantRecommendation, error) {
+func (r *selectedRestaurantRecommendationRepository) FindAllByRestaurantRecommendationRequestID(ctx context.Context, db *gorm.DB, restaurantRecommendationRequestID int64) ([]*recommendation_domain.SelectedRestaurantRecommendation, error) {
 	var selectedRestaurantRecommendations []*recommendation_domain.SelectedRestaurantRecommendation
-	result := r.db.
+	result := db.
 		Where(recommendation_domain.SelectedRestaurantRecommendation{
 			RestaurantRecommendationRequestID: restaurantRecommendationRequestID,
 		}).

diff --git a/server/repository/restaurant/restaurant_image_repository.go b/server/repository/restaurant/restaurant_image_repository.go
@@ -1,28 +1,25 @@
 package restaurant
 
 import (
+	"context"
 	"github.com/BOAZ-LKVK/LKVK-server/server/domain/restaurant"
 	"gorm.io/gorm"
 )
 
 type RestaurantImageRepository interface {
-	FindAllByRestaurantID(restaurantID int64) ([]*restaurant.RestaurantImage, error)
-	FindAllByRestaurantIDs(restaurantIDs []int64) ([]*restaurant.RestaurantImage, error)
+	FindAllByRestaurantID(ctx context.Context, db *gorm.DB, restaurantID int64) ([]*restaurant.RestaurantImage, error)
+	FindAllByRestaurantIDs(ctx context.Context, db *gorm.DB, restaurantIDs []int64) ([]*restaurant.RestaurantImage, error)
 }
 
-func NewRestaurantImageRepository(db *gorm.DB) RestaurantImageRepository {
-	return &restaurantImageRepository{
-		db: db,
-	}
+func NewRestaurantImageRepository() RestaurantImageRepository {
+	return &restaurantImageRepository{}
 }
 
-type restaurantImageRepository struct {
-	db *gorm.DB
-}
+type restaurantImageRepository struct{}
 
-func (r *restaurantImageRepository) FindAllByRestaurantID(restaurantID int64) ([]*restaurant.RestaurantImage, error) {
+func (r *restaurantImageRepository) FindAllByRestaurantID(ctx context.Context, db *gorm.DB, restaurantID int64) ([]*restaurant.RestaurantImage, error) {
 	var images []*restaurant.RestaurantImage
-	result := r.db.
+	result := db.
 		Where(restaurant.RestaurantImage{
 			RestaurantID: restaurantID,
 		}).
@@ -34,9 +31,9 @@ func (r *restaurantImageRepository) FindAllByRestaurantID(restaurantID int64) ([
 	return images, nil
 }
 
-func (r *restaurantImageRepository) FindAllByRestaurantIDs(restaurantIDs []int64) ([]*restaurant.RestaurantImage, error) {
+func (r *restaurantImageRepository) FindAllByRestaurantIDs(ctx context.Context, db *gorm.DB, restaurantIDs []int64) ([]*restaurant.RestaurantImage, error) {
 	var images []*restaurant.RestaurantImage
-	result := r.db.
+	result := db.
 		Where("restaurant_id IN ?", restaurantIDs).
 		Find(&images)
 	if result.Error != nil {