refactor: repo DI

repository/course.go

@@ -51,8 +51,8 @@ func (b *BaseCourseQuery) GetBaseCourseList(ctx context.Context, opts ...DBOptio
 	return coursePOs, nil
 }
 
-func NewBaseCourseQuery() IBaseCourseQuery {
-	return &BaseCourseQuery{db: dal.GetDBClient()}
+func NewBaseCourseQuery(db *gorm.DB) IBaseCourseQuery {
+	return &BaseCourseQuery{db: db}
 }
 
 type ICourseQuery interface {
@@ -238,6 +238,6 @@ func (o *OfferedCourseQuery) GetMainTeacherIDsWithOfferedCourseIDs(ctx context.C
 	return mainTeacherIDs, nil
 }
 
-func NewOfferedCourseQuery() IOfferedCourseQuery {
-	return &OfferedCourseQuery{db: dal.GetDBClient()}
+func NewOfferedCourseQuery(db *gorm.DB) IOfferedCourseQuery {
+	return &OfferedCourseQuery{db: db}
 }

repository/review.go

@@ -5,7 +5,6 @@ import (
 
 	"gorm.io/gorm"
 
-	"jcourse_go/dal"
 	"jcourse_go/model/po"
 )
 
@@ -95,6 +94,6 @@ func (c *ReviewQuery) DeleteReview(ctx context.Context, opts ...DBOption) (int64
 	return result.RowsAffected, result.Error
 }
 
-func NewReviewQuery() IReviewQuery {
-	return &ReviewQuery{db: dal.GetDBClient()}
+func NewReviewQuery(db *gorm.DB) IReviewQuery {
+	return &ReviewQuery{db: db}
 }

repository/teacher.go

@@ -6,7 +6,6 @@ import (
 
 	"gorm.io/gorm"
 
-	"jcourse_go/dal"
 	"jcourse_go/model/po"
 )
 
@@ -21,9 +20,9 @@ type TeacherQuery struct {
 	db *gorm.DB
 }
 
-func NewTeacherQuery() ITeacherQuery {
+func NewTeacherQuery(db *gorm.DB) ITeacherQuery {
 	return &TeacherQuery{
-		db: dal.GetDBClient(),
+		db: db,
 	}
 }
 

repository/trainingplan.go

@@ -3,7 +3,6 @@ package repository
 import (
 	"context"
 
-	"jcourse_go/dal"
 	"jcourse_go/model/po"
 
 	"gorm.io/gorm"
@@ -21,8 +20,8 @@ type ITrainingPlanQuery interface {
 	GetTrainingPlanCount(ctx context.Context, opts ...DBOption) int64
 }
 
-func NewTrainingPlanQuery() ITrainingPlanQuery {
-	return &TrainingPlanQuery{db: dal.GetDBClient()}
+func NewTrainingPlanQuery(db *gorm.DB) ITrainingPlanQuery {
+	return &TrainingPlanQuery{db: db}
 }
 
 func (t *TrainingPlanQuery) GetTrainingPlanListIDs(ctx context.Context, opts ...DBOption) ([]int64, error) {
@@ -76,8 +75,8 @@ type TrainingPlanCourseQuery struct {
 	db *gorm.DB
 }
 
-func NewTrainingPlanCourseQuery() ITrainingPlanCourseQuery {
-	return &TrainingPlanCourseQuery{db: dal.GetDBClient()}
+func NewTrainingPlanCourseQuery(db *gorm.DB) ITrainingPlanCourseQuery {
+	return &TrainingPlanCourseQuery{db: db}
 }
 
 func (t *TrainingPlanCourseQuery) optionDB(ctx context.Context, opts ...DBOption) *gorm.DB {

repository/user.go

@@ -8,7 +8,6 @@ import (
 	"gorm.io/gorm"
 
 	"jcourse_go/constant"
-	"jcourse_go/dal"
 	"jcourse_go/model/po"
 )
 
@@ -68,13 +67,13 @@ func (u *UserProfileQuery) optionDB(ctx context.Context, opts ...DBOption) *gorm
 	return db
 }
 
-func NewUserProfileQuery() IUserProfileQuery {
-	return &UserProfileQuery{db: dal.GetDBClient()}
+func NewUserProfileQuery(db *gorm.DB) IUserProfileQuery {
+	return &UserProfileQuery{db: db}
 }
 
-func NewUserQuery() IUserQuery {
+func NewUserQuery(db *gorm.DB) IUserQuery {
 	return &UserQuery{
-		db: dal.GetDBClient(),
+		db: db,
 	}
 }
 

service/auth.go

@@ -11,6 +11,7 @@ import (
 	"github.com/SJTU-jCourse/password_hasher"
 
 	"jcourse_go/constant"
+	"jcourse_go/dal"
 	"jcourse_go/model/converter"
 	"jcourse_go/model/domain"
 	"jcourse_go/repository"
@@ -22,7 +23,7 @@ func Login(ctx context.Context, email string, password string) (*domain.User, er
 	if err != nil {
 		return nil, err
 	}
-	query := repository.NewUserQuery()
+	query := repository.NewUserQuery(dal.GetDBClient())
 	userPO, err := query.GetUserDetail(ctx, repository.WithEmail(email), repository.WithPassword(passwordStore))
 	if err != nil {
 		return nil, err
@@ -39,7 +40,7 @@ func Register(ctx context.Context, email string, password string, code string) (
 	if storedCode != code {
 		return nil, errors.New("verify code is wrong")
 	}
-	query := repository.NewUserQuery()
+	query := repository.NewUserQuery(dal.GetDBClient())
 	userPO, err := query.GetUserDetail(ctx, repository.WithEmail(email))
 	if err != nil {
 		return nil, err
@@ -68,7 +69,7 @@ func ResetPassword(ctx context.Context, email string, password string, code stri
 	if storedCode != code {
 		return errors.New("verify code is wrong")
 	}
-	query := repository.NewUserQuery()
+	query := repository.NewUserQuery(dal.GetDBClient())
 	user, err := query.GetUserDetail(ctx, repository.WithEmail(email))
 	if err != nil {
 		return err

service/course.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 
+	"jcourse_go/dal"
 	"jcourse_go/model/converter"
 	"jcourse_go/model/domain"
 	"jcourse_go/repository"
@@ -25,19 +26,19 @@ func GetCourseDetail(ctx context.Context, courseID int64) (*domain.Course, error
 		return nil, err
 	}
 
-	teacherQuery := repository.NewTeacherQuery()
+	teacherQuery := repository.NewTeacherQuery(dal.GetDBClient())
 	teacherPO, err := teacherQuery.GetTeacher(ctx, repository.WithID(coursePO.MainTeacherID))
 	if err != nil {
 		return nil, err
 	}
 
-	offeredCourseQuery := repository.NewOfferedCourseQuery()
+	offeredCourseQuery := repository.NewOfferedCourseQuery(dal.GetDBClient())
 	offeredCoursePOs, err := offeredCourseQuery.GetOfferedCourseList(ctx, repository.WithCourseID(courseID), repository.WithOrderBy("semester", false))
 	if err != nil {
 		return nil, err
 	}
 
-	reviewQuery := repository.NewReviewQuery()
+	reviewQuery := repository.NewReviewQuery(dal.GetDBClient())
 	infos, err := reviewQuery.GetCourseReviewInfo(ctx, []int64{courseID})
 	if err != nil {
 		return nil, err
@@ -93,7 +94,7 @@ func GetCourseList(ctx context.Context, filter domain.CourseListFilter) ([]domai
 		return nil, err
 	}
 
-	reviewQuery := repository.NewReviewQuery()
+	reviewQuery := repository.NewReviewQuery(dal.GetDBClient())
 	infos, err := reviewQuery.GetCourseReviewInfo(ctx, courseIDs)
 	if err != nil {
 		return nil, err

service/review.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 
+	"jcourse_go/dal"
 	"jcourse_go/model/converter"
 	"jcourse_go/model/domain"
 	"jcourse_go/model/dto"
@@ -38,7 +39,7 @@ func buildReviewDBOptionFromFilter(query repository.IReviewQuery, filter domain.
 }
 
 func GetReviewList(ctx context.Context, filter domain.ReviewFilter) ([]domain.Review, error) {
-	reviewQuery := repository.NewReviewQuery()
+	reviewQuery := repository.NewReviewQuery(dal.GetDBClient())
 	opts := buildReviewDBOptionFromFilter(reviewQuery, filter)
 	reviewPOs, err := reviewQuery.GetReviewList(ctx, opts...)
 	if err != nil {
@@ -82,7 +83,7 @@ func GetReviewList(ctx context.Context, filter domain.ReviewFilter) ([]domain.Re
 }
 
 func GetReviewCount(ctx context.Context, filter domain.ReviewFilter) (int64, error) {
-	query := repository.NewReviewQuery()
+	query := repository.NewReviewQuery(dal.GetDBClient())
 	filter.Page, filter.PageSize = 0, 0
 	opts := buildReviewDBOptionFromFilter(query, filter)
 	return query.GetReviewCount(ctx, opts...)
@@ -92,7 +93,7 @@ func CreateReview(ctx context.Context, review dto.UpdateReviewDTO, user *domain.
 	if !validateReview(ctx, review, user) {
 		return 0, errors.New("validate review error")
 	}
-	query := repository.NewReviewQuery()
+	query := repository.NewReviewQuery(dal.GetDBClient())
 	reviewPO := converter.ConvertUpdateReviewDTOToPO(review, user.ID)
 	reviewID, err := query.CreateReview(ctx, reviewPO)
 	if err != nil {
@@ -108,7 +109,7 @@ func UpdateReview(ctx context.Context, review dto.UpdateReviewDTO, user *domain.
 	if !validateReview(ctx, review, user) {
 		return errors.New("validate review error")
 	}
-	query := repository.NewReviewQuery()
+	query := repository.NewReviewQuery(dal.GetDBClient())
 	reviewPO := converter.ConvertUpdateReviewDTOToPO(review, user.ID)
 	_, err := query.UpdateReview(ctx, reviewPO)
 	if err != nil {
@@ -118,7 +119,7 @@ func UpdateReview(ctx context.Context, review dto.UpdateReviewDTO, user *domain.
 }
 
 func DeleteReview(ctx context.Context, reviewID int64) error {
-	query := repository.NewReviewQuery()
+	query := repository.NewReviewQuery(dal.GetDBClient())
 	_, err := query.DeleteReview(ctx, repository.WithID(reviewID))
 	if err != nil {
 		return err
@@ -128,7 +129,7 @@ func DeleteReview(ctx context.Context, reviewID int64) error {
 
 func validateReview(ctx context.Context, review dto.UpdateReviewDTO, user *domain.User) bool {
 	// 1. validate course and semester exists
-	offeredCourseQuery := repository.NewOfferedCourseQuery()
+	offeredCourseQuery := repository.NewOfferedCourseQuery(dal.GetDBClient())
 	offeredCourse, err := offeredCourseQuery.GetOfferedCourse(ctx, repository.WithCourseID(review.CourseID), repository.WithSemester(review.Semester))
 	if err != nil || offeredCourse == nil {
 		return false

service/teacher.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 
+	"jcourse_go/dal"
 	"jcourse_go/model/converter"
 	"jcourse_go/model/domain"
 	"jcourse_go/repository"
@@ -13,15 +14,15 @@ func GetTeacherDetail(ctx context.Context, teacherID int64) (*domain.Teacher, er
 	if teacherID == 0 {
 		return nil, errors.New("training-plan id is 0")
 	}
-	teacherQuery := repository.NewTeacherQuery()
+	teacherQuery := repository.NewTeacherQuery(dal.GetDBClient())
 
 	teacherPO, err := teacherQuery.GetTeacher(ctx, repository.WithID(teacherID))
 	if err != nil {
 		return nil, err
 	}
 	teacher := converter.ConvertTeacherPOToDomain(teacherPO)
 
-	courseQuery := repository.NewOfferedCourseQuery()
+	courseQuery := repository.NewOfferedCourseQuery(dal.GetDBClient())
 	courses, err := courseQuery.GetOfferedCourseList(ctx, repository.WithMainTeacherID(teacherID))
 	if err != nil {
 		return nil, err
@@ -60,10 +61,10 @@ func buildTeacherDBOptionFromFilter(query repository.ITeacherQuery, filter domai
 }
 
 func SearchTeacherList(ctx context.Context, filter domain.TeacherListFilter) ([]domain.Teacher, error) {
-	teacherQuery := repository.NewTeacherQuery()
+	teacherQuery := repository.NewTeacherQuery(dal.GetDBClient())
 	t_opts := buildTeacherDBOptionFromFilter(teacherQuery, filter)
 
-	teacherCourseQuery := repository.NewOfferedCourseQuery()
+	teacherCourseQuery := repository.NewOfferedCourseQuery(dal.GetDBClient())
 	validTeacherIDs, err := teacherCourseQuery.GetMainTeacherIDsWithOfferedCourseIDs(ctx, filter.ContainCourseIDs)
 	if err != nil {
 		return nil, err
@@ -77,7 +78,7 @@ func SearchTeacherList(ctx context.Context, filter domain.TeacherListFilter) ([]
 
 	domainTeachers := make([]domain.Teacher, 0)
 	for _, t := range teachers {
-		q := repository.NewOfferedCourseQuery()
+		q := repository.NewOfferedCourseQuery(dal.GetDBClient())
 		offeredCoursePOs, err := q.GetOfferedCourseList(ctx, repository.WithMainTeacherID(int64(t.ID)))
 		if err != nil {
 			return nil, err
@@ -90,15 +91,15 @@ func SearchTeacherList(ctx context.Context, filter domain.TeacherListFilter) ([]
 }
 
 func GetTeacherCount(ctx context.Context, filter domain.TeacherListFilter) (int64, error) {
-	query := repository.NewTeacherQuery()
+	query := repository.NewTeacherQuery(dal.GetDBClient())
 	filter.Page, filter.PageSize = 0, 0
 	opts := buildTeacherDBOptionFromFilter(query, filter)
 	return query.GetTeacherCount(ctx, opts...)
 }
 
 func GetTeacherListByIDs(ctx context.Context, teacherIDs []int64) (map[int64]domain.Teacher, error) {
 
-	teacherQuery := repository.NewTeacherQuery()
+	teacherQuery := repository.NewTeacherQuery(dal.GetDBClient())
 	teachers, err := teacherQuery.GetTeacherList(ctx, repository.WithIDs(teacherIDs))
 	if err != nil {
 		return nil, err

service/trainingplan.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 
+	"jcourse_go/dal"
 	"jcourse_go/model/converter"
 	"jcourse_go/model/domain"
 	"jcourse_go/repository"
@@ -13,17 +14,17 @@ func GetTrainingPlanDetail(ctx context.Context, trainingPlanID int64) (*domain.T
 	if trainingPlanID == 0 {
 		return nil, errors.New("training-plan id is 0")
 	}
-	trainingPlanQuery := repository.NewTrainingPlanQuery()
+	trainingPlanQuery := repository.NewTrainingPlanQuery(dal.GetDBClient())
 
 	trainingPlanPO, err := trainingPlanQuery.GetTrainingPlan(ctx, repository.WithID(trainingPlanID))
 	if err != nil {
 		return nil, err
 	}
 	trainingPlan := converter.ConvertTrainingPlanPOToDomain(*trainingPlanPO)
 
-	courseQuery := repository.NewTrainingPlanCourseQuery()
+	courseQuery := repository.NewTrainingPlanCourseQuery(dal.GetDBClient())
 	courses, err := courseQuery.GetCourseListOfTrainingPlan(ctx, trainingPlanID)
-	baseCourseQuery := repository.NewBaseCourseQuery()
+	baseCourseQuery := repository.NewBaseCourseQuery(dal.GetDBClient())
 	if err != nil {
 		return nil, err
 	}
@@ -65,15 +66,15 @@ func buildTrainingPlanCourseDBOptionFromFilter(query repository.ITrainingPlanCou
 	return opts
 }
 func GetTrainingPlanCount(ctx context.Context, filter domain.TrainingPlanFilter) int64 {
-	trainingPlanQuery := repository.NewTrainingPlanQuery()
+	trainingPlanQuery := repository.NewTrainingPlanQuery(dal.GetDBClient())
 	opts := buildTrainingPlanDBOptionFromFilter(trainingPlanQuery, filter)
 	return trainingPlanQuery.GetTrainingPlanCount(ctx, opts...)
 }
 func SearchTrainingPlanList(ctx context.Context, filter domain.TrainingPlanFilter) ([]domain.TrainingPlanDetail, error) {
 
-	trainingPlanQuery := repository.NewTrainingPlanQuery()
+	trainingPlanQuery := repository.NewTrainingPlanQuery(dal.GetDBClient())
 	tp_opts := buildTrainingPlanDBOptionFromFilter(trainingPlanQuery, filter)
-	trainingPlanCourseQuery := repository.NewTrainingPlanCourseQuery()
+	trainingPlanCourseQuery := repository.NewTrainingPlanCourseQuery(dal.GetDBClient())
 	if len(filter.ContainCourseIDs) != 0 {
 		tpc_opts := buildTrainingPlanCourseDBOptionFromFilter(trainingPlanCourseQuery, filter)
 		validTrainingPlanIDs, err := trainingPlanCourseQuery.GetTrainingPlanListIDs(ctx, tpc_opts...)