From 73e044c6f0a9763002186ba48de32433c19a8825 Mon Sep 17 00:00:00 2001 From: vanilia Date: Mon, 13 Oct 2025 15:07:00 +0700 Subject: [PATCH 1/6] add create internal reference --- .../main-entities/checkout-polies/dto.go | 76 +++++ .../main-handler/checkout-polies/handler.go | 69 ++++ .../interface/main-handler/main-handler.go | 3 + .../main-use-case/checkout-polies/case.go | 92 ++++++ .../main-use-case/checkout-polies/helper.go | 302 ++++++++++++++++++ .../main-use-case/checkout-polies/lib.go | 31 ++ .../checkout-polies/middleware-runner.go | 103 ++++++ .../checkout-polies/middleware.go | 9 + .../main-use-case/checkout-polies/tycovar.go | 44 +++ 9 files changed, 729 insertions(+) create mode 100644 internal/domain/main-entities/checkout-polies/dto.go create mode 100644 internal/interface/main-handler/checkout-polies/handler.go create mode 100644 internal/use-case/main-use-case/checkout-polies/case.go create mode 100644 internal/use-case/main-use-case/checkout-polies/helper.go create mode 100644 internal/use-case/main-use-case/checkout-polies/lib.go create mode 100644 internal/use-case/main-use-case/checkout-polies/middleware-runner.go create mode 100644 internal/use-case/main-use-case/checkout-polies/middleware.go create mode 100644 internal/use-case/main-use-case/checkout-polies/tycovar.go diff --git a/internal/domain/main-entities/checkout-polies/dto.go b/internal/domain/main-entities/checkout-polies/dto.go new file mode 100644 index 00000000..448efa46 --- /dev/null +++ b/internal/domain/main-entities/checkout-polies/dto.go @@ -0,0 +1,76 @@ +package checkout_polies + +import ( + ecore "simrs-vx/internal/domain/base-entities/core" + ed "simrs-vx/internal/domain/main-entities/doctor" + ee "simrs-vx/internal/domain/main-entities/encounter" + eu "simrs-vx/internal/domain/main-entities/unit" +) + +type CreateDto struct { + Encounter_Id *uint `json:"encounter_id"` + Unit_Id *uint16 `json:"unit_id"` + Doctor_Id *uint `json:"doctor_Id"` +} + +type ReadListDto struct { + FilterDto + Includes string `json:"includes"` + Pagination ecore.Pagination +} + +type FilterDto struct { + Encounter_Id *uint `json:"encounter-id"` + Unit_Id *uint `json:"unit-id"` + Doctor_Id *uint `json:"doctor-id"` +} + +type ReadDetailDto struct { + Id uint16 `json:"id"` +} + +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"` + Encounter *ee.Encounter `json:"encounter,omitempty"` + Unit_Id *uint16 `json:"unit_id"` + Unit *eu.Unit `json:"unit,omitempty"` + Doctor_Id *uint `json:"doctor_id"` + Doctor *ed.Doctor `json:"doctor,omitempty"` +} + +func (d CheckoutPolies) ToResponse() ResponseDto { + resp := ResponseDto{ + Encounter_Id: d.Encounter_Id, + Encounter: d.Encounter, + Unit_Id: d.Unit_Id, + Unit: d.Unit, + Doctor_Id: d.Doctor_Id, + Doctor: d.Doctor, + } + resp.Main = d.Main + return resp +} + +func ToResponseList(data []CheckoutPolies) []ResponseDto { + resp := make([]ResponseDto, len(data)) + for i, u := range data { + resp[i] = u.ToResponse() + } + return resp +} diff --git a/internal/interface/main-handler/checkout-polies/handler.go b/internal/interface/main-handler/checkout-polies/handler.go new file mode 100644 index 00000000..f7833032 --- /dev/null +++ b/internal/interface/main-handler/checkout-polies/handler.go @@ -0,0 +1,69 @@ +package checkout_polies + +import ( + "net/http" + + ecp "simrs-vx/internal/domain/main-entities/checkout-polies" + ucp "simrs-vx/internal/use-case/main-use-case/checkout-polies" + + rw "github.com/karincake/risoles" +) + +type myBase struct{} + +var O myBase + +func (obj myBase) Create(w http.ResponseWriter, r *http.Request) { + dto := ecp.CreateDto{} + if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { + return + } + + res, err := ucp.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 + //} + // + //dto := e.UpdateDto{} + //if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { + // return + //} + //dto.Id = uint16(id) + //res, err := u.Update(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 5eb85084..c54a449c 100644 --- a/internal/interface/main-handler/main-handler.go +++ b/internal/interface/main-handler/main-handler.go @@ -6,6 +6,7 @@ import ( /******************** main / transaction ********************/ adime "simrs-vx/internal/interface/main-handler/adime" auth "simrs-vx/internal/interface/main-handler/authentication" + checkoutpolies "simrs-vx/internal/interface/main-handler/checkout-polies" chemo "simrs-vx/internal/interface/main-handler/chemo" consultation "simrs-vx/internal/interface/main-handler/consultation" counter "simrs-vx/internal/interface/main-handler/counter" @@ -232,6 +233,8 @@ func SetRoutes() http.Handler { "PATCH /{id}/reject": chemo.O.Reject, }) + hc.RegCrud(r, "/v1/checkout-poly", checkoutpolies.O) + /******************** actor ********************/ hc.RegCrud(r, "/v1/person", person.O) hc.RegCrud(r, "/v1/person-address", personaddress.O) diff --git a/internal/use-case/main-use-case/checkout-polies/case.go b/internal/use-case/main-use-case/checkout-polies/case.go new file mode 100644 index 00000000..48bf9046 --- /dev/null +++ b/internal/use-case/main-use-case/checkout-polies/case.go @@ -0,0 +1,92 @@ +package checkout_polies + +import ( + + // main entities + cp "simrs-vx/internal/domain/main-entities/checkout-polies" + ed "simrs-vx/internal/domain/main-entities/doctor" + ee "simrs-vx/internal/domain/main-entities/encounter" + eu "simrs-vx/internal/domain/main-entities/unit" + + // main use case + ud "simrs-vx/internal/use-case/main-use-case/doctor" + ue "simrs-vx/internal/use-case/main-use-case/encounter" + uu "simrs-vx/internal/use-case/main-use-case/unit" + + 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" +) + +const source = "checkout-polies" + +func Create(input cp.CreateDto) (*d.Data, error) { + data := cp.CheckoutPolies{} + + 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 + if err := mwRunner.RunCreateMiddleware(createPreMw, &input, &data); err != nil { + return err + } + + // Validate Encounter Id + _, err := ue.ReadDetail(ee.ReadDetailDto{Id: uint16(*input.Encounter_Id)}) + if err != nil { + return err + } + + // Validate Unit Id + _, err = uu.ReadDetail(eu.ReadDetailDto{Id: *input.Unit_Id}) + if err != nil { + return err + } + + // Validate Doctor Id + _, err = ud.ReadDetail(ed.ReadDetailDto{Id: uint16(*input.Doctor_Id)}) + if err != nil { + return err + } + + if resData, err := CreateData(input, &event, tx); err != nil { + return err + } else { + data = *resData + } + + 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 +} diff --git a/internal/use-case/main-use-case/checkout-polies/helper.go b/internal/use-case/main-use-case/checkout-polies/helper.go new file mode 100644 index 00000000..884e6cca --- /dev/null +++ b/internal/use-case/main-use-case/checkout-polies/helper.go @@ -0,0 +1,302 @@ +/* +DESCRIPTION: +Any functions that are used internally by the use-case +*/ +package checkout_polies + +import ( + "errors" + "fmt" + cp "simrs-vx/internal/domain/main-entities/checkout-polies" + "strings" + + e "simrs-vx/internal/domain/main-entities/encounter" + es "simrs-vx/internal/domain/main-entities/soapi" + + edo "simrs-vx/internal/domain/main-entities/device-order" + emo "simrs-vx/internal/domain/main-entities/material-order" + emco "simrs-vx/internal/domain/main-entities/mcu-order" + em "simrs-vx/internal/domain/main-entities/medication" + emei "simrs-vx/internal/domain/main-entities/medication-item" + emi "simrs-vx/internal/domain/main-entities/medicine-mix" + emmi "simrs-vx/internal/domain/main-entities/medicine-mix-item" + ep "simrs-vx/internal/domain/main-entities/prescription" + epi "simrs-vx/internal/domain/main-entities/prescription-item" + + // udo "simrs-vx/internal/use-case/main-use-case/device-order" + um "simrs-vx/internal/use-case/main-use-case/medication" + umei "simrs-vx/internal/use-case/main-use-case/medication-item" + umi "simrs-vx/internal/use-case/main-use-case/medicine-mix" + ummi "simrs-vx/internal/use-case/main-use-case/medicine-mix-item" + up "simrs-vx/internal/use-case/main-use-case/prescription" + upi "simrs-vx/internal/use-case/main-use-case/prescription-item" + + pl "simrs-vx/pkg/logger" + pu "simrs-vx/pkg/use-case-helper" + + erc "simrs-vx/internal/domain/references/common" + ero "simrs-vx/internal/domain/references/organization" + + "gorm.io/gorm" +) + +func setData[T *cp.CreateDto | *cp.UpdateDto](input T, data *cp.CheckoutPolies) { + var inputSrc *cp.CreateDto + if inputT, ok := any(input).(*cp.CreateDto); ok { + inputSrc = inputT + } else { + inputTemp := any(input).(*cp.UpdateDto) + inputSrc = &inputTemp.CreateDto + } + + data.Encounter_Id = inputSrc.Encounter_Id + data.Unit_Id = inputSrc.Unit_Id + data.Doctor_Id = inputSrc.Doctor_Id +} + +func setDataUpdate(src e.UpdateDto, dst *e.Encounter) { + dst.Appointment_Doctor_Id = src.Appointment_Doctor_Id + dst.Responsible_Doctor_Id = src.Responsible_Doctor_Id + dst.Unit_Id = src.Unit_Id + dst.Specialist_Id = src.Specialist_Id + dst.Subspecialist_Id = src.Subspecialist_Id + dst.VisitDate = src.VisitDate +} + +func setDataDischarge(src e.DischargeDto, dst *e.Encounter) { + dst.DischargeMethod_Code = src.DischargeMethod_Code + dst.EarlyEducation = src.EarlyEducation + dst.MedicalDischargeEducation = src.MedicalDischargeEducation + dst.AdmDischargeEducation = src.AdmDischargeEducation + dst.DischargeReason = src.DischargeReason + dst.Status_Code = erc.DSCDone +} + +func checkSoapiByDocExists(encounter_id uint, event *pl.Event, tx *gorm.DB) error { + pl.SetLogInfo(event, nil, "started", "checkSoapiByDocExists") + var soapies []es.Soapi + err := tx. + Preload("Employee"). + Preload("Employee.User"). + Where("\"Encounter_Id\" = ?", encounter_id).Find(&soapies).Error + if err != nil { + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "data-get-fail", + Detail: "get soapi failed", + Raw: err, + } + return pl.SetLogError(event, nil) + } + + if len(soapies) == 0 { + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "data-notFound", + Detail: "no soapi found for encounter", + Raw: errors.New("soapi not found"), + } + return pl.SetLogError(event, nil) + } + + for _, s := range soapies { + if s.Employee != nil && s.Employee.User != nil && s.Employee.User.Position_Code == ero.UPCDoc { + return nil + } + } + + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "data-update-fail", + Detail: "no soapi written by a doctor found", + Raw: errors.New("all soapi employees are not doctors"), + } + return pl.SetLogError(event, nil) +} + +func createMedication(encounter_id uint, event *pl.Event, tx *gorm.DB) error { + pl.SetLogInfo(event, nil, "started", "createMedication") + + prescription, err := up.ReadDetailData(ep.ReadDetailDto{Encounter_Id: &encounter_id}, event, tx) + if err != nil { + return err + } + + prescriptionItem, _, err := upi.ReadListData(epi.ReadListDto{FilterDto: epi.FilterDto{Prescription_Id: &prescription.Id}}, event, tx) + if err != nil { + return err + } + + if len(prescriptionItem) == 0 { + return nil + } + + medicationCreate := em.CreateDto{ + Encounter_Id: &encounter_id, + IssuedAt: pu.GetTimeNow(), + Status_Code: erc.DSCNew, + } + medication, err := um.CreateData(medicationCreate, event, tx) + if err != nil { + return err + } + + for _, prescriptionItem := range prescriptionItem { + if prescriptionItem.IsMix { + medMix_id, err := createMedicineMixAndItem(*prescriptionItem.MedicineMix, event, tx) + if err != nil { + return err + } + prescriptionItem.MedicineMix_Id = medMix_id + } + err := createMedicationItem(medication.Id, prescriptionItem, event, tx) + if err != nil { + return err + } + } + return nil +} + +func createMedicineMixAndItem(input emi.MedicineMix, event *pl.Event, tx *gorm.DB) (*uint, error) { + pl.SetLogInfo(event, nil, "started", "createMedicineMix") + + medicineMixCreate := emi.CreateDto{ + Name: input.Name, + Uom_Code: input.Uom_Code, + } + medicineMix, err := umi.CreateData(medicineMixCreate, event, tx) + if err != nil { + return nil, err + } + + // recreate medicineMixItem with new medicineMix_id to keep medMixItem remain the same for prescriptionItem that is created + for _, medicineMixItem := range input.MixItems { + medicineMixItemCreate := emmi.CreateDto{ + MedicineMix_Id: &medicineMix.Id, + Medicine_Id: medicineMixItem.Medicine_Id, + Dose: medicineMixItem.Dose, + } + _, err := ummi.CreateData(medicineMixItemCreate, event, tx) + if err != nil { + return nil, err + } + + } + return &medicineMix.Id, nil +} + +func createMedicationItem(medication_id uint, input epi.PrescriptionItem, event *pl.Event, tx *gorm.DB) error { + pl.SetLogInfo(event, nil, "started", "createMedicationItem") + + medicationItemCreate := emei.CreateDto{ + Medication_Id: &medication_id, + IsMix: input.IsMix, + Medicine_Id: input.Medicine_Id, + MedicineMix_Id: input.MedicineMix_Id, + Usage: input.Usage, + Interval: input.Interval, + IntervalUnit_Code: input.IntervalUnit_Code, + Quantity: input.Quantity, + } + + _, err := umei.CreateData(medicationItemCreate, event, tx) + if err != nil { + return err + } + + return nil +} + +func checkNewOrdersExist(encounter_id uint, event *pl.Event, tx *gorm.DB) error { + pl.SetLogInfo(event, nil, "started", "CheckNewOrdersExist") + var errs []string + if err := getDeviceOrders(encounter_id, event, tx); err != nil { + errs = append(errs, err.Error()) + } + + if err := getMaterialOrders(encounter_id, event, tx); err != nil { + errs = append(errs, err.Error()) + } + + if err := getMcuOrders(encounter_id, event, tx); err != nil { + errs = append(errs, err.Error()) + } + + if len(errs) > 0 { + return fmt.Errorf("encounter has open orders: %s", strings.Join(errs, "; ")) + } + + return nil +} + +func getDeviceOrders(encounter_id uint, event *pl.Event, tx *gorm.DB) error { + pl.SetLogInfo(event, nil, "started", "getDeviceOrders") + var orders []edo.DeviceOrder + err := tx.Where("\"Encounter_Id\" = ? AND \"Status_Code\" = ?", encounter_id, erc.DSCNew).Find(&orders).Error + if err != nil { + if err == gorm.ErrRecordNotFound { + return nil + } + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "data-get-fail", + Detail: "get device order failed", + Raw: err, + } + return pl.SetLogError(event, nil) + } + + if len(orders) > 0 { + return fmt.Errorf("encounter has %d device orders", len(orders)) + } + + return nil +} + +func getMaterialOrders(encounter_id uint, event *pl.Event, tx *gorm.DB) error { + pl.SetLogInfo(event, nil, "started", "getMaterialOrders") + var orders []emo.MaterialOrder + err := tx.Where("\"Encounter_Id\" = ? AND \"Status_Code\" = ?", encounter_id, erc.DSCNew).Find(&orders).Error + if err != nil { + if err == gorm.ErrRecordNotFound { + return nil + } + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "data-get-fail", + Detail: "get material order failed", + Raw: err, + } + return pl.SetLogError(event, nil) + } + + if len(orders) > 0 { + return fmt.Errorf("encounter has %d material orders", len(orders)) + } + + return nil +} + +func getMcuOrders(encounter_id uint, event *pl.Event, tx *gorm.DB) error { + pl.SetLogInfo(event, nil, "started", "getMcuOrders") + var orders []emco.McuOrder + err := tx.Where("\"Encounter_Id\" = ? AND \"Status_Code\" = ?", encounter_id, erc.DSCNew).Find(&orders).Error + if err != nil { + if err == gorm.ErrRecordNotFound { + return nil + } + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "data-get-fail", + Detail: "get mcu order failed", + Raw: err, + } + return pl.SetLogError(event, nil) + } + + if len(orders) > 0 { + return fmt.Errorf("encounter has %d mcu orders", len(orders)) + } + + return nil +} diff --git a/internal/use-case/main-use-case/checkout-polies/lib.go b/internal/use-case/main-use-case/checkout-polies/lib.go new file mode 100644 index 00000000..5525e906 --- /dev/null +++ b/internal/use-case/main-use-case/checkout-polies/lib.go @@ -0,0 +1,31 @@ +package checkout_polies + +import ( + cp "simrs-vx/internal/domain/main-entities/checkout-polies" + plh "simrs-vx/pkg/lib-helper" + pl "simrs-vx/pkg/logger" + + dg "github.com/karincake/apem/db-gorm-pg" + "gorm.io/gorm" +) + +func CreateData(input cp.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*cp.CheckoutPolies, error) { + pl.SetLogInfo(event, nil, "started", "DBCreate") + + data := cp.CheckoutPolies{} + 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 +} diff --git a/internal/use-case/main-use-case/checkout-polies/middleware-runner.go b/internal/use-case/main-use-case/checkout-polies/middleware-runner.go new file mode 100644 index 00000000..2da2dcca --- /dev/null +++ b/internal/use-case/main-use-case/checkout-polies/middleware-runner.go @@ -0,0 +1,103 @@ +package checkout_polies + +import ( + cp "simrs-vx/internal/domain/main-entities/checkout-polies" + 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 *cp.CreateDto, data *cp.CheckoutPolies) 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 *cp.ReadListDto, data *cp.CheckoutPolies) 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 *cp.ReadDetailDto, data *cp.CheckoutPolies) 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 *cp.ReadDetailDto, data *cp.CheckoutPolies) 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 *cp.ReadDetailDto, data *cp.CheckoutPolies) 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/checkout-polies/middleware.go b/internal/use-case/main-use-case/checkout-polies/middleware.go new file mode 100644 index 00000000..ebd4cff8 --- /dev/null +++ b/internal/use-case/main-use-case/checkout-polies/middleware.go @@ -0,0 +1,9 @@ +package checkout_polies + +// 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/checkout-polies/tycovar.go b/internal/use-case/main-use-case/checkout-polies/tycovar.go new file mode 100644 index 00000000..a6978f08 --- /dev/null +++ b/internal/use-case/main-use-case/checkout-polies/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 checkout_polies + +import ( + "gorm.io/gorm" + + cp "simrs-vx/internal/domain/main-entities/checkout-polies" +) + +type createMw struct { + Name string + Func func(input *cp.CreateDto, data *cp.CheckoutPolies, tx *gorm.DB) error +} + +type readListMw struct { + Name string + Func func(input *cp.ReadListDto, data *cp.CheckoutPolies, tx *gorm.DB) error +} + +type readDetailMw struct { + Name string + Func func(input *cp.ReadDetailDto, data *cp.CheckoutPolies, 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 From bd6c76fee9b742ae58b6e6ef54af169660e96b92 Mon Sep 17 00:00:00 2001 From: vanilia Date: Mon, 13 Oct 2025 16:25:30 +0700 Subject: [PATCH 2/6] add list internal-reference --- .../dto.go | 6 +- .../entity.go | 4 +- .../handler.go | 19 +- .../interface/main-handler/main-handler.go | 4 +- internal/interface/migration/main-entities.go | 2 +- .../main-use-case/checkout-polies/helper.go | 302 ------------------ .../main-use-case/checkout-polies/lib.go | 31 -- .../case.go | 64 +++- .../internal-reference/helper.go | 23 ++ .../main-use-case/internal-reference/lib.go | 70 ++++ .../middleware-runner.go | 14 +- .../middleware.go | 2 +- .../tycovar.go | 10 +- 13 files changed, 183 insertions(+), 368 deletions(-) rename internal/domain/main-entities/{checkout-polies => internal-reference}/dto.go (91%) rename internal/domain/main-entities/{checkout-polies => internal-reference}/entity.go (91%) rename internal/interface/main-handler/{checkout-polies => internal-reference}/handler.go (76%) delete mode 100644 internal/use-case/main-use-case/checkout-polies/helper.go delete mode 100644 internal/use-case/main-use-case/checkout-polies/lib.go rename internal/use-case/main-use-case/{checkout-polies => internal-reference}/case.go (54%) create mode 100644 internal/use-case/main-use-case/internal-reference/helper.go create mode 100644 internal/use-case/main-use-case/internal-reference/lib.go rename internal/use-case/main-use-case/{checkout-polies => internal-reference}/middleware-runner.go (85%) rename internal/use-case/main-use-case/{checkout-polies => internal-reference}/middleware.go (88%) rename internal/use-case/main-use-case/{checkout-polies => internal-reference}/tycovar.go (73%) diff --git a/internal/domain/main-entities/checkout-polies/dto.go b/internal/domain/main-entities/internal-reference/dto.go similarity index 91% rename from internal/domain/main-entities/checkout-polies/dto.go rename to internal/domain/main-entities/internal-reference/dto.go index 448efa46..5ac439b9 100644 --- a/internal/domain/main-entities/checkout-polies/dto.go +++ b/internal/domain/main-entities/internal-reference/dto.go @@ -1,4 +1,4 @@ -package checkout_polies +package internal_reference import ( ecore "simrs-vx/internal/domain/base-entities/core" @@ -54,7 +54,7 @@ type ResponseDto struct { Doctor *ed.Doctor `json:"doctor,omitempty"` } -func (d CheckoutPolies) ToResponse() ResponseDto { +func (d InternalReference) ToResponse() ResponseDto { resp := ResponseDto{ Encounter_Id: d.Encounter_Id, Encounter: d.Encounter, @@ -67,7 +67,7 @@ func (d CheckoutPolies) ToResponse() ResponseDto { return resp } -func ToResponseList(data []CheckoutPolies) []ResponseDto { +func ToResponseList(data []InternalReference) []ResponseDto { resp := make([]ResponseDto, len(data)) for i, u := range data { resp[i] = u.ToResponse() diff --git a/internal/domain/main-entities/checkout-polies/entity.go b/internal/domain/main-entities/internal-reference/entity.go similarity index 91% rename from internal/domain/main-entities/checkout-polies/entity.go rename to internal/domain/main-entities/internal-reference/entity.go index d329fc52..56dcdc19 100644 --- a/internal/domain/main-entities/checkout-polies/entity.go +++ b/internal/domain/main-entities/internal-reference/entity.go @@ -1,4 +1,4 @@ -package checkout_polies +package internal_reference import ( ecore "simrs-vx/internal/domain/base-entities/core" @@ -7,7 +7,7 @@ import ( eu "simrs-vx/internal/domain/main-entities/unit" ) -type CheckoutPolies struct { +type InternalReference struct { ecore.Main Encounter_Id *uint `json:"encounter_id"` Encounter *ee.Encounter `json:"encounter,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"` diff --git a/internal/interface/main-handler/checkout-polies/handler.go b/internal/interface/main-handler/internal-reference/handler.go similarity index 76% rename from internal/interface/main-handler/checkout-polies/handler.go rename to internal/interface/main-handler/internal-reference/handler.go index f7833032..ca5afdc9 100644 --- a/internal/interface/main-handler/checkout-polies/handler.go +++ b/internal/interface/main-handler/internal-reference/handler.go @@ -1,12 +1,13 @@ -package checkout_polies +package internal_reference import ( "net/http" - ecp "simrs-vx/internal/domain/main-entities/checkout-polies" - ucp "simrs-vx/internal/use-case/main-use-case/checkout-polies" + eir "simrs-vx/internal/domain/main-entities/internal-reference" + uir "simrs-vx/internal/use-case/main-use-case/internal-reference" rw "github.com/karincake/risoles" + sf "github.com/karincake/semprit" ) type myBase struct{} @@ -14,20 +15,20 @@ type myBase struct{} var O myBase func (obj myBase) Create(w http.ResponseWriter, r *http.Request) { - dto := ecp.CreateDto{} + dto := eir.CreateDto{} if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { return } - res, err := ucp.Create(dto) + res, err := uir.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) + dto := eir.ReadListDto{} + sf.UrlQueryParam(&dto, *r.URL) + res, err := uir.ReadList(dto) + rw.DataResponse(w, res, err) } func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) { diff --git a/internal/interface/main-handler/main-handler.go b/internal/interface/main-handler/main-handler.go index c54a449c..63448f21 100644 --- a/internal/interface/main-handler/main-handler.go +++ b/internal/interface/main-handler/main-handler.go @@ -6,13 +6,13 @@ import ( /******************** main / transaction ********************/ adime "simrs-vx/internal/interface/main-handler/adime" auth "simrs-vx/internal/interface/main-handler/authentication" - checkoutpolies "simrs-vx/internal/interface/main-handler/checkout-polies" chemo "simrs-vx/internal/interface/main-handler/chemo" consultation "simrs-vx/internal/interface/main-handler/consultation" counter "simrs-vx/internal/interface/main-handler/counter" 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" + 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" mcuorder "simrs-vx/internal/interface/main-handler/mcu-order" @@ -233,7 +233,7 @@ func SetRoutes() http.Handler { "PATCH /{id}/reject": chemo.O.Reject, }) - hc.RegCrud(r, "/v1/checkout-poly", checkoutpolies.O) + hc.RegCrud(r, "/v1/internal-reference", internalreference.O) /******************** actor ********************/ hc.RegCrud(r, "/v1/person", person.O) diff --git a/internal/interface/migration/main-entities.go b/internal/interface/migration/main-entities.go index b1875a8f..3821e982 100644 --- a/internal/interface/migration/main-entities.go +++ b/internal/interface/migration/main-entities.go @@ -4,7 +4,6 @@ import ( adime "simrs-vx/internal/domain/main-entities/adime" ambulatory "simrs-vx/internal/domain/main-entities/ambulatory" appointment "simrs-vx/internal/domain/main-entities/appointment" - checkoutpolies "simrs-vx/internal/domain/main-entities/checkout-polies" chemo "simrs-vx/internal/domain/main-entities/chemo" consultation "simrs-vx/internal/domain/main-entities/consultation" counter "simrs-vx/internal/domain/main-entities/counter" @@ -25,6 +24,7 @@ import ( inpatient "simrs-vx/internal/domain/main-entities/inpatient" installation "simrs-vx/internal/domain/main-entities/installation" insurancecompany "simrs-vx/internal/domain/main-entities/insurance-company" + checkoutpolies "simrs-vx/internal/domain/main-entities/internal-reference" item "simrs-vx/internal/domain/main-entities/item" itemprice "simrs-vx/internal/domain/main-entities/item-price" laborant "simrs-vx/internal/domain/main-entities/laborant" diff --git a/internal/use-case/main-use-case/checkout-polies/helper.go b/internal/use-case/main-use-case/checkout-polies/helper.go deleted file mode 100644 index 884e6cca..00000000 --- a/internal/use-case/main-use-case/checkout-polies/helper.go +++ /dev/null @@ -1,302 +0,0 @@ -/* -DESCRIPTION: -Any functions that are used internally by the use-case -*/ -package checkout_polies - -import ( - "errors" - "fmt" - cp "simrs-vx/internal/domain/main-entities/checkout-polies" - "strings" - - e "simrs-vx/internal/domain/main-entities/encounter" - es "simrs-vx/internal/domain/main-entities/soapi" - - edo "simrs-vx/internal/domain/main-entities/device-order" - emo "simrs-vx/internal/domain/main-entities/material-order" - emco "simrs-vx/internal/domain/main-entities/mcu-order" - em "simrs-vx/internal/domain/main-entities/medication" - emei "simrs-vx/internal/domain/main-entities/medication-item" - emi "simrs-vx/internal/domain/main-entities/medicine-mix" - emmi "simrs-vx/internal/domain/main-entities/medicine-mix-item" - ep "simrs-vx/internal/domain/main-entities/prescription" - epi "simrs-vx/internal/domain/main-entities/prescription-item" - - // udo "simrs-vx/internal/use-case/main-use-case/device-order" - um "simrs-vx/internal/use-case/main-use-case/medication" - umei "simrs-vx/internal/use-case/main-use-case/medication-item" - umi "simrs-vx/internal/use-case/main-use-case/medicine-mix" - ummi "simrs-vx/internal/use-case/main-use-case/medicine-mix-item" - up "simrs-vx/internal/use-case/main-use-case/prescription" - upi "simrs-vx/internal/use-case/main-use-case/prescription-item" - - pl "simrs-vx/pkg/logger" - pu "simrs-vx/pkg/use-case-helper" - - erc "simrs-vx/internal/domain/references/common" - ero "simrs-vx/internal/domain/references/organization" - - "gorm.io/gorm" -) - -func setData[T *cp.CreateDto | *cp.UpdateDto](input T, data *cp.CheckoutPolies) { - var inputSrc *cp.CreateDto - if inputT, ok := any(input).(*cp.CreateDto); ok { - inputSrc = inputT - } else { - inputTemp := any(input).(*cp.UpdateDto) - inputSrc = &inputTemp.CreateDto - } - - data.Encounter_Id = inputSrc.Encounter_Id - data.Unit_Id = inputSrc.Unit_Id - data.Doctor_Id = inputSrc.Doctor_Id -} - -func setDataUpdate(src e.UpdateDto, dst *e.Encounter) { - dst.Appointment_Doctor_Id = src.Appointment_Doctor_Id - dst.Responsible_Doctor_Id = src.Responsible_Doctor_Id - dst.Unit_Id = src.Unit_Id - dst.Specialist_Id = src.Specialist_Id - dst.Subspecialist_Id = src.Subspecialist_Id - dst.VisitDate = src.VisitDate -} - -func setDataDischarge(src e.DischargeDto, dst *e.Encounter) { - dst.DischargeMethod_Code = src.DischargeMethod_Code - dst.EarlyEducation = src.EarlyEducation - dst.MedicalDischargeEducation = src.MedicalDischargeEducation - dst.AdmDischargeEducation = src.AdmDischargeEducation - dst.DischargeReason = src.DischargeReason - dst.Status_Code = erc.DSCDone -} - -func checkSoapiByDocExists(encounter_id uint, event *pl.Event, tx *gorm.DB) error { - pl.SetLogInfo(event, nil, "started", "checkSoapiByDocExists") - var soapies []es.Soapi - err := tx. - Preload("Employee"). - Preload("Employee.User"). - Where("\"Encounter_Id\" = ?", encounter_id).Find(&soapies).Error - if err != nil { - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "get soapi failed", - Raw: err, - } - return pl.SetLogError(event, nil) - } - - if len(soapies) == 0 { - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-notFound", - Detail: "no soapi found for encounter", - Raw: errors.New("soapi not found"), - } - return pl.SetLogError(event, nil) - } - - for _, s := range soapies { - if s.Employee != nil && s.Employee.User != nil && s.Employee.User.Position_Code == ero.UPCDoc { - return nil - } - } - - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-update-fail", - Detail: "no soapi written by a doctor found", - Raw: errors.New("all soapi employees are not doctors"), - } - return pl.SetLogError(event, nil) -} - -func createMedication(encounter_id uint, event *pl.Event, tx *gorm.DB) error { - pl.SetLogInfo(event, nil, "started", "createMedication") - - prescription, err := up.ReadDetailData(ep.ReadDetailDto{Encounter_Id: &encounter_id}, event, tx) - if err != nil { - return err - } - - prescriptionItem, _, err := upi.ReadListData(epi.ReadListDto{FilterDto: epi.FilterDto{Prescription_Id: &prescription.Id}}, event, tx) - if err != nil { - return err - } - - if len(prescriptionItem) == 0 { - return nil - } - - medicationCreate := em.CreateDto{ - Encounter_Id: &encounter_id, - IssuedAt: pu.GetTimeNow(), - Status_Code: erc.DSCNew, - } - medication, err := um.CreateData(medicationCreate, event, tx) - if err != nil { - return err - } - - for _, prescriptionItem := range prescriptionItem { - if prescriptionItem.IsMix { - medMix_id, err := createMedicineMixAndItem(*prescriptionItem.MedicineMix, event, tx) - if err != nil { - return err - } - prescriptionItem.MedicineMix_Id = medMix_id - } - err := createMedicationItem(medication.Id, prescriptionItem, event, tx) - if err != nil { - return err - } - } - return nil -} - -func createMedicineMixAndItem(input emi.MedicineMix, event *pl.Event, tx *gorm.DB) (*uint, error) { - pl.SetLogInfo(event, nil, "started", "createMedicineMix") - - medicineMixCreate := emi.CreateDto{ - Name: input.Name, - Uom_Code: input.Uom_Code, - } - medicineMix, err := umi.CreateData(medicineMixCreate, event, tx) - if err != nil { - return nil, err - } - - // recreate medicineMixItem with new medicineMix_id to keep medMixItem remain the same for prescriptionItem that is created - for _, medicineMixItem := range input.MixItems { - medicineMixItemCreate := emmi.CreateDto{ - MedicineMix_Id: &medicineMix.Id, - Medicine_Id: medicineMixItem.Medicine_Id, - Dose: medicineMixItem.Dose, - } - _, err := ummi.CreateData(medicineMixItemCreate, event, tx) - if err != nil { - return nil, err - } - - } - return &medicineMix.Id, nil -} - -func createMedicationItem(medication_id uint, input epi.PrescriptionItem, event *pl.Event, tx *gorm.DB) error { - pl.SetLogInfo(event, nil, "started", "createMedicationItem") - - medicationItemCreate := emei.CreateDto{ - Medication_Id: &medication_id, - IsMix: input.IsMix, - Medicine_Id: input.Medicine_Id, - MedicineMix_Id: input.MedicineMix_Id, - Usage: input.Usage, - Interval: input.Interval, - IntervalUnit_Code: input.IntervalUnit_Code, - Quantity: input.Quantity, - } - - _, err := umei.CreateData(medicationItemCreate, event, tx) - if err != nil { - return err - } - - return nil -} - -func checkNewOrdersExist(encounter_id uint, event *pl.Event, tx *gorm.DB) error { - pl.SetLogInfo(event, nil, "started", "CheckNewOrdersExist") - var errs []string - if err := getDeviceOrders(encounter_id, event, tx); err != nil { - errs = append(errs, err.Error()) - } - - if err := getMaterialOrders(encounter_id, event, tx); err != nil { - errs = append(errs, err.Error()) - } - - if err := getMcuOrders(encounter_id, event, tx); err != nil { - errs = append(errs, err.Error()) - } - - if len(errs) > 0 { - return fmt.Errorf("encounter has open orders: %s", strings.Join(errs, "; ")) - } - - return nil -} - -func getDeviceOrders(encounter_id uint, event *pl.Event, tx *gorm.DB) error { - pl.SetLogInfo(event, nil, "started", "getDeviceOrders") - var orders []edo.DeviceOrder - err := tx.Where("\"Encounter_Id\" = ? AND \"Status_Code\" = ?", encounter_id, erc.DSCNew).Find(&orders).Error - if err != nil { - if err == gorm.ErrRecordNotFound { - return nil - } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "get device order failed", - Raw: err, - } - return pl.SetLogError(event, nil) - } - - if len(orders) > 0 { - return fmt.Errorf("encounter has %d device orders", len(orders)) - } - - return nil -} - -func getMaterialOrders(encounter_id uint, event *pl.Event, tx *gorm.DB) error { - pl.SetLogInfo(event, nil, "started", "getMaterialOrders") - var orders []emo.MaterialOrder - err := tx.Where("\"Encounter_Id\" = ? AND \"Status_Code\" = ?", encounter_id, erc.DSCNew).Find(&orders).Error - if err != nil { - if err == gorm.ErrRecordNotFound { - return nil - } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "get material order failed", - Raw: err, - } - return pl.SetLogError(event, nil) - } - - if len(orders) > 0 { - return fmt.Errorf("encounter has %d material orders", len(orders)) - } - - return nil -} - -func getMcuOrders(encounter_id uint, event *pl.Event, tx *gorm.DB) error { - pl.SetLogInfo(event, nil, "started", "getMcuOrders") - var orders []emco.McuOrder - err := tx.Where("\"Encounter_Id\" = ? AND \"Status_Code\" = ?", encounter_id, erc.DSCNew).Find(&orders).Error - if err != nil { - if err == gorm.ErrRecordNotFound { - return nil - } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "get mcu order failed", - Raw: err, - } - return pl.SetLogError(event, nil) - } - - if len(orders) > 0 { - return fmt.Errorf("encounter has %d mcu orders", len(orders)) - } - - return nil -} diff --git a/internal/use-case/main-use-case/checkout-polies/lib.go b/internal/use-case/main-use-case/checkout-polies/lib.go deleted file mode 100644 index 5525e906..00000000 --- a/internal/use-case/main-use-case/checkout-polies/lib.go +++ /dev/null @@ -1,31 +0,0 @@ -package checkout_polies - -import ( - cp "simrs-vx/internal/domain/main-entities/checkout-polies" - plh "simrs-vx/pkg/lib-helper" - pl "simrs-vx/pkg/logger" - - dg "github.com/karincake/apem/db-gorm-pg" - "gorm.io/gorm" -) - -func CreateData(input cp.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*cp.CheckoutPolies, error) { - pl.SetLogInfo(event, nil, "started", "DBCreate") - - data := cp.CheckoutPolies{} - 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 -} diff --git a/internal/use-case/main-use-case/checkout-polies/case.go b/internal/use-case/main-use-case/internal-reference/case.go similarity index 54% rename from internal/use-case/main-use-case/checkout-polies/case.go rename to internal/use-case/main-use-case/internal-reference/case.go index 48bf9046..ccb2a5fe 100644 --- a/internal/use-case/main-use-case/checkout-polies/case.go +++ b/internal/use-case/main-use-case/internal-reference/case.go @@ -1,12 +1,13 @@ -package checkout_polies +package internal_reference import ( // main entities - cp "simrs-vx/internal/domain/main-entities/checkout-polies" ed "simrs-vx/internal/domain/main-entities/doctor" ee "simrs-vx/internal/domain/main-entities/encounter" + eir "simrs-vx/internal/domain/main-entities/internal-reference" eu "simrs-vx/internal/domain/main-entities/unit" + "strconv" // main use case ud "simrs-vx/internal/use-case/main-use-case/doctor" @@ -21,10 +22,10 @@ import ( "gorm.io/gorm" ) -const source = "checkout-polies" +const source = "internal-reference" -func Create(input cp.CreateDto) (*d.Data, error) { - data := cp.CheckoutPolies{} +func Create(input eir.CreateDto) (*d.Data, error) { + data := eir.InternalReference{} event := pl.Event{ Feature: "Create", @@ -90,3 +91,56 @@ func Create(input cp.CreateDto) (*d.Data, error) { Data: data.ToResponse(), }, nil } + +func ReadList(input eir.ReadListDto) (*d.Data, error) { + var data *eir.InternalReference + var dataList []eir.InternalReference + var metaList *eir.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: eir.ToResponseList(dataList), + }, nil +} diff --git a/internal/use-case/main-use-case/internal-reference/helper.go b/internal/use-case/main-use-case/internal-reference/helper.go new file mode 100644 index 00000000..aaef382a --- /dev/null +++ b/internal/use-case/main-use-case/internal-reference/helper.go @@ -0,0 +1,23 @@ +/* +DESCRIPTION: +Any functions that are used internally by the use-case +*/ +package internal_reference + +import ( + ir "simrs-vx/internal/domain/main-entities/internal-reference" +) + +func setData[T *ir.CreateDto | *ir.UpdateDto](input T, data *ir.InternalReference) { + var inputSrc *ir.CreateDto + if inputT, ok := any(input).(*ir.CreateDto); ok { + inputSrc = inputT + } else { + inputTemp := any(input).(*ir.UpdateDto) + inputSrc = &inputTemp.CreateDto + } + + data.Encounter_Id = inputSrc.Encounter_Id + data.Unit_Id = inputSrc.Unit_Id + data.Doctor_Id = inputSrc.Doctor_Id +} diff --git a/internal/use-case/main-use-case/internal-reference/lib.go b/internal/use-case/main-use-case/internal-reference/lib.go new file mode 100644 index 00000000..2c338f92 --- /dev/null +++ b/internal/use-case/main-use-case/internal-reference/lib.go @@ -0,0 +1,70 @@ +package internal_reference + +import ( + "errors" + ir "simrs-vx/internal/domain/main-entities/internal-reference" + plh "simrs-vx/pkg/lib-helper" + pl "simrs-vx/pkg/logger" + + dg "github.com/karincake/apem/db-gorm-pg" + gh "github.com/karincake/getuk" + "gorm.io/gorm" +) + +func CreateData(input ir.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*ir.InternalReference, error) { + pl.SetLogInfo(event, nil, "started", "DBCreate") + + data := ir.InternalReference{} + 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 ir.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]ir.InternalReference, *ir.MetaDto, error) { + pl.SetLogInfo(event, input, "started", "DBReadList") + data := []ir.InternalReference{} + pagination := gh.Pagination{} + count := int64(0) + meta := ir.MetaDto{} + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + tx = tx. + Model(&ir.InternalReference{}). + 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 +} diff --git a/internal/use-case/main-use-case/checkout-polies/middleware-runner.go b/internal/use-case/main-use-case/internal-reference/middleware-runner.go similarity index 85% rename from internal/use-case/main-use-case/checkout-polies/middleware-runner.go rename to internal/use-case/main-use-case/internal-reference/middleware-runner.go index 2da2dcca..f677b66f 100644 --- a/internal/use-case/main-use-case/checkout-polies/middleware-runner.go +++ b/internal/use-case/main-use-case/internal-reference/middleware-runner.go @@ -1,7 +1,7 @@ -package checkout_polies +package internal_reference import ( - cp "simrs-vx/internal/domain/main-entities/checkout-polies" + ir "simrs-vx/internal/domain/main-entities/internal-reference" pl "simrs-vx/pkg/logger" pu "simrs-vx/pkg/use-case-helper" @@ -23,7 +23,7 @@ func newMiddlewareRunner(event *pl.Event, tx *gorm.DB) *middlewareRunner { } // ExecuteCreateMiddleware executes create middleware -func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *cp.CreateDto, data *cp.CheckoutPolies) error { +func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *ir.CreateDto, data *ir.InternalReference) error { for _, middleware := range middlewares { logData := pu.GetLogData(input, data) @@ -38,7 +38,7 @@ func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *c return nil } -func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *cp.ReadListDto, data *cp.CheckoutPolies) error { +func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *ir.ReadListDto, data *ir.InternalReference) error { for _, middleware := range middlewares { logData := pu.GetLogData(input, data) @@ -53,7 +53,7 @@ func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, inpu return nil } -func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *cp.ReadDetailDto, data *cp.CheckoutPolies) error { +func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *ir.ReadDetailDto, data *ir.InternalReference) error { for _, middleware := range middlewares { logData := pu.GetLogData(input, data) @@ -68,7 +68,7 @@ func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, return nil } -func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *cp.ReadDetailDto, data *cp.CheckoutPolies) error { +func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *ir.ReadDetailDto, data *ir.InternalReference) error { for _, middleware := range middlewares { logData := pu.GetLogData(input, data) @@ -83,7 +83,7 @@ func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, inpu return nil } -func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *cp.ReadDetailDto, data *cp.CheckoutPolies) error { +func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *ir.ReadDetailDto, data *ir.InternalReference) error { for _, middleware := range middlewares { logData := pu.GetLogData(input, data) diff --git a/internal/use-case/main-use-case/checkout-polies/middleware.go b/internal/use-case/main-use-case/internal-reference/middleware.go similarity index 88% rename from internal/use-case/main-use-case/checkout-polies/middleware.go rename to internal/use-case/main-use-case/internal-reference/middleware.go index ebd4cff8..2afd1eaf 100644 --- a/internal/use-case/main-use-case/checkout-polies/middleware.go +++ b/internal/use-case/main-use-case/internal-reference/middleware.go @@ -1,4 +1,4 @@ -package checkout_polies +package internal_reference // example of middleware // func init() { diff --git a/internal/use-case/main-use-case/checkout-polies/tycovar.go b/internal/use-case/main-use-case/internal-reference/tycovar.go similarity index 73% rename from internal/use-case/main-use-case/checkout-polies/tycovar.go rename to internal/use-case/main-use-case/internal-reference/tycovar.go index a6978f08..10efa497 100644 --- a/internal/use-case/main-use-case/checkout-polies/tycovar.go +++ b/internal/use-case/main-use-case/internal-reference/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 checkout_polies +package internal_reference import ( "gorm.io/gorm" - cp "simrs-vx/internal/domain/main-entities/checkout-polies" + ir "simrs-vx/internal/domain/main-entities/internal-reference" ) type createMw struct { Name string - Func func(input *cp.CreateDto, data *cp.CheckoutPolies, tx *gorm.DB) error + Func func(input *ir.CreateDto, data *ir.InternalReference, tx *gorm.DB) error } type readListMw struct { Name string - Func func(input *cp.ReadListDto, data *cp.CheckoutPolies, tx *gorm.DB) error + Func func(input *ir.ReadListDto, data *ir.InternalReference, tx *gorm.DB) error } type readDetailMw struct { Name string - Func func(input *cp.ReadDetailDto, data *cp.CheckoutPolies, tx *gorm.DB) error + Func func(input *ir.ReadDetailDto, data *ir.InternalReference, tx *gorm.DB) error } type UpdateMw = readDetailMw From 973af63bf6dd847bef7f2c53eae7fdf357ec263d Mon Sep 17 00:00:00 2001 From: vanilia Date: Tue, 14 Oct 2025 10:56:25 +0700 Subject: [PATCH 3/6] add delete and update internal reference --- .../internal-reference/handler.go | 58 ++--- .../main-use-case/internal-reference/case.go | 207 ++++++++++++++++-- .../internal-reference/helper.go | 12 + .../main-use-case/internal-reference/lib.go | 90 +++++++- 4 files changed, 316 insertions(+), 51 deletions(-) diff --git a/internal/interface/main-handler/internal-reference/handler.go b/internal/interface/main-handler/internal-reference/handler.go index ca5afdc9..297cf357 100644 --- a/internal/interface/main-handler/internal-reference/handler.go +++ b/internal/interface/main-handler/internal-reference/handler.go @@ -32,39 +32,39 @@ func (obj myBase) GetList(w http.ResponseWriter, r *http.Request) { } 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) + id := rw.ValidateInt(w, "id", r.PathValue("id")) + if id <= 0 { + return + } + dto := eir.ReadDetailDto{} + dto.Id = uint16(id) + res, err := uir.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 - //} - // - //dto := e.UpdateDto{} - //if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { - // return - //} - //dto.Id = uint16(id) - //res, err := u.Update(dto) - //rw.DataResponse(w, res, err) + id := rw.ValidateInt(w, "id", r.PathValue("id")) + if id <= 0 { + return + } + + dto := eir.UpdateDto{} + if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { + return + } + dto.Id = uint16(id) + res, err := uir.Update(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) + id := rw.ValidateInt(w, "id", r.PathValue("id")) + if id <= 0 { + return + } + + dto := eir.DeleteDto{} + dto.Id = uint16(id) + res, err := uir.Delete(dto) + rw.DataResponse(w, res, err) } diff --git a/internal/use-case/main-use-case/internal-reference/case.go b/internal/use-case/main-use-case/internal-reference/case.go index ccb2a5fe..44bcd79e 100644 --- a/internal/use-case/main-use-case/internal-reference/case.go +++ b/internal/use-case/main-use-case/internal-reference/case.go @@ -43,21 +43,8 @@ func Create(input eir.CreateDto) (*d.Data, error) { return err } - // Validate Encounter Id - _, err := ue.ReadDetail(ee.ReadDetailDto{Id: uint16(*input.Encounter_Id)}) - if err != nil { - return err - } - - // Validate Unit Id - _, err = uu.ReadDetail(eu.ReadDetailDto{Id: *input.Unit_Id}) - if err != nil { - return err - } - - // Validate Doctor Id - _, err = ud.ReadDetail(ed.ReadDetailDto{Id: uint16(*input.Doctor_Id)}) - if err != nil { + // Validate Request + if err := validateRequest(input); err != nil { return err } @@ -144,3 +131,193 @@ func ReadList(input eir.ReadListDto) (*d.Data, error) { Data: eir.ToResponseList(dataList), }, nil } + +func ReadDetail(input eir.ReadDetailDto) (*d.Data, error) { + var data *eir.InternalReference + 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 validateRequest(input eir.CreateDto) (err error) { + + // Validate Encounter Id + _, err = ue.ReadDetail(ee.ReadDetailDto{Id: uint16(*input.Encounter_Id)}) + if err != nil { + return err + } + + // Validate Unit Id + _, err = uu.ReadDetail(eu.ReadDetailDto{Id: *input.Unit_Id}) + if err != nil { + return err + } + + // Validate Doctor Id + _, err = ud.ReadDetail(ed.ReadDetailDto{Id: uint16(*input.Doctor_Id)}) + if err != nil { + return err + } + + return +} + +func Update(input eir.UpdateDto) (*d.Data, error) { + rdDto := eir.ReadDetailDto{Id: input.Id} + var data *eir.InternalReference + 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 + } + + // Validate Request + if err := validateRequest(input.CreateDto); err != nil { + return err + } + + if err := UpdateData(input, data, &event, tx); err != nil { + return err + } + + // Get Updated Data + if data, err = ReadDetailData(rdDto, &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 eir.DeleteDto) (*d.Data, error) { + rdDto := eir.ReadDetailDto{Id: input.Id} + var data *eir.InternalReference + 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 := 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 + +} diff --git a/internal/use-case/main-use-case/internal-reference/helper.go b/internal/use-case/main-use-case/internal-reference/helper.go index aaef382a..7b7f3d2b 100644 --- a/internal/use-case/main-use-case/internal-reference/helper.go +++ b/internal/use-case/main-use-case/internal-reference/helper.go @@ -5,6 +5,7 @@ Any functions that are used internally by the use-case package internal_reference import ( + "simrs-vx/internal/domain/base-entities/core" ir "simrs-vx/internal/domain/main-entities/internal-reference" ) @@ -21,3 +22,14 @@ func setData[T *ir.CreateDto | *ir.UpdateDto](input T, data *ir.InternalReferenc data.Unit_Id = inputSrc.Unit_Id data.Doctor_Id = inputSrc.Doctor_Id } + +func setDataUpdate(src ir.UpdateDto) *ir.InternalReference { + return &ir.InternalReference{ + Main: core.Main{ + Id: uint(src.Id), + }, + Encounter_Id: src.Encounter_Id, + Unit_Id: src.Unit_Id, + Doctor_Id: src.Doctor_Id, + } +} diff --git a/internal/use-case/main-use-case/internal-reference/lib.go b/internal/use-case/main-use-case/internal-reference/lib.go index 2c338f92..dee874ba 100644 --- a/internal/use-case/main-use-case/internal-reference/lib.go +++ b/internal/use-case/main-use-case/internal-reference/lib.go @@ -2,19 +2,20 @@ package internal_reference import ( "errors" - ir "simrs-vx/internal/domain/main-entities/internal-reference" + eir "simrs-vx/internal/domain/main-entities/internal-reference" 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 ir.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*ir.InternalReference, error) { +func CreateData(input eir.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*eir.InternalReference, error) { pl.SetLogInfo(event, nil, "started", "DBCreate") - data := ir.InternalReference{} + data := eir.InternalReference{} setData(&input, &data) var tx *gorm.DB @@ -32,12 +33,12 @@ func CreateData(input ir.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*ir.Inter return &data, nil } -func ReadListData(input ir.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]ir.InternalReference, *ir.MetaDto, error) { +func ReadListData(input eir.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]eir.InternalReference, *eir.MetaDto, error) { pl.SetLogInfo(event, input, "started", "DBReadList") - data := []ir.InternalReference{} + data := []eir.InternalReference{} pagination := gh.Pagination{} count := int64(0) - meta := ir.MetaDto{} + meta := eir.MetaDto{} var tx *gorm.DB if len(dbx) > 0 { @@ -47,7 +48,7 @@ func ReadListData(input ir.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]ir. } tx = tx. - Model(&ir.InternalReference{}). + Model(&eir.InternalReference{}). Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). @@ -68,3 +69,78 @@ func ReadListData(input ir.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]ir. pl.SetLogInfo(event, nil, "complete") return data, &meta, nil } + +func ReadDetailData(input eir.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*eir.InternalReference, error) { + pl.SetLogInfo(event, input, "started", "DBReadDetail") + data := eir.InternalReference{} + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + preload := "encounter,unit,doctor" + + if err := tx. + Scopes(gh.Preload(preload)). + 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 eir.UpdateDto, data *eir.InternalReference, event *pl.Event, dbx ...*gorm.DB) error { + pl.SetLogInfo(event, data, "started", "DBUpdate") + data = setDataUpdate(input) + + 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 *eir.InternalReference, 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 +} From 6c6ad16af9177c30acbaa3c3ffac77b4c24c4eb2 Mon Sep 17 00:00:00 2001 From: vanilia Date: Tue, 14 Oct 2025 10:56:25 +0700 Subject: [PATCH 4/6] add delete and update internal reference --- .../internal-reference/handler.go | 58 ++--- internal/interface/migration/main-entities.go | 4 +- .../main-use-case/internal-reference/case.go | 207 ++++++++++++++++-- .../internal-reference/helper.go | 9 + .../main-use-case/internal-reference/lib.go | 90 +++++++- 5 files changed, 315 insertions(+), 53 deletions(-) diff --git a/internal/interface/main-handler/internal-reference/handler.go b/internal/interface/main-handler/internal-reference/handler.go index ca5afdc9..297cf357 100644 --- a/internal/interface/main-handler/internal-reference/handler.go +++ b/internal/interface/main-handler/internal-reference/handler.go @@ -32,39 +32,39 @@ func (obj myBase) GetList(w http.ResponseWriter, r *http.Request) { } 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) + id := rw.ValidateInt(w, "id", r.PathValue("id")) + if id <= 0 { + return + } + dto := eir.ReadDetailDto{} + dto.Id = uint16(id) + res, err := uir.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 - //} - // - //dto := e.UpdateDto{} - //if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { - // return - //} - //dto.Id = uint16(id) - //res, err := u.Update(dto) - //rw.DataResponse(w, res, err) + id := rw.ValidateInt(w, "id", r.PathValue("id")) + if id <= 0 { + return + } + + dto := eir.UpdateDto{} + if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { + return + } + dto.Id = uint16(id) + res, err := uir.Update(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) + id := rw.ValidateInt(w, "id", r.PathValue("id")) + if id <= 0 { + return + } + + dto := eir.DeleteDto{} + dto.Id = uint16(id) + res, err := uir.Delete(dto) + rw.DataResponse(w, res, err) } diff --git a/internal/interface/migration/main-entities.go b/internal/interface/migration/main-entities.go index 3821e982..41bb18db 100644 --- a/internal/interface/migration/main-entities.go +++ b/internal/interface/migration/main-entities.go @@ -24,7 +24,7 @@ import ( inpatient "simrs-vx/internal/domain/main-entities/inpatient" installation "simrs-vx/internal/domain/main-entities/installation" insurancecompany "simrs-vx/internal/domain/main-entities/insurance-company" - checkoutpolies "simrs-vx/internal/domain/main-entities/internal-reference" + internalreference "simrs-vx/internal/domain/main-entities/internal-reference" item "simrs-vx/internal/domain/main-entities/item" itemprice "simrs-vx/internal/domain/main-entities/item-price" laborant "simrs-vx/internal/domain/main-entities/laborant" @@ -152,6 +152,6 @@ func getMainEntities() []any { &chemo.Chemo{}, &midwife.Midwife{}, &postalregion.PostalRegion{}, - &checkoutpolies.CheckoutPolies{}, + &internalreference.InternalReference{}, } } diff --git a/internal/use-case/main-use-case/internal-reference/case.go b/internal/use-case/main-use-case/internal-reference/case.go index ccb2a5fe..44bcd79e 100644 --- a/internal/use-case/main-use-case/internal-reference/case.go +++ b/internal/use-case/main-use-case/internal-reference/case.go @@ -43,21 +43,8 @@ func Create(input eir.CreateDto) (*d.Data, error) { return err } - // Validate Encounter Id - _, err := ue.ReadDetail(ee.ReadDetailDto{Id: uint16(*input.Encounter_Id)}) - if err != nil { - return err - } - - // Validate Unit Id - _, err = uu.ReadDetail(eu.ReadDetailDto{Id: *input.Unit_Id}) - if err != nil { - return err - } - - // Validate Doctor Id - _, err = ud.ReadDetail(ed.ReadDetailDto{Id: uint16(*input.Doctor_Id)}) - if err != nil { + // Validate Request + if err := validateRequest(input); err != nil { return err } @@ -144,3 +131,193 @@ func ReadList(input eir.ReadListDto) (*d.Data, error) { Data: eir.ToResponseList(dataList), }, nil } + +func ReadDetail(input eir.ReadDetailDto) (*d.Data, error) { + var data *eir.InternalReference + 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 validateRequest(input eir.CreateDto) (err error) { + + // Validate Encounter Id + _, err = ue.ReadDetail(ee.ReadDetailDto{Id: uint16(*input.Encounter_Id)}) + if err != nil { + return err + } + + // Validate Unit Id + _, err = uu.ReadDetail(eu.ReadDetailDto{Id: *input.Unit_Id}) + if err != nil { + return err + } + + // Validate Doctor Id + _, err = ud.ReadDetail(ed.ReadDetailDto{Id: uint16(*input.Doctor_Id)}) + if err != nil { + return err + } + + return +} + +func Update(input eir.UpdateDto) (*d.Data, error) { + rdDto := eir.ReadDetailDto{Id: input.Id} + var data *eir.InternalReference + 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 + } + + // Validate Request + if err := validateRequest(input.CreateDto); err != nil { + return err + } + + if err := UpdateData(input, data, &event, tx); err != nil { + return err + } + + // Get Updated Data + if data, err = ReadDetailData(rdDto, &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 eir.DeleteDto) (*d.Data, error) { + rdDto := eir.ReadDetailDto{Id: input.Id} + var data *eir.InternalReference + 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 := 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 + +} diff --git a/internal/use-case/main-use-case/internal-reference/helper.go b/internal/use-case/main-use-case/internal-reference/helper.go index aaef382a..39dbe199 100644 --- a/internal/use-case/main-use-case/internal-reference/helper.go +++ b/internal/use-case/main-use-case/internal-reference/helper.go @@ -21,3 +21,12 @@ func setData[T *ir.CreateDto | *ir.UpdateDto](input T, data *ir.InternalReferenc data.Unit_Id = inputSrc.Unit_Id data.Doctor_Id = inputSrc.Doctor_Id } + +func setDataUpdate(src ir.UpdateDto, dst *ir.InternalReference) *ir.InternalReference { + return &ir.InternalReference{ + Main: dst.Main, + Encounter_Id: src.Encounter_Id, + Unit_Id: src.Unit_Id, + Doctor_Id: src.Doctor_Id, + } +} diff --git a/internal/use-case/main-use-case/internal-reference/lib.go b/internal/use-case/main-use-case/internal-reference/lib.go index 2c338f92..54b862ae 100644 --- a/internal/use-case/main-use-case/internal-reference/lib.go +++ b/internal/use-case/main-use-case/internal-reference/lib.go @@ -2,19 +2,20 @@ package internal_reference import ( "errors" - ir "simrs-vx/internal/domain/main-entities/internal-reference" + eir "simrs-vx/internal/domain/main-entities/internal-reference" 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 ir.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*ir.InternalReference, error) { +func CreateData(input eir.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*eir.InternalReference, error) { pl.SetLogInfo(event, nil, "started", "DBCreate") - data := ir.InternalReference{} + data := eir.InternalReference{} setData(&input, &data) var tx *gorm.DB @@ -32,12 +33,12 @@ func CreateData(input ir.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*ir.Inter return &data, nil } -func ReadListData(input ir.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]ir.InternalReference, *ir.MetaDto, error) { +func ReadListData(input eir.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]eir.InternalReference, *eir.MetaDto, error) { pl.SetLogInfo(event, input, "started", "DBReadList") - data := []ir.InternalReference{} + data := []eir.InternalReference{} pagination := gh.Pagination{} count := int64(0) - meta := ir.MetaDto{} + meta := eir.MetaDto{} var tx *gorm.DB if len(dbx) > 0 { @@ -47,7 +48,7 @@ func ReadListData(input ir.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]ir. } tx = tx. - Model(&ir.InternalReference{}). + Model(&eir.InternalReference{}). Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). @@ -68,3 +69,78 @@ func ReadListData(input ir.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]ir. pl.SetLogInfo(event, nil, "complete") return data, &meta, nil } + +func ReadDetailData(input eir.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*eir.InternalReference, error) { + pl.SetLogInfo(event, input, "started", "DBReadDetail") + data := eir.InternalReference{} + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + preload := "encounter,unit,doctor" + + if err := tx. + Scopes(gh.Preload(preload)). + 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 eir.UpdateDto, data *eir.InternalReference, event *pl.Event, dbx ...*gorm.DB) error { + pl.SetLogInfo(event, data, "started", "DBUpdate") + data = setDataUpdate(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 *eir.InternalReference, 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 +} From 1b1f641c2c048fb6bcf1e4a82e2a33f7246fa0d2 Mon Sep 17 00:00:00 2001 From: vanilia Date: Tue, 14 Oct 2025 13:35:48 +0700 Subject: [PATCH 5/6] revised lib and usecase update --- internal/domain/main-entities/internal-reference/dto.go | 3 ++- .../interface/main-handler/internal-reference/handler.go | 2 ++ .../use-case/main-use-case/internal-reference/case.go | 2 ++ .../use-case/main-use-case/internal-reference/helper.go | 9 --------- .../use-case/main-use-case/internal-reference/lib.go | 7 +++---- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/internal/domain/main-entities/internal-reference/dto.go b/internal/domain/main-entities/internal-reference/dto.go index 5ac439b9..6c71e6f1 100644 --- a/internal/domain/main-entities/internal-reference/dto.go +++ b/internal/domain/main-entities/internal-reference/dto.go @@ -26,7 +26,8 @@ type FilterDto struct { } type ReadDetailDto struct { - Id uint16 `json:"id"` + Id uint16 `json:"id"` + Includes string `json:"includes"` } type UpdateDto struct { diff --git a/internal/interface/main-handler/internal-reference/handler.go b/internal/interface/main-handler/internal-reference/handler.go index 297cf357..c46c974d 100644 --- a/internal/interface/main-handler/internal-reference/handler.go +++ b/internal/interface/main-handler/internal-reference/handler.go @@ -36,7 +36,9 @@ func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) { if id <= 0 { return } + dto := eir.ReadDetailDto{} + sf.UrlQueryParam(&dto, *r.URL) dto.Id = uint16(id) res, err := uir.ReadDetail(dto) rw.DataResponse(w, res, err) diff --git a/internal/use-case/main-use-case/internal-reference/case.go b/internal/use-case/main-use-case/internal-reference/case.go index 44bcd79e..a71699e2 100644 --- a/internal/use-case/main-use-case/internal-reference/case.go +++ b/internal/use-case/main-use-case/internal-reference/case.go @@ -152,6 +152,7 @@ func ReadDetail(input eir.ReadDetailDto) (*d.Data, error) { return err } + //input.Includes = "encounter,unit,doctor" if data, err = ReadDetailData(input, &event, tx); err != nil { return err } @@ -238,6 +239,7 @@ func Update(input eir.UpdateDto) (*d.Data, error) { } // Get Updated Data + rdDto.Includes = "encounter,unit,doctor" if data, err = ReadDetailData(rdDto, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/internal-reference/helper.go b/internal/use-case/main-use-case/internal-reference/helper.go index 39dbe199..aaef382a 100644 --- a/internal/use-case/main-use-case/internal-reference/helper.go +++ b/internal/use-case/main-use-case/internal-reference/helper.go @@ -21,12 +21,3 @@ func setData[T *ir.CreateDto | *ir.UpdateDto](input T, data *ir.InternalReferenc data.Unit_Id = inputSrc.Unit_Id data.Doctor_Id = inputSrc.Doctor_Id } - -func setDataUpdate(src ir.UpdateDto, dst *ir.InternalReference) *ir.InternalReference { - return &ir.InternalReference{ - Main: dst.Main, - Encounter_Id: src.Encounter_Id, - Unit_Id: src.Unit_Id, - Doctor_Id: src.Doctor_Id, - } -} diff --git a/internal/use-case/main-use-case/internal-reference/lib.go b/internal/use-case/main-use-case/internal-reference/lib.go index 54b862ae..44db86c5 100644 --- a/internal/use-case/main-use-case/internal-reference/lib.go +++ b/internal/use-case/main-use-case/internal-reference/lib.go @@ -81,10 +81,8 @@ func ReadDetailData(input eir.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) ( tx = dg.I } - preload := "encounter,unit,doctor" - if err := tx. - Scopes(gh.Preload(preload)). + Scopes(gh.Preload(input.Includes)). First(&data, input.Id). Error; err != nil { @@ -99,7 +97,8 @@ func ReadDetailData(input eir.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) ( func UpdateData(input eir.UpdateDto, data *eir.InternalReference, event *pl.Event, dbx ...*gorm.DB) error { pl.SetLogInfo(event, data, "started", "DBUpdate") - data = setDataUpdate(input, data) + setData(&input, data) + //data = setDataUpdate(input, data) var tx *gorm.DB if len(dbx) > 0 { From f93621ac2b3627aa12065bc3f84c61d42c1d30a2 Mon Sep 17 00:00:00 2001 From: vanilia Date: Tue, 14 Oct 2025 13:35:48 +0700 Subject: [PATCH 6/6] revised lib and usecase update --- internal/domain/main-entities/internal-reference/dto.go | 3 ++- .../interface/main-handler/internal-reference/handler.go | 2 ++ .../use-case/main-use-case/internal-reference/case.go | 1 + .../use-case/main-use-case/internal-reference/helper.go | 9 --------- .../use-case/main-use-case/internal-reference/lib.go | 6 ++---- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/internal/domain/main-entities/internal-reference/dto.go b/internal/domain/main-entities/internal-reference/dto.go index 5ac439b9..6c71e6f1 100644 --- a/internal/domain/main-entities/internal-reference/dto.go +++ b/internal/domain/main-entities/internal-reference/dto.go @@ -26,7 +26,8 @@ type FilterDto struct { } type ReadDetailDto struct { - Id uint16 `json:"id"` + Id uint16 `json:"id"` + Includes string `json:"includes"` } type UpdateDto struct { diff --git a/internal/interface/main-handler/internal-reference/handler.go b/internal/interface/main-handler/internal-reference/handler.go index 297cf357..c46c974d 100644 --- a/internal/interface/main-handler/internal-reference/handler.go +++ b/internal/interface/main-handler/internal-reference/handler.go @@ -36,7 +36,9 @@ func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) { if id <= 0 { return } + dto := eir.ReadDetailDto{} + sf.UrlQueryParam(&dto, *r.URL) dto.Id = uint16(id) res, err := uir.ReadDetail(dto) rw.DataResponse(w, res, err) diff --git a/internal/use-case/main-use-case/internal-reference/case.go b/internal/use-case/main-use-case/internal-reference/case.go index 44bcd79e..1681bf26 100644 --- a/internal/use-case/main-use-case/internal-reference/case.go +++ b/internal/use-case/main-use-case/internal-reference/case.go @@ -238,6 +238,7 @@ func Update(input eir.UpdateDto) (*d.Data, error) { } // Get Updated Data + rdDto.Includes = "encounter,unit,doctor" if data, err = ReadDetailData(rdDto, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/internal-reference/helper.go b/internal/use-case/main-use-case/internal-reference/helper.go index 39dbe199..aaef382a 100644 --- a/internal/use-case/main-use-case/internal-reference/helper.go +++ b/internal/use-case/main-use-case/internal-reference/helper.go @@ -21,12 +21,3 @@ func setData[T *ir.CreateDto | *ir.UpdateDto](input T, data *ir.InternalReferenc data.Unit_Id = inputSrc.Unit_Id data.Doctor_Id = inputSrc.Doctor_Id } - -func setDataUpdate(src ir.UpdateDto, dst *ir.InternalReference) *ir.InternalReference { - return &ir.InternalReference{ - Main: dst.Main, - Encounter_Id: src.Encounter_Id, - Unit_Id: src.Unit_Id, - Doctor_Id: src.Doctor_Id, - } -} diff --git a/internal/use-case/main-use-case/internal-reference/lib.go b/internal/use-case/main-use-case/internal-reference/lib.go index 54b862ae..a50d594c 100644 --- a/internal/use-case/main-use-case/internal-reference/lib.go +++ b/internal/use-case/main-use-case/internal-reference/lib.go @@ -81,10 +81,8 @@ func ReadDetailData(input eir.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) ( tx = dg.I } - preload := "encounter,unit,doctor" - if err := tx. - Scopes(gh.Preload(preload)). + Scopes(gh.Preload(input.Includes)). First(&data, input.Id). Error; err != nil { @@ -99,7 +97,7 @@ func ReadDetailData(input eir.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) ( func UpdateData(input eir.UpdateDto, data *eir.InternalReference, event *pl.Event, dbx ...*gorm.DB) error { pl.SetLogInfo(event, data, "started", "DBUpdate") - data = setDataUpdate(input, data) + setData(&input, data) var tx *gorm.DB if len(dbx) > 0 {