refactor (upload-file)

internal/domain/main-entities/encounter-document/dto.go

@@ -1,7 +1,7 @@
 package encounter_document
 
 import (
-	eru "simrs-vx/internal/domain/references/upload"
+	ere "simrs-vx/internal/domain/references/encounter"
 	// internal - domain - base-entities
 	ecore "simrs-vx/internal/domain/base-entities/core"
 
@@ -10,7 +10,7 @@ import (
 
 type CreateDto struct {
 	Encounter_Id       *uint           `json:"encounter_id"`
-	Type_Code          eru.DocTypeCode `json:"type_code"`
+	Type_Code          ere.DocTypeCode `json:"type_code"`
 	Name               string          `json:"name"`
 	FilePath           string          `json:"filePath"`
 	Filename           string          `json:"-"`
@@ -25,7 +25,7 @@ type ReadListDto struct {
 
 type FilterDto struct {
 	Encounter_Id       *uint           `json:"encounter-id"`
-	Type_Code          eru.DocTypeCode `json:"type-code"`
+	Type_Code          ere.DocTypeCode `json:"type-code"`
 	Upload_Employee_Id *string         `json:"encounter-document-employee-id"`
 }
 
@@ -52,7 +52,7 @@ type MetaDto struct {
 type ResponseDto struct {
 	ecore.Main
 	Encounter_Id       *uint           `json:"encounter_id"`
-	Type_Code          eru.DocTypeCode `json:"type_code"`
+	Type_Code          ere.DocTypeCode `json:"type_code"`
 	Name               string          `json:"name"`
 	FilePath           *string         `json:"filePath"`
 	FileName           *string         `json:"fileName"`

internal/domain/main-entities/encounter-document/entity.go

@@ -3,13 +3,13 @@ package encounter_document
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
 	ee "simrs-vx/internal/domain/main-entities/employee"
-	eru "simrs-vx/internal/domain/references/upload"
+	ere "simrs-vx/internal/domain/references/encounter"
 )
 
 type EncounterDocument struct {
 	ecore.Main
 	Encounter_Id       *uint           `json:"encounter_id"`
-	Type_Code          eru.DocTypeCode `json:"type_code"`
+	Type_Code          ere.DocTypeCode `json:"type_code"`
 	Name               string          `json:"name"`
 	FilePath           *string         `json:"filePath"`
 	FileName           *string         `json:"fileName"`

internal/domain/main-entities/patient/dto.go

@@ -12,7 +12,7 @@ import (
 	epr "simrs-vx/internal/domain/main-entities/person-relative"
 
 	erc "simrs-vx/internal/domain/references/common"
-	eru "simrs-vx/internal/domain/references/upload"
+	ere "simrs-vx/internal/domain/references/encounter"
 
 	pa "simrs-vx/internal/lib/auth"
 )
@@ -68,7 +68,7 @@ type SearchDto struct {
 
 type UploadDto struct {
 	Id           uint                  `json:"-"`
-	Code         eru.DocTypeCode       `json:"-"`
+	Code         ere.DocTypeCode       `json:"-"`
 	File         multipart.File        `json:"-"`
 	FileHeader   *multipart.FileHeader `json:"-"`
 	Filename     string                `json:"-"`

internal/domain/references/encounter/encounter.go

@@ -1,5 +1,7 @@
 package encounter
 
+import "fmt"
+
 type (
 	EncounterClassCode    string
 	QueueStatusCode       string
@@ -18,6 +20,8 @@ type (
 	SEPRefTypeCode        string
 	VisitModeCode         string
 	PolySwitchCode        string
+	DocTypeCode           string
+	EntityTypeCode        string
 )
 
 const (
@@ -104,6 +108,22 @@ const (
 
 	PSCConsulPoly      PolySwitchCode = "consul-poly"      // Konsultasi Poliklinik Lain
 	PSCConsulExecutive PolySwitchCode = "consul-executive" // Konsultasi Antar Dokter Eksekutif
+
+	DTCPRN       DocTypeCode = "person-resident-number" // Person Resident Number
+	DTCPDL       DocTypeCode = "person-driver-license"  // Person Driver License
+	DTCPP        DocTypeCode = "person-passport"        // Person Passport
+	DTCPFC       DocTypeCode = "person-family-card"     // Person Family Card
+	DTCMIR       DocTypeCode = "mcu-item-result"        // Mcu Item Result
+	DTCEnPatient DocTypeCode = "encounter-patient"
+	DTCEnSupport DocTypeCode = "encounter-support"
+	DTCEnOther   DocTypeCode = "encounter-other"
+	DTCSEP       DocTypeCode = "vclaim-sep"  // SEP
+	DTCSIPP      DocTypeCode = "vclaim-sipp" // SIPP
+	DTCGC        DocTypeCode = "general-consent"
+
+	ETCPerson    EntityTypeCode = "person"
+	ETCEncounter EntityTypeCode = "encounter"
+	ETCMCU       EntityTypeCode = "mcu"
 )
 
 func (ec EncounterClassCode) Code() string {
@@ -118,3 +138,30 @@ func (ec EncounterClassCode) Code() string {
 		return "UNKNOWN"
 	}
 }
+
+var validUploadCodesByEntity = map[EntityTypeCode][]DocTypeCode{
+	ETCPerson: {
+		DTCPRN, DTCPDL, DTCPP, DTCPFC,
+	},
+	ETCEncounter: {
+		DTCSEP, DTCSIPP, DTCEnPatient, DTCEnSupport, DTCGC, DTCEnOther,
+	},
+	ETCMCU: {
+		DTCMIR,
+	},
+}
+
+func IsValidUploadCode(entity EntityTypeCode, code DocTypeCode) (bool, string) {
+	allowedCodes, ok := validUploadCodesByEntity[entity]
+	if !ok {
+		return false, fmt.Sprintf("unknown entityType_code: %s", entity)
+	}
+
+	for _, c := range allowedCodes {
+		if c == code {
+			return true, ""
+		}
+	}
+
+	return false, fmt.Sprintf("invalid doctype_code '%s' for entityType_code '%s'", code, entity)
+}

internal/domain/references/upload/upload.go

@@ -1,53 +0,0 @@
-package upload
-
-import "fmt"
-
-type (
-	DocTypeCode    string
-	EntityTypeCode string
-)
-
-const (
-	DTCPRN       DocTypeCode = "person-resident-number" // Person Resident Number
-	DTCPDL       DocTypeCode = "person-driver-license"  // Person Driver License
-	DTCPP        DocTypeCode = "person-passport"        // Person Passport
-	DTCPFC       DocTypeCode = "person-family-card"     // Person Family Card
-	DTCMIR       DocTypeCode = "mcu-item-result"        // Mcu Item Result
-	DTCEnPatient DocTypeCode = "encounter-patient"
-	DTCEnSupport DocTypeCode = "encounter-support"
-	DTCEnOther   DocTypeCode = "encounter-other"
-	DTCSEP       DocTypeCode = "vclaim-sep"  // SEP
-	DTCSIPP      DocTypeCode = "vclaim-sipp" // SIPP
-	DTCGC        DocTypeCode = "general-consent"
-
-	ETCPerson    EntityTypeCode = "person"
-	ETCEncounter EntityTypeCode = "encounter"
-	ETCMCU       EntityTypeCode = "mcu"
-)
-
-var validUploadCodesByEntity = map[EntityTypeCode][]DocTypeCode{
-	ETCPerson: {
-		DTCPRN, DTCPDL, DTCPP, DTCPFC,
-	},
-	ETCEncounter: {
-		DTCSEP, DTCSIPP, DTCEnPatient, DTCEnSupport, DTCEnOther,
-	},
-	ETCMCU: {
-		DTCMIR,
-	},
-}
-
-func IsValidUploadCode(entity EntityTypeCode, code DocTypeCode) (bool, string) {
-	allowedCodes, ok := validUploadCodesByEntity[entity]
-	if !ok {
-		return false, fmt.Sprintf("unknown entityType_code: %s", entity)
-	}
-
-	for _, c := range allowedCodes {
-		if c == code {
-			return true, ""
-		}
-	}
-
-	return false, fmt.Sprintf("invalid doctype_code '%s' for entityType_code '%s'", code, entity)
-}

internal/interface/main-handler/main-handler.go

@@ -34,7 +34,7 @@ import (
 	responsibledoctorhist "simrs-vx/internal/interface/main-handler/responsible-doctor-hist"
 	sbar "simrs-vx/internal/interface/main-handler/sbar"
 	soapi "simrs-vx/internal/interface/main-handler/soapi"
-	upload "simrs-vx/internal/interface/main-handler/upload"
+	uploadfile "simrs-vx/internal/interface/main-handler/upload-file"
 
 	/******************** actor ********************/
 	authpartner "simrs-vx/internal/interface/main-handler/auth-partner"
@@ -274,7 +274,7 @@ func SetRoutes() http.Handler {
 		"PATCH /{id}/reject": therapyprotocol.O.Reject,
 	})
 	hc.RegCrud(r, "/v1/chemo-protocol", chemoprotocol.O)
-	hc.RegCrud(r, "/v1/upload", upload.O)
+	hc.RegCrud(r, "/v1/upload-file", uploadfile.O)
 	hc.RegCrud(r, "/v1/encounter-document", encounterdocument.O)
 
 	/******************** actor ********************/

internal/interface/main-handler/upload-file/handler.go

@@ -1,4 +1,4 @@
-package upload
+package uploadfile
 
 import (
 	"net/http"
@@ -7,10 +7,9 @@ import (
 	d "github.com/karincake/dodol"
 	rw "github.com/karincake/risoles"
 
-	eru "simrs-vx/internal/domain/references/upload"
+	ere "simrs-vx/internal/domain/references/encounter"
 
-	e "simrs-vx/internal/domain/main-entities/upload"
+	u "simrs-vx/internal/use-case/main-use-case/upload-file"
-	u "simrs-vx/internal/use-case/main-use-case/upload"
 )
 
 type myBase struct{}
@@ -49,10 +48,10 @@ func (obj myBase) Create(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	dto := e.CreateDto{
+	dto := u.CreateDto{
-		EntityType_Code:    eru.EntityTypeCode(r.FormValue("entityType_code")),
+		EntityType_Code:    ere.EntityTypeCode(r.FormValue("entityType_code")),
 		Ref_Id:             refID,
-		Type_Code:          eru.DocTypeCode(r.FormValue("type_code")),
+		Type_Code:          ere.DocTypeCode(r.FormValue("type_code")),
 		Name:               r.FormValue("name"),
 		Upload_Employee_Id: employeeId,
 		File:               file,

internal/interface/main-handler/upload-file/validate-request.go

@@ -1,10 +1,10 @@
-package upload
+package uploadfile
 
 import (
-	e "simrs-vx/internal/domain/main-entities/upload"
+	u "simrs-vx/internal/use-case/main-use-case/upload-file"
 )
 
-func validateCreate(dto e.CreateDto) string {
+func validateCreate(dto u.CreateDto) string {
 
 	switch {
 	case dto.EntityType_Code == "":

internal/use-case/main-use-case/encounter-document/case.go

@@ -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
 		}
 

internal/use-case/main-use-case/upload-file/case.go

@@ -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
+}

internal/use-case/main-use-case/upload-file/helper.go

@@ -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]
 

internal/use-case/main-use-case/upload-file/tycovar.go

@@ -1,17 +1,22 @@
-package upload
+/*
+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"
-	eru "simrs-vx/internal/domain/references/upload"
+	ere "simrs-vx/internal/domain/references/encounter"
-
-	// internal - domain - base-entities
-	ecore "simrs-vx/internal/domain/base-entities/core"
 )
 
 type CreateDto struct {
-	EntityType_Code    eru.EntityTypeCode `form:"entityType_code"`
+	EntityType_Code    ere.EntityTypeCode `form:"entityType_code"`
 	Ref_Id             *uint              `form:"ref_id"`
-	Type_Code          eru.DocTypeCode    `form:"type_code"`
+	Type_Code          ere.DocTypeCode    `form:"type_code"`
 	Name               string             `form:"name"`
 	Upload_Employee_Id *uint              `form:"upload_employee_id"`
 	FilePath           string             `json:"-"`
@@ -23,46 +28,10 @@ type CreateDto struct {
 	MimeType   string                `json:"-"`
 }
 
-type ReadListDto struct {
-	FilterDto
-	Includes   string `json:"includes"`
-	Pagination ecore.Pagination
-}
-
-type FilterDto struct {
-	EntityType_Code    eru.EntityTypeCode `json:"entityType-code"`
-	Ref_Id             *uint              `json:"ref-id"`
-	Type_Code          eru.DocTypeCode    `json:"type-code"`
-	Name               string             `json:"name"`
-	FilePath           *string            `json:"filePath"`
-	FileName           *string            `json:"fileName"`
-	Upload_Employee_Id *string            `json:"encounter-document-employee-id"`
-}
-
-type ReadDetailDto struct {
-	Id       uint16 `json:"id"`
-	Includes string `json:"includes"`
-}
-
-type UpdateDto struct {
-	Id uint16 `json:"id"`
-	CreateDto
-}
-
-type DeleteDto struct {
-	Id uint16 `json:"id"`
-}
-
-type MetaDto struct {
-	PageNumber int `json:"page_number"`
-	PageSize   int `json:"page_size"`
-	Count      int `json:"count"`
-}
-
 type ResponseDto struct {
-	EntityType_Code    eru.EntityTypeCode    `json:"entityType_code"`
+	EntityType_Code    ere.EntityTypeCode    `json:"entityType_code"`
 	Ref_Id             *uint                 `json:"ref_id"`
-	Type_Code          eru.DocTypeCode       `json:"type_code"`
+	Type_Code          ere.DocTypeCode       `json:"type_code"`
 	Name               string                `json:"name"`
 	Upload_Employee_Id *uint                 `json:"upload_employee_id"`
 	FilePath           string                `json:"filePath"`

internal/use-case/main-use-case/upload/case.go

@@ -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
-}

internal/use-case/main-use-case/upload/middleware-runner.go

@@ -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
-}

internal/use-case/main-use-case/upload/middleware.go

@@ -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},
-// 	)
-// }

internal/use-case/main-use-case/upload/tycovar.go

@@ -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

pkg/upload-helper/upload-helper.go

@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	ere "simrs-vx/internal/domain/references/upload"
+	ere "simrs-vx/internal/domain/references/encounter"
 )
 
 func getBucketForType(docType string) (string, error) {