Merge branch 'dev' into ruang_operasi
This commit is contained in:
@@ -67,7 +67,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.En
|
||||
|
||||
if input.StartDate != nil && input.EndDate != nil {
|
||||
tx = tx.Where(
|
||||
"DATE(\"RegisteredAt\") >= DATE(?) AND DATE(\"RegisteredAt\") <= DATE(?)",
|
||||
"DATE(\"Encounter\".\"RegisteredAt\") >= DATE(?) AND DATE(\"Encounter\".\"RegisteredAt\") <= DATE(?)",
|
||||
input.StartDate,
|
||||
input.EndDate,
|
||||
)
|
||||
|
||||
@@ -1,16 +1,19 @@
|
||||
package procedureroomorder
|
||||
|
||||
import (
|
||||
e "simrs-vx/internal/domain/main-entities/procedure-room-order"
|
||||
"errors"
|
||||
"strconv"
|
||||
|
||||
"gorm.io/gorm"
|
||||
|
||||
dg "github.com/karincake/apem/db-gorm-pg"
|
||||
d "github.com/karincake/dodol"
|
||||
|
||||
pl "simrs-vx/pkg/logger"
|
||||
pu "simrs-vx/pkg/use-case-helper"
|
||||
|
||||
"gorm.io/gorm"
|
||||
e "simrs-vx/internal/domain/main-entities/procedure-room-order"
|
||||
erc "simrs-vx/internal/domain/references/common"
|
||||
)
|
||||
|
||||
const source = "procedure-room-order"
|
||||
@@ -274,3 +277,62 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
|
||||
}, nil
|
||||
|
||||
}
|
||||
|
||||
func Submit(input e.ReadDetailDto) (*d.Data, error) {
|
||||
var data *e.ProcedureRoomOrder
|
||||
var err error
|
||||
|
||||
event := pl.Event{
|
||||
Feature: "Process",
|
||||
Source: source,
|
||||
}
|
||||
|
||||
// Start log
|
||||
pl.SetLogInfo(&event, input, "started", "process")
|
||||
|
||||
err = dg.I.Transaction(func(tx *gorm.DB) error {
|
||||
data, err = ReadDetailData(input, &event, tx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if data.IsNotNew() {
|
||||
event.Status = "failed"
|
||||
event.ErrInfo = pl.ErrorInfo{
|
||||
Code: "data-state-mismatch",
|
||||
Detail: source + " is not in new state",
|
||||
Raw: errors.New(source + " is not in new state"),
|
||||
}
|
||||
return pl.SetLogError(&event, input)
|
||||
}
|
||||
|
||||
data.Status_Code = erc.DSCSubmited
|
||||
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
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &d.Data{
|
||||
Meta: d.IS{
|
||||
"source": source,
|
||||
"structure": "single-data",
|
||||
"status": "submited",
|
||||
},
|
||||
Data: data.ToResponse(),
|
||||
}, nil
|
||||
|
||||
}
|
||||
|
||||
@@ -19,7 +19,6 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.ProcedureRoomOrder)
|
||||
}
|
||||
|
||||
data.Encounter_Id = inputSrc.Encounter_Id
|
||||
data.Infra_Code = inputSrc.Infra_Code
|
||||
data.MaterialPackage_Code = inputSrc.MaterialPackage_Code
|
||||
data.Status_Code = erc.DSCNew
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user