adjust upload
This commit is contained in:
@@ -244,13 +244,6 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
|
||||
return err
|
||||
}
|
||||
|
||||
mwRunner := newMiddlewareRunner(&event, tx)
|
||||
mwRunner.setMwType(pu.MWTPre)
|
||||
// Run pre-middleware
|
||||
if err := mwRunner.RunDeleteMiddleware(readDetailPreMw, &rdDto, data); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := removeUploadedFile(string(eru.ETCEncounter), *data.FilePath, &event); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -259,12 +252,6 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
|
||||
return err
|
||||
}
|
||||
|
||||
mwRunner.setMwType(pu.MWTPost)
|
||||
// Run post-middleware
|
||||
if err := mwRunner.RunDeleteMiddleware(readDetailPostMw, &rdDto, data); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"errors"
|
||||
pl "simrs-vx/pkg/logger"
|
||||
pu "simrs-vx/pkg/use-case-helper"
|
||||
"strconv"
|
||||
|
||||
dg "github.com/karincake/apem/db-gorm-pg"
|
||||
d "github.com/karincake/dodol"
|
||||
|
||||
@@ -164,29 +164,44 @@ func setEncounterDocument(input e.CreateDto, event *pl.Event, tx *gorm.DB) (*ee.
|
||||
Upload_Employee_Id: input.Upload_Employee_Id,
|
||||
}
|
||||
|
||||
if len(dataUpload) > 0 {
|
||||
if err := removeUploadedFile(string(input.EntityType_Code), *dataUpload[0].FilePath, *dataUpload[0].Encounter_Id, event); err != nil {
|
||||
return nil, err
|
||||
if input.Type_Code == eru.UCSEP || input.Type_Code == eru.UCSIPP {
|
||||
if len(dataUpload) > 0 {
|
||||
data = dataUpload[0]
|
||||
|
||||
// remove file
|
||||
if err := removeUploadedFile(string(input.EntityType_Code), *data.FilePath, *data.Encounter_Id, event); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// update data
|
||||
err = ue.UpdateData(ee.UpdateDto{
|
||||
Id: uint16(data.Id),
|
||||
CreateDto: createDto}, &data, event, tx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
data.FilePath = &input.FilePath
|
||||
|
||||
return &data, nil
|
||||
}
|
||||
|
||||
// update data
|
||||
err = ue.UpdateData(ee.UpdateDto{
|
||||
Id: uint16(dataUpload[0].Id),
|
||||
CreateDto: createDto}, &dataUpload[0], event, tx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
data = dataUpload[0]
|
||||
data.FilePath = &input.FilePath
|
||||
} else {
|
||||
// insert data
|
||||
resData, err := ue.CreateData(createDto, event, tx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
data = *resData
|
||||
|
||||
return &data, nil
|
||||
}
|
||||
|
||||
// insert data
|
||||
resData, err := ue.CreateData(createDto, event, tx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
data = *resData
|
||||
|
||||
return &data, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user