refactor : adjust use case after mw refactored

This commit is contained in:
dpurbosakti
2025-08-22 15:18:25 +07:00
parent 7a032ff518
commit a4a0a4f672
49 changed files with 2331 additions and 2304 deletions

No files matched your search

+62 -218
View File
@@ -1,7 +1,6 @@
package unit
import (
"fmt"
e "simrs-vx/internal/domain/main-entities/unit"
"strconv"
@@ -19,8 +18,6 @@ const source = "unit"
func Create(input e.CreateDto) (*d.Data, error) {
data := e.Unit{}
setData(&input, &data)
event := pl.Event{
Feature: "Create",
Source: source,
@@ -30,51 +27,23 @@ func Create(input e.CreateDto) (*d.Data, error) {
pl.SetLogInfo(&event, input, "started", "create")
err := dg.I.Transaction(func(tx *gorm.DB) error {
for i := range createPreMw {
mwName := fmt.Sprintf("createPreMw[%d]", i)
pl.SetLogInfo(&event, data, "started", mwName)
if err := createPreMw[i](&input, &data, tx); err != nil {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "MW_PRE_FAILED", // TODO: add to lang json
Detail: fmt.Sprintf("Pre-middleware %s failed", mwName),
Raw: err,
}
return pl.SetLogError(event, data)
}
pl.SetLogInfo(&event, nil, "complete")
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")
for i := range createPostMw {
mwName := fmt.Sprintf("createPostMw[%d]", i)
pl.SetLogInfo(&event, input, "started", mwName)
if err := createPostMw[i](&input, &data, tx); err != nil {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "MW_POST_FAILED", // TODO: add to lang json
Detail: fmt.Sprintf("Post-middleware %s failed", mwName),
Raw: err,
}
return pl.SetLogError(event, data)
}
mwRunner.setMwType(pu.MWTPost)
// Run post-middleware
if err := mwRunner.RunCreateMiddleware(createPostMw, &input, &data); err != nil {
return err
}
pl.SetLogInfo(&event, nil, "complete")
@@ -111,54 +80,21 @@ func ReadList(input e.ReadListDto) (*d.Data, error) {
pl.SetLogInfo(&event, input, "started", "readList")
err = dg.I.Transaction(func(tx *gorm.DB) error {
for i := range readListPreMw {
mwName := fmt.Sprintf("readListPreMw[%d]", i)
pl.SetLogInfo(&event, input, "started", mwName)
if err := readListPreMw[i](&input, data, tx); err != nil {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "MW_PRE_FAILED", // TODO: add to lang json
Detail: fmt.Sprintf("Pre-middleware %s failed", mwName),
Raw: err,
}
return pl.SetLogError(event, input)
}
pl.SetLogInfo(&event, nil, "complete")
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")
for i := range readListPostMw {
mwName := fmt.Sprintf("readListPostMw[%d]", i)
pl.SetLogInfo(&event, input, "started", mwName)
if err := readListPostMw[i](&input, data, tx); err != nil {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "MW_POST_FAILED", // TODO: add to lang json
Detail: fmt.Sprintf("Post-middleware %s failed", mwName),
Raw: err,
}
return pl.SetLogError(event, input)
}
pl.SetLogInfo(&event, nil, "complete")
mwRunner.setMwType(pu.MWTPost)
// Run post-middleware
if err := mwRunner.RunReadListMiddleware(readListPostMw, &input, data); err != nil {
return err
}
return nil
@@ -194,46 +130,21 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
pl.SetLogInfo(&event, input, "started", "readDetail")
err = dg.I.Transaction(func(tx *gorm.DB) error {
for i := range readDetailPreMw {
mwName := fmt.Sprintf("readDetailPreMw[%d]", i)
pl.SetLogInfo(&event, input, "started", mwName)
if err := readDetailPreMw[i](&input, data, tx); err != nil {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "MW_PRE_FAILED", // TODO: add to lang json
Detail: fmt.Sprintf("Pre-middleware %s failed", mwName),
Raw: err,
}
return pl.SetLogError(event, input)
}
pl.SetLogInfo(&event, nil, "complete")
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
}
for i := range readDetailPostMw {
mwName := fmt.Sprintf("readDetailPostMw[%d]", i)
pl.SetLogInfo(&event, data, "started", mwName)
if err := readDetailPostMw[i](&input, data, tx); err != nil {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "MW_POST_FAILED", // TODO: add to lang json
Detail: fmt.Sprintf("Post-middleware %s failed", mwName),
Raw: err,
}
return pl.SetLogError(event, data)
}
pl.SetLogInfo(&event, nil, "complete")
mwRunner.setMwType(pu.MWTPost)
// Run post-middleware
if err := mwRunner.RunReadDetailMiddleware(readDetailPostMw, &input, data); err != nil {
return err
}
return nil
@@ -249,7 +160,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
"structure": "single-data",
"status": "fetched",
},
Data: pu.SafeToResponse(data),
Data: data.ToResponse(),
}, nil
}
@@ -268,61 +179,27 @@ 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
if data, err = ReadDetailData(rdDto, &event, tx); err != nil {
return err
}
pl.SetLogInfo(&event, input, "started", "setUpdate")
setData(&input, data)
for i := range updatePreMw {
mwName := fmt.Sprintf("updatePreMw[%d]", i)
pl.SetLogInfo(&event, data, "started", mwName)
if err := updatePreMw[i](&rdDto, data, tx); err != nil {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "MW_PRE_FAILED", // TODO: add to lang json
Detail: fmt.Sprintf("Pre-middleware %s failed", mwName),
Raw: err,
}
return pl.SetLogError(event, data)
}
pl.SetLogInfo(&event, nil, "complete")
mwRunner := newMiddlewareRunner(&event, tx)
mwRunner.setMwType(pu.MWTPre)
// Run pre-middleware
if err := mwRunner.RunUpdateMiddleware(readDetailPreMw, &rdDto, data); 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)
if err := UpdateData(input, data, &event, tx); err != nil {
return err
}
pl.SetLogInfo(&event, nil, "complete")
for i := range updatePostMw {
mwName := fmt.Sprintf("updatePostMw[%d]", i)
pl.SetLogInfo(&event, data, "started", mwName)
if err := updatePostMw[i](&rdDto, data, tx); err != nil {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "MW_POST_FAILED", // TODO: add to lang json
Detail: fmt.Sprintf("Post-middleware %s failed", mwName),
Raw: err,
}
return pl.SetLogError(event, data)
}
pl.SetLogInfo(&event, nil, "complete")
mwRunner.setMwType(pu.MWTPost)
// Run post-middleware
if err := mwRunner.RunUpdateMiddleware(readDetailPostMw, &rdDto, data); err != nil {
return err
}
return nil
@@ -358,58 +235,25 @@ 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
if data, err = ReadDetailData(rdDto, &event, tx); err != nil {
return err
}
for i := range deletePreMw {
mwName := fmt.Sprintf("deletePreMw[%d]", i)
pl.SetLogInfo(&event, data, "started", mwName)
if err := deletePreMw[i](&rdDto, data, tx); err != nil {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "MW_PRE_FAILED", // TODO: add to lang json
Detail: fmt.Sprintf("Pre-middleware %s failed", mwName),
Raw: err,
}
return pl.SetLogError(event, data)
}
pl.SetLogInfo(&event, nil, "complete")
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, 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)
if err := DeleteData(data, &event, tx); err != nil {
return err
}
pl.SetLogInfo(&event, nil, "complete")
for i := range deletePostMw {
mwName := fmt.Sprintf("deletePostMw[%d]", i)
pl.SetLogInfo(&event, data, "started", mwName)
if err := deletePostMw[i](&rdDto, data, tx); err != nil {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "MW_POST_FAILED", // TODO: add to lang json
Detail: fmt.Sprintf("Post-middleware %s failed", mwName),
Raw: err,
}
return pl.SetLogError(event, data)
}
pl.SetLogInfo(&event, nil, "complete")
mwRunner.setMwType(pu.MWTPost)
// Run post-middleware
if err := mwRunner.RunDeleteMiddleware(readDetailPostMw, &rdDto, data); err != nil {
return err
}
return nil
+66 -15
View File
@@ -2,13 +2,20 @@ package unit
import (
e "simrs-vx/internal/domain/main-entities/unit"
pl "simrs-vx/pkg/logger"
pu "simrs-vx/pkg/use-case-helper"
dg "github.com/karincake/apem/db-gorm-pg"
gh "github.com/karincake/getuk"
"gorm.io/gorm"
)
func CreateData(input *e.Unit, dbx ...*gorm.DB) (*e.Unit, error) {
func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.Unit, error) {
pl.SetLogInfo(event, nil, "started", "DBCreate")
data := e.Unit{}
setData(&input, &data)
var tx *gorm.DB
if len(dbx) > 0 {
tx = dbx[0]
@@ -16,14 +23,22 @@ func CreateData(input *e.Unit, dbx ...*gorm.DB) (*e.Unit, error) {
tx = dg.I
}
if err := tx.Create(&input).Error; err != nil {
return nil, err
if err := tx.Create(&data).Error; err != nil {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "data-create-fail",
Detail: "Database insert failed",
Raw: err,
}
return nil, pl.SetLogError(event, input)
}
return input, nil
pl.SetLogInfo(event, nil, "complete")
return &data, nil
}
func ReadListData(input e.ReadListDto, dbx ...*gorm.DB) ([]e.Unit, *e.MetaDto, error) {
func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Unit, *e.MetaDto, error) {
pl.SetLogInfo(event, input, "started", "DBReadList")
data := []e.Unit{}
pagination := gh.Pagination{}
count := int64(0)
@@ -38,9 +53,7 @@ func ReadListData(input e.ReadListDto, dbx ...*gorm.DB) ([]e.Unit, *e.MetaDto, e
tx = tx.
Model(&e.Unit{}).
// Joins("Patient"). // if needed
// Preload("Patient"). // if needed
Preload("Installation"). // if needed
Preload("Installation").
Scopes(gh.Filter(input)).
Count(&count).
Scopes(gh.Paginate(input, &pagination)).
@@ -50,16 +63,25 @@ func ReadListData(input e.ReadListDto, dbx ...*gorm.DB) ([]e.Unit, *e.MetaDto, e
if err == gorm.ErrRecordNotFound {
return nil, &meta, nil
}
return nil, nil, err
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "data-create-fail",
Detail: "Database insert failed",
Raw: err,
}
return nil, nil, pl.SetLogError(event, input)
}
meta.Count = int(count)
meta.PageNumber = pagination.PageNumber
meta.PageSize = pagination.PageSize
pl.SetLogInfo(event, nil, "complete")
return data, &meta, nil
}
func ReadDetailData(input e.ReadDetailDto, dbx ...*gorm.DB) (*e.Unit, error) {
func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e.Unit, error) {
pl.SetLogInfo(event, input, "started", "DBReadDetail")
data := e.Unit{}
var tx *gorm.DB
@@ -70,13 +92,19 @@ func ReadDetailData(input e.ReadDetailDto, dbx ...*gorm.DB) (*e.Unit, error) {
}
if err := tx.First(&data, input.Id).Error; err != nil {
return nil, err
if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
return nil, processedErr
}
}
pl.SetLogInfo(event, nil, "complete")
return &data, nil
}
func UpdateData(input e.Unit, dbx ...*gorm.DB) error {
func UpdateData(input e.UpdateDto, data *e.Unit, event *pl.Event, dbx ...*gorm.DB) error {
pl.SetLogInfo(event, data, "started", "DBUpdate")
setData(&input, data)
var tx *gorm.DB
if len(dbx) > 0 {
tx = dbx[0]
@@ -84,10 +112,22 @@ func UpdateData(input e.Unit, dbx ...*gorm.DB) error {
tx = dg.I
}
return tx.Save(&input).Error
if err := tx.Save(&data).Error; err != nil {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "data-update-fail",
Detail: "Database update failed",
Raw: err,
}
return pl.SetLogError(event, input)
}
pl.SetLogInfo(event, nil, "complete")
return nil
}
func DeleteData(input *e.Unit, dbx ...*gorm.DB) error {
func DeleteData(data *e.Unit, event *pl.Event, dbx ...*gorm.DB) error {
pl.SetLogInfo(event, data, "started", "DBDelete")
var tx *gorm.DB
if len(dbx) > 0 {
tx = dbx[0]
@@ -95,5 +135,16 @@ func DeleteData(input *e.Unit, dbx ...*gorm.DB) error {
tx = dg.I
}
return tx.Delete(input).Error
if err := tx.Delete(&data).Error; err != nil {
event.Status = "failed"
event.ErrInfo = pl.ErrorInfo{
Code: "data-delete-fail",
Detail: "Database delete failed",
Raw: err,
}
return pl.SetLogError(event, data)
}
pl.SetLogInfo(event, nil, "complete")
return nil
}
@@ -0,0 +1,103 @@
package unit
import (
e "simrs-vx/internal/domain/main-entities/unit"
pl "simrs-vx/pkg/logger"
pu "simrs-vx/pkg/use-case-helper"
"gorm.io/gorm"
)
type middlewareRunner struct {
Event *pl.Event
Tx *gorm.DB
MwType pu.MWType
}
// NewMiddlewareExecutor creates a new middleware executor
func newMiddlewareRunner(event *pl.Event, tx *gorm.DB) *middlewareRunner {
return &middlewareRunner{
Event: event,
Tx: tx,
}
}
// ExecuteCreateMiddleware executes create middleware
func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *e.Unit) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
pl.SetLogInfo(me.Event, logData, "started", middleware.Name)
if err := middleware.Func(input, data, me.Tx); err != nil {
return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err)
}
pl.SetLogInfo(me.Event, nil, "complete")
}
return nil
}
func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *e.ReadListDto, data *e.Unit) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
pl.SetLogInfo(me.Event, logData, "started", middleware.Name)
if err := middleware.Func(input, data, me.Tx); err != nil {
return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err)
}
pl.SetLogInfo(me.Event, nil, "complete")
}
return nil
}
func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.Unit) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
pl.SetLogInfo(me.Event, logData, "started", middleware.Name)
if err := middleware.Func(input, data, me.Tx); err != nil {
return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err)
}
pl.SetLogInfo(me.Event, nil, "complete")
}
return nil
}
func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.Unit) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
pl.SetLogInfo(me.Event, logData, "started", middleware.Name)
if err := middleware.Func(input, data, me.Tx); err != nil {
return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err)
}
pl.SetLogInfo(me.Event, nil, "complete")
}
return nil
}
func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.Unit) error {
for _, middleware := range middlewares {
logData := pu.GetLogData(input, data)
pl.SetLogInfo(me.Event, logData, "started", middleware.Name)
if err := middleware.Func(input, data, me.Tx); err != nil {
return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err)
}
pl.SetLogInfo(me.Event, nil, "complete")
}
return nil
}
func (me *middlewareRunner) setMwType(mwType pu.MWType) {
me.MwType = mwType
}
@@ -0,0 +1,9 @@
package unit
// example of middleware
// func init() {
// createPreMw = append(createPreMw,
// CreateMw{Name: "modif-input", Func: pm.ModifInput},
// CreateMw{Name: "check-data", Func: pm.CheckData},
// )
// }
@@ -14,11 +14,23 @@ import (
e "simrs-vx/internal/domain/main-entities/unit"
)
type createMw func(input *e.CreateDto, data *e.Unit, tx *gorm.DB) error
type readListMw func(input *e.ReadListDto, data *e.Unit, tx *gorm.DB) error
type readDetailMw func(input *e.ReadDetailDto, data *e.Unit, tx *gorm.DB) error
type updateMw func(input *e.ReadDetailDto, data *e.Unit, tx *gorm.DB) error
type deleteMw func(input *e.ReadDetailDto, data *e.Unit, tx *gorm.DB) error
type createMw struct {
Name string
Func func(input *e.CreateDto, data *e.Unit, tx *gorm.DB) error
}
type readListMw struct {
Name string
Func func(input *e.ReadListDto, data *e.Unit, tx *gorm.DB) error
}
type readDetailMw struct {
Name string
Func func(input *e.ReadDetailDto, data *e.Unit, tx *gorm.DB) error
}
type UpdateMw = readDetailMw
type DeleteMw = readDetailMw
var createPreMw []createMw // preprocess middleware
var createPostMw []createMw // postprocess middleware