...
|
...
|
@@ -3,6 +3,7 @@ package repository |
|
|
import (
|
|
|
"fmt"
|
|
|
"github.com/go-pg/pg/v10"
|
|
|
"github.com/tiptok/gocomm/pkg/cache"
|
|
|
|
|
|
"github.com/linmadan/egglib-go/persistent/pg/sqlbuilder"
|
|
|
pgTransaction "github.com/linmadan/egglib-go/transaction/pg"
|
...
|
...
|
@@ -13,6 +14,7 @@ import ( |
|
|
)
|
|
|
|
|
|
type UserRepository struct {
|
|
|
*cache.CachedRepository
|
|
|
transactionContext *pgTransaction.TransactionContext
|
|
|
}
|
|
|
|
...
|
...
|
@@ -38,7 +40,7 @@ func (repository *UserRepository) Save(user *domain.User) (*domain.User, error) |
|
|
"access_partners",
|
|
|
"create_at",
|
|
|
"update_at",
|
|
|
"delete_at",
|
|
|
//"delete_at",
|
|
|
}
|
|
|
insertFieldsSnippet := sqlbuilder.SqlFieldsSnippet(sqlBuildFields)
|
|
|
insertPlaceHoldersSnippet := sqlbuilder.SqlPlaceHoldersSnippet(sqlBuildFields)
|
...
|
...
|
@@ -87,35 +89,41 @@ func (repository *UserRepository) Save(user *domain.User) (*domain.User, error) |
|
|
return user, err
|
|
|
}
|
|
|
} else {
|
|
|
if _, err := tx.QueryOne(
|
|
|
pg.Scan(
|
|
|
&user.UserId,
|
|
|
&user.UserType,
|
|
|
pg.Array(&user.Permissions),
|
|
|
&user.CompanyId,
|
|
|
&user.UserAccount,
|
|
|
&user.UserInfo,
|
|
|
&user.PartnerInfo,
|
|
|
&user.Status,
|
|
|
&user.AdminType,
|
|
|
pg.Array(&user.AccessPartners),
|
|
|
&user.CreateAt,
|
|
|
&user.UpdateAt,
|
|
|
&user.DeleteAt,
|
|
|
),
|
|
|
fmt.Sprintf("UPDATE users SET %s WHERE user_id=? RETURNING %s", updateFieldsSnippet, returningFieldsSnippet),
|
|
|
user.UserType,
|
|
|
pg.Array(user.Permissions),
|
|
|
user.CompanyId,
|
|
|
user.UserAccount,
|
|
|
user.UserInfo,
|
|
|
user.PartnerInfo,
|
|
|
user.Status,
|
|
|
user.AdminType,
|
|
|
pg.Array(user.AccessPartners),
|
|
|
user.UpdateAt,
|
|
|
user.Identify(),
|
|
|
); err != nil {
|
|
|
queryFunc := func() (interface{}, error) {
|
|
|
if _, err := tx.QueryOne(
|
|
|
pg.Scan(
|
|
|
&user.UserId,
|
|
|
&user.UserType,
|
|
|
pg.Array(&user.Permissions),
|
|
|
&user.CompanyId,
|
|
|
&user.UserAccount,
|
|
|
&user.UserInfo,
|
|
|
&user.PartnerInfo,
|
|
|
&user.Status,
|
|
|
&user.AdminType,
|
|
|
pg.Array(&user.AccessPartners),
|
|
|
&user.CreateAt,
|
|
|
&user.UpdateAt,
|
|
|
&user.DeleteAt,
|
|
|
),
|
|
|
fmt.Sprintf("UPDATE users SET %s WHERE user_id=? RETURNING %s", updateFieldsSnippet, returningFieldsSnippet),
|
|
|
user.UserType,
|
|
|
pg.Array(user.Permissions),
|
|
|
user.CompanyId,
|
|
|
user.UserAccount,
|
|
|
user.UserInfo,
|
|
|
user.PartnerInfo,
|
|
|
user.Status,
|
|
|
user.AdminType,
|
|
|
pg.Array(user.AccessPartners),
|
|
|
user.UpdateAt,
|
|
|
user.Identify(),
|
|
|
); err != nil {
|
|
|
return user, err
|
|
|
}
|
|
|
return user, nil
|
|
|
}
|
|
|
if _, err := repository.Query(queryFunc, user.CacheKeyFunc()); err != nil {
|
|
|
return user, err
|
|
|
}
|
|
|
}
|
...
|
...
|
@@ -125,7 +133,10 @@ func (repository *UserRepository) Remove(user *domain.User) (*domain.User, error |
|
|
tx := repository.transactionContext.PgTx
|
|
|
userModel := new(models.User)
|
|
|
userModel.UserId = user.Identify().(int64)
|
|
|
if _, err := tx.Model(userModel).WherePK().Delete(); err != nil {
|
|
|
queryFunc := func() (interface{}, error) {
|
|
|
return tx.Model(userModel).WherePK().Delete()
|
|
|
}
|
|
|
if _, err := repository.Query(queryFunc, user.CacheKeyFunc()); err != nil {
|
|
|
return user, err
|
|
|
}
|
|
|
return user, nil
|
...
|
...
|
@@ -133,19 +144,29 @@ func (repository *UserRepository) Remove(user *domain.User) (*domain.User, error |
|
|
func (repository *UserRepository) FindOne(queryOptions map[string]interface{}) (*domain.User, error) {
|
|
|
tx := repository.transactionContext.PgTx
|
|
|
userModel := new(models.User)
|
|
|
query := sqlbuilder.BuildQuery(tx.Model(userModel), queryOptions)
|
|
|
query.SetWhereByQueryOption("users.user_id = ?", "userId")
|
|
|
query.SetWhereByQueryOption("users.status = ?", "status")
|
|
|
query.SetWhereByQueryOption("users.user_type = ?", "userType")
|
|
|
if v, ok := queryOptions["inUserIds"]; ok {
|
|
|
query.Where("users.user_id in (?)", pg.Array(v))
|
|
|
}
|
|
|
if err := query.First(); err != nil {
|
|
|
if err.Error() == "pg: no rows in result set" {
|
|
|
return nil, fmt.Errorf("没有此资源")
|
|
|
} else {
|
|
|
return nil, err
|
|
|
queryFunc := func() (interface{}, error) {
|
|
|
query := sqlbuilder.BuildQuery(tx.Model(userModel), queryOptions)
|
|
|
query.SetWhereByQueryOption("users.user_id = ?", "userId")
|
|
|
query.SetWhereByQueryOption("users.status = ?", "status")
|
|
|
query.SetWhereByQueryOption("users.user_type = ?", "userType")
|
|
|
if v, ok := queryOptions["inUserIds"]; ok {
|
|
|
query.Where("users.user_id in (?)", pg.Array(v))
|
|
|
}
|
|
|
if err := query.First(); err != nil {
|
|
|
if err.Error() == "pg: no rows in result set" {
|
|
|
return nil, fmt.Errorf("没有此资源")
|
|
|
} else {
|
|
|
return nil, err
|
|
|
}
|
|
|
}
|
|
|
return userModel, nil
|
|
|
}
|
|
|
var cacheModel = &domain.User{}
|
|
|
if _, ok := queryOptions["userId"]; ok {
|
|
|
cacheModel.UserId = queryOptions["userId"].(int64)
|
|
|
}
|
|
|
if err := repository.QueryCache(cacheModel.CacheKeyFunc, userModel, queryFunc); err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
if userModel.UserId == 0 {
|
|
|
return nil, nil
|
...
|
...
|
@@ -179,6 +200,7 @@ func NewUserRepository(transactionContext *pgTransaction.TransactionContext) (*U |
|
|
} else {
|
|
|
return &UserRepository{
|
|
|
transactionContext: transactionContext,
|
|
|
CachedRepository: cache.NewDefaultCachedRepository(),
|
|
|
}, nil
|
|
|
}
|
|
|
} |
...
|
...
|
|