refactor : adjust use case after mw refactored
This commit is contained in:
No files matched your search
@@ -18,8 +18,6 @@ const source = "user"
|
||||
func Create(input e.CreateDto) (*d.Data, error) {
|
||||
data := e.User{}
|
||||
|
||||
setCreate(input, &data)
|
||||
|
||||
event := pl.Event{
|
||||
Feature: "Create",
|
||||
Source: source,
|
||||
@@ -29,31 +27,22 @@ func Create(input e.CreateDto) (*d.Data, error) {
|
||||
pl.SetLogInfo(&event, input, "started", "create")
|
||||
|
||||
err := dg.I.Transaction(func(tx *gorm.DB) error {
|
||||
executor := newMiddlewareExecutor(&event, tx)
|
||||
executor.setMwtype(pu.MWTPre)
|
||||
|
||||
// Execute pre-middleware
|
||||
if err := executor.ExecuteCreateMiddleware(createPreMw, &input, &data); err != nil {
|
||||
mwRunner := newMiddlewareRunner(&event, tx)
|
||||
mwRunner.setMwType(pu.MWTPre)
|
||||
// Run pre-middleware
|
||||
if err := mwRunner.RunCreateMiddleware(createPreMw, &input, &data); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
pl.SetLogInfo(&event, data, "started", "DBCreate")
|
||||
_, err := CreateData(&data, tx)
|
||||
if err != nil {
|
||||
event.Status = "failed"
|
||||
event.ErrInfo = pl.ErrorInfo{
|
||||
Code: "data-create-fail",
|
||||
Detail: "Database insert failed",
|
||||
Raw: err,
|
||||
}
|
||||
return pl.SetLogError(event, data)
|
||||
if resData, err := CreateData(input, &event, tx); err != nil {
|
||||
return err
|
||||
} else {
|
||||
data = *resData
|
||||
}
|
||||
|
||||
pl.SetLogInfo(&event, nil, "complete")
|
||||
|
||||
executor.setMwtype(pu.MWTPost)
|
||||
// Execute post-middleware
|
||||
if err := executor.ExecuteCreateMiddleware(createPostMw, &input, &data); err != nil {
|
||||
mwRunner.setMwType(pu.MWTPost)
|
||||
// Run post-middleware
|
||||
if err := mwRunner.RunCreateMiddleware(createPostMw, &input, &data); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -91,31 +80,20 @@ func ReadList(input e.ReadListDto) (*d.Data, error) {
|
||||
pl.SetLogInfo(&event, input, "started", "readList")
|
||||
|
||||
err = dg.I.Transaction(func(tx *gorm.DB) error {
|
||||
executor := newMiddlewareExecutor(&event, tx)
|
||||
executor.setMwtype(pu.MWTPre)
|
||||
|
||||
// Execute pre-middleware
|
||||
if err := executor.ExecuteReadListMiddleware(readListPreMw, &input, data); err != nil {
|
||||
mwRunner := newMiddlewareRunner(&event, tx)
|
||||
mwRunner.setMwType(pu.MWTPre)
|
||||
// Run pre-middleware
|
||||
if err := mwRunner.RunReadListMiddleware(readListPreMw, &input, data); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
pl.SetLogInfo(&event, input, "started", "DBReadList")
|
||||
dataList, metaList, err = ReadListData(input, tx)
|
||||
if err != nil {
|
||||
event.Status = "failed"
|
||||
event.ErrInfo = pl.ErrorInfo{
|
||||
Code: "data-read-list-fail",
|
||||
Detail: "Database read list failed",
|
||||
Raw: err,
|
||||
}
|
||||
return pl.SetLogError(event, input)
|
||||
if dataList, metaList, err = ReadListData(input, &event, tx); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
pl.SetLogInfo(&event, nil, "complete")
|
||||
|
||||
executor.setMwtype(pu.MWTPost)
|
||||
// Execute post-middleware
|
||||
if err := executor.ExecuteReadListMiddleware(readListPostMw, &input, data); err != nil {
|
||||
mwRunner.setMwType(pu.MWTPost)
|
||||
// Run post-middleware
|
||||
if err := mwRunner.RunReadListMiddleware(readListPostMw, &input, data); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -152,23 +130,20 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
|
||||
pl.SetLogInfo(&event, input, "started", "readDetail")
|
||||
|
||||
err = dg.I.Transaction(func(tx *gorm.DB) error {
|
||||
executor := newMiddlewareExecutor(&event, tx)
|
||||
executor.setMwtype(pu.MWTPre)
|
||||
|
||||
// Execute pre-middleware
|
||||
if err := executor.ExecuteReadDetailMiddleware(readDetailPreMw, &input, data); err != nil {
|
||||
mwRunner := newMiddlewareRunner(&event, tx)
|
||||
mwRunner.setMwType(pu.MWTPre)
|
||||
// Run pre-middleware
|
||||
if err := mwRunner.RunReadDetailMiddleware(readDetailPreMw, &input, data); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
pl.SetLogInfo(&event, input, "started", "DBReadDetail")
|
||||
data, err = ReadDetailData(input, tx)
|
||||
if processedErr := pu.HandleReadError(err, &event, source, input.Id, data); processedErr != nil {
|
||||
return processedErr
|
||||
if data, err = ReadDetailData(input, &event, tx); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
executor.setMwtype(pu.MWTPost)
|
||||
// Execute post-middleware
|
||||
if err := executor.ExecuteReadDetailMiddleware(readDetailPostMw, &input, data); err != nil {
|
||||
mwRunner.setMwType(pu.MWTPost)
|
||||
// Run post-middleware
|
||||
if err := mwRunner.RunReadDetailMiddleware(readDetailPostMw, &input, data); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -185,7 +160,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
|
||||
"structure": "single-data",
|
||||
"status": "fetched",
|
||||
},
|
||||
Data: pu.SafeToResponse(data),
|
||||
Data: data.ToResponse(),
|
||||
}, nil
|
||||
}
|
||||
|
||||
@@ -204,49 +179,26 @@ func Update(input e.UpdateDto) (*d.Data, error) {
|
||||
|
||||
err = dg.I.Transaction(func(tx *gorm.DB) error {
|
||||
pl.SetLogInfo(&event, rdDto, "started", "DBReadDetail")
|
||||
data, err = ReadDetailData(rdDto, tx)
|
||||
if processedErr := pu.HandleReadError(err, &event, source, input.Id, data); processedErr != nil {
|
||||
return processedErr
|
||||
}
|
||||
|
||||
pl.SetLogInfo(&event, input, "started", "setUpdate")
|
||||
err = setUpdate(input, data)
|
||||
if err != nil {
|
||||
event.Status = "failed"
|
||||
event.ErrInfo = pl.ErrorInfo{
|
||||
Code: "set-update-fail",
|
||||
Detail: "Set update data failed",
|
||||
Raw: err,
|
||||
}
|
||||
return pl.SetLogError(event, input)
|
||||
}
|
||||
|
||||
pl.SetLogInfo(&event, nil, "complete")
|
||||
|
||||
executor := newMiddlewareExecutor(&event, tx)
|
||||
executor.setMwtype(pu.MWTPre)
|
||||
|
||||
// Execute pre-middleware
|
||||
if err := executor.ExecuteUpdateMiddleware(readDetailPreMw, &rdDto, data); err != nil {
|
||||
if data, err = ReadDetailData(rdDto, &event, tx); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
pl.SetLogInfo(&event, data, "started", "DBUpdate")
|
||||
if err := UpdateData(*data, tx); err != nil {
|
||||
event.Status = "failed"
|
||||
event.ErrInfo = pl.ErrorInfo{
|
||||
Code: "data-update-fail",
|
||||
Detail: "Database update failed",
|
||||
Raw: err,
|
||||
}
|
||||
return pl.SetLogError(event, data)
|
||||
mwRunner := newMiddlewareRunner(&event, tx)
|
||||
mwRunner.setMwType(pu.MWTPre)
|
||||
// Run pre-middleware
|
||||
if err := mwRunner.RunUpdateMiddleware(readDetailPreMw, &rdDto, data); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := UpdateData(input, data, &event, tx); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
pl.SetLogInfo(&event, nil, "complete")
|
||||
|
||||
executor.setMwtype(pu.MWTPost)
|
||||
// Execute post-middleware
|
||||
if err := executor.ExecuteUpdateMiddleware(readDetailPostMw, &rdDto, data); err != nil {
|
||||
mwRunner.setMwType(pu.MWTPost)
|
||||
// Run post-middleware
|
||||
if err := mwRunner.RunUpdateMiddleware(readDetailPostMw, &rdDto, data); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -283,35 +235,24 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
|
||||
|
||||
err = dg.I.Transaction(func(tx *gorm.DB) error {
|
||||
pl.SetLogInfo(&event, rdDto, "started", "DBReadDetail")
|
||||
data, err = ReadDetailData(rdDto, tx)
|
||||
if processedErr := pu.HandleReadError(err, &event, source, input.Id, data); processedErr != nil {
|
||||
return processedErr
|
||||
}
|
||||
|
||||
executor := newMiddlewareExecutor(&event, tx)
|
||||
executor.setMwtype(pu.MWTPre)
|
||||
|
||||
// Execute pre-middleware
|
||||
if err := executor.ExecuteDeleteMiddleware(readDetailPreMw, &rdDto, data); err != nil {
|
||||
if data, err = ReadDetailData(rdDto, &event, tx); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
pl.SetLogInfo(&event, data, "started", "DBDelete")
|
||||
if err := DeleteData(data, tx); err != nil {
|
||||
event.Status = "failed"
|
||||
event.ErrInfo = pl.ErrorInfo{
|
||||
Code: "data-delete-fail",
|
||||
Detail: "Database delete failed",
|
||||
Raw: err,
|
||||
}
|
||||
return pl.SetLogError(event, data)
|
||||
mwRunner := newMiddlewareRunner(&event, tx)
|
||||
mwRunner.setMwType(pu.MWTPre)
|
||||
// Run pre-middleware
|
||||
if err := mwRunner.RunDeleteMiddleware(readDetailPreMw, &rdDto, data); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
pl.SetLogInfo(&event, nil, "complete")
|
||||
if err := DeleteData(data, &event, tx); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
executor.setMwtype(pu.MWTPost)
|
||||
// Execute post-middleware
|
||||
if err := executor.ExecuteDeleteMiddleware(readDetailPostMw, &rdDto, data); err != nil {
|
||||
mwRunner.setMwType(pu.MWTPost)
|
||||
// Run post-middleware
|
||||
if err := mwRunner.RunDeleteMiddleware(readDetailPostMw, &rdDto, data); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user