From 3bd099a9920108c5c2f4030a918e984556f2ae96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Tue, 16 Aug 2022 00:15:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor(user):=E5=90=88=E5=B9=B6=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9A=84Service=E5=92=8CRepository=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller/user.go | 5 +- repository/abstract.go | 23 --------- repository/user.go | 101 ------------------------------------- service/user.go | 112 ++++++++++++++++++++++++++++++++++++----- 4 files changed, 101 insertions(+), 140 deletions(-) delete mode 100644 repository/abstract.go delete mode 100644 repository/user.go diff --git a/controller/user.go b/controller/user.go index 28e8e7a..ee4e51f 100644 --- a/controller/user.go +++ b/controller/user.go @@ -5,7 +5,6 @@ import ( "electricity_bill_calc/exceptions" "electricity_bill_calc/global" "electricity_bill_calc/model" - "electricity_bill_calc/repository" "electricity_bill_calc/response" "electricity_bill_calc/security" "electricity_bill_calc/service" @@ -167,7 +166,7 @@ func listPagedUser(c *gin.Context) { } else { requestUserStat = &state } - users, total, err := repository.UserRepo.ListUserDetail(requestKeyword, requestUserType, requestUserStat, requestPage) + users, total, err := service.UserService.ListUserDetail(requestKeyword, requestUserType, requestUserStat, requestPage) if err != nil { result.NotFound(err.Error()) return @@ -252,7 +251,7 @@ func getUserDetail(c *gin.Context) { if err != nil { result.Error(http.StatusInternalServerError, err.Error()) } - userDetail, err := repository.UserRepo.FetchUserDetail(targetUserId) + userDetail, err := service.UserService.FetchUserDetail(targetUserId) if err != nil { result.Error(http.StatusInternalServerError, err.Error()) return diff --git a/repository/abstract.go b/repository/abstract.go deleted file mode 100644 index 50d137c..0000000 --- a/repository/abstract.go +++ /dev/null @@ -1,23 +0,0 @@ -package repository - -func _postProcessSingle[T interface{}](instance *T, has bool, err error) (*T, error) { - if err != nil { - return nil, err - } - if has { - return instance, nil - } else { - return nil, nil - } -} - -func _postProcessList[T interface{}](instance []*T, has bool, err error) ([]*T, error) { - if err != nil { - return nil, err - } - if has { - return instance, nil - } else { - return nil, nil - } -} diff --git a/repository/user.go b/repository/user.go deleted file mode 100644 index 8e83836..0000000 --- a/repository/user.go +++ /dev/null @@ -1,101 +0,0 @@ -package repository - -import ( - "electricity_bill_calc/cache" - "electricity_bill_calc/config" - "electricity_bill_calc/global" - "electricity_bill_calc/model" - - "xorm.io/builder" -) - -type _UserRepository struct{} - -var UserRepo _UserRepository - -func (_UserRepository) FindUserByUsername(username string) (*model.User, error) { - cachedUser, _ := cache.RetreiveData[model.User]("user", username) - if cachedUser != nil { - return cachedUser, nil - } - user := new(model.User) - has, err := global.DBConn.Where(builder.Eq{"username": username}).NoAutoCondition().Get(user) - if has { - cache.CacheData(user, "user", username) - } - return _postProcessSingle(user, has, err) -} - -func (_UserRepository) RetreiveUserDetail(uid string) (*model.UserDetail, error) { - cachedUser, _ := cache.RetreiveData[model.UserDetail]("user", uid) - if cachedUser != nil { - return cachedUser, nil - } - user := new(model.UserDetail) - has, err := global.DBConn.ID(uid).NoAutoCondition().Get(user) - if has { - cache.CacheData(user, "user_detail", uid) - } - return _postProcessSingle(user, has, err) -} - -func (_UserRepository) FindUserByID(uid string) (*model.User, error) { - cachedUser, _ := cache.RetreiveData[model.User]("user", uid) - if cachedUser != nil { - return cachedUser, nil - } - user := new(model.User) - has, err := global.DBConn.ID(uid).NoAutoCondition().Get(user) - if has { - cache.CacheData(user, "user", uid) - } - return _postProcessSingle(user, has, err) -} - -func (_UserRepository) ListUserDetail(keyword string, userType int, userState *bool, page int) ([]model.JoinedUserDetail, int64, error) { - var cond = builder.NewCond() - cond = cond.And(builder.Neq{"d.id": "000"}) - if len(keyword) != 0 { - keywordCond := builder.NewCond(). - Or(builder.Like{"u.username", keyword}). - Or(builder.Like{"d.name", keyword}) - cond = cond.And(keywordCond) - } - if userType != -1 { - cond = cond.And(builder.Eq{"u.type": userType}) - } - if userState != nil { - cond = cond.And(builder.Eq{"u.enabled": *userState}) - } - startItem := (page - 1) * config.ServiceSettings.ItemsPageSize - total, err := global.DBConn. - Table("user_detail").Alias("d"). - Join("INNER", []string{"user", "u"}, "d.id=u.id"). - Where(cond). - Count(&model.User{}) - if err != nil { - return nil, -1, err - } - users := make([]model.JoinedUserDetail, 0) - err = global.DBConn. - Table("user_detail").Alias("d"). - Join("INNER", []string{"user", "u"}, "d.id=u.id"). - Where(cond). - Limit(config.ServiceSettings.ItemsPageSize, startItem). - Find(&users) - return users, total, err -} - -func (_UserRepository) FetchUserDetail(uid string) (*model.FullJoinedUserDetail, error) { - user := &model.FullJoinedUserDetail{} - has, err := global.DBConn. - Table("user_detail").Alias("d"). - Join("INNER", []string{"user", "u"}, "d.id=u.id"). - Where(builder.Eq{"d.id": uid}). - NoAutoCondition(). - Get(user) - if has { - return user, nil - } - return nil, err -} diff --git a/service/user.go b/service/user.go index d3accc5..5e7afdd 100644 --- a/service/user.go +++ b/service/user.go @@ -7,7 +7,6 @@ import ( "electricity_bill_calc/exceptions" "electricity_bill_calc/global" "electricity_bill_calc/model" - "electricity_bill_calc/repository" "electricity_bill_calc/utils" "fmt" "time" @@ -20,8 +19,8 @@ type _UserService struct{} var UserService _UserService -func (_UserService) ProcessEnterpriseUserLogin(username, password string) (*model.Session, error) { - user, err := repository.UserRepo.FindUserByUsername(username) +func (u _UserService) ProcessEnterpriseUserLogin(username, password string) (*model.Session, error) { + user, err := u.findUserByUsername(username) if err != nil { return nil, err @@ -46,7 +45,7 @@ func (_UserService) ProcessEnterpriseUserLogin(username, password string) (*mode authErr.NeedReset = true return nil, authErr } - userDetial, _ := repository.UserRepo.RetreiveUserDetail(user.Id) + userDetial, _ := u.retreiveUserDetail(user.Id) if userDetial.ServiceExpiration.Before(time.Now()) { return nil, exceptions.NewAuthenticationError(401, "用户服务期限已过。") } @@ -64,8 +63,8 @@ func (_UserService) ProcessEnterpriseUserLogin(username, password string) (*mode return session, nil } -func (_UserService) ProcessManagementUserLogin(username, password string) (*model.Session, error) { - user, err := repository.UserRepo.FindUserByUsername(username) +func (u _UserService) ProcessManagementUserLogin(username, password string) (*model.Session, error) { + user, err := u.findUserByUsername(username) if err != nil { return nil, err @@ -97,7 +96,7 @@ func (_UserService) ProcessManagementUserLogin(username, password string) (*mode Name: user.Username, ExpiresAt: time.Now().Add(config.ServiceSettings.MaxSessionLife), } - userDetial, _ := repository.UserRepo.RetreiveUserDetail(user.Id) + userDetial, _ := u.retreiveUserDetail(user.Id) if userDetial != nil { session.Name = *userDetial.Name } @@ -105,8 +104,8 @@ func (_UserService) ProcessManagementUserLogin(username, password string) (*mode return session, nil } -func (_UserService) InvalidUserPassword(uid string) (string, error) { - user, err := repository.UserRepo.FindUserByID(uid) +func (u _UserService) InvalidUserPassword(uid string) (string, error) { + user, err := u.findUserByID(uid) if user == nil && err != nil { return "", exceptions.NewNotFoundError("指定的用户不存在。") } @@ -129,8 +128,8 @@ func (_UserService) InvalidUserPassword(uid string) (string, error) { } } -func (_UserService) VerifyUserPassword(username, verifyCode string) (bool, error) { - user, err := repository.UserRepo.FindUserByUsername(username) +func (u _UserService) VerifyUserPassword(username, verifyCode string) (bool, error) { + user, err := u.findUserByUsername(username) if user == nil || err != nil { return false, exceptions.NewNotFoundError("指定的用户不存在。") } @@ -144,8 +143,8 @@ func (_UserService) VerifyUserPassword(username, verifyCode string) (bool, error } } -func (_UserService) ResetUserPassword(username, password string) (bool, error) { - user, err := repository.UserRepo.FindUserByUsername(username) +func (u _UserService) ResetUserPassword(username, password string) (bool, error) { + user, err := u.findUserByUsername(username) if user == nil || err != nil { return false, exceptions.NewNotFoundError("指定的用户不存在。") } @@ -254,3 +253,90 @@ func (_UserService) SearchLimitUsers(keyword string, limit int) ([]model.JoinedU } return users, nil } + +func (_UserService) findUserByUsername(username string) (*model.User, error) { + cachedUser, _ := cache.RetreiveData[model.User]("user", username) + if cachedUser != nil { + return cachedUser, nil + } + user := new(model.User) + has, err := global.DBConn.Where(builder.Eq{"username": username}).NoAutoCondition().Get(user) + if has { + cache.CacheData(user, "user", username) + } + return _postProcessSingle(user, has, err) +} + +func (_UserService) retreiveUserDetail(uid string) (*model.UserDetail, error) { + cachedUser, _ := cache.RetreiveData[model.UserDetail]("user", uid) + if cachedUser != nil { + return cachedUser, nil + } + user := new(model.UserDetail) + has, err := global.DBConn.ID(uid).NoAutoCondition().Get(user) + if has { + cache.CacheData(user, "user_detail", uid) + } + return _postProcessSingle(user, has, err) +} + +func (_UserService) findUserByID(uid string) (*model.User, error) { + cachedUser, _ := cache.RetreiveData[model.User]("user", uid) + if cachedUser != nil { + return cachedUser, nil + } + user := new(model.User) + has, err := global.DBConn.ID(uid).NoAutoCondition().Get(user) + if has { + cache.CacheData(user, "user", uid) + } + return _postProcessSingle(user, has, err) +} + +func (_UserService) ListUserDetail(keyword string, userType int, userState *bool, page int) ([]model.JoinedUserDetail, int64, error) { + var cond = builder.NewCond() + cond = cond.And(builder.Neq{"d.id": "000"}) + if len(keyword) != 0 { + keywordCond := builder.NewCond(). + Or(builder.Like{"u.username", keyword}). + Or(builder.Like{"d.name", keyword}) + cond = cond.And(keywordCond) + } + if userType != -1 { + cond = cond.And(builder.Eq{"u.type": userType}) + } + if userState != nil { + cond = cond.And(builder.Eq{"u.enabled": *userState}) + } + startItem := (page - 1) * config.ServiceSettings.ItemsPageSize + total, err := global.DBConn. + Table("user_detail").Alias("d"). + Join("INNER", []string{"user", "u"}, "d.id=u.id"). + Where(cond). + Count(&model.User{}) + if err != nil { + return nil, -1, err + } + users := make([]model.JoinedUserDetail, 0) + err = global.DBConn. + Table("user_detail").Alias("d"). + Join("INNER", []string{"user", "u"}, "d.id=u.id"). + Where(cond). + Limit(config.ServiceSettings.ItemsPageSize, startItem). + Find(&users) + return users, total, err +} + +func (_UserService) FetchUserDetail(uid string) (*model.FullJoinedUserDetail, error) { + user := &model.FullJoinedUserDetail{} + has, err := global.DBConn. + Table("user_detail").Alias("d"). + Join("INNER", []string{"user", "u"}, "d.id=u.id"). + Where(builder.Eq{"d.id": uid}). + NoAutoCondition(). + Get(user) + if has { + return user, nil + } + return nil, err +}