diff --git a/internal/domain/main-entities/encounter-document/dto.go b/internal/domain/main-entities/encounter-document/dto.go new file mode 100644 index 00000000..c1e0894c --- /dev/null +++ b/internal/domain/main-entities/encounter-document/dto.go @@ -0,0 +1,83 @@ +package encounter_document + +import ( + eru "simrs-vx/internal/domain/references/upload" + // internal - domain - base-entities + ecore "simrs-vx/internal/domain/base-entities/core" + + ee "simrs-vx/internal/domain/main-entities/employee" +) + +type CreateDto struct { + Encounter_Id *uint `json:"encounter_id"` + Type_Code eru.UploadCode `json:"type_code"` + Name string `json:"name"` + FilePath string `json:"filePath"` + Filename string `json:"-"` + Upload_Employee_Id *uint `form:"upload_employee_id"` +} + +type ReadListDto struct { + FilterDto + Includes string `json:"includes"` + Pagination ecore.Pagination +} + +type FilterDto struct { + Encounter_Id *uint `json:"encounter-id"` + Type_Code eru.UploadCode `json:"type-code"` + 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 { + ecore.Main + Encounter_Id *uint `json:"encounter_id"` + Type_Code eru.UploadCode `json:"type_code"` + Name string `json:"name"` + FilePath *string `json:"filePath"` + FileName *string `json:"fileName"` + Upload_Employee_Id *uint `json:"upload_employee_id"` + Upload_Employee *ee.Employee `json:"upload_employee,omitempty"` +} + +func (d EncounterDocument) ToResponse() ResponseDto { + resp := ResponseDto{ + Encounter_Id: d.Encounter_Id, + Type_Code: d.Type_Code, + Name: d.Name, + FilePath: d.FilePath, + FileName: d.FileName, + Upload_Employee_Id: d.Upload_Employee_Id, + Upload_Employee: d.Upload_Employee, + } + resp.Main = d.Main + return resp +} + +func ToResponseList(data []EncounterDocument) []ResponseDto { + resp := make([]ResponseDto, len(data)) + for i, u := range data { + resp[i] = u.ToResponse() + } + return resp +} diff --git a/internal/domain/main-entities/encounter/dto.go b/internal/domain/main-entities/encounter/dto.go index 290a7766..d3f2d04d 100644 --- a/internal/domain/main-entities/encounter/dto.go +++ b/internal/domain/main-entities/encounter/dto.go @@ -4,6 +4,7 @@ import ( eam "simrs-vx/internal/domain/main-entities/ambulatory" edc "simrs-vx/internal/domain/main-entities/death-cause" eem "simrs-vx/internal/domain/main-entities/emergency" + eed "simrs-vx/internal/domain/main-entities/encounter-document" eip "simrs-vx/internal/domain/main-entities/inpatient" eir "simrs-vx/internal/domain/main-entities/internal-reference" er "simrs-vx/internal/domain/main-entities/rehab/base" @@ -188,6 +189,7 @@ type ResponseDto struct { Inpatient *eip.Inpatient `json:"inpatient,omitempty"` Rehab *er.Basic `json:"rehab,omitempty"` RehabChildren *[]er.Basic `json:"rehabChildren,omitempty"` + EncounterDocuments *[]eed.EncounterDocument `json:"encounterDocuments,omitempty"` } func (d Encounter) ToResponse() ResponseDto { @@ -234,6 +236,7 @@ func (d Encounter) ToResponse() ResponseDto { Inpatient: d.Inpatient, Rehab: d.Rehab, RehabChildren: d.RehabChildren, + EncounterDocuments: d.EncounterDocuments, } resp.Main = d.Main return resp diff --git a/internal/domain/main-entities/file-attachment/dto.go b/internal/domain/main-entities/upload/dto.go similarity index 64% rename from internal/domain/main-entities/file-attachment/dto.go rename to internal/domain/main-entities/upload/dto.go index 38941ec1..ca8e101b 100644 --- a/internal/domain/main-entities/file-attachment/dto.go +++ b/internal/domain/main-entities/upload/dto.go @@ -1,12 +1,10 @@ -package file_attachment +package upload import ( "mime/multipart" eru "simrs-vx/internal/domain/references/upload" // internal - domain - base-entities ecore "simrs-vx/internal/domain/base-entities/core" - - ee "simrs-vx/internal/domain/main-entities/employee" ) type CreateDto struct { @@ -19,7 +17,7 @@ type CreateDto struct { File multipart.File `json:"-"` FileHeader *multipart.FileHeader `json:"-"` - Filename string `json:"-"` + Filename string `json:"filename"` Size int64 `json:"-"` MimeType string `json:"-"` } @@ -37,7 +35,7 @@ type FilterDto struct { Name string `json:"name"` FilePath *string `json:"filePath"` FileName *string `json:"fileName"` - Upload_Employee_Id *string `json:"upload-employee-id"` + Upload_Employee_Id *string `json:"encounter-document-employee-id"` } type ReadDetailDto struct { @@ -61,36 +59,30 @@ type MetaDto struct { } type ResponseDto struct { - ecore.Main - EntityType_Code eru.EntityTypeCode `json:"entityType_code"` - Ref_Id *uint `json:"ref_id"` - Type_Code eru.UploadCode `json:"type_code"` - Name string `json:"name"` - FilePath *string `json:"filePath"` - FileName *string `json:"fileName"` - Upload_Employee_Id *uint `json:"upload_employee_id"` - Upload_Employee *ee.Employee `json:"upload_employee,omitempty"` + EntityType_Code eru.EntityTypeCode `json:"entityType_code"` + Ref_Id *uint `json:"ref_id"` + Type_Code eru.UploadCode `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 FileAttachment) ToResponse() ResponseDto { +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, - FilePath: d.FilePath, - FileName: d.FileName, Upload_Employee_Id: d.Upload_Employee_Id, - Upload_Employee: d.Upload_Employee, - } - resp.Main = d.Main - return resp -} - -func ToResponseList(data []FileAttachment) []ResponseDto { - resp := make([]ResponseDto, len(data)) - for i, u := range data { - resp[i] = u.ToResponse() + FilePath: d.FilePath, + Filename: d.Filename, + FileHeader: d.FileHeader, + Size: d.Size, + MimeType: d.MimeType, } return resp } diff --git a/internal/interface/main-handler/file-attachment/handler.go b/internal/interface/main-handler/file-attachment/handler.go deleted file mode 100644 index 4d64ec8d..00000000 --- a/internal/interface/main-handler/file-attachment/handler.go +++ /dev/null @@ -1,162 +0,0 @@ -package file_attachment - -import ( - "net/http" - eru "simrs-vx/internal/domain/references/upload" - "strconv" - - d "github.com/karincake/dodol" - rw "github.com/karincake/risoles" - sf "github.com/karincake/semprit" - - // ua "github.com/karincake/tumpeng/auth/svc" - - e "simrs-vx/internal/domain/main-entities/file-attachment" - u "simrs-vx/internal/use-case/main-use-case/file-attachement" -) - -type myBase struct{} - -var O myBase - -func (obj myBase) Create(w http.ResponseWriter, r *http.Request) { - err := r.ParseMultipartForm(10 << 20) // 10 MB - if err != nil { - rw.DataResponse(w, nil, err) - return - } - - file, header, err := r.FormFile("content") - if err != nil { - rw.DataResponse(w, nil, err) - return - } - defer file.Close() - - refIDStr := r.FormValue("ref_id") - var refID *uint - if refIDStr != "" { - if id64, err := strconv.ParseUint(refIDStr, 10, 32); err == nil { - id := uint(id64) - refID = &id - } - } - - employeeIdStr := r.FormValue("upload_employee_id") - var employeeId *uint - if employeeIdStr != "" { - if id64, err := strconv.ParseUint(employeeIdStr, 10, 32); err == nil { - id := uint(id64) - employeeId = &id - } - } - - dto := e.CreateDto{ - EntityType_Code: eru.EntityTypeCode(r.FormValue("entityType_code")), - Ref_Id: refID, - Type_Code: eru.UploadCode(r.FormValue("type_code")), - Name: r.FormValue("name"), - Upload_Employee_Id: employeeId, - File: file, - FileHeader: header, - Filename: header.Filename, - Size: header.Size, - MimeType: header.Header.Get("Content-Type"), - } - - dataFail := validateCreate(dto) - if dataFail != "" { - rw.DataResponse(w, nil, d.FieldError{ - Code: "data-validation-fail", - Message: dataFail, - }) - return - } - - res, err := u.Create(dto) - rw.DataResponse(w, res, err) -} - -func (obj myBase) GetList(w http.ResponseWriter, r *http.Request) { - dto := e.ReadListDto{} - sf.UrlQueryParam(&dto, *r.URL) - res, err := u.ReadList(dto) - rw.DataResponse(w, res, err) -} - -func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) { - id := rw.ValidateInt(w, "id", r.PathValue("id")) - if id <= 0 { - return - } - dto := e.ReadDetailDto{} - dto.Id = uint16(id) - res, err := u.ReadDetail(dto) - rw.DataResponse(w, res, err) -} - -func (obj myBase) Update(w http.ResponseWriter, r *http.Request) { - id := rw.ValidateInt(w, "id", r.PathValue("id")) - if id <= 0 { - return - } - - err := r.ParseMultipartForm(10 << 20) // 10 MB - if err != nil { - rw.DataResponse(w, nil, err) - return - } - - file, header, err := r.FormFile("content") - if err != nil { - rw.DataResponse(w, nil, err) - return - } - defer file.Close() - - refIDStr := r.FormValue("ref_id") - var refID *uint - if refIDStr != "" { - if id64, err := strconv.ParseUint(refIDStr, 10, 32); err == nil { - id := uint(id64) - refID = &id - } - } - - employeeIdStr := r.FormValue("upload_employee_id") - var employeeId *uint - if employeeIdStr != "" { - if id64, err := strconv.ParseUint(employeeIdStr, 10, 32); err == nil { - id := uint(id64) - employeeId = &id - } - } - - dto := e.CreateDto{ - EntityType_Code: eru.EntityTypeCode(r.FormValue("entityType_code")), - Ref_Id: refID, - Type_Code: eru.UploadCode(r.FormValue("type_code")), - Name: r.FormValue("name"), - Upload_Employee_Id: employeeId, - File: file, - FileHeader: header, - Filename: header.Filename, - Size: header.Size, - MimeType: header.Header.Get("Content-Type"), - } - - res, err := u.Update(e.UpdateDto{Id: uint16(id), CreateDto: dto}) - rw.DataResponse(w, res, err) -} - -func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) { - id := rw.ValidateInt(w, "id", r.PathValue("id")) - if id <= 0 { - return - } - - dto := e.DeleteDto{} - dto.Id = uint16(id) - res, err := u.Delete(dto) - rw.DataResponse(w, res, err) -} diff --git a/internal/interface/main-handler/main-handler.go b/internal/interface/main-handler/main-handler.go index 7706be6c..8e885dc3 100644 --- a/internal/interface/main-handler/main-handler.go +++ b/internal/interface/main-handler/main-handler.go @@ -16,7 +16,6 @@ import ( deviceorder "simrs-vx/internal/interface/main-handler/device-order" deviceorderitem "simrs-vx/internal/interface/main-handler/device-order-item" encounter "simrs-vx/internal/interface/main-handler/encounter" - fileattachment "simrs-vx/internal/interface/main-handler/file-attachment" internalreference "simrs-vx/internal/interface/main-handler/internal-reference" materialorder "simrs-vx/internal/interface/main-handler/material-order" materialorderitem "simrs-vx/internal/interface/main-handler/material-order-item" @@ -34,6 +33,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" /******************** actor ********************/ @@ -269,7 +269,7 @@ func SetRoutes() http.Handler { hc.RegCrud(r, "/v1/adm-employee-hist", admemployeehist.O) hc.RegCrud(r, "/v1/therapy-protocol", therapyprotocol.O) hc.RegCrud(r, "/v1/chemo-protocol", chemoprotocol.O) - hc.RegCrud(r, "/v1/upload", fileattachment.O) + hc.RegCrud(r, "/v1/upload", upload.O) /******************** actor ********************/ hc.RegCrud(r, "/v1/person", person.O) diff --git a/internal/interface/main-handler/upload/handler.go b/internal/interface/main-handler/upload/handler.go index 0cff949e..9f1f45a0 100644 --- a/internal/interface/main-handler/upload/handler.go +++ b/internal/interface/main-handler/upload/handler.go @@ -1,56 +1,89 @@ package upload -// "net/http" +import ( + "net/http" + "strconv" -// uh "simrs-vx/pkg/upload-helper" + eru "simrs-vx/internal/domain/references/upload" -// uploadHandler handles single file upload requests -// func uploadHandler(w http.ResponseWriter, r *http.Request) { + d "github.com/karincake/dodol" + rw "github.com/karincake/risoles" -// if r.Method == "OPTIONS" { -// w.WriteHeader(http.StatusNoContent) -// return -// } + e "simrs-vx/internal/domain/main-entities/upload" -// if r.Method != "POST" { -// writeJSONResponse(w, http.StatusMethodNotAllowed, uh.UploadResponse{ -// Success: false, -// Message: "Method not allowed. Use POST.", -// }) -// return -// } + u "simrs-vx/internal/use-case/main-use-case/upload" +) -// // Parse multipart form (32MB max memory) -// err := r.ParseMultipartForm(32 << 20) -// if err != nil { -// writeJSONResponse(w, http.StatusBadRequest, uh.UploadResponse{ -// Success: false, -// Message: "Failed to parse multipart form", -// }) -// return -// } +type myBase struct{} -// // Get file from form -// file, header, err := r.FormFile("file") -// if err != nil { -// writeJSONResponse(w, http.StatusBadRequest, uh.UploadResponse{ -// Success: false, -// Message: "No file uploaded or invalid file field name. Use 'file' as field name.", -// }) -// return -// } -// defer file.Close() +var O myBase -// // Upload file -// response, err := service.UploadFile(file, header.Filename, header.Size) -// if err != nil { -// writeJSONResponse(w, http.StatusInternalServerError, *response) -// return -// } +func (obj myBase) Create(w http.ResponseWriter, r *http.Request) { + err := r.ParseMultipartForm(10 << 20) // 10 MB + if err != nil { + rw.DataResponse(w, nil, err) + return + } -// if response.Success { -// writeJSONResponse(w, http.StatusOK, *response) -// } else { -// writeJSONResponse(w, http.StatusBadRequest, *response) -// } -// } + file, header, err := r.FormFile("content") + if err != nil { + rw.DataResponse(w, nil, err) + return + } + defer file.Close() + + refIDStr := r.FormValue("ref_id") + var refID *uint + if refIDStr != "" { + if id64, err := strconv.ParseUint(refIDStr, 10, 32); err == nil { + id := uint(id64) + refID = &id + } + } + + employeeIdStr := r.FormValue("upload_employee_id") + var employeeId *uint + if employeeIdStr != "" { + if id64, err := strconv.ParseUint(employeeIdStr, 10, 32); err == nil { + id := uint(id64) + employeeId = &id + } + } + + dto := e.CreateDto{ + EntityType_Code: eru.EntityTypeCode(r.FormValue("entityType_code")), + Ref_Id: refID, + Type_Code: eru.UploadCode(r.FormValue("type_code")), + Name: r.FormValue("name"), + Upload_Employee_Id: employeeId, + File: file, + FileHeader: header, + Filename: header.Filename, + Size: header.Size, + MimeType: header.Header.Get("Content-Type"), + } + + dataFail := validateCreate(dto) + if dataFail != "" { + rw.DataResponse(w, nil, d.FieldError{ + Code: "data-validation-fail", + Message: dataFail, + }) + return + } + + res, err := u.Upload(dto) + rw.DataResponse(w, res, err) +} + +func (obj myBase) GetList(w http.ResponseWriter, r *http.Request) { +} + +func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) { +} + +func (obj myBase) Update(w http.ResponseWriter, r *http.Request) { +} + +func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) { +} diff --git a/internal/interface/main-handler/file-attachment/validate-request.go b/internal/interface/main-handler/upload/validate-request.go similarity index 76% rename from internal/interface/main-handler/file-attachment/validate-request.go rename to internal/interface/main-handler/upload/validate-request.go index c5865597..38ae492c 100644 --- a/internal/interface/main-handler/file-attachment/validate-request.go +++ b/internal/interface/main-handler/upload/validate-request.go @@ -1,7 +1,7 @@ -package file_attachment +package upload import ( - e "simrs-vx/internal/domain/main-entities/file-attachment" + e "simrs-vx/internal/domain/main-entities/upload" ) func validateCreate(dto e.CreateDto) string { diff --git a/internal/use-case/main-use-case/file-attachement/case.go b/internal/use-case/main-use-case/encounter-document/case.go similarity index 68% rename from internal/use-case/main-use-case/file-attachement/case.go rename to internal/use-case/main-use-case/encounter-document/case.go index f0cd7a6a..206b5e1d 100644 --- a/internal/use-case/main-use-case/file-attachement/case.go +++ b/internal/use-case/main-use-case/encounter-document/case.go @@ -1,9 +1,6 @@ -package file_attachment +package encounter_document import ( - "errors" - ep "simrs-vx/internal/domain/main-entities/person" - up "simrs-vx/internal/use-case/main-use-case/person" "strconv" pl "simrs-vx/pkg/logger" @@ -13,16 +10,15 @@ import ( d "github.com/karincake/dodol" "gorm.io/gorm" - ecore "simrs-vx/internal/domain/base-entities/core" eru "simrs-vx/internal/domain/references/upload" - e "simrs-vx/internal/domain/main-entities/file-attachment" + e "simrs-vx/internal/domain/main-entities/encounter-document" ) -const source = "file-attachment" +const source = "encounter-document" func Create(input e.CreateDto) (*d.Data, error) { - data := e.FileAttachment{} + data := e.EncounterDocument{} event := pl.Event{ Feature: "Create", @@ -42,58 +38,12 @@ func Create(input e.CreateDto) (*d.Data, error) { return err } - 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) - } - - input.FilePath, err = uploadAndGenerateFileUrl(input, &event) - if err != nil { - return err - } - - // get uploadData - dataUpload, _, err := ReadListData(e.ReadListDto{ - FilterDto: e.FilterDto{ - EntityType_Code: input.EntityType_Code, - Ref_Id: input.Ref_Id, - Type_Code: input.Type_Code, - }, - Pagination: ecore.Pagination{PageSize: 1}}, &event, tx) - if err != nil { - return err - } - - if len(dataUpload) > 0 { - if err := removeUploadedFile(string(input.EntityType_Code), *dataUpload[0].FilePath, &event); err != nil { - return err - } - } - if resData, err := CreateData(input, &event, tx); err != nil { return err } else { data = *resData } - if input.EntityType_Code == eru.ETCPerson { - // get person - dataPerson, err := up.ReadDetailData(ep.ReadDetailDto{Id: *data.Ref_Id}, &event, tx) - if err != nil { - return err - } - - if err := setPersonAttachment(dataPerson, data, &event, tx); err != nil { - return err - } - } - mwRunner.setMwType(pu.MWTPost) // Run post-middleware if err := mwRunner.RunCreateMiddleware(createPostMw, &input, &data); err != nil { @@ -120,8 +70,8 @@ func Create(input e.CreateDto) (*d.Data, error) { } func ReadList(input e.ReadListDto) (*d.Data, error) { - var data *e.FileAttachment - var dataList []e.FileAttachment + var data *e.EncounterDocument + var dataList []e.EncounterDocument var metaList *e.MetaDto var err error @@ -173,7 +123,7 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { } func ReadDetail(input e.ReadDetailDto) (*d.Data, error) { - var data *e.FileAttachment + var data *e.EncounterDocument var err error event := pl.Event{ @@ -221,7 +171,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) { func Update(input e.UpdateDto) (*d.Data, error) { rdDto := e.ReadDetailDto{Id: uint16(input.Id)} - var data *e.FileAttachment + var data *e.EncounterDocument var err error event := pl.Event{ @@ -245,46 +195,10 @@ func Update(input e.UpdateDto) (*d.Data, error) { return err } - 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) - } - - if data, err = ReadDetailData(rdDto, &event, tx); err != nil { - return err - } - - input.FilePath, err = uploadAndGenerateFileUrl(input.CreateDto, &event) - if err != nil { - return err - } - - if err := removeUploadedFile(string(input.EntityType_Code), *data.FilePath, &event); err != nil { - return err - } - if err = UpdateData(input, data, &event, tx); err != nil { return err } - if input.EntityType_Code == eru.ETCPerson { - // get person - dataPerson, err := up.ReadDetailData(ep.ReadDetailDto{Id: *data.Ref_Id}, &event, tx) - if err != nil { - return err - } - - if err := setPersonAttachment(dataPerson, *data, &event, tx); err != nil { - return err - } - } - pl.SetLogInfo(&event, nil, "complete") mwRunner.setMwType(pu.MWTPost) @@ -313,7 +227,7 @@ func Update(input e.UpdateDto) (*d.Data, error) { func Delete(input e.DeleteDto) (*d.Data, error) { rdDto := e.ReadDetailDto{Id: uint16(input.Id)} - var data *e.FileAttachment + var data *e.EncounterDocument var err error event := pl.Event{ @@ -337,7 +251,7 @@ func Delete(input e.DeleteDto) (*d.Data, error) { return err } - if err := removeUploadedFile(string(data.EntityType_Code), *data.FilePath, &event); err != nil { + if err := removeUploadedFile(string(eru.ETCEncounter), *data.FilePath, &event); err != nil { return err } diff --git a/internal/use-case/main-use-case/encounter-document/helper.go b/internal/use-case/main-use-case/encounter-document/helper.go new file mode 100644 index 00000000..2f26f347 --- /dev/null +++ b/internal/use-case/main-use-case/encounter-document/helper.go @@ -0,0 +1,44 @@ +/* +DESCRIPTION: +Any functions that are used internally by the use-case +*/ +package encounter_document + +import ( + pl "simrs-vx/pkg/logger" + pmh "simrs-vx/pkg/minio-helper" + + e "simrs-vx/internal/domain/main-entities/encounter-document" +) + +func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.EncounterDocument) { + var inputSrc *e.CreateDto + if inputT, ok := any(input).(*e.CreateDto); ok { + inputSrc = inputT + } else { + inputTemp := any(input).(*e.UpdateDto) + inputSrc = &inputTemp.CreateDto + } + + data.Encounter_Id = inputSrc.Encounter_Id + data.Type_Code = inputSrc.Type_Code + data.Name = inputSrc.Name + data.FilePath = &inputSrc.FilePath + data.FileName = &inputSrc.Filename + data.Upload_Employee_Id = inputSrc.Upload_Employee_Id +} + +func removeUploadedFile(bucket, fileUrl string, event *pl.Event) error { + pl.SetLogInfo(event, nil, "started", "removeUploadedFile") + filename, err := pmh.GetFilename(fileUrl) + if err != nil { + return err + } + + err = pmh.I.RemoveObject(bucket, filename) + if err != nil { + return err + } + pl.SetLogInfo(event, nil, "complete") + return nil +} diff --git a/internal/use-case/main-use-case/file-attachement/lib.go b/internal/use-case/main-use-case/encounter-document/lib.go similarity index 83% rename from internal/use-case/main-use-case/file-attachement/lib.go rename to internal/use-case/main-use-case/encounter-document/lib.go index cd6a7e55..268c6a70 100644 --- a/internal/use-case/main-use-case/file-attachement/lib.go +++ b/internal/use-case/main-use-case/encounter-document/lib.go @@ -1,8 +1,8 @@ -package file_attachment +package encounter_document import ( "errors" - e "simrs-vx/internal/domain/main-entities/file-attachment" + e "simrs-vx/internal/domain/main-entities/encounter-document" plh "simrs-vx/pkg/lib-helper" pl "simrs-vx/pkg/logger" @@ -13,10 +13,10 @@ import ( "gorm.io/gorm" ) -func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.FileAttachment, error) { +func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.EncounterDocument, error) { pl.SetLogInfo(event, nil, "started", "DBCreate") - data := e.FileAttachment{} + data := e.EncounterDocument{} setData(&input, &data) var tx *gorm.DB @@ -34,9 +34,9 @@ func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.FileAtt return &data, nil } -func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.FileAttachment, *e.MetaDto, error) { +func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.EncounterDocument, *e.MetaDto, error) { pl.SetLogInfo(event, input, "started", "DBReadList") - data := []e.FileAttachment{} + data := []e.EncounterDocument{} pagination := gh.Pagination{} count := int64(0) meta := e.MetaDto{} @@ -49,7 +49,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Fi } tx = tx. - Model(&e.FileAttachment{}). + Model(&e.EncounterDocument{}). Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). @@ -71,9 +71,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Fi return data, &meta, nil } -func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e.FileAttachment, error) { +func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e.EncounterDocument, error) { pl.SetLogInfo(event, input, "started", "DBReadDetail") - data := e.FileAttachment{} + data := e.EncounterDocument{} var tx *gorm.DB if len(dbx) > 0 { @@ -92,7 +92,7 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e return &data, nil } -func UpdateData(input e.UpdateDto, data *e.FileAttachment, event *pl.Event, dbx ...*gorm.DB) error { +func UpdateData(input e.UpdateDto, data *e.EncounterDocument, event *pl.Event, dbx ...*gorm.DB) error { pl.SetLogInfo(event, data, "started", "DBUpdate") setData(&input, data) @@ -117,7 +117,7 @@ func UpdateData(input e.UpdateDto, data *e.FileAttachment, event *pl.Event, dbx return nil } -func DeleteData(data *e.FileAttachment, event *pl.Event, dbx ...*gorm.DB) error { +func DeleteData(data *e.EncounterDocument, event *pl.Event, dbx ...*gorm.DB) error { pl.SetLogInfo(event, data, "started", "DBDelete") var tx *gorm.DB if len(dbx) > 0 { diff --git a/internal/use-case/main-use-case/encounter-document/middleware-runner.go b/internal/use-case/main-use-case/encounter-document/middleware-runner.go new file mode 100644 index 00000000..06121b54 --- /dev/null +++ b/internal/use-case/main-use-case/encounter-document/middleware-runner.go @@ -0,0 +1,103 @@ +package encounter_document + +import ( + e "simrs-vx/internal/domain/main-entities/encounter-document" + 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.EncounterDocument) 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.EncounterDocument) 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.EncounterDocument) 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.EncounterDocument) 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.EncounterDocument) 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 +} diff --git a/internal/use-case/main-use-case/encounter-document/middleware.go b/internal/use-case/main-use-case/encounter-document/middleware.go new file mode 100644 index 00000000..65fa9e30 --- /dev/null +++ b/internal/use-case/main-use-case/encounter-document/middleware.go @@ -0,0 +1,9 @@ +package encounter_document + +// example of middleware +// func init() { +// createPreMw = append(createPreMw, +// CreateMw{Name: "modif-input", Func: pm.ModifInput}, +// CreateMw{Name: "check-data", Func: pm.CheckData}, +// ) +// } diff --git a/internal/use-case/main-use-case/file-attachement/tycovar.go b/internal/use-case/main-use-case/encounter-document/tycovar.go similarity index 60% rename from internal/use-case/main-use-case/file-attachement/tycovar.go rename to internal/use-case/main-use-case/encounter-document/tycovar.go index 84428b14..2f1e0d19 100644 --- a/internal/use-case/main-use-case/file-attachement/tycovar.go +++ b/internal/use-case/main-use-case/encounter-document/tycovar.go @@ -6,27 +6,27 @@ 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 file_attachment +package encounter_document import ( "gorm.io/gorm" - e "simrs-vx/internal/domain/main-entities/file-attachment" + e "simrs-vx/internal/domain/main-entities/encounter-document" ) type createMw struct { Name string - Func func(input *e.CreateDto, data *e.FileAttachment, tx *gorm.DB) error + Func func(input *e.CreateDto, data *e.EncounterDocument, tx *gorm.DB) error } type readListMw struct { Name string - Func func(input *e.ReadListDto, data *e.FileAttachment, tx *gorm.DB) error + Func func(input *e.ReadListDto, data *e.EncounterDocument, tx *gorm.DB) error } type readDetailMw struct { Name string - Func func(input *e.ReadDetailDto, data *e.FileAttachment, tx *gorm.DB) error + Func func(input *e.ReadDetailDto, data *e.EncounterDocument, tx *gorm.DB) error } type UpdateMw = readDetailMw @@ -42,16 +42,3 @@ var updatePreMw []readDetailMw var updatePostMw []readDetailMw var deletePreMw []readDetailMw var deletePostMw []readDetailMw - -type BPJSResponse struct { - MetaData struct { - Code string `json:"code"` - Message string `json:"message"` - } `json:"metaData"` - Response *struct { - Peserta struct { - NoKartu string `json:"noKartu"` - NIK string `json:"nik"` - } `json:"peserta"` - } `json:"response"` -} diff --git a/internal/use-case/main-use-case/file-attachement/helper.go b/internal/use-case/main-use-case/file-attachement/helper.go deleted file mode 100644 index 365660c9..00000000 --- a/internal/use-case/main-use-case/file-attachement/helper.go +++ /dev/null @@ -1,122 +0,0 @@ -/* -DESCRIPTION: -Any functions that are used internally by the use-case -*/ -package file_attachment - -import ( - "fmt" - "path/filepath" - "strings" - "time" - - pl "simrs-vx/pkg/logger" - pmh "simrs-vx/pkg/minio-helper" - puh "simrs-vx/pkg/upload-helper" - - dg "github.com/karincake/apem/db-gorm-pg" - "gorm.io/gorm" - - eru "simrs-vx/internal/domain/references/upload" - - e "simrs-vx/internal/domain/main-entities/file-attachment" - ep "simrs-vx/internal/domain/main-entities/person" -) - -func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.FileAttachment) { - var inputSrc *e.CreateDto - if inputT, ok := any(input).(*e.CreateDto); ok { - inputSrc = inputT - } else { - inputTemp := any(input).(*e.UpdateDto) - inputSrc = &inputTemp.CreateDto - } - - data.EntityType_Code = inputSrc.EntityType_Code - data.Ref_Id = inputSrc.Ref_Id - data.Type_Code = inputSrc.Type_Code - data.Name = inputSrc.Name - data.FilePath = &inputSrc.FilePath - data.FileName = &inputSrc.Filename - data.Upload_Employee_Id = inputSrc.Upload_Employee_Id -} - -func uploadAndGenerateFileUrl(input e.CreateDto, event *pl.Event) (string, error) { - pl.SetLogInfo(event, input, "started", "uploadAndGenerateFileUrl") - bucket := string(input.EntityType_Code) - ext := strings.ToLower(filepath.Ext(input.Filename)) - - if !puh.IsValidFileType(ext, bucket) { - return "", fmt.Errorf("invalid file type: %s", input.Filename) - } - objectName := fmt.Sprintf("%v/%s-%d%s", *input.Ref_Id, input.Type_Code, time.Now().UnixNano(), ext) - - uploadInput := pmh.UploadReaderInput{ - BucketName: bucket, - Name: objectName, - File: input.File, - Size: input.Size, - ContentType: input.MimeType, - } - - _, err := pmh.I.PutObject(uploadInput) - if err != nil { - return "", err - } - - // Build URL for access - publicUrl := pmh.I.GenerateUrl(bucket, objectName) - - pl.SetLogInfo(event, nil, "complete") - return publicUrl, nil -} - -func removeUploadedFile(bucket, fileUrl string, event *pl.Event) error { - pl.SetLogInfo(event, nil, "started", "removeUploadedFile") - filename, err := pmh.GetFilename(fileUrl) - if err != nil { - return err - } - - err = pmh.I.RemoveObject(bucket, filename) - if err != nil { - return err - } - pl.SetLogInfo(event, nil, "complete") - return nil -} - -func setPersonAttachment(dataPerson *ep.Person, data e.FileAttachment, event *pl.Event, dbx ...*gorm.DB) error { - pl.SetLogInfo(event, dataPerson, "started", "DBUpdate") - - switch data.Type_Code { - case eru.UCPRN: - dataPerson.ResidentIdentityFileUrl = data.FilePath - case eru.UCPDL: - dataPerson.DrivingLicenseFileUrl = data.FilePath - case eru.UCPP: - dataPerson.PassportFileUrl = data.FilePath - case eru.UCPFC: - dataPerson.FamilyIdentityFileUrl = data.FilePath - } - - var tx *gorm.DB - if len(dbx) > 0 { - tx = dbx[0] - } else { - tx = dg.I - } - - if err := tx.Save(&dataPerson).Error; err != nil { - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-update-fail", - Detail: "Database update failed", - Raw: err, - } - return pl.SetLogError(event, dataPerson) - } - - pl.SetLogInfo(event, nil, "complete") - return nil -} diff --git a/internal/use-case/main-use-case/upload/case.go b/internal/use-case/main-use-case/upload/case.go new file mode 100644 index 00000000..40ff74f6 --- /dev/null +++ b/internal/use-case/main-use-case/upload/case.go @@ -0,0 +1,90 @@ +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 +} diff --git a/internal/use-case/main-use-case/upload/helper.go b/internal/use-case/main-use-case/upload/helper.go new file mode 100644 index 00000000..65edb9eb --- /dev/null +++ b/internal/use-case/main-use-case/upload/helper.go @@ -0,0 +1,184 @@ +/* +DESCRIPTION: +Any functions that are used internally by the use-case +*/ +package upload + +import ( + "fmt" + "path/filepath" + ecore "simrs-vx/internal/domain/base-entities/core" + eru "simrs-vx/internal/domain/references/upload" + "strings" + "time" + + pl "simrs-vx/pkg/logger" + pmh "simrs-vx/pkg/minio-helper" + puh "simrs-vx/pkg/upload-helper" + + dg "github.com/karincake/apem/db-gorm-pg" + "gorm.io/gorm" + + 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) { + pl.SetLogInfo(event, input, "started", "uploadAndGenerateFileUrl") + bucket := string(input.EntityType_Code) + ext := strings.ToLower(filepath.Ext(input.Filename)) + + if !puh.IsValidFileType(ext, bucket) { + return "", fmt.Errorf("invalid file type: %s", input.Filename) + } + objectName := fmt.Sprintf("%v/%s-%d%s", *input.Ref_Id, input.Type_Code, time.Now().UnixNano(), ext) + + uploadInput := pmh.UploadReaderInput{ + BucketName: bucket, + Name: objectName, + File: input.File, + Size: input.Size, + ContentType: input.MimeType, + } + + _, err := pmh.I.PutObject(uploadInput) + if err != nil { + return "", err + } + + // Build URL for access + publicUrl := pmh.I.GenerateUrl(bucket, objectName) + + pl.SetLogInfo(event, nil, "complete") + return publicUrl, nil +} + +func removeUploadedFile(bucket, fileUrl string, refId uint, event *pl.Event) error { + pl.SetLogInfo(event, nil, "started", "removeUploadedFile") + filename, err := pmh.GetFilename(fileUrl) + if err != nil { + return err + } + + filePath := fmt.Sprintf("%v/%s", refId, filename) + err = pmh.I.RemoveObject(bucket, filePath) + if err != nil { + return err + } + pl.SetLogInfo(event, nil, "complete") + return nil +} + +func updatePersonAttachment(dataPerson *ep.Person, event *pl.Event, dbx ...*gorm.DB) error { + pl.SetLogInfo(event, dataPerson, "started", "DBUpdate") + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + if err := tx.Save(&dataPerson).Error; err != nil { + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "data-update-fail", + Detail: "Database update failed", + Raw: err, + } + return pl.SetLogError(event, dataPerson) + } + + pl.SetLogInfo(event, nil, "complete") + return nil +} + +func setPersonAttachment(input e.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 { + return nil, err + } + + var removeUrl string + switch input.Type_Code { + case eru.UCPRN: + removeUrl = *dataPerson.ResidentIdentityFileUrl + dataPerson.ResidentIdentityFileUrl = &input.FilePath + case eru.UCPDL: + removeUrl = *dataPerson.DrivingLicenseFileUrl + dataPerson.DrivingLicenseFileUrl = &input.FilePath + case eru.UCPP: + removeUrl = *dataPerson.PassportFileUrl + dataPerson.PassportFileUrl = &input.FilePath + case eru.UCPFC: + removeUrl = *dataPerson.FamilyIdentityFileUrl + dataPerson.FamilyIdentityFileUrl = &input.FilePath + } + + if removeUrl != "" { + if err := removeUploadedFile(string(input.EntityType_Code), removeUrl, *input.Ref_Id, event); err != nil { + return nil, err + } + } + + if err = updatePersonAttachment(dataPerson, event, tx); err != nil { + return nil, err + } + + return dataPerson, nil +} + +func setEncounterDocument(input e.CreateDto, event *pl.Event, tx *gorm.DB) (*ee.EncounterDocument, error) { + data := ee.EncounterDocument{} + + // get EncounterDocument + dataUpload, _, err := ue.ReadListData(ee.ReadListDto{ + FilterDto: ee.FilterDto{ + Encounter_Id: input.Ref_Id, + Type_Code: input.Type_Code}, + Pagination: ecore.Pagination{PageSize: 1}}, event, tx) + if err != nil { + return nil, err + } + + // set data + createDto := ee.CreateDto{ + Encounter_Id: input.Ref_Id, + Type_Code: input.Type_Code, + Name: input.Name, + FilePath: input.FilePath, + Filename: input.Filename, + 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 + } + + // 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 +} diff --git a/internal/use-case/main-use-case/file-attachement/middleware-runner.go b/internal/use-case/main-use-case/upload/middleware-runner.go similarity index 86% rename from internal/use-case/main-use-case/file-attachement/middleware-runner.go rename to internal/use-case/main-use-case/upload/middleware-runner.go index a8926620..88e3e637 100644 --- a/internal/use-case/main-use-case/file-attachement/middleware-runner.go +++ b/internal/use-case/main-use-case/upload/middleware-runner.go @@ -1,11 +1,12 @@ -package file_attachment +package upload import ( - e "simrs-vx/internal/domain/main-entities/file-attachment" 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 { @@ -23,7 +24,7 @@ func newMiddlewareRunner(event *pl.Event, tx *gorm.DB) *middlewareRunner { } // ExecuteCreateMiddleware executes create middleware -func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *e.FileAttachment) error { +func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data interface{}) error { for _, middleware := range middlewares { logData := pu.GetLogData(input, data) @@ -38,7 +39,7 @@ func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e return nil } -func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *e.ReadListDto, data *e.FileAttachment) error { +func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *e.ReadListDto, data interface{}) error { for _, middleware := range middlewares { logData := pu.GetLogData(input, data) @@ -53,7 +54,7 @@ func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, inpu return nil } -func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.FileAttachment) error { +func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data interface{}) error { for _, middleware := range middlewares { logData := pu.GetLogData(input, data) @@ -68,7 +69,7 @@ func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, return nil } -func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.FileAttachment) error { +func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data interface{}) error { for _, middleware := range middlewares { logData := pu.GetLogData(input, data) @@ -83,7 +84,7 @@ func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, inpu return nil } -func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.FileAttachment) error { +func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data interface{}) error { for _, middleware := range middlewares { logData := pu.GetLogData(input, data) diff --git a/internal/use-case/main-use-case/file-attachement/middleware.go b/internal/use-case/main-use-case/upload/middleware.go similarity index 89% rename from internal/use-case/main-use-case/file-attachement/middleware.go rename to internal/use-case/main-use-case/upload/middleware.go index 4f9e1fe5..63beb606 100644 --- a/internal/use-case/main-use-case/file-attachement/middleware.go +++ b/internal/use-case/main-use-case/upload/middleware.go @@ -1,4 +1,4 @@ -package file_attachment +package upload // example of middleware // func init() { diff --git a/internal/use-case/main-use-case/upload/tycovar.go b/internal/use-case/main-use-case/upload/tycovar.go new file mode 100644 index 00000000..4849e215 --- /dev/null +++ b/internal/use-case/main-use-case/upload/tycovar.go @@ -0,0 +1,44 @@ +/* +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