improve context and add transaction for db

applications/comment/main.go

@@ -2,16 +2,19 @@ package main
 
 import (
 	"context"
+
+	"go.uber.org/zap"
+
 	"github.com/TremblingV5/DouTok/applications/comment/handler"
 	"github.com/TremblingV5/DouTok/applications/comment/rpc"
 	"github.com/TremblingV5/DouTok/config/configStruct"
 	"github.com/TremblingV5/DouTok/kitex_gen/comment/commentservice"
-	"github.com/TremblingV5/DouTok/pkg/DouTokContext"
 	"github.com/TremblingV5/DouTok/pkg/DouTokLogger"
 	"github.com/TremblingV5/DouTok/pkg/configurator"
 	"github.com/TremblingV5/DouTok/pkg/constants"
+	"github.com/TremblingV5/DouTok/pkg/dtviper"
+	"github.com/TremblingV5/DouTok/pkg/dtx"
 	"github.com/TremblingV5/DouTok/pkg/services"
-	"go.uber.org/zap"
 )
 
 type Config struct {
@@ -28,10 +31,17 @@ var (
 func init() {
 
 	ctx := context.Background()
-	_, err := configurator.Load(config, "DOUTOK_COMMENT", "comment")
-	logger = DouTokLogger.InitLogger(config.Logger)
-	DouTokContext.DefaultLogger = logger
-	DouTokContext.AddLoggerToContext(ctx, logger)
+	commentConfig = Config{}
+	logcfg = LoggerConfig{}
+	ViperConfig = dtviper.ConfigInit("DOUTOK_COMMENT", "comment")
+	ViperConfig.UnmarshalStructTags(reflect.TypeOf(commentConfig), "")
+	ViperConfig.UnmarshalStruct(&commentConfig)
+
+	logcfg, err := configStruct.Load[*LoggerConfig](ctx, &logcfg)
+
+	logger = DouTokLogger.InitLogger(logcfg.Logger)
+	dtx.DefaultLogger = logger
+	dtx.AddLoggerToContext(ctx, logger)
 	if err != nil {
 		logger.Fatal("could not load env variables", zap.Error(err), zap.Any("config", config))
 	}

applications/commentDomain/cmd/server/main.go

@@ -2,19 +2,22 @@ package main
 
 import (
 	"context"
+
+	"go.uber.org/zap"
+
 	"github.com/TremblingV5/DouTok/applications/commentDomain/handler"
 	"github.com/TremblingV5/DouTok/applications/commentDomain/redis/commentTotalCountRedis"
 	"github.com/TremblingV5/DouTok/applications/commentDomain/service"
 	"github.com/TremblingV5/DouTok/config/configStruct"
 	"github.com/TremblingV5/DouTok/kitex_gen/commentDomain/commentdomainservice"
-	"github.com/TremblingV5/DouTok/pkg/DouTokContext"
 	"github.com/TremblingV5/DouTok/pkg/DouTokLogger"
 	"github.com/TremblingV5/DouTok/pkg/configurator"
 	"github.com/TremblingV5/DouTok/pkg/constants"
+	"github.com/TremblingV5/DouTok/pkg/dtviper"
+	"github.com/TremblingV5/DouTok/pkg/dtx"
 	"github.com/TremblingV5/DouTok/pkg/hbaseHandle"
 	redishandle "github.com/TremblingV5/DouTok/pkg/redisHandle"
 	"github.com/TremblingV5/DouTok/pkg/services"
-	"go.uber.org/zap"
 )
 
 type Config struct {
@@ -39,15 +42,14 @@ func init() {
 
 	_, err := configurator.Load(config, "DOUTOK_COMMENT_DOMAIN", "commentDomain")
 
-	logger = DouTokLogger.InitLogger(config.Logger)
-	DouTokContext.DefaultLogger = logger
-	DouTokContext.AddLoggerToContext(ctx, logger)
-
+	logger = DouTokLogger.InitLogger(logcfg.Logger)
+	dtx.DefaultLogger = logger
+	ctx = dtx.AddLoggerToContext(ctx, logger)
 	if err != nil {
 		logger.Fatal("could not load env variables", zap.Error(err), zap.Any("config", config))
 	}
 
-	logger = DouTokContext.Extract(ctx)
+	logger = dtx.Extract(ctx)
 
 	db, err := config.MySQL.InitDB()
 	if err != nil {

applications/favorite/main.go

@@ -3,16 +3,18 @@ package main
 import (
 	"context"
 
+	"go.uber.org/zap"
+
 	"github.com/TremblingV5/DouTok/applications/favorite/handler"
 	"github.com/TremblingV5/DouTok/applications/favorite/rpc"
 	"github.com/TremblingV5/DouTok/config/configStruct"
 	"github.com/TremblingV5/DouTok/kitex_gen/favorite/favoriteservice"
-	"github.com/TremblingV5/DouTok/pkg/DouTokContext"
 	"github.com/TremblingV5/DouTok/pkg/DouTokLogger"
 	"github.com/TremblingV5/DouTok/pkg/configurator"
 	"github.com/TremblingV5/DouTok/pkg/constants"
+	"github.com/TremblingV5/DouTok/pkg/dtviper"
+	"github.com/TremblingV5/DouTok/pkg/dtx"
 	"github.com/TremblingV5/DouTok/pkg/services"
-	"go.uber.org/zap"
 )
 
 type Config struct {
@@ -28,10 +30,17 @@ var (
 
 func init() {
 	ctx := context.Background()
-	_, err := configurator.Load(config, "DOUTOK_FAVORITE", "favorite")
-	logger = DouTokLogger.InitLogger(config.Logger)
-	DouTokContext.DefaultLogger = logger
-	DouTokContext.AddLoggerToContext(ctx, logger)
+	favoriteConfig = Config{}
+	logcfg = LoggerConfig{}
+	viperConfig = dtviper.ConfigInit("DOUTOK_FAVORITE", "favorite")
+	viperConfig.UnmarshalStructTags(reflect.TypeOf(favoriteConfig), "")
+	viperConfig.UnmarshalStruct(&favoriteConfig)
+
+	logcfg, err := configStruct.Load[*LoggerConfig](ctx, &logcfg)
+
+	logger = DouTokLogger.InitLogger(logcfg.Logger)
+	dtx.DefaultLogger = logger
+	dtx.AddLoggerToContext(ctx, logger)
 	if err != nil {
 		logger.Fatal("could not load env variables", zap.Error(err), zap.Any("config", config))
 	}

applications/user/main.go

@@ -9,10 +9,11 @@ import (
 	"github.com/TremblingV5/DouTok/applications/user/rpc"
 	"github.com/TremblingV5/DouTok/config/configStruct"
 	"github.com/TremblingV5/DouTok/kitex_gen/user/userservice"
-	"github.com/TremblingV5/DouTok/pkg/DouTokContext"
 	"github.com/TremblingV5/DouTok/pkg/DouTokLogger"
 	"github.com/TremblingV5/DouTok/pkg/configurator"
 	"github.com/TremblingV5/DouTok/pkg/constants"
+	"github.com/TremblingV5/DouTok/pkg/dtviper"
+	"github.com/TremblingV5/DouTok/pkg/dtx"
 	"github.com/TremblingV5/DouTok/pkg/services"
 )
 
@@ -28,10 +29,17 @@ var (
 
 func init() {
 	ctx := context.Background()
-	_, err := configurator.Load(config, "DOUTOK_USER", "user")
-	logger = DouTokLogger.InitLogger(config.Logger)
-	DouTokContext.DefaultLogger = logger
-	DouTokContext.AddLoggerToContext(ctx, logger)
+	userConfig = Config{}
+	logcfg = LoggerConfig{}
+	viperConfig = dtviper.ConfigInit("DOUTOK_USER", "user")
+	viperConfig.UnmarshalStructTags(reflect.TypeOf(userConfig), "")
+	viperConfig.UnmarshalStruct(&userConfig)
+
+	logcfg, err := configStruct.Load[*LoggerConfig](ctx, &logcfg)
+
+	logger = DouTokLogger.InitLogger(logcfg.Logger)
+	dtx.DefaultLogger = logger
+	dtx.AddLoggerToContext(ctx, logger)
 	if err != nil {
 		logger.Fatal("could not load env variables", zap.Error(err), zap.Any("config", config))
 	}

applications/userDomain/dal/repository/user/repository.go

@@ -1,47 +1,52 @@
 package user
 
 import (
+	"context"
 	"github.com/TremblingV5/DouTok/applications/userDomain/dal/model"
 	"github.com/TremblingV5/DouTok/applications/userDomain/dal/query"
-	"gorm.io/gorm"
+	"github.com/TremblingV5/DouTok/pkg/dtdb"
 )
 
 type Repository interface {
-	Save(user *model.User) error
-	LoadByUsername(username string) (*model.User, error)
-	LoadById(id uint64) (*model.User, error)
-	LoadUserListByIds(ids ...uint64) ([]*model.User, error)
-	IsUserNameExisted(username string) (bool, error)
+	Save(ctx context.Context, user *model.User) error
+	LoadByUsername(ctx context.Context, username string) (*model.User, error)
+	LoadById(ctx context.Context, id uint64) (*model.User, error)
+	LoadUserListByIds(ctx context.Context, ids ...uint64) ([]*model.User, error)
+	IsUserNameExisted(ctx context.Context, username string) (bool, error)
 }
 
 type PersistRepository struct {
 	user query.IUserDo
 }
 
-func New(db *gorm.DB) *PersistRepository {
-	return &PersistRepository{
-		user: query.User.WithContext(db.Statement.Context),
-	}
+func New() *PersistRepository {
+	return &PersistRepository{}
 }
 
-func (p *PersistRepository) Save(user *model.User) error {
-	return p.user.Create(user)
+func (p *PersistRepository) Save(ctx context.Context, user *model.User) error {
+	tx := dtdb.Tx(ctx).(*query.QueryTx)
+	return tx.User.Save(user)
 }
 
-func (p *PersistRepository) LoadByUsername(username string) (*model.User, error) {
-	return p.user.Where(query.User.UserName.Eq(username)).First()
+func (p *PersistRepository) LoadByUsername(ctx context.Context, username string) (*model.User, error) {
+	tx := dtdb.Tx(ctx).(*query.QueryTx)
+	return tx.User.Where(query.User.UserName.Eq(username)).First()
 }
 
-func (p *PersistRepository) LoadById(id uint64) (*model.User, error) {
-	return p.user.Where(query.User.ID.Eq(id)).First()
+func (p *PersistRepository) LoadById(ctx context.Context, id uint64) (*model.User, error) {
+	tx := dtdb.Tx(ctx).(*query.QueryTx)
+	return tx.User.Where(query.User.ID.Eq(id)).First()
 }
 
-func (p *PersistRepository) LoadUserListByIds(ids ...uint64) ([]*model.User, error) {
-	return p.user.Where(query.User.ID.In(ids...)).Find()
+func (p *PersistRepository) LoadUserListByIds(ctx context.Context, ids ...uint64) ([]*model.User, error) {
+	tx := dtdb.Tx(ctx).(*query.QueryTx)
+	return tx.User.Where(query.User.ID.In(ids...)).Find()
 }
 
-func (p *PersistRepository) IsUserNameExisted(username string) (bool, error) {
-	count, err := p.user.Where(query.User.UserName.Eq(username)).Count()
+func (p *PersistRepository) IsUserNameExisted(ctx context.Context, username string) (bool, error) {
+	tx := dtdb.Tx(ctx).(*query.QueryTx)
+
+	count, err := tx.User.Where(query.User.UserName.Eq(username)).Count()
 	if err != nil {
 		return false, err
 	}

applications/userDomain/handler/handler.go

@@ -27,7 +27,7 @@ func (s *Handler) AddUser(ctx context.Context, req *userDomain.DoutokAddUserRequ
 		}, nil
 	}
 
-	userId, err := s.user.CreateNewUser(req.Username, req.Password)
+	userId, err := s.user.CreateNewUser(ctx, req.Username, req.Password)
 
 	if err != nil {
 		return &userDomain.DoutokAddUserResponse{
@@ -49,7 +49,7 @@ func (s *Handler) CheckUser(ctx context.Context, req *userDomain.DoutokCheckUser
 		return packCheckUserResp(errs.EmptyErr.Code(), errs.EmptyErr.Message(), 0)
 	}
 
-	userId, err := s.user.CheckPassword(req.Username, req.Password)
+	userId, err := s.user.CheckPassword(ctx, req.Username, req.Password)
 	if err != nil || userId == 0 {
 		return packCheckUserResp(errs.PasswordErr.Code(), errs.PasswordErr.Message(), 0)
 	}
@@ -65,7 +65,7 @@ func (s *Handler) GetUserInfo(ctx context.Context, req *userDomain.DoutokGetUser
 		}
 	}
 
-	userList, err := s.user.LoadUserListByIds(userIdList...)
+	userList, err := s.user.LoadUserListByIds(ctx, userIdList...)
 	if err != nil {
 		return packGetUserInfoResp(errs.SystemErr.Code(), err.Error(), nil)
 	}

applications/userDomain/main.go

@@ -2,8 +2,16 @@ package main
 
 import (
 	"context"
+	"reflect"
+	"strconv"
+
 	"go.uber.org/zap"
 
+	"github.com/TremblingV5/DouTok/applications/userDomain/errs"
+	"github.com/TremblingV5/DouTok/config/configStruct"
+	"github.com/TremblingV5/DouTok/pkg/DouTokLogger"
+	"github.com/TremblingV5/DouTok/pkg/dtviper"
+	"github.com/TremblingV5/DouTok/pkg/dtx"
 	"github.com/TremblingV5/DouTok/applications/userDomain/dal/query"
 	"github.com/TremblingV5/DouTok/applications/userDomain/dal/repository/user"
 	"github.com/TremblingV5/DouTok/applications/userDomain/errs"
@@ -33,17 +41,25 @@ var (
 func init() {
 	ctx := context.Background()
 
-	_, err := configurator.Load(config, "DOUTOK_USER_DOMAIN", "userDomain")
-	errs.Init(config.Base)
-	logger = DouTokLogger.InitLogger(config.Logger)
-	DouTokContext.DefaultLogger = logger
-	DouTokContext.AddLoggerToContext(ctx, logger)
+	userDomainConfig = Config{}
+	logcfg = LoggerConfig{}
+	viperConfig = dtviper.ConfigInit("DOUTOK_USER_DOMAIN", "userDomain")
+	viperConfig.UnmarshalStructTags(reflect.TypeOf(userDomainConfig), "")
+	viperConfig.UnmarshalStruct(&userDomainConfig)
+
+	logcfg, err := configStruct.Load[*LoggerConfig](ctx, &logcfg)
+
+	errs.Init(userDomainConfig.Server)
+
+	logger = DouTokLogger.InitLogger(logcfg.Logger)
+	dtx.DefaultLogger = logger
+	dtx.AddLoggerToContext(ctx, logger)
 
 	if err != nil {
 		logger.Fatal("could not load env variables", zap.Error(err), zap.Any("config", config))
 	}
 
-	logger = DouTokContext.Extract(ctx)
+	logger = dtx.Extract(ctx)
 }
 
 func loadFeature() *handler.Handler {
@@ -53,7 +69,7 @@ func loadFeature() *handler.Handler {
 	}
 	query.SetDefault(db)
 
-	userRepo := user.New(db)
+	userRepo := user.New()
 	userService := service.New(userRepo)
 	return handler.New(userService)
 }