improve upload done

2025-11-11 13:55:26 +07:00
parent 6139081a72 ddc7376216
commit a382dfdb3e
22 changed files with 1135 additions and 202 deletions
@@ -0,0 +1,17 @@
+-- Create "FileAttachment" table
+CREATE TABLE "public"."FileAttachment" (
+  "Id" bigserial NOT NULL,
+  "CreatedAt" timestamptz NULL,
+  "UpdatedAt" timestamptz NULL,
+  "DeletedAt" timestamptz NULL,
+  "EntityType_Code" text NULL,
+  "Ref_Id" bigint NULL,
+  "Type_Code" text NULL,
+  "Name" text NULL,
+  "FilePath" text NULL,
+  "FileName" text NULL,
+  "Upload_Employee_Id" bigint NULL,
+  PRIMARY KEY ("Id"),
+  CONSTRAINT "fk_Encounter_FileAttachments" FOREIGN KEY ("Ref_Id") REFERENCES "public"."Encounter" ("Id") ON UPDATE NO ACTION ON DELETE NO ACTION,
+  CONSTRAINT "fk_FileAttachment_Upload_Employee" FOREIGN KEY ("Upload_Employee_Id") REFERENCES "public"."Employee" ("Id") ON UPDATE NO ACTION ON DELETE NO ACTION
+);
@@ -1,4 +1,4 @@
-h1:G3qRvFBAP/TQryQugzXbMshM2Pw9VqQpw3gXWUzam0A=
+h1:l9TShSJKxWO7Ag2+PYB7DcVDd3pz/M2Sm0hpZYpUNBA=
 20250904105930.sql h1:MEM6blCgke9DzWQSTnLzasbPIrcHssNNrJqZpSkEo6k=
 20250904141448.sql h1:J8cmYNk4ZrG9fhfbi2Z1IWz7YkfvhFqTzrLFo58BPY0=
 20250908062237.sql h1:Pu23yEW/aKkwozHoOuROvHS/GK4ngARJGdO7FB7HZuI=
@@ -108,4 +108,4 @@ h1:G3qRvFBAP/TQryQugzXbMshM2Pw9VqQpw3gXWUzam0A=
 20251110093522.sql h1:nsz8jCxGjEdr/bz9g+4ozfZzIP803xONjVmucad1GMc=
 20251110100258.sql h1:IBqt1VZj5WjQ+l9aAFGHOCCBtzb03KlLLihFLut7itg=
 20251110100545.sql h1:6/LV7751iyKxE2xI6vO1zly+aHUwxXD/IBwLcVpKxqM=
