|
|
@@ -1,4 +1,4 @@
|
|
|
-package entity_crud
|
|
|
+package value_object
|
|
|
|
|
|
import (
|
|
|
"git.sxidc.com/go-framework/baize/api"
|
|
|
@@ -10,151 +10,88 @@ import (
|
|
|
"git.sxidc.com/go-framework/baize/infrastructure/database"
|
|
|
"git.sxidc.com/go-framework/baize/infrastructure/database/sql"
|
|
|
"git.sxidc.com/go-framework/baize/tag/sql/sql_mapping"
|
|
|
- "git.sxidc.com/go-tools/utils/strutils"
|
|
|
"git.sxidc.com/service-supports/fserr"
|
|
|
"reflect"
|
|
|
)
|
|
|
|
|
|
-func CommonEntityCreate(tableName string, dbExecutor database.Executor, callbacks *Callbacks[string]) binding.ServiceFunc[string] {
|
|
|
- return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (string, error) {
|
|
|
- e, ok := objects[0].(domain.Entity)
|
|
|
+func CreateValueObject(tableName string, dbExecutor database.Executor, callbacks *Callbacks[any]) binding.ServiceFunc[any] {
|
|
|
+ return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (any, error) {
|
|
|
+ valueObject, ok := objects[0].(domain.ValueObject)
|
|
|
if !ok {
|
|
|
- return "", fserr.New("需要传递领域对象应该为实体")
|
|
|
- }
|
|
|
-
|
|
|
- err := e.GenerateID()
|
|
|
- if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, "")
|
|
|
+ return nil, fserr.New("需要传递领域对象应该为值对象")
|
|
|
}
|
|
|
|
|
|
- err = callbackBeforeDBOperate(callbacks, e, dbExecutor)
|
|
|
+ err := callbackBeforeDBOperate(callbacks, valueObject, dbExecutor)
|
|
|
if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, "")
|
|
|
+ return callbackOnErrorReturn(callbacks, valueObject, err, dbExecutor, nil)
|
|
|
}
|
|
|
|
|
|
- err = database.InsertEntity(dbExecutor, tableName, e)
|
|
|
+ err = database.InsertEntity(dbExecutor, tableName, valueObject)
|
|
|
if err != nil {
|
|
|
if database.IsErrorDBRecordHasExist(err) {
|
|
|
- err = fserr.New(e.DomainCNName() + "已存在")
|
|
|
+ err = fserr.New(valueObject.DomainCNName() + "已存在")
|
|
|
}
|
|
|
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, "")
|
|
|
- }
|
|
|
-
|
|
|
- err = callbackAfterDBOperate(callbacks, e, dbExecutor)
|
|
|
- if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, "")
|
|
|
- }
|
|
|
-
|
|
|
- return callbackOnSuccessReturn(callbacks, e, dbExecutor, e.GetID())
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-func CommonEntityDelete(tableName string, dbExecutor database.Executor, callbacks *Callbacks[any]) binding.ServiceFunc[any] {
|
|
|
- return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (any, error) {
|
|
|
- e, ok := objects[0].(domain.Entity)
|
|
|
- if !ok {
|
|
|
- return nil, fserr.New("需要传递领域对象应该为实体")
|
|
|
- }
|
|
|
-
|
|
|
- if strutils.IsStringEmpty(e.GetID()) {
|
|
|
- err := fserr.New("领域实体ID为空")
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
- }
|
|
|
-
|
|
|
- exist, err := database.CheckExist(dbExecutor, &sql.CheckExistExecuteParams{
|
|
|
- TableName: tableName,
|
|
|
- Conditions: sql.NewConditions().Equal(e.IDColumnName(), e.GetID()),
|
|
|
- })
|
|
|
- if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
- }
|
|
|
-
|
|
|
- if !exist {
|
|
|
- err := fserr.New(e.DomainCNName() + "不存在")
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
- }
|
|
|
-
|
|
|
- err = callbackBeforeDBOperate(callbacks, e, dbExecutor)
|
|
|
- if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
- }
|
|
|
-
|
|
|
- err = database.DeleteEntity(dbExecutor, tableName, e)
|
|
|
- if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
+ return callbackOnErrorReturn(callbacks, valueObject, err, dbExecutor, nil)
|
|
|
}
|
|
|
|
|
|
- err = callbackAfterDBOperate(callbacks, e, dbExecutor)
|
|
|
+ err = callbackAfterDBOperate(callbacks, valueObject, dbExecutor)
|
|
|
if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
+ return callbackOnErrorReturn(callbacks, valueObject, err, dbExecutor, nil)
|
|
|
}
|
|
|
|
|
|
- return callbackOnSuccessReturn(callbacks, e, dbExecutor, nil)
|
|
|
+ return callbackOnSuccessReturn(callbacks, valueObject, dbExecutor, nil)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-func CommonEntityUpdate(tableName string, dbExecutor database.Executor, callbacks *Callbacks[any]) binding.ServiceFunc[any] {
|
|
|
+func DeleteValueObject(tableName string, dbExecutor database.Executor, callbacks *Callbacks[any]) binding.ServiceFunc[any] {
|
|
|
return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (any, error) {
|
|
|
- e, ok := objects[0].(domain.Entity)
|
|
|
+ valueObject, ok := objects[0].(domain.ValueObject)
|
|
|
if !ok {
|
|
|
- return nil, fserr.New("需要传递领域对象应该为实体")
|
|
|
- }
|
|
|
-
|
|
|
- if strutils.IsStringEmpty(e.GetID()) {
|
|
|
- err := fserr.New("领域实体ID为空")
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
+ return nil, fserr.New("需要传递领域对象应该为值对象")
|
|
|
}
|
|
|
|
|
|
- exist, err := database.CheckExist(dbExecutor, &sql.CheckExistExecuteParams{
|
|
|
- TableName: tableName,
|
|
|
- Conditions: sql.NewConditions().Equal(e.IDColumnName(), e.GetID()),
|
|
|
- })
|
|
|
+ err := valueObject.CheckKeyFields()
|
|
|
if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
- }
|
|
|
-
|
|
|
- if !exist {
|
|
|
- err := fserr.New(e.DomainCNName() + "不存在")
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
+ return callbackOnErrorReturn(callbacks, valueObject, err, dbExecutor, nil)
|
|
|
}
|
|
|
|
|
|
- err = callbackBeforeDBOperate(callbacks, e, dbExecutor)
|
|
|
+ err = callbackBeforeDBOperate(callbacks, valueObject, dbExecutor)
|
|
|
if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
+ return callbackOnErrorReturn(callbacks, valueObject, err, dbExecutor, nil)
|
|
|
}
|
|
|
|
|
|
- err = database.UpdateEntity(dbExecutor, tableName, e)
|
|
|
+ err = database.DeleteEntity(dbExecutor, tableName, valueObject)
|
|
|
if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
+ return callbackOnErrorReturn(callbacks, valueObject, err, dbExecutor, nil)
|
|
|
}
|
|
|
|
|
|
- err = callbackAfterDBOperate(callbacks, e, dbExecutor)
|
|
|
+ err = callbackAfterDBOperate(callbacks, valueObject, dbExecutor)
|
|
|
if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
+ return callbackOnErrorReturn(callbacks, valueObject, err, dbExecutor, nil)
|
|
|
}
|
|
|
|
|
|
- return callbackOnSuccessReturn(callbacks, e, dbExecutor, nil)
|
|
|
+ return callbackOnSuccessReturn(callbacks, valueObject, dbExecutor, nil)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
type ConditionFieldCallback func(conditions *sql.Conditions, fieldName string, columnName string, value any) (hasDeal bool)
|
|
|
|
|
|
-func CommonEntityQuery[O any](tableName string, dbExecutor database.Executor, callbacks *Callbacks[response.InfosData[O]], conditionFieldCallback ConditionFieldCallback) binding.ServiceFunc[response.InfosData[O]] {
|
|
|
+func QueryValueObjects[O any](tableName string, dbExecutor database.Executor, callbacks *Callbacks[response.InfosData[O]], conditionFieldCallback ConditionFieldCallback) binding.ServiceFunc[response.InfosData[O]] {
|
|
|
return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (response.InfosData[O], error) {
|
|
|
queryDTO, ok := dto.(request.Query)
|
|
|
if !ok {
|
|
|
return response.InfosData[O]{}, fserr.New("DTO不是Query")
|
|
|
}
|
|
|
|
|
|
- e, ok := objects[0].(domain.Entity)
|
|
|
+ valueObject, ok := objects[0].(domain.ValueObject)
|
|
|
if !ok {
|
|
|
- return response.InfosData[O]{}, fserr.New("需要传递领域对象应该为实体")
|
|
|
+ return response.InfosData[O]{}, fserr.New("需要传递领域对象应该为值对象")
|
|
|
}
|
|
|
|
|
|
conditions := sql.NewConditions()
|
|
|
|
|
|
- fields, err := sql_mapping.DefaultUsage(e)
|
|
|
+ fields, err := sql_mapping.DefaultUsage(valueObject)
|
|
|
if err != nil {
|
|
|
return response.InfosData[O]{}, err
|
|
|
}
|
|
|
@@ -173,9 +110,9 @@ func CommonEntityQuery[O any](tableName string, dbExecutor database.Executor, ca
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- err = callbackBeforeDBOperate(callbacks, e, dbExecutor)
|
|
|
+ err = callbackBeforeDBOperate(callbacks, valueObject, dbExecutor)
|
|
|
if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, response.InfosData[O]{})
|
|
|
+ return callbackOnErrorReturn(callbacks, valueObject, err, dbExecutor, response.InfosData[O]{})
|
|
|
}
|
|
|
|
|
|
results, totalCount, err := database.Query(dbExecutor, &sql.QueryExecuteParams{
|
|
|
@@ -185,18 +122,18 @@ func CommonEntityQuery[O any](tableName string, dbExecutor database.Executor, ca
|
|
|
PageSize: queryDTO.GetPageSize(),
|
|
|
})
|
|
|
if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, response.InfosData[O]{})
|
|
|
+ return callbackOnErrorReturn(callbacks, valueObject, err, dbExecutor, response.InfosData[O]{})
|
|
|
}
|
|
|
|
|
|
- err = callbackAfterDBOperate(callbacks, e, dbExecutor)
|
|
|
+ err = callbackAfterDBOperate(callbacks, valueObject, dbExecutor)
|
|
|
if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, response.InfosData[O]{})
|
|
|
+ return callbackOnErrorReturn(callbacks, valueObject, err, dbExecutor, response.InfosData[O]{})
|
|
|
}
|
|
|
|
|
|
infos := make([]O, 0)
|
|
|
err = sql.ParseSqlResult(results, &infos)
|
|
|
if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, response.InfosData[O]{})
|
|
|
+ return callbackOnErrorReturn(callbacks, valueObject, err, dbExecutor, response.InfosData[O]{})
|
|
|
}
|
|
|
|
|
|
output := response.InfosData[O]{
|
|
|
@@ -205,91 +142,33 @@ func CommonEntityQuery[O any](tableName string, dbExecutor database.Executor, ca
|
|
|
PageNo: queryDTO.GetPageNo(),
|
|
|
}
|
|
|
|
|
|
- return callbackOnSuccessReturn(callbacks, e, dbExecutor, output)
|
|
|
+ return callbackOnSuccessReturn(callbacks, valueObject, dbExecutor, output)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-func CommonEntityQueryByID[O any](tableName string, dbExecutor database.Executor, callbacks *Callbacks[O]) binding.ServiceFunc[O] {
|
|
|
- return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (O, error) {
|
|
|
- var outputZero O
|
|
|
- outputZeroValue := reflect.Zero(reflect.TypeOf(outputZero))
|
|
|
- if outputZeroValue.Kind() == reflect.Pointer {
|
|
|
- outputZeroValue.Set(reflect.New(outputZeroValue.Type().Elem()))
|
|
|
- }
|
|
|
-
|
|
|
- e, ok := objects[0].(domain.Entity)
|
|
|
- if !ok {
|
|
|
- return outputZero, fserr.New("需要传递领域对象应该为实体")
|
|
|
- }
|
|
|
-
|
|
|
- if strutils.IsStringEmpty(e.GetID()) {
|
|
|
- err := fserr.New("领域实体ID为空")
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, outputZero)
|
|
|
- }
|
|
|
-
|
|
|
- err := callbackBeforeDBOperate(callbacks, e, dbExecutor)
|
|
|
- if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, outputZero)
|
|
|
- }
|
|
|
-
|
|
|
- result, err := database.QueryOne(dbExecutor, &sql.QueryOneExecuteParams{
|
|
|
- TableName: tableName,
|
|
|
- Conditions: sql.NewConditions().Equal(e.IDColumnName(), e.GetID()),
|
|
|
- })
|
|
|
- if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, outputZero)
|
|
|
- }
|
|
|
-
|
|
|
- err = callbackAfterDBOperate(callbacks, e, dbExecutor)
|
|
|
- if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, outputZero)
|
|
|
- }
|
|
|
-
|
|
|
- var info O
|
|
|
- var infoPointer any
|
|
|
-
|
|
|
- infoPointer = &info
|
|
|
- if outputZeroValue.Kind() == reflect.Pointer {
|
|
|
- infoPointer = info
|
|
|
- }
|
|
|
-
|
|
|
- err = sql.ParseSqlResult(result, infoPointer)
|
|
|
- if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, outputZero)
|
|
|
- }
|
|
|
-
|
|
|
- return callbackOnSuccessReturn(callbacks, e, dbExecutor, info)
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-func CommonEntityCreateTx(tableName string, dbExecutor database.Executor, callbacks *Callbacks[string]) binding.ServiceFunc[string] {
|
|
|
- return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (string, error) {
|
|
|
- e, ok := objects[0].(domain.Entity)
|
|
|
+func CreateValueObjectTx(tableName string, dbExecutor database.Executor, callbacks *Callbacks[any]) binding.ServiceFunc[any] {
|
|
|
+ return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (any, error) {
|
|
|
+ valueObject, ok := objects[0].(domain.ValueObject)
|
|
|
if !ok {
|
|
|
- return "", fserr.New("需要传递领域对象应该为实体")
|
|
|
+ return nil, fserr.New("需要传递领域对象应该为值对象")
|
|
|
}
|
|
|
|
|
|
- err := e.GenerateID()
|
|
|
- if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, "")
|
|
|
- }
|
|
|
-
|
|
|
- err = database.Transaction(dbExecutor, func(tx database.Executor) error {
|
|
|
- err = callbackBeforeDBOperate(callbacks, e, tx)
|
|
|
+ err := database.Transaction(dbExecutor, func(tx database.Executor) error {
|
|
|
+ err := callbackBeforeDBOperate(callbacks, valueObject, dbExecutor)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
- err = database.InsertEntity(tx, tableName, e)
|
|
|
+ err = database.InsertEntity(dbExecutor, tableName, valueObject)
|
|
|
if err != nil {
|
|
|
if database.IsErrorDBRecordHasExist(err) {
|
|
|
- err = fserr.New(e.DomainCNName() + "已存在")
|
|
|
+ err = fserr.New(valueObject.DomainCNName() + "已存在")
|
|
|
}
|
|
|
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
- err = callbackAfterDBOperate(callbacks, e, tx)
|
|
|
+ err = callbackAfterDBOperate(callbacks, valueObject, dbExecutor)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
@@ -297,101 +176,37 @@ func CommonEntityCreateTx(tableName string, dbExecutor database.Executor, callba
|
|
|
return nil
|
|
|
})
|
|
|
if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, "")
|
|
|
+ return callbackOnErrorReturn(callbacks, valueObject, err, dbExecutor, nil)
|
|
|
}
|
|
|
|
|
|
- return callbackOnSuccessReturn(callbacks, e, dbExecutor, e.GetID())
|
|
|
+ return callbackOnSuccessReturn(callbacks, valueObject, dbExecutor, nil)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-func CommonEntityDeleteTx(tableName string, dbExecutor database.Executor, callbacks *Callbacks[any]) binding.ServiceFunc[any] {
|
|
|
+func DeleteValueObjectTx(tableName string, dbExecutor database.Executor, callbacks *Callbacks[any]) binding.ServiceFunc[any] {
|
|
|
return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (any, error) {
|
|
|
- e, ok := objects[0].(domain.Entity)
|
|
|
+ valueObject, ok := objects[0].(domain.ValueObject)
|
|
|
if !ok {
|
|
|
- return nil, fserr.New("需要传递领域对象应该为实体")
|
|
|
+ return nil, fserr.New("需要传递领域对象应该为值对象")
|
|
|
}
|
|
|
|
|
|
- if strutils.IsStringEmpty(e.GetID()) {
|
|
|
- err := fserr.New("领域实体ID为空")
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
- }
|
|
|
-
|
|
|
- exist, err := database.CheckExist(dbExecutor, &sql.CheckExistExecuteParams{
|
|
|
- TableName: tableName,
|
|
|
- Conditions: sql.NewConditions().Equal(e.IDColumnName(), e.GetID()),
|
|
|
- })
|
|
|
+ err := valueObject.CheckKeyFields()
|
|
|
if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
- }
|
|
|
-
|
|
|
- if !exist {
|
|
|
- err := fserr.New(e.DomainCNName() + "不存在")
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
- }
|
|
|
-
|
|
|
- err = database.Transaction(dbExecutor, func(tx database.Executor) error {
|
|
|
- err = callbackBeforeDBOperate(callbacks, e, tx)
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
-
|
|
|
- err = database.DeleteEntity(tx, tableName, e)
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
-
|
|
|
- err = callbackAfterDBOperate(callbacks, e, tx)
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
- }
|
|
|
-
|
|
|
- return nil
|
|
|
- })
|
|
|
- if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
- }
|
|
|
-
|
|
|
- return callbackOnSuccessReturn(callbacks, e, dbExecutor, nil)
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
-func CommonEntityUpdateTx(tableName string, dbExecutor database.Executor, callbacks *Callbacks[any]) binding.ServiceFunc[any] {
|
|
|
- return func(c *api.Context, dto request.DTO, objects []domain.Object, i *infrastructure.Infrastructure) (any, error) {
|
|
|
- e, ok := objects[0].(domain.Entity)
|
|
|
- if !ok {
|
|
|
- return nil, fserr.New("需要传递领域对象应该为实体")
|
|
|
- }
|
|
|
-
|
|
|
- if strutils.IsStringEmpty(e.GetID()) {
|
|
|
- err := fserr.New("领域实体ID为空")
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
- }
|
|
|
-
|
|
|
- exist, err := database.CheckExist(dbExecutor, &sql.CheckExistExecuteParams{
|
|
|
- TableName: tableName,
|
|
|
- Conditions: sql.NewConditions().Equal(e.IDColumnName(), e.GetID()),
|
|
|
- })
|
|
|
- if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
- }
|
|
|
-
|
|
|
- if !exist {
|
|
|
- err := fserr.New(e.DomainCNName() + "不存在")
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
+ return callbackOnErrorReturn(callbacks, valueObject, err, dbExecutor, nil)
|
|
|
}
|
|
|
|
|
|
err = database.Transaction(dbExecutor, func(tx database.Executor) error {
|
|
|
- err = callbackBeforeDBOperate(callbacks, e, tx)
|
|
|
+ err = callbackBeforeDBOperate(callbacks, valueObject, dbExecutor)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
- err = database.UpdateEntity(tx, tableName, e)
|
|
|
+ err = database.DeleteEntity(dbExecutor, tableName, valueObject)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
- err = callbackAfterDBOperate(callbacks, e, tx)
|
|
|
+ err = callbackAfterDBOperate(callbacks, valueObject, dbExecutor)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
@@ -399,9 +214,9 @@ func CommonEntityUpdateTx(tableName string, dbExecutor database.Executor, callba
|
|
|
return nil
|
|
|
})
|
|
|
if err != nil {
|
|
|
- return callbackOnErrorReturn(callbacks, e, err, dbExecutor, nil)
|
|
|
+ return callbackOnErrorReturn(callbacks, valueObject, err, dbExecutor, nil)
|
|
|
}
|
|
|
|
|
|
- return callbackOnSuccessReturn(callbacks, e, dbExecutor, nil)
|
|
|
+ return callbackOnSuccessReturn(callbacks, valueObject, dbExecutor, nil)
|
|
|
}
|
|
|
}
|