refactor (upload-file)
This commit is contained in:
@@ -10,7 +10,7 @@ import (
|
||||
d "github.com/karincake/dodol"
|
||||
"gorm.io/gorm"
|
||||
|
||||
eru "simrs-vx/internal/domain/references/upload"
|
||||
ere "simrs-vx/internal/domain/references/encounter"
|
||||
|
||||
e "simrs-vx/internal/domain/main-entities/encounter-document"
|
||||
)
|
||||
@@ -244,7 +244,7 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := removeUploadedFile(string(eru.ETCEncounter), *data.FilePath, &event); err != nil {
|
||||
if err := removeUploadedFile(string(ere.ETCEncounter), *data.FilePath, &event); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
package uploadfile
|
||||
|
||||
import (
|
||||
"errors"
|
||||
pl "simrs-vx/pkg/logger"
|
||||
|
||||
dg "github.com/karincake/apem/db-gorm-pg"
|
||||
d "github.com/karincake/dodol"
|
||||
"gorm.io/gorm"
|
||||
|
||||
ere "simrs-vx/internal/domain/references/encounter"
|
||||
)
|
||||
|
||||
const source = "upload-file"
|
||||
|
||||
func Upload(input CreateDto) (*d.Data, error) {
|
||||
event := pl.Event{
|
||||
Feature: "Upload",
|
||||
Source: source,
|
||||
}
|
||||
|
||||
// Start log
|
||||
pl.SetLogInfo(&event, input, "started", "create")
|
||||
|
||||
var (
|
||||
err error
|
||||
)
|
||||
err = dg.I.Transaction(func(tx *gorm.DB) error {
|
||||
// validate entityType_Code and Type_Code
|
||||
valid, msg := ere.IsValidUploadCode(input.EntityType_Code, input.Type_Code)
|
||||
if !valid {
|
||||
event.Status = "failed"
|
||||
event.ErrInfo = pl.ErrorInfo{
|
||||
Code: "invalid-code",
|
||||
Detail: msg,
|
||||
Raw: errors.New(msg),
|
||||
}
|
||||
return pl.SetLogError(&event, input)
|
||||
}
|
||||
|
||||
// upload file
|
||||
input.FilePath, err = uploadAndGenerateFileUrl(input, &event)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if input.EntityType_Code == ere.ETCEncounter {
|
||||
_, err = setEncounterDocument(input, &event, tx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
} else if input.EntityType_Code == ere.ETCPerson {
|
||||
_, err = setPersonAttachment(input, &event, tx)
|
||||
}
|
||||
|
||||
pl.SetLogInfo(&event, nil, "complete")
|
||||
|
||||
return nil
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &d.Data{
|
||||
Meta: d.II{
|
||||
"source": source,
|
||||
"structure": "single-data",
|
||||
"status": "created",
|
||||
},
|
||||
Data: d.IS{
|
||||
"fileUrl": input.FilePath,
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
+10
-11
@@ -2,13 +2,13 @@
|
||||
DESCRIPTION:
|
||||
Any functions that are used internally by the use-case
|
||||
*/
|
||||
package upload
|
||||
package uploadfile
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"path/filepath"
|
||||
ecore "simrs-vx/internal/domain/base-entities/core"
|
||||
eru "simrs-vx/internal/domain/references/upload"
|
||||
ere "simrs-vx/internal/domain/references/encounter"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
@@ -21,13 +21,12 @@ import (
|
||||
|
||||
ee "simrs-vx/internal/domain/main-entities/encounter-document"
|
||||
ep "simrs-vx/internal/domain/main-entities/person"
|
||||
e "simrs-vx/internal/domain/main-entities/upload"
|
||||
|
||||
ue "simrs-vx/internal/use-case/main-use-case/encounter-document"
|
||||
up "simrs-vx/internal/use-case/main-use-case/person"
|
||||
)
|
||||
|
||||
func uploadAndGenerateFileUrl(input e.CreateDto, event *pl.Event) (string, error) {
|
||||
func uploadAndGenerateFileUrl(input CreateDto, event *pl.Event) (string, error) {
|
||||
pl.SetLogInfo(event, input, "started", "uploadAndGenerateFileUrl")
|
||||
bucket := string(input.EntityType_Code)
|
||||
ext := strings.ToLower(filepath.Ext(input.Filename))
|
||||
@@ -97,7 +96,7 @@ func updatePersonAttachment(dataPerson *ep.Person, event *pl.Event, dbx ...*gorm
|
||||
return nil
|
||||
}
|
||||
|
||||
func setPersonAttachment(input e.CreateDto, event *pl.Event, tx *gorm.DB) (*ep.Person, error) {
|
||||
func setPersonAttachment(input CreateDto, event *pl.Event, tx *gorm.DB) (*ep.Person, error) {
|
||||
// get person
|
||||
dataPerson, err := up.ReadDetailData(ep.ReadDetailDto{Id: *input.Ref_Id}, event, tx)
|
||||
if err != nil {
|
||||
@@ -106,22 +105,22 @@ func setPersonAttachment(input e.CreateDto, event *pl.Event, tx *gorm.DB) (*ep.P
|
||||
|
||||
var removeUrl string
|
||||
switch input.Type_Code {
|
||||
case eru.DTCPRN:
|
||||
case ere.DTCPRN:
|
||||
if dataPerson.ResidentIdentityFileUrl != nil {
|
||||
removeUrl = *dataPerson.ResidentIdentityFileUrl
|
||||
}
|
||||
dataPerson.ResidentIdentityFileUrl = &input.FilePath
|
||||
case eru.DTCPDL:
|
||||
case ere.DTCPDL:
|
||||
if dataPerson.DrivingLicenseFileUrl != nil {
|
||||
removeUrl = *dataPerson.DrivingLicenseFileUrl
|
||||
}
|
||||
dataPerson.DrivingLicenseFileUrl = &input.FilePath
|
||||
case eru.DTCPP:
|
||||
case ere.DTCPP:
|
||||
if dataPerson.PassportFileUrl != nil {
|
||||
removeUrl = *dataPerson.PassportFileUrl
|
||||
}
|
||||
dataPerson.PassportFileUrl = &input.FilePath
|
||||
case eru.DTCPFC:
|
||||
case ere.DTCPFC:
|
||||
if dataPerson.FamilyIdentityFileUrl != nil {
|
||||
removeUrl = *dataPerson.FamilyIdentityFileUrl
|
||||
}
|
||||
@@ -141,7 +140,7 @@ func setPersonAttachment(input e.CreateDto, event *pl.Event, tx *gorm.DB) (*ep.P
|
||||
return dataPerson, nil
|
||||
}
|
||||
|
||||
func setEncounterDocument(input e.CreateDto, event *pl.Event, tx *gorm.DB) (*ee.EncounterDocument, error) {
|
||||
func setEncounterDocument(input CreateDto, event *pl.Event, tx *gorm.DB) (*ee.EncounterDocument, error) {
|
||||
data := ee.EncounterDocument{}
|
||||
|
||||
// get EncounterDocument
|
||||
@@ -164,7 +163,7 @@ func setEncounterDocument(input e.CreateDto, event *pl.Event, tx *gorm.DB) (*ee.
|
||||
Upload_Employee_Id: input.Upload_Employee_Id,
|
||||
}
|
||||
|
||||
if input.Type_Code == eru.DTCSEP || input.Type_Code == eru.DTCSIPP {
|
||||
if input.Type_Code == ere.DTCSEP || input.Type_Code == ere.DTCSIPP {
|
||||
if len(dataUpload) > 0 {
|
||||
data = dataUpload[0]
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
/*
|
||||
DESCRIPTION:
|
||||
A sample, part of the package that contains type, constants, and/or variables.
|
||||
|
||||
In this sample it also provides type and variable regarding the needs of the
|
||||
middleware to separate from main use-case which has the basic CRUD
|
||||
functionality. The purpose of this is to make the code more maintainable.
|
||||
*/
|
||||
package uploadfile
|
||||
|
||||
import (
|
||||
"mime/multipart"
|
||||
ere "simrs-vx/internal/domain/references/encounter"
|
||||
)
|
||||
|
||||
type CreateDto struct {
|
||||
EntityType_Code ere.EntityTypeCode `form:"entityType_code"`
|
||||
Ref_Id *uint `form:"ref_id"`
|
||||
Type_Code ere.DocTypeCode `form:"type_code"`
|
||||
Name string `form:"name"`
|
||||
Upload_Employee_Id *uint `form:"upload_employee_id"`
|
||||
FilePath string `json:"-"`
|
||||
|
||||
File multipart.File `json:"-"`
|
||||
FileHeader *multipart.FileHeader `json:"-"`
|
||||
Filename string `json:"filename"`
|
||||
Size int64 `json:"-"`
|
||||
MimeType string `json:"-"`
|
||||
}
|
||||
|
||||
type ResponseDto struct {
|
||||
EntityType_Code ere.EntityTypeCode `json:"entityType_code"`
|
||||
Ref_Id *uint `json:"ref_id"`
|
||||
Type_Code ere.DocTypeCode `json:"type_code"`
|
||||
Name string `json:"name"`
|
||||
Upload_Employee_Id *uint `json:"upload_employee_id"`
|
||||
FilePath string `json:"filePath"`
|
||||
Filename string `json:"filename"`
|
||||
FileHeader *multipart.FileHeader `json:"fileHeader"`
|
||||
Size int64 `json:"size"`
|
||||
MimeType string `json:"mimeType"`
|
||||
}
|
||||
|
||||
func (d CreateDto) ToResponse() ResponseDto {
|
||||
resp := ResponseDto{
|
||||
EntityType_Code: d.EntityType_Code,
|
||||
Ref_Id: d.Ref_Id,
|
||||
Type_Code: d.Type_Code,
|
||||
Name: d.Name,
|
||||
Upload_Employee_Id: d.Upload_Employee_Id,
|
||||
FilePath: d.FilePath,
|
||||
Filename: d.Filename,
|
||||
FileHeader: d.FileHeader,
|
||||
Size: d.Size,
|
||||
MimeType: d.MimeType,
|
||||
}
|
||||
return resp
|
||||
}
|
||||
@@ -1,90 +0,0 @@
|
||||
package upload
|
||||
|
||||
import (
|
||||
"errors"
|
||||
pl "simrs-vx/pkg/logger"
|
||||
pu "simrs-vx/pkg/use-case-helper"
|
||||
|
||||
dg "github.com/karincake/apem/db-gorm-pg"
|
||||
d "github.com/karincake/dodol"
|
||||
"gorm.io/gorm"
|
||||
|
||||
eru "simrs-vx/internal/domain/references/upload"
|
||||
|
||||
e "simrs-vx/internal/domain/main-entities/upload"
|
||||
)
|
||||
|
||||
const source = "upload"
|
||||
|
||||
func Upload(input e.CreateDto) (*d.Data, error) {
|
||||
event := pl.Event{
|
||||
Feature: "Upload",
|
||||
Source: source,
|
||||
}
|
||||
|
||||
// Start log
|
||||
pl.SetLogInfo(&event, input, "started", "create")
|
||||
|
||||
var data interface{}
|
||||
err := dg.I.Transaction(func(tx *gorm.DB) error {
|
||||
mwRunner := newMiddlewareRunner(&event, tx)
|
||||
mwRunner.setMwType(pu.MWTPre)
|
||||
|
||||
// Run pre-middleware
|
||||
err := mwRunner.RunCreateMiddleware(createPreMw, &input, &data)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// validate entityType_Code and Type_Code
|
||||
valid, msg := eru.IsValidUploadCode(input.EntityType_Code, input.Type_Code)
|
||||
if !valid {
|
||||
event.Status = "failed"
|
||||
event.ErrInfo = pl.ErrorInfo{
|
||||
Code: "invalid-code",
|
||||
Detail: msg,
|
||||
Raw: errors.New(msg),
|
||||
}
|
||||
return pl.SetLogError(&event, input)
|
||||
}
|
||||
|
||||
// upload file
|
||||
input.FilePath, err = uploadAndGenerateFileUrl(input, &event)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if input.EntityType_Code == eru.ETCEncounter {
|
||||
data, err = setEncounterDocument(input, &event, tx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
} else if input.EntityType_Code == eru.ETCPerson {
|
||||
data, err = setPersonAttachment(input, &event, tx)
|
||||
}
|
||||
|
||||
mwRunner.setMwType(pu.MWTPost)
|
||||
// Run post-middleware
|
||||
if err := mwRunner.RunCreateMiddleware(createPostMw, &input, &data); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
pl.SetLogInfo(&event, nil, "complete")
|
||||
|
||||
return nil
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &d.Data{
|
||||
Meta: d.II{
|
||||
"source": source,
|
||||
"structure": "single-data",
|
||||
"status": "created",
|
||||
},
|
||||
Data: input.ToResponse(),
|
||||
}, nil
|
||||
}
|
||||
@@ -1,104 +0,0 @@
|
||||
package upload
|
||||
|
||||
import (
|
||||
pl "simrs-vx/pkg/logger"
|
||||
pu "simrs-vx/pkg/use-case-helper"
|
||||
|
||||
"gorm.io/gorm"
|
||||
|
||||
e "simrs-vx/internal/domain/main-entities/upload"
|
||||
)
|
||||
|
||||
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 interface{}) 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 interface{}) 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 interface{}) 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 interface{}) 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 interface{}) 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
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package upload
|
||||
|
||||
// example of middleware
|
||||
// func init() {
|
||||
// createPreMw = append(createPreMw,
|
||||
// CreateMw{Name: "modif-input", Func: pm.ModifInput},
|
||||
// CreateMw{Name: "check-data", Func: pm.CheckData},
|
||||
// )
|
||||
// }
|
||||
@@ -1,44 +0,0 @@
|
||||
/*
|
||||
DESCRIPTION:
|
||||
A sample, part of the package that contains type, constants, and/or variables.
|
||||
|
||||
In this sample it also provides type and variable regarding the needs of the
|
||||
middleware to separate from main use-case which has the basic CRUD
|
||||
functionality. The purpose of this is to make the code more maintainable.
|
||||
*/
|
||||
package upload
|
||||
|
||||
import (
|
||||
"gorm.io/gorm"
|
||||
|
||||
e "simrs-vx/internal/domain/main-entities/upload"
|
||||
)
|
||||
|
||||
type createMw struct {
|
||||
Name string
|
||||
Func func(input *e.CreateDto, data interface{}, tx *gorm.DB) error
|
||||
}
|
||||
|
||||
type readListMw struct {
|
||||
Name string
|
||||
Func func(input *e.ReadListDto, data interface{}, tx *gorm.DB) error
|
||||
}
|
||||
|
||||
type readDetailMw struct {
|
||||
Name string
|
||||
Func func(input *e.ReadDetailDto, data interface{}, tx *gorm.DB) error
|
||||
}
|
||||
|
||||
type UpdateMw = readDetailMw
|
||||
type DeleteMw = readDetailMw
|
||||
|
||||
var createPreMw []createMw // preprocess middleware
|
||||
var createPostMw []createMw // postprocess middleware
|
||||
var readListPreMw []readListMw // ..
|
||||
var readListPostMw []readListMw // ..
|
||||
var readDetailPreMw []readDetailMw
|
||||
var readDetailPostMw []readDetailMw
|
||||
var updatePreMw []readDetailMw
|
||||
var updatePostMw []readDetailMw
|
||||
var deletePreMw []readDetailMw
|
||||
var deletePostMw []readDetailMw
|
||||
Reference in New Issue
Block a user