-20251110155448.sql h1:kFPobJB+cpflsXBAWUwy3lohuWvrb/VRlXnhJWl7i3Y=
+20251111040358.sql h1:dbHqvkf0FWQVGpmTQAY0bdx6v2cXAxrPSH5byP0r/eU=
@@ -9,6 +9,7 @@ import (
 	ed "simrs-vx/internal/domain/main-entities/doctor"
 	eem "simrs-vx/internal/domain/main-entities/emergency"
 	ee "simrs-vx/internal/domain/main-entities/employee"
+	efa "simrs-vx/internal/domain/main-entities/file-attachment"
 	eip "simrs-vx/internal/domain/main-entities/inpatient"
 	ei "simrs-vx/internal/domain/main-entities/insurance-company"
 	eir "simrs-vx/internal/domain/main-entities/internal-reference"
@@ -70,6 +71,7 @@ type Encounter struct {
 	Inpatient                 *eip.Inpatient           `json:"inpatient,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
 	Rehab                     *er.Basic                `json:"rehab,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
 	RehabChildren             *[]er.Basic              `json:"rehabChildren,omitempty" gorm:"foreignKey:Parent_Encounter_Id;references:Id"`
+	FileAttachments           *[]efa.FileAttachment    `json:"fileAttachments,omitempty" gorm:"foreignKey:Ref_Id;references:Id"`
 }

 func (d Encounter) IsDone() bool {
@@ -0,0 +1,97 @@
+package file_attachment
+
+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 {
+	EntityType_Code    eru.EntityTypeCode `form:"entityType_code" validate:"required"`
+	Ref_Id             *uint              `form:"ref_id" validate:"required"`
+	Type_Code          eru.UploadCode     `form:"type_code" validate:"required"`
+	Name               string             `form:"name"`
+	Upload_Employee_Id *string            `form:"upload_employee_id"`
+	FilePath           string             `json:"-"`
+
+	File       multipart.File        `json:"-"`
+	FileHeader *multipart.FileHeader `json:"-"`
+	Filename   string                `json:"-"`
+	Size       int64                 `json:"-"`
+	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.UploadCode     `json:"type-code"`
+	Name               string             `json:"name"`
+	FilePath           *string            `json:"filePath"`
+	FileName           *string            `json:"fileName"`
+	Upload_Employee_Id *string            `json:"upload-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
+	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 *string            `json:"upload_employee_id"`
+	Upload_Employee    *ee.Employee       `json:"upload_employee,omitempty"`
+}
+
+func (d FileAttachment) 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()
+	}
+	return resp
+}
@@ -0,0 +1,19 @@
+package file_attachment
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+	ee "simrs-vx/internal/domain/main-entities/employee"
+	eru "simrs-vx/internal/domain/references/upload"
+)
+
+type FileAttachment 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 *string            `json:"upload_employee_id"`
+	Upload_Employee    *ee.Employee       `json:"upload_employee,omitempty" gorm:"foreignKey:Upload_Employee_Id;references:Id"`
+}
@@ -12,7 +12,7 @@ import (
 	epr "simrs-vx/internal/domain/main-entities/person-relative"

 	erc "simrs-vx/internal/domain/references/common"
-	ere "simrs-vx/internal/domain/references/encounter"
+	eru "simrs-vx/internal/domain/references/upload"

 	pa "simrs-vx/internal/lib/auth"
 )
@@ -68,7 +68,7 @@ type SearchDto struct {

 type UploadDto struct {
 	Id           uint                  `json:"-"`
-	Code         ere.UploadCode        `json:"-"`
+	Code         eru.UploadCode        `json:"-"`
 	File         multipart.File        `json:"-"`
 	FileHeader   *multipart.FileHeader `json:"-"`
 	Filename     string                `json:"-"`
@@ -10,7 +10,6 @@ type (
 	OutpatientClassCode   string
 	AmbulatoryClassCode   string
 	InpatientClassCode    string
-	UploadCode            string
 	ChemoClassCode        string
 	AmbulanceFacilityCode string
 	AmbulanceNeedsCode    string
@@ -78,12 +77,6 @@ const (
 	ICCHCU InpatientClassCode = "hcu" // HCU
 	ICCVK  InpatientClassCode = "vk"  // Verlos kamer

-	UCPRN UploadCode = "person-resident-number" // Person Resident Number
-	UCPDL UploadCode = "person-driver-license"  // Person Driver License
-	UCPP  UploadCode = "person-passport"        // Person Passport
-	UCPFC UploadCode = "person-family-card"     // Person Family Card
-	UCMIR UploadCode = "mcu-item-result"        // Mcu Item Result
-
 	CCCAdm ChemoClassCode = "adm" // Administrasi
 	CCCAct ChemoClassCode = "act" // Tindakan

@@ -125,12 +118,3 @@ func (ec EncounterClassCode) Code() string {
 		return "UNKNOWN"
 	}
 }
-
-func IsValidUploadCode(code UploadCode) bool {
-	switch UploadCode(code) {
-	case UCPRN, UCPDL, UCPP, UCPFC, UCMIR:
-		return true
-	default:
-		return false
-	}
-}
@@ -0,0 +1,37 @@
+package upload
+
+type (
+	UploadCode     string
+	EntityTypeCode string
+)
+
+const (
+	UCPRN  UploadCode = "person-resident-number" // Person Resident Number
+	UCPDL  UploadCode = "person-driver-license"  // Person Driver License
+	UCPP   UploadCode = "person-passport"        // Person Passport
+	UCPFC  UploadCode = "person-family-card"     // Person Family Card
+	UCMIR  UploadCode = "mcu-item-result"        // Mcu Item Result
+	UCSEP  UploadCode = "vclaim-sep"             // SEP
+	UCSIPP UploadCode = "vclaim-sipp"            // SIPP
+
+	ETCPerson    EntityTypeCode = "person"
+	ETCEncounter EntityTypeCode = "encounter"
+)
+
+var validUploadCodesByEntity = map[EntityTypeCode][]UploadCode{
+	ETCPerson: {
+		UCPRN, UCPDL, UCPP, UCPFC, UCMIR,
+	},
+	ETCEncounter: {
+		UCSEP, UCSIPP,
+	},
+}
+
+func IsValidUploadCode(entity EntityTypeCode, code UploadCode) bool {
+	for _, c := range validUploadCodesByEntity[entity] {
+		if c == code {
+			return true
+		}
+	}
+	return false
+}
@@ -0,0 +1,146 @@
+package file_attachment
+
+import (
+	"net/http"
+	eru "simrs-vx/internal/domain/references/upload"
+	"strconv"
+	"strings"
+
+	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("employee_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: &employeeIdStr,
+		File:               file,
+		FileHeader:         header,
+		Filename:           header.Filename,
+		Size:               header.Size,
+		MimeType:           header.Header.Get("Content-Type"),
+	}
+
+	errs := validateCreate(dto)
+	if len(errs) > 0 {
+		rw.DataResponse(w, nil, d.FieldError{
+			Code:    "data-validation-fail",
+			Message: strings.Join(errs, "\n"),
+		})
+	}
+
+	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("employee_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: &employeeIdStr,
+		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)
+}
@@ -0,0 +1,20 @@
+package file_attachment
+
+import (
+	e "simrs-vx/internal/domain/main-entities/file-attachment"
+)
+
+func validateCreate(dto e.CreateDto) []string {
+	var errs []string
+
+	switch {
+	case dto.EntityType_Code == "":
+		errs = append(errs, "entityType_code is required")
+	case dto.Ref_Id == nil:
+		errs = append(errs, "ref_id is required")
+	case dto.Type_Code == "":
+		errs = append(errs, "type_code is required")
+	}
+
+	return errs
+}
@@ -16,6 +16,7 @@ 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"
@@ -268,6 +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, "POST /upload", fileattachment.O)

 	/******************** actor ********************/
 	hc.RegCrud(r, "/v1/person", person.O)
@@ -298,7 +300,6 @@ func SetRoutes() http.Handler {
 		"DELETE /{id}":              patient.O.Delete,
 		"GET /search/{keyword}":     patient.O.Search,
 		"GET /by-resident-identity": patient.O.SearchByResidentIdentityNumber,
-		"POST /{id}/upload":         patient.O.Upload,
 	})

 	/******************** sources ********************/
@@ -11,8 +11,6 @@ import (
 	e "simrs-vx/internal/domain/main-entities/patient"
 	u "simrs-vx/internal/use-case/main-use-case/patient"

-	ere "simrs-vx/internal/domain/references/encounter"
-
 	d "github.com/karincake/dodol"
 )

@@ -94,37 +92,3 @@ func (obj myBase) SearchByResidentIdentityNumber(w http.ResponseWriter, r *http.
 	res, err := u.SearchByResidentIdentityNumber(dto)
 	rw.DataResponse(w, res, err)
 }
-
-func (obj myBase) Upload(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
-	}
-
-	code := r.FormValue("code")
-
-	file, header, err := r.FormFile("content")
-	if err != nil {
-		rw.DataResponse(w, nil, err)
-		return
-	}
-	defer file.Close()
-
-	dto := e.UploadDto{}
-	dto.Id = uint(id)
-	dto.Code = ere.UploadCode(code)
-	dto.File = file
-	dto.FileHeader = header
-	dto.Filename = header.Filename
-	dto.Size = header.Size
-	dto.MimeType = header.Header.Get("Content-Type")
-
-	res, err := u.Upload(dto)
-	rw.DataResponse(w, res, err)
-}
@@ -29,6 +29,7 @@ import (
 	employee "simrs-vx/internal/domain/main-entities/employee"
 	encounter "simrs-vx/internal/domain/main-entities/encounter"
 	ethnic "simrs-vx/internal/domain/main-entities/ethnic"
+	fileattachemnt "simrs-vx/internal/domain/main-entities/file-attachment"
 	generalconsent "simrs-vx/internal/domain/main-entities/general-consent"
 	infra "simrs-vx/internal/domain/main-entities/infra"
 	inpatient "simrs-vx/internal/domain/main-entities/inpatient"
@@ -207,5 +208,6 @@ func getMainEntities() []any {
 		&controlletter.ControlLetter{},
 		&rehab.Rehab{},
 		&chemoprotocol.ChemoProtocol{},
+		&fileattachemnt.FileAttachment{},
 	}
 }
@@ -0,0 +1,356 @@
+package file_attachment
+
+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"
+	pu "simrs-vx/pkg/use-case-helper"
+
+	dg "github.com/karincake/apem/db-gorm-pg"
+	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"
+)
+
+const source = "file-attachment"
+
+func Create(input e.CreateDto) (*d.Data, error) {
+	data := e.FileAttachment{}
+
+	event := pl.Event{
+		Feature: "Create",
+		Source:  source,
+	}
+
+	// Start log
+	pl.SetLogInfo(&event, input, "started", "create")
+
+	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
+		}
+
+		if !eru.IsValidUploadCode(input.EntityType_Code, input.Type_Code) {
+			return errors.New("invalid upload code")
+		}
+
+		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 {
+			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: data.ToResponse(),
+	}, nil
+}
+
+func ReadList(input e.ReadListDto) (*d.Data, error) {
+	var data *e.FileAttachment
+	var dataList []e.FileAttachment
+	var metaList *e.MetaDto
+	var err error
+
+	event := pl.Event{
+		Feature: "ReadList",
+		Source:  source,
+	}
+
+	// Start log
+	pl.SetLogInfo(&event, input, "started", "readList")
+
+	err = dg.I.Transaction(func(tx *gorm.DB) error {
+		mwRunner := newMiddlewareRunner(&event, tx)
+		mwRunner.setMwType(pu.MWTPre)
+		// Run pre-middleware
+		if err := mwRunner.RunReadListMiddleware(readListPreMw, &input, data); err != nil {
+			return err
+		}
+
+		if dataList, metaList, err = ReadListData(input, &event, tx); err != nil {
+			return err
+		}
+
+		mwRunner.setMwType(pu.MWTPost)
+		// Run post-middleware
+		if err := mwRunner.RunReadListMiddleware(readListPostMw, &input, data); err != nil {
+			return err
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &d.Data{
+		Meta: d.IS{
+			"source":              source,
+			"structure":           "list-data",
+			"status":              "fetched",
+			"page_number":         strconv.Itoa(metaList.PageNumber),
+			"page_size":           strconv.Itoa(metaList.PageSize),
+			"record_totalCount":   strconv.Itoa(metaList.Count),
+			"record_currentCount": strconv.Itoa(len(dataList)),
+		},
+		Data: e.ToResponseList(dataList),
+	}, nil
+}
+
+func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
+	var data *e.FileAttachment
+	var err error
+
+	event := pl.Event{
+		Feature: "ReadDetail",
+		Source:  source,
+	}
+
+	// Start log
+	pl.SetLogInfo(&event, input, "started", "readDetail")
+
+	err = dg.I.Transaction(func(tx *gorm.DB) error {
+		mwRunner := newMiddlewareRunner(&event, tx)
+		mwRunner.setMwType(pu.MWTPre)
+		// Run pre-middleware
+		if err := mwRunner.RunReadDetailMiddleware(readDetailPreMw, &input, data); err != nil {
+			return err
+		}
+
+		if data, err = ReadDetailData(input, &event, tx); err != nil {
+			return err
+		}
+
+		mwRunner.setMwType(pu.MWTPost)
+		// Run post-middleware
+		if err := mwRunner.RunReadDetailMiddleware(readDetailPostMw, &input, data); err != nil {
+			return err
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &d.Data{
+		Meta: d.IS{
+			"source":    source,
+			"structure": "single-data",
+			"status":    "fetched",
+		},
+		Data: data.ToResponse(),
+	}, nil
+}
+
+func Update(input e.UpdateDto) (*d.Data, error) {
+	rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
+	var data *e.FileAttachment
+	var err error
+
+	event := pl.Event{
+		Feature: "Update",
+		Source:  source,
+	}
+
+	// Start log
+	pl.SetLogInfo(&event, input, "started", "update")
+
+	err = dg.I.Transaction(func(tx *gorm.DB) error {
+		pl.SetLogInfo(&event, rdDto, "started", "DBReadDetail")
+		if data, err = ReadDetailData(rdDto, &event, tx); err != nil {
+			return err
+		}
+
+		mwRunner := newMiddlewareRunner(&event, tx)
+		mwRunner.setMwType(pu.MWTPre)
+		// Run pre-middleware
+		if err := mwRunner.RunUpdateMiddleware(readDetailPreMw, &rdDto, data); err != nil {
+			return err
+		}
+
+		if !eru.IsValidUploadCode(input.EntityType_Code, input.Type_Code) {
+			return errors.New("invalid upload code")
+		}
+
+		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)
+		// Run post-middleware
+		if err := mwRunner.RunUpdateMiddleware(readDetailPostMw, &rdDto, data); err != nil {
+			return err
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &d.Data{
+		Meta: d.IS{
+			"source":    source,
+			"structure": "single-data",
+			"status":    "updated",
+		},
+		Data: data.ToResponse(),
+	}, nil
+
+}
+
+func Delete(input e.DeleteDto) (*d.Data, error) {
+	rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
+	var data *e.FileAttachment
+	var err error
+
+	event := pl.Event{
+		Feature: "Delete",
+		Source:  source,
+	}
+
+	// Start log
+	pl.SetLogInfo(&event, input, "started", "delete")
+
+	err = dg.I.Transaction(func(tx *gorm.DB) error {
+		pl.SetLogInfo(&event, rdDto, "started", "DBReadDetail")
+		if data, err = ReadDetailData(rdDto, &event, tx); err != nil {
+			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(data.EntityType_Code), *data.FilePath, &event); err != nil {
+			return err
+		}
+
+		if err := DeleteData(data, &event, tx); err != nil {
+			return err
+		}
+
+		mwRunner.setMwType(pu.MWTPost)
+		// Run post-middleware
+		if err := mwRunner.RunDeleteMiddleware(readDetailPostMw, &rdDto, data); err != nil {
+			return err
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &d.Data{
+		Meta: d.IS{
+			"source":    source,
+			"structure": "single-data",
+			"status":    "deleted",
+		},
+		Data: data.ToResponse(),
+	}, nil
+
+}
@@ -0,0 +1,122 @@
+/*
+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("%s%s%s%d%s", input.EntityType_Code, 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
+}
@@ -0,0 +1,141 @@
+package file_attachment
+
+import (
+	"errors"
+	e "simrs-vx/internal/domain/main-entities/file-attachment"
+
+	plh "simrs-vx/pkg/lib-helper"
+	pl "simrs-vx/pkg/logger"
+	pu "simrs-vx/pkg/use-case-helper"
+
+	dg "github.com/karincake/apem/db-gorm-pg"
+	gh "github.com/karincake/getuk"
+	"gorm.io/gorm"
+)
+
+func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.FileAttachment, error) {
+	pl.SetLogInfo(event, nil, "started", "DBCreate")
+
+	data := e.FileAttachment{}
+	setData(&input, &data)
+
+	var tx *gorm.DB
+	if len(dbx) > 0 {
+		tx = dbx[0]
+	} else {
+		tx = dg.I
+	}
+
+	if err := tx.Create(&data).Error; err != nil {
+		return nil, plh.HandleCreateError(input, event, err)
+	}
+
+	pl.SetLogInfo(event, nil, "complete")
+	return &data, nil
+}
+
+func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.FileAttachment, *e.MetaDto, error) {
+	pl.SetLogInfo(event, input, "started", "DBReadList")
+	data := []e.FileAttachment{}
+	pagination := gh.Pagination{}
+	count := int64(0)
+	meta := e.MetaDto{}
+
+	var tx *gorm.DB
+	if len(dbx) > 0 {
+		tx = dbx[0]
+	} else {
+		tx = dg.I
+	}
+
+	tx = tx.
+		Model(&e.FileAttachment{}).
+		Scopes(gh.Preload(input.Includes)).
+		Scopes(gh.Filter(input.FilterDto)).
+		Count(&count).
+		Scopes(gh.Paginate(input, &pagination)).
+		Order("\"CreatedAt\" DESC")
+
+	if err := tx.Find(&data).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, &meta, nil
+		}
+		return nil, nil, plh.HandleListError(input, event, err)
+	}
+
+	meta.Count = int(count)
+	meta.PageNumber = pagination.PageNumber
+	meta.PageSize = pagination.PageSize
+
+	pl.SetLogInfo(event, nil, "complete")
+	return data, &meta, nil
+}
+
+func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e.FileAttachment, error) {
+	pl.SetLogInfo(event, input, "started", "DBReadDetail")
+	data := e.FileAttachment{}
+
+	var tx *gorm.DB
+	if len(dbx) > 0 {
+		tx = dbx[0]
+	} else {
+		tx = dg.I
+	}
+
+	if err := tx.First(&data, input.Id).Error; err != nil {
+		if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
+			return nil, processedErr
+		}
+	}
+
+	pl.SetLogInfo(event, nil, "complete")
+	return &data, nil
+}
+
+func UpdateData(input e.UpdateDto, data *e.FileAttachment, event *pl.Event, dbx ...*gorm.DB) error {
+	pl.SetLogInfo(event, data, "started", "DBUpdate")
+	setData(&input, data)
+
+	var tx *gorm.DB
+	if len(dbx) > 0 {
+		tx = dbx[0]
+	} else {
+		tx = dg.I
+	}
+
+	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
+}
+
+func DeleteData(data *e.FileAttachment, event *pl.Event, dbx ...*gorm.DB) error {
+	pl.SetLogInfo(event, data, "started", "DBDelete")
+	var tx *gorm.DB
+	if len(dbx) > 0 {
+		tx = dbx[0]
+	} else {
+		tx = dg.I
+	}
+
+	if err := tx.Delete(&data).Error; err != nil {
+		event.Status = "failed"
+		event.ErrInfo = pl.ErrorInfo{
+			Code:   "data-delete-fail",
+			Detail: "Database delete failed",
+			Raw:    err,
+		}
+		return pl.SetLogError(event, data)
+	}
+
+	pl.SetLogInfo(event, nil, "complete")
+	return nil
+}
@@ -0,0 +1,103 @@
+package file_attachment
+
+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"
+)
+
+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.FileAttachment) 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.FileAttachment) 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.FileAttachment) 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.FileAttachment) 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.FileAttachment) 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
+}
@@ -0,0 +1,9 @@
+package file_attachment
+
+// example of middleware
+// func init() {
+// 	createPreMw = append(createPreMw,
+// 		CreateMw{Name: "modif-input", Func: pm.ModifInput},
+// 		CreateMw{Name: "check-data", Func: pm.CheckData},
+// 	)
+// }
@@ -0,0 +1,57 @@
+/*
+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 file_attachment
+
+import (
+	"gorm.io/gorm"
+
+	e "simrs-vx/internal/domain/main-entities/file-attachment"
+)
+
+type createMw struct {
+	Name string
+	Func func(input *e.CreateDto, data *e.FileAttachment, tx *gorm.DB) error
+}
+
+type readListMw struct {
+	Name string
+	Func func(input *e.ReadListDto, data *e.FileAttachment, tx *gorm.DB) error
+}
+
+type readDetailMw struct {
+	Name string
+	Func func(input *e.ReadDetailDto, data *e.FileAttachment, 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
+
+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"`
+}
@@ -1,7 +1,6 @@
 package patient

 import (
-	"errors"
 	"strconv"

 	evm "simrs-vx/internal/domain/bpjs-entities/vclaim-member"
@@ -14,8 +13,6 @@ import (
 	upi "simrs-vx/internal/use-case/main-use-case/person-insurance"
 	upr "simrs-vx/internal/use-case/main-use-case/person-relative"

-	ere "simrs-vx/internal/domain/references/encounter"
-
 	pl "simrs-vx/pkg/logger"
 	pu "simrs-vx/pkg/use-case-helper"

@@ -424,93 +421,3 @@ func Search(input e.SearchDto) (*d.Data, error) {
 		Data: e.ToResponseList(dataList),
 	}, nil
 }
-
-func Upload(input e.UploadDto) (*d.Data, error) {
-	rdDto := e.ReadDetailDto{Id: uint16(input.Id)}
-	var data *e.Patient
-	var err error
-
-	event := pl.Event{
-		Feature: "Upload",
-		Source:  source,
-	}
-
-	// Start log
-	pl.SetLogInfo(&event, input, "started", "upload")
-
-	err = dg.I.Transaction(func(tx *gorm.DB) error {
-		if !ere.IsValidUploadCode(input.Code) {
-			return errors.New("invalid upload code")
-		}
-
-		pl.SetLogInfo(&event, rdDto, "started", "DBReadDetail")
-		if data, err = ReadDetailData(rdDto, &event, tx); err != nil {
-			return err
-		}
-
-		if data.Person == nil {
-			return errors.New("person not found")
-		}
-
-		person := data.Person
-
-		input.MedRecNumber = *data.Number
-		pubUrl, err := uploadAndGenerateFileUrl(input, &event)
-		if err != nil {
-			event.Action = ""
-		}
-
-		fileUrl := ""
-		switch input.Code {
-		case ere.UCPRN:
-			if person.ResidentIdentityFileUrl != nil {
-				fileUrl = *person.ResidentIdentityFileUrl
-			}
-			person.ResidentIdentityFileUrl = &pubUrl
-		case ere.UCPDL:
-			if person.DrivingLicenseFileUrl != nil {
-				fileUrl = *person.DrivingLicenseFileUrl
-			}
-			person.DrivingLicenseFileUrl = &pubUrl
-		case ere.UCPP:
-			if person.PassportFileUrl != nil {
-				fileUrl = *person.PassportFileUrl
-			}
-			person.PassportFileUrl = &pubUrl
-		case ere.UCPFC:
-			if person.FamilyIdentityFileUrl != nil {
-				fileUrl = *person.FamilyIdentityFileUrl
-			}
-			person.FamilyIdentityFileUrl = &pubUrl
-		default:
-			return errors.New("invalid upload code")
-		}
-
-		if fileUrl != "" {
-			if err := removeUploadedFile(string(input.Code), fileUrl, &event); err != nil {
-				return err
-			}
-		}
-
-		if err := tx.Save(&person).Error; err != nil {
-			return err
-		}
-
-		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":    "uploaded",
-		},
-		Data: data.ToResponse(),
-	}, nil
-}
@@ -6,18 +6,12 @@ package patient

 import (
 	"fmt"
-	"path/filepath"
 	"strconv"
-	"strings"
 	"time"

 	e "simrs-vx/internal/domain/main-entities/patient"
 	ibpjs "simrs-vx/internal/infra/bpjs"

-	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"
 )

@@ -92,51 +86,6 @@ func GenerateNextMedicalRecordNumber() (string, error) {
 	return fmt.Sprintf(format, nextInt), nil
 }

-func uploadAndGenerateFileUrl(input e.UploadDto, event *pl.Event) (string, error) {
-	pl.SetLogInfo(event, input, "started", "uploadAndGenerateFileUrl")
-	bucket := string(input.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("%s%d%s", input.MedRecNumber, 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 endpointMapper(noBpjs string) string {
 	today := getTodayDate()
 	return fmt.Sprintf("%speserta/nokartu?noKartu=%s&tglpelayanan=%s", ibpjs.O.BaseUrl, noBpjs, today)
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strings"

-	ere "simrs-vx/internal/domain/references/encounter"
+	ere "simrs-vx/internal/domain/references/upload"
 )

 func getBucketForType(docType string) (string, error) {