From 46d0c17669b467cee217ea327ac75b48229062c2 Mon Sep 17 00:00:00 2001 From: vanilia Date: Thu, 20 Nov 2025 14:16:08 +0700 Subject: [PATCH 1/6] encounter mapping --- internal/domain/references/person/person.go | 3 + .../domain/simgos-entities/patient/entity.go | 2 +- .../interface/main-handler/patient/handler.go | 8 + .../use-case/main-use-case/patient/case.go | 14 ++ .../simgos-sync-use-case/encounter/case.go | 197 ++++++++++++++++++ .../simgos-sync-use-case/encounter/helper.go | 74 +++++++ .../simgos-sync-use-case/encounter/lib.go | 188 +++++++++++++++++ .../encounter/middleware-runner.go | 104 +++++++++ .../encounter/middleware.go | 9 + .../simgos-sync-use-case/encounter/tycovar.go | 44 ++++ .../simgos-sync-use-case/patient/case.go | 2 +- .../simgos-sync-use-case/patient/helper.go | 109 ++++++---- 12 files changed, 714 insertions(+), 40 deletions(-) create mode 100644 internal/use-case/simgos-sync-use-case/encounter/case.go create mode 100644 internal/use-case/simgos-sync-use-case/encounter/helper.go create mode 100644 internal/use-case/simgos-sync-use-case/encounter/lib.go create mode 100644 internal/use-case/simgos-sync-use-case/encounter/middleware-runner.go create mode 100644 internal/use-case/simgos-sync-use-case/encounter/middleware.go create mode 100644 internal/use-case/simgos-sync-use-case/encounter/tycovar.go diff --git a/internal/domain/references/person/person.go b/internal/domain/references/person/person.go index 1648b578..dfd35179 100644 --- a/internal/domain/references/person/person.go +++ b/internal/domain/references/person/person.go @@ -112,6 +112,9 @@ const ( RCNephew RelationshipCode = "nephew" // Keponakan RCGdChild RelationshipCode = "gd-child" // Cucu RCOther RelationshipCode = "other" // Lainnya + RCFriend RelationshipCode = "friend" // Teman + RCSpouse RelationshipCode = "spouse" // Pasangan (Suami / Istri) + RCSelf RelationshipCode = "self" // Diri Sendiri ALTCIdn AddressLocationTypeCode = "identity" // Sesuai Identitas ALTCDom AddressLocationTypeCode = "domicile" // Sesuai Domisili diff --git a/internal/domain/simgos-entities/patient/entity.go b/internal/domain/simgos-entities/patient/entity.go index 20b7fee6..67958d56 100644 --- a/internal/domain/simgos-entities/patient/entity.go +++ b/internal/domain/simgos-entities/patient/entity.go @@ -65,7 +65,7 @@ type MPasien struct { NamaIbu string `json:"nama_ibu" gorm:"column:nama_ibu"` PendidikanAyah string `json:"pendidikan_ayah" gorm:"column:pendidikan_ayah"` PendidikanIbu string `json:"pendidikan_ibu" gorm:"column:pendidikan_ibu"` - StIdentitasOrtu string `json:"st_identitas_ortu" gorm:"column:st_identitas_ortu"` + StIdentitasOrtu uint `json:"st_identitas_ortu" gorm:"column:st_identitas_ortu"` NomrBaru *string `json:"nomr_baru" gorm:"column:nomr_baru"` KtpFile *string `json:"ktp_file" gorm:"column:ktp_file"` KkFile *string `json:"kk_file" gorm:"column:kk_file"` diff --git a/internal/interface/main-handler/patient/handler.go b/internal/interface/main-handler/patient/handler.go index 9fd5fdce..41fca562 100644 --- a/internal/interface/main-handler/patient/handler.go +++ b/internal/interface/main-handler/patient/handler.go @@ -2,6 +2,7 @@ package patient import ( "net/http" + pa "simrs-vx/internal/lib/auth" rw "github.com/karincake/risoles" sf "github.com/karincake/semprit" @@ -19,10 +20,17 @@ type myBase struct{} var O myBase func (obj myBase) Create(w http.ResponseWriter, r *http.Request) { + authInfo, err := pa.GetAuthInfo(r) + if err != nil { + rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil) + } + dto := e.CreateDto{} if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { return } + + dto.AuthInfo = *authInfo res, err := u.Create(dto) rw.DataResponse(w, res, err) } diff --git a/internal/use-case/main-use-case/patient/case.go b/internal/use-case/main-use-case/patient/case.go index 1a8437e5..0ed93bbe 100644 --- a/internal/use-case/main-use-case/patient/case.go +++ b/internal/use-case/main-use-case/patient/case.go @@ -1,6 +1,7 @@ package patient import ( + "errors" "strconv" pl "simrs-vx/pkg/logger" @@ -38,6 +39,19 @@ func Create(input e.CreateDto) (*d.Data, error) { pl.SetLogInfo(&event, input, "started", "create") mwRunner := newMiddlewareRunner(&event) + // check if user has employee position + if !input.AuthInfo.HasEmployeePosition() { + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "auth-forbidden", + Detail: "user has no employee position", + Raw: errors.New("authentication failed"), + } + return nil, pl.SetLogError(&event, input) + } + + input.RegisteredBy_User_Name = &input.AuthInfo.User_Name + err := dg.I.Transaction(func(tx *gorm.DB) error { mwRunner.setMwType(pu.MWTPre) // Run pre-middleware diff --git a/internal/use-case/simgos-sync-use-case/encounter/case.go b/internal/use-case/simgos-sync-use-case/encounter/case.go new file mode 100644 index 00000000..57650594 --- /dev/null +++ b/internal/use-case/simgos-sync-use-case/encounter/case.go @@ -0,0 +1,197 @@ +package encounter + +import ( + pl "simrs-vx/pkg/logger" + + d "github.com/karincake/dodol" + "gorm.io/gorm" + + db "simrs-vx/pkg/dualtrx-helper" + + e "simrs-vx/internal/domain/main-entities/division" + esimgos "simrs-vx/internal/domain/simgos-entities/division" + esync "simrs-vx/internal/domain/sync-entities/division" + elog "simrs-vx/internal/domain/sync-entities/log" +) + +const source = "division" + +func Create(input e.CreateDto) (*d.Data, error) { + var ( + sgData *esimgos.MUnit + syncLink *esync.DivisionLink + err error + ) + + event := pl.Event{ + Feature: "Create", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "create") + + err = db.WithDualTx(func(tx *db.Dualtx) error { + // STEP 1: Insert to simgos + sgData, err = CreateSimgosData(input, &event, tx.Simgos) + if err != nil { + return err + } + + // STEP 2: Insert to Link + syncLink, err = CreateLinkData(*input.Id, sgData.KodeUnit, &event, tx.Sync) + if err != nil { + return err + } + + return nil + }) + + if err != nil { + if syncLink != nil { + go func() { _ = DeleteLinkData(syncLink, &event) }() + } + return nil, err + } + + pl.SetLogInfo(&event, nil, "complete") + + return &d.Data{ + Meta: d.II{ + "source": source, + "structure": "single-data", + "status": "created", + }, + }, nil +} + +func CreateSimxLog(input elog.SimxLogDto) (*d.Data, error) { + event := pl.Event{ + Feature: "Create", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "create") + + tx := db.NewTx() + err := tx.Sync.Transaction(func(tx *gorm.DB) error { + // Insert to Log + if err := CreateLogData(input, &event, tx); err != nil { + return err + } + + return nil + }) + + if err != nil { + return nil, err + } + + pl.SetLogInfo(&event, nil, "complete") + + return &d.Data{ + Meta: d.II{ + "source": source, + "structure": "single-data", + "status": "created", + }, + }, nil +} + +func Update(input e.UpdateDto) (*d.Data, error) { + event := pl.Event{ + Feature: "Update", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "update") + + // STEP 1: Get Link + syncLink, err := ReadDetailLinkData(*input.Id, &event) + if err != nil { + return nil, err + } + + tx := db.NewTx() + err = tx.Simgos.Transaction(func(tx *gorm.DB) error { + // Step 2: Update Simgos + if err = UpdateSimgosData(input, syncLink, &event, tx); err != nil { + return err + } + + return nil + }) + + pl.SetLogInfo(&event, nil, "complete") + + return &d.Data{ + Meta: d.IS{ + "source": source, + "structure": "single-data", + "status": "updated", + }, + }, nil +} + +func Delete(input e.DeleteDto) (*d.Data, error) { + var isLinkDeleted bool + + event := pl.Event{ + Feature: "Delete", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "delete") + + // STEP 1: Get Link + syncLink, err := ReadDetailLinkData(*input.Id, &event) + if err != nil { + return nil, err + } + + // STEP 2: Get Simgos + sgData, err := ReadDetailSimgosData(uint16(syncLink.Simgos_Id), &event) + if err != nil { + return nil, err + } + + err = db.WithDualTx(func(tx *db.Dualtx) error { + // STEP 3: Delete Simgos + err = HardDeleteSimgosData(sgData, &event, tx.Simgos) + if err != nil { + return err + } + + // STEP 4: Delete Link + err = DeleteLinkData(syncLink, &event, tx.Sync) + if err != nil { + return err + } + + isLinkDeleted = true + return nil + }) + + if err != nil { + if isLinkDeleted { + go func() { + _, _ = CreateLinkData(uint(*input.Id), sgData.KodeUnit, &event) + }() + } + return nil, err + } + + pl.SetLogInfo(&event, nil, "complete") + + return &d.Data{ + Meta: d.IS{ + "source": source, + "structure": "single-data", + "status": "deleted", + }, + }, nil + +} diff --git a/internal/use-case/simgos-sync-use-case/encounter/helper.go b/internal/use-case/simgos-sync-use-case/encounter/helper.go new file mode 100644 index 00000000..6fb47ac9 --- /dev/null +++ b/internal/use-case/simgos-sync-use-case/encounter/helper.go @@ -0,0 +1,74 @@ +/* +DESCRIPTION: +Any functions that are used internally by the use-case +*/ +package encounter + +import ( + "encoding/json" + "strconv" + + erc "simrs-vx/internal/domain/references/common" + ere "simrs-vx/internal/domain/references/encounter" + + e "simrs-vx/internal/domain/main-entities/encounter" + esimgos "simrs-vx/internal/domain/simgos-entities/encounter" + esync "simrs-vx/internal/domain/sync-entities/encounter" + esyncLog "simrs-vx/internal/domain/sync-entities/encounter" +) + +func setDataSimgos(input *e.Encounter) (data esimgos.TPendaftaran) { + data.Nomr = *input.Patient.Number + data.Tglreg = input.RegisteredAt + + kddokter, _ := strconv.Atoi(*input.Appointment_Doctor_Code) + data.Kddokter = uint(kddokter) + + kdpoly, _ := strconv.Atoi(*input.Unit_Code) + data.Kdpoly = uint(kdpoly) + + setKdrujuk(input.RefType_Code, data) + + return +} + +func setKdrujuk(input *ere.RefTypeCode, data esimgos.TPendaftaran) { + switch *input { + case ere.RTCGov: + data.Kdrujuk = 1 + case ere.RTCPrivate: + data.Kdrujuk = 2 + case ere.RTCBpjs: + data.Kdrujuk = 3 + default: + data.Kdrujuk = 0 + } +} + +func setDataSimxLog(input *esyncLog.SimxLogDto) (data esync.DivisionSimxLog) { + // encode to JSON + jsonData, _ := json.MarshalIndent(input.Payload, "", " ") + jsonString := string(jsonData) + + var status erc.ProcessStatusCode + if input.IsSuccess { + status = erc.PSCSuccess + } else { + status = erc.PSCFailed + if input.ErrMessage != nil { + data.ErrMessage = input.ErrMessage + } + } + + data.Value = &jsonString + data.Date = &now + data.Status = status + + return +} + +func setDataSimxLink(simxId, simgosId uint) (data esync.DivisionLink) { + data.Simx_Id = simxId + data.Simgos_Id = simgosId + return +} diff --git a/internal/use-case/simgos-sync-use-case/encounter/lib.go b/internal/use-case/simgos-sync-use-case/encounter/lib.go new file mode 100644 index 00000000..f713ca6c --- /dev/null +++ b/internal/use-case/simgos-sync-use-case/encounter/lib.go @@ -0,0 +1,188 @@ +package encounter + +import ( + plh "simrs-vx/pkg/lib-helper" + pl "simrs-vx/pkg/logger" + pu "simrs-vx/pkg/use-case-helper" + "time" + + dg "github.com/karincake/apem/db-gorm-pg" + "gorm.io/gorm" + + e "simrs-vx/internal/domain/main-entities/division" + esimgos "simrs-vx/internal/domain/simgos-entities/division" + esync "simrs-vx/internal/domain/sync-entities/division" + esynclog "simrs-vx/internal/domain/sync-entities/log" +) + +var now = time.Now() + +func CreateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*esimgos.MUnit, error) { + pl.SetLogInfo(event, nil, "started", "DBCreate") + + data := setDataSimgos(&input) + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.IS["simrs"] + } + + if err := tx.Create(&data).Error; err != nil { + return nil, plh.HandleCreateError(input, event, err) + } + + pl.SetLogInfo(event, nil, "complete") + return &data, nil +} + +func ReadDetailSimgosData(simgosId uint16, event *pl.Event) (*esimgos.MUnit, error) { + pl.SetLogInfo(event, simgosId, "started", "DBReadDetail") + data := esimgos.MUnit{} + + var tx = dg.IS["simrs"] + + if err := tx. + Where("\"kode_unit\" = ?", simgosId). + First(&data).Error; err != nil { + if processedErr := pu.HandleReadError(err, event, source, simgosId, data); processedErr != nil { + return nil, processedErr + } + } + + pl.SetLogInfo(event, nil, "complete") + return &data, nil +} + +func UpdateSimgosData(input e.UpdateDto, dataSimgos *esync.DivisionLink, event *pl.Event, dbx ...*gorm.DB) error { + pl.SetLogInfo(event, input, "started", "DBUpdate") + + data := setDataSimgos(&input) + data.KodeUnit = dataSimgos.Simgos_Id + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.IS["simrs"] + } + + 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 HardDeleteSimgosData(data *esimgos.MUnit, 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.IS["simrs"] + } + + 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 +} + +func CreateLinkData(simxId, simgosId uint, event *pl.Event, dbx ...*gorm.DB) (*esync.DivisionLink, error) { + pl.SetLogInfo(event, nil, "started", "DBCreate") + data := setDataSimxLink(simxId, simgosId) + + 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(data, event, err) + } + + pl.SetLogInfo(event, nil, "complete") + return &data, nil +} + +func ReadDetailLinkData(simxId uint16, event *pl.Event) (*esync.DivisionLink, error) { + pl.SetLogInfo(event, simxId, "started", "DBReadDetail") + data := esync.DivisionLink{} + + var tx = dg.I + + if err := tx. + Where("\"Simx_Id\" = ?", simxId). + First(&data).Error; err != nil { + if processedErr := pu.HandleReadError(err, event, source, simxId, data); processedErr != nil { + return nil, processedErr + } + } + + pl.SetLogInfo(event, nil, "complete") + return &data, nil +} + +func DeleteLinkData(data *esync.DivisionLink, 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 +} + +func CreateLogData(input esynclog.SimxLogDto, event *pl.Event, dbx ...*gorm.DB) error { + pl.SetLogInfo(event, nil, "started", "DBCreate") + data := setDataSimxLog(&input) + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + if err := tx.Create(&data).Error; err != nil { + return plh.HandleCreateError(input, event, err) + } + + pl.SetLogInfo(event, nil, "complete") + return nil +} diff --git a/internal/use-case/simgos-sync-use-case/encounter/middleware-runner.go b/internal/use-case/simgos-sync-use-case/encounter/middleware-runner.go new file mode 100644 index 00000000..83e0252c --- /dev/null +++ b/internal/use-case/simgos-sync-use-case/encounter/middleware-runner.go @@ -0,0 +1,104 @@ +package encounter + +import ( + pl "simrs-vx/pkg/logger" + pu "simrs-vx/pkg/use-case-helper" + + "gorm.io/gorm" + + e "simrs-vx/internal/domain/main-entities/encounter" +) + +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.Encounter) 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.Encounter) 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.Encounter) 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.Encounter) 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.Encounter) 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/simgos-sync-use-case/encounter/middleware.go b/internal/use-case/simgos-sync-use-case/encounter/middleware.go new file mode 100644 index 00000000..8a047d33 --- /dev/null +++ b/internal/use-case/simgos-sync-use-case/encounter/middleware.go @@ -0,0 +1,9 @@ +package encounter + +// 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/simgos-sync-use-case/encounter/tycovar.go b/internal/use-case/simgos-sync-use-case/encounter/tycovar.go new file mode 100644 index 00000000..17890a1b --- /dev/null +++ b/internal/use-case/simgos-sync-use-case/encounter/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 encounter + +import ( + "gorm.io/gorm" + + e "simrs-vx/internal/domain/main-entities/encounter" +) + +type createMw struct { + Name string + Func func(input *e.CreateDto, data *e.Encounter, tx *gorm.DB) error +} + +type readListMw struct { + Name string + Func func(input *e.ReadListDto, data *e.Encounter, tx *gorm.DB) error +} + +type readDetailMw struct { + Name string + Func func(input *e.ReadDetailDto, data *e.Encounter, 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 diff --git a/internal/use-case/simgos-sync-use-case/patient/case.go b/internal/use-case/simgos-sync-use-case/patient/case.go index d403a8ac..104e79e9 100644 --- a/internal/use-case/simgos-sync-use-case/patient/case.go +++ b/internal/use-case/simgos-sync-use-case/patient/case.go @@ -211,7 +211,7 @@ func GenerateNomr() (*d.Data, error) { // Start log pl.SetLogInfo(&event, nil, "started", "create") - norm, err := generateNomrPatient() + norm, err := generateNomrPatient("12") if err != nil { return nil, err } diff --git a/internal/use-case/simgos-sync-use-case/patient/helper.go b/internal/use-case/simgos-sync-use-case/patient/helper.go index 0bffcc9b..8ab4c326 100644 --- a/internal/use-case/simgos-sync-use-case/patient/helper.go +++ b/internal/use-case/simgos-sync-use-case/patient/helper.go @@ -39,21 +39,33 @@ func setDataSimgos(input *e.Patient) (data esimgos.MPasien) { if input.Person != nil && input.Person.Relatives != nil { mapRelative(input.Person.Relatives, &data) + } else { + data.PenanggungjawabHubungan = "DIRI SENDIRI" + data.PenanggungjawabNama = input.Person.Name + data.PenanggungjawabPhone = data.Notelp + data.PenanggungjawabAlamat = data.Alamat } data.Nip = input.RegisteredBy_User_Name data.Tgldaftar = input.RegisteredAt data.Nomr = *input.Number + nomrBaru, _ := generateNomrPatient("00") + data.NomrBaru = &nomrBaru + return } -func generateNomrPatient() (string, error) { - const prefix = "12" // fixed starting prefix (same as $awal_rm) in simgos +func generateNomrPatient(prefix string) (string, error) { const maxSuffix = 999999 + column := "nomr" + if prefix == "00" { + column = "nomr_baru" + } + type Row struct { - Nomr string `gorm:"column:nomr"` + Value string `gorm:"column:value"` } var r Row @@ -61,31 +73,35 @@ func generateNomrPatient() (string, error) { // Lock rows for this prefix → prevents race condition if err := dg.IS["simrs"]. Table("m_pasien"). - Select("nomr"). - Where("nomr LIKE ?", prefix+"%"). - Order("nomr DESC"). + Select(fmt.Sprintf("%s AS value", column)). + Where(fmt.Sprintf("%s LIKE ?", column), prefix+"%"). + Order(fmt.Sprintf("%s DESC", column)). Clauses(clause.Locking{Strength: "UPDATE"}). Limit(1). Scan(&r).Error; err != nil { return "", err } - // No existing NOMR → start fresh - if r.Nomr == "" { + // No existing number → start at 000001 + if r.Value == "" || len(r.Value) < len(prefix) { return prefix + "000001", nil } - suffix := r.Nomr[len(prefix):] // extract numeric part - num, _ := strconv.Atoi(suffix) - - // 3. If suffix reaches 999999 → increment the prefix - if num == maxSuffix { - p, _ := strconv.Atoi(prefix) - p++ - return fmt.Sprintf("%d000001", p), nil + suffix := r.Value[len(prefix):] + num, err := strconv.Atoi(suffix) + if err != nil { + // data corrupt, reset nomor + return prefix + "000001", nil } - // 4. Normal increment + // If reached 999999 → increment prefix + if num >= maxSuffix { + p, _ := strconv.Atoi(prefix) + p++ + return fmt.Sprintf("%02d000001", p), nil + } + + // Normal increment return prefix + fmt.Sprintf("%06d", num+1), nil } @@ -262,30 +278,47 @@ func mapRelative(relative *[]epr.PersonRelative, data *esimgos.MPasien) { return } - r := (*relative)[0] - data.PenanggungjawabNama = *r.Name + for _, r := range *relative { + if r.Responsible { + data.PenanggungjawabNama = *r.Name - switch r.Relationship_Code { - case erp.RCMother, erp.RCFather: - data.PenanggungjawabHubungan = "ORANG TUA" - switch { - case r.Relationship_Code == erp.RCMother: - data.NamaIbu = *r.Name - eduCode, _ := setEducation(r.Education_Code) - data.PendidikanIbu = strconv.Itoa(int(eduCode)) - case r.Relationship_Code == erp.RCFather: - data.NamaAyah = *r.Name - eduCode, _ := setEducation(r.Education_Code) - data.PendidikanAyah = strconv.Itoa(int(eduCode)) + switch r.Relationship_Code { + case erp.RCMother, erp.RCFather: + data.PenanggungjawabHubungan = "ORANG TUA" + switch { + case r.Relationship_Code == erp.RCMother: + data.NamaIbu = *r.Name + eduCode, _ := setEducation(r.Education_Code) + data.PendidikanIbu = strconv.Itoa(int(eduCode)) + case r.Relationship_Code == erp.RCFather: + data.NamaAyah = *r.Name + eduCode, _ := setEducation(r.Education_Code) + data.PendidikanAyah = strconv.Itoa(int(eduCode)) + } + case erp.RCChild: + data.PenanggungjawabHubungan = "ANAK" + case erp.RCSibling: + data.PenanggungjawabHubungan = "SAUDARA" + case erp.RCUncle, erp.RCAunt, + erp.RCGdMother, erp.RCGdFather, + erp.RCNephew, erp.RCGdChild: + data.PenanggungjawabHubungan = "KELUARGA LAIN" + case erp.RCFriend: + data.PenanggungjawabHubungan = "TEMAN" + case erp.RCSpouse: + data.PenanggungjawabHubungan = "SUAMI/ISTRI" + case erp.RCSelf: + data.PenanggungjawabHubungan = "DIRI SENDIRI" + default: + data.PenanggungjawabHubungan = "LAINNYA ..." + } + + data.PenanggungjawabAlamat = *r.Address + data.PenanggungjawabPhone = *r.PhoneNumber + + break } - case erp.RCChild: - data.PenanggungjawabHubungan = "ANAK" - default: - data.PenanggungjawabHubungan = "LAINNYA" } - - data.PenanggungjawabAlamat = *r.Address - data.PenanggungjawabPhone = *r.PhoneNumber } func setDataSimxLog(input *esyncLog.SimxLogDto) (data esync.PatientSimxLog) { From dd5f6f78e34eb493747e26da8c746e0b09741358 Mon Sep 17 00:00:00 2001 From: vanilia Date: Fri, 21 Nov 2025 10:21:21 +0700 Subject: [PATCH 2/6] add cud sync encounter --- .../domain/main-entities/encounter/entity.go | 2 +- .../domain/references/encounter/encounter.go | 1 + .../simgos-entities/encounter/entity.go | 2 +- .../use-case/main-use-case/encounter/case.go | 198 +++++++++++------- .../encounter/middleware-runner.go | 71 +++++-- .../main-use-case/encounter/tycovar.go | 30 ++- .../use-case/main-use-case/patient/case.go | 2 - .../simgos-sync-use-case/encounter/case.go | 24 +-- .../simgos-sync-use-case/encounter/helper.go | 141 ++++++++++++- .../simgos-sync-use-case/encounter/lib.go | 28 +-- 10 files changed, 364 insertions(+), 135 deletions(-) diff --git a/internal/domain/main-entities/encounter/entity.go b/internal/domain/main-entities/encounter/entity.go index c188bb1a..4d814ed0 100644 --- a/internal/domain/main-entities/encounter/entity.go +++ b/internal/domain/main-entities/encounter/entity.go @@ -40,7 +40,7 @@ type Encounter struct { VisitDate time.Time `json:"visitDate"` StartedAt *time.Time `json:"startedAt"` FinishedAt *time.Time `json:"finishedAt"` - PaymentMethod_Code erc.PaymentMethodCode `json:"paymentMethod_code" gorm:"size:10"` + PaymentMethod_Code ere.AllPaymentMethodCode `json:"paymentMethod_code" gorm:"size:10"` InsuranceCompany_Code *string `json:"insuranceCompany_code"` InsuranceCompany *ei.InsuranceCompany `json:"insuranceCompany,omitempty" gorm:"foreignKey:InsuranceCompany_Code;references:Code"` Member_Number *string `json:"memberNumber" gorm:"unique;size:20"` diff --git a/internal/domain/references/encounter/encounter.go b/internal/domain/references/encounter/encounter.go index 532e1625..66025373 100644 --- a/internal/domain/references/encounter/encounter.go +++ b/internal/domain/references/encounter/encounter.go @@ -99,6 +99,7 @@ const ( APMCJkmm AllPaymentMethodCode = "jkmm" // JKMM APMCSpm AllPaymentMethodCode = "spm" // SPM APMCPks AllPaymentMethodCode = "pks" // PKS + APMCUmum AllPaymentMethodCode = "umum" SRTCInternal SEPRefTypeCode = "internal" // Rujukan Internal SRTCExternal SEPRefTypeCode = "external" // Faskes Lain diff --git a/internal/domain/simgos-entities/encounter/entity.go b/internal/domain/simgos-entities/encounter/entity.go index 16ba873e..cd8f538d 100644 --- a/internal/domain/simgos-entities/encounter/entity.go +++ b/internal/domain/simgos-entities/encounter/entity.go @@ -16,7 +16,7 @@ type TPendaftaran struct { KeteranganStatus *uint `json:"keterangan_status" gorm:"column:keterangan_status"` Pasienbaru uint `json:"pasienbaru" gorm:"column:pasienbaru"` Nip string `json:"nip" gorm:"column:nip"` - Idxdaftar uint `json:"idxdaftar" gorm:"column:idxdaftar"` + Idxdaftar uint `json:"idxdaftar" gorm:"primaryKey;autoIncrement;column:idxdaftar"` Masukpoly *time.Time `json:"masukpoly" gorm:"column:masukpoly"` Keluarpoly *time.Time `json:"keluarpoly" gorm:"column:keluarpoly"` Ketrujuk string `json:"ketrujuk" gorm:"column:ketrujuk"` diff --git a/internal/use-case/main-use-case/encounter/case.go b/internal/use-case/main-use-case/encounter/case.go index e3d564ff..37e08bc5 100644 --- a/internal/use-case/main-use-case/encounter/case.go +++ b/internal/use-case/main-use-case/encounter/case.go @@ -3,7 +3,6 @@ package encounter import ( "errors" "fmt" - us "simrs-vx/internal/use-case/main-use-case/soapi" "strconv" "time" @@ -24,11 +23,13 @@ import ( eir "simrs-vx/internal/domain/main-entities/internal-reference" erdh "simrs-vx/internal/domain/main-entities/responsible-doctor-hist" es "simrs-vx/internal/domain/main-entities/soapi" + esync "simrs-vx/internal/domain/sync-entities/log" uaeh "simrs-vx/internal/use-case/main-use-case/adm-employee-hist" udc "simrs-vx/internal/use-case/main-use-case/death-cause" uir "simrs-vx/internal/use-case/main-use-case/internal-reference" urdh "simrs-vx/internal/use-case/main-use-case/responsible-doctor-hist" + us "simrs-vx/internal/use-case/main-use-case/soapi" ) const source = "encounter" @@ -50,34 +51,6 @@ func Create(input e.CreateDto) (*d.Data, error) { // Start log pl.SetLogInfo(&event, input, "started", "create") - // validate rehab bpjs - if input.RefTypeCode == ere.RTCBpjs && input.Class_Code == ere.ECAmbulatory && ere.AmbulatoryClassCode(*input.SubClass_Code) == ere.ACCRehab { - // get latest rehab data - recentRehabData, err := getLatestRehabData(input, &event) - if err != nil { - return nil, err - } - - if recentRehabData != nil { - // determine VisitModeCode - input.VisitMode_Code, input.RecentEncounterAdm, err = determineVisitMode(recentRehabData, input, &event) - if err != nil { - return nil, err - } - } else { - input.VisitMode_Code = ere.VMCAdm - } - - // if visitMode_Code is series, then get data soapi for copy - if input.VisitMode_Code == ere.VMCSeries { - // get data soapi - recentSoapiDataforCopy, err = getSoapiEncounterAdm(*input.RecentEncounterAdm, &event) - if err != nil { - return nil, err - } - } - } - // check if user has employee position if !input.AuthInfo.HasEmployeePosition() { event.Status = "failed" @@ -102,17 +75,44 @@ func Create(input e.CreateDto) (*d.Data, error) { input.Adm_Employee_Id = input.AuthInfo.Employee_Id } - // check if patient is new in the hospital - input.NewStatus, err = identifyPatientStatus(input) - - 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 rehab by bpjs + if input.RefTypeCode == ere.RTCBpjs && + input.Class_Code == ere.ECAmbulatory && + ere.AmbulatoryClassCode(*input.SubClass_Code) == ere.ACCRehab { + // get latest rehab data + recentRehabData, err := getLatestRehabData(input, &event) + if err != nil { + return nil, err } + // If recentRehabData is nil, then visitMode_Code = "adm" + if recentRehabData != nil { + // If recentRehabData is not nil, determine the visitMode_Code: + // If the mode is "series", verify whether the visit count still remains + // and whether the series has not expired. + input.VisitMode_Code, input.RecentEncounterAdm, err = determineVisitMode(recentRehabData, input, &event) + if err != nil { + return nil, err + } + } else { + input.VisitMode_Code = ere.VMCAdm + } + + // When visitMode_Code is "series", load the associated SOAPI record to copy its values. + if input.VisitMode_Code == ere.VMCSeries { + // get data soapi + recentSoapiDataforCopy, err = getSoapiEncounterAdm(*input.RecentEncounterAdm, &event) + if err != nil { + return nil, err + } + } + } + + // check if patient is new in the hospital + input.NewStatus, err = identifyPatientStatus(input) + mwRunner := newMiddlewareRunner(&event) + + err = dg.I.Transaction(func(tx *gorm.DB) error { // create encounter if resData, err := CreateData(input, &event, tx); err != nil { return err @@ -128,28 +128,36 @@ func Create(input e.CreateDto) (*d.Data, error) { } // insert adm_employee_hist - if _, err := uaeh.CreateData(eaeh.CreateDto{ + if _, err = uaeh.CreateData(eaeh.CreateDto{ Encounter_Id: &data.Id, Employee_Id: data.Adm_Employee_Id, StartedAt: &now}, &event, tx); err != nil { return err } - mwRunner.setMwType(pu.MWTPost) - // Run post-middleware - if err := mwRunner.RunCreateMiddleware(createPostMw, &input, &data); err != nil { + dataEncounter, err := ReadDetailData(e.ReadDetailDto{ + Id: uint16(data.Id), + Includes: "Adm_Employee.User,Patient.Person.Relatives,Patient.Person.VclaimMember"}, + &event, tx) + if err != nil { return err } - pl.SetLogInfo(&event, nil, "complete") + mwRunner.setMwType(pu.MWTPre) + // Run pre-middleware + if err := mwRunner.RunCreateMiddleware(createPreMw, dataEncounter); err != nil { + return err + } return nil }) - if err != nil { + if err = runLogMiddleware(err, input, mwRunner); err != nil { return nil, err } + pl.SetLogInfo(&event, nil, "complete") + return &d.Data{ Meta: d.II{ "source": source, @@ -175,7 +183,7 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { pl.SetLogInfo(&event, input, "started", "readList") err = dg.I.Transaction(func(tx *gorm.DB) error { - mwRunner := newMiddlewareRunner(&event, tx) + mwRunner := newMiddlewareRunner(&event) mwRunner.setMwType(pu.MWTPre) // Run pre-middleware if err := mwRunner.RunReadListMiddleware(readListPreMw, &input, data); err != nil { @@ -226,7 +234,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) { pl.SetLogInfo(&event, input, "started", "readDetail") err = dg.I.Transaction(func(tx *gorm.DB) error { - mwRunner := newMiddlewareRunner(&event, tx) + mwRunner := newMiddlewareRunner(&event) mwRunner.setMwType(pu.MWTPre) // Run pre-middleware if err := mwRunner.RunReadDetailMiddleware(readDetailPreMw, &input, data); err != nil { @@ -261,7 +269,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) { } func Update(input e.UpdateDto) (*d.Data, error) { - rdDto := e.ReadDetailDto{Id: uint16(input.Id)} + rdDto := e.ReadDetailDto{Id: input.Id} var data *e.Encounter var err error @@ -272,6 +280,7 @@ func Update(input e.UpdateDto) (*d.Data, error) { // Start log pl.SetLogInfo(&event, input, "started", "update") + mwRunner := newMiddlewareRunner(&event) err = dg.I.Transaction(func(tx *gorm.DB) error { pl.SetLogInfo(&event, rdDto, "started", "DBReadDetail") @@ -289,32 +298,33 @@ func Update(input e.UpdateDto) (*d.Data, error) { return pl.SetLogError(&event, input) } - mwRunner := newMiddlewareRunner(&event, tx) - mwRunner.setMwType(pu.MWTPre) - // Run pre-middleware - if err := mwRunner.RunUpdateMiddleware(readDetailPreMw, &rdDto, data); err != nil { - return err - } - if err := UpdateData(input, data, &event, tx); err != nil { return err } - pl.SetLogInfo(&event, nil, "complete") + dataEncounter, err := ReadDetailData(e.ReadDetailDto{ + Id: uint16(data.Id), + Includes: "Adm_Employee.User,Patient.Person.Relatives,Patient.Person.VclaimMember"}, + &event, tx) + if err != nil { + return err + } - mwRunner.setMwType(pu.MWTPost) + mwRunner.setMwType(pu.MWTPre) // Run post-middleware - if err := mwRunner.RunUpdateMiddleware(readDetailPostMw, &rdDto, data); err != nil { + if err := mwRunner.RunUpdateMiddleware(updatePreMw, dataEncounter); err != nil { return err } return nil }) - if err != nil { + if err = runLogMiddleware(err, input, mwRunner); err != nil { return nil, err } + pl.SetLogInfo(&event, nil, "complete") + return &d.Data{ Meta: d.IS{ "source": source, @@ -327,7 +337,7 @@ func Update(input e.UpdateDto) (*d.Data, error) { } func Delete(input e.DeleteDto) (*d.Data, error) { - rdDto := e.ReadDetailDto{Id: uint16(input.Id)} + rdDto := e.ReadDetailDto{Id: input.Id} var data *e.Encounter var err error @@ -361,36 +371,33 @@ func Delete(input e.DeleteDto) (*d.Data, error) { return nil, pl.SetLogError(&event, input) } + mwRunner := newMiddlewareRunner(&event) + 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 { + mwRunner.setMwType(pu.MWTPre) + // Run pre-middleware + if err := mwRunner.RunDeleteMiddleware(deletePreMw, &input); err != nil { return err } return nil }) - if err != nil { + if err = runLogMiddleware(err, input, mwRunner); err != nil { return nil, err } + pl.SetLogInfo(&event, nil, "complete") + return &d.Data{ Meta: d.IS{ "source": source, @@ -581,12 +588,12 @@ func UpdateStatusCode(input e.UpdateStatusDto) (*d.Data, error) { } } - mwRunner := newMiddlewareRunner(&event, tx) - mwRunner.setMwType(pu.MWTPre) - // Run pre-middleware - if err := mwRunner.RunUpdateMiddleware(readDetailPreMw, &rdDto, data); err != nil { - return err - } + //mwRunner := newMiddlewareRunner(&event) + //mwRunner.setMwType(pu.MWTPre) + //// Run pre-middleware + //if err := mwRunner.RunUpdateMiddleware(readDetailPreMw, &rdDto, data); err != nil { + // return err + //} if err := UpdateStatusData(input, data, &event, tx); err != nil { return err @@ -594,11 +601,11 @@ func UpdateStatusCode(input e.UpdateStatusDto) (*d.Data, error) { pl.SetLogInfo(&event, nil, "complete") - mwRunner.setMwType(pu.MWTPost) - // Run post-middleware - if err := mwRunner.RunUpdateMiddleware(readDetailPostMw, &rdDto, data); err != nil { - return err - } + //mwRunner.setMwType(pu.MWTPost) + //// Run post-middleware + //if err := mwRunner.RunUpdateMiddleware(readDetailPostMw, &rdDto, data); err != nil { + // return err + //} return nil }) @@ -915,3 +922,32 @@ func ApproveSwitchUnit(input e.ApproveUnitDto) (*d.Data, error) { }, nil } + +func runLogMiddleware(err error, input any, mwRunner *middlewareRunner) error { + var errMsg string + inputLog := esync.SimxLogDto{ + Payload: input, + Method: erc.CCCreate, + } + + if err != nil { + // Run log-middleware + errMsg = err.Error() + inputLog.ErrMessage = &errMsg + inputLog.IsSuccess = false + + // create log failed + if errMiddleware := mwRunner.RunCreateLogMiddleware(createSimxLogMw, &inputLog); errMiddleware != nil { + return errMiddleware + } + return err + } + + // create log success + inputLog.IsSuccess = true + if err = mwRunner.RunCreateLogMiddleware(createSimxLogMw, &inputLog); err != nil { + return err + } + + return nil +} diff --git a/internal/use-case/main-use-case/encounter/middleware-runner.go b/internal/use-case/main-use-case/encounter/middleware-runner.go index 1448a7af..b030d286 100644 --- a/internal/use-case/main-use-case/encounter/middleware-runner.go +++ b/internal/use-case/main-use-case/encounter/middleware-runner.go @@ -1,35 +1,64 @@ package encounter import ( - e "simrs-vx/internal/domain/main-entities/encounter" pl "simrs-vx/pkg/logger" pu "simrs-vx/pkg/use-case-helper" "gorm.io/gorm" + + sync "simrs-vx/internal/infra/sync-cfg" + + e "simrs-vx/internal/domain/main-entities/encounter" + esync "simrs-vx/internal/domain/sync-entities/log" ) type middlewareRunner struct { Event *pl.Event Tx *gorm.DB MwType pu.MWType + SyncOn bool } // NewMiddlewareExecutor creates a new middleware executor -func newMiddlewareRunner(event *pl.Event, tx *gorm.DB) *middlewareRunner { +func newMiddlewareRunner(event *pl.Event) *middlewareRunner { return &middlewareRunner{ - Event: event, - Tx: tx, + Event: event, + SyncOn: sync.O.Enable, } } // ExecuteCreateMiddleware executes create middleware -func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *e.Encounter) error { +func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.Encounter) error { + if !me.SyncOn { + return nil + } + for _, middleware := range middlewares { - logData := pu.GetLogData(input, data) + logData := pu.GetLogData(input, nil) pl.SetLogInfo(me.Event, logData, "started", middleware.Name) - if err := middleware.Func(input, data, me.Tx); err != nil { + if err := middleware.Func(input); err != nil { + return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err) + } + + pl.SetLogInfo(me.Event, nil, "complete") + } + return nil +} + +// ExecuteCreateMiddleware executes create middleware +func (me *middlewareRunner) RunCreateLogMiddleware(middlewares []createLogMw, input *esync.SimxLogDto) error { + if !me.SyncOn { + return nil + } + + for _, middleware := range middlewares { + logData := pu.GetLogData(input, nil) + + pl.SetLogInfo(me.Event, logData, "started", middleware.Name) + + if err := middleware.Func(input); err != nil { return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err) } @@ -39,6 +68,10 @@ func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e } func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *e.ReadListDto, data *e.Encounter) error { + if !me.SyncOn { + return nil + } + for _, middleware := range middlewares { logData := pu.GetLogData(input, data) @@ -54,6 +87,10 @@ func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, inpu } func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.Encounter) error { + if !me.SyncOn { + return nil + } + for _, middleware := range middlewares { logData := pu.GetLogData(input, data) @@ -68,13 +105,17 @@ func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, return nil } -func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.Encounter) error { +func (me *middlewareRunner) RunUpdateMiddleware(middlewares []updateMw, input *e.Encounter) error { + if !me.SyncOn { + return nil + } + for _, middleware := range middlewares { - logData := pu.GetLogData(input, data) + logData := pu.GetLogData(input, nil) pl.SetLogInfo(me.Event, logData, "started", middleware.Name) - if err := middleware.Func(input, data, me.Tx); err != nil { + if err := middleware.Func(input); err != nil { return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err) } @@ -83,13 +124,17 @@ func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, inpu return nil } -func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.Encounter) error { +func (me *middlewareRunner) RunDeleteMiddleware(middlewares []deleteMw, input *e.DeleteDto) error { + if !me.SyncOn { + return nil + } + for _, middleware := range middlewares { - logData := pu.GetLogData(input, data) + logData := pu.GetLogData(input, nil) pl.SetLogInfo(me.Event, logData, "started", middleware.Name) - if err := middleware.Func(input, data, me.Tx); err != nil { + if err := middleware.Func(input); err != nil { return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err) } diff --git a/internal/use-case/main-use-case/encounter/tycovar.go b/internal/use-case/main-use-case/encounter/tycovar.go index 17890a1b..f618bd19 100644 --- a/internal/use-case/main-use-case/encounter/tycovar.go +++ b/internal/use-case/main-use-case/encounter/tycovar.go @@ -12,13 +12,28 @@ import ( "gorm.io/gorm" e "simrs-vx/internal/domain/main-entities/encounter" + elog "simrs-vx/internal/domain/sync-entities/log" ) type createMw struct { Name string - Func func(input *e.CreateDto, data *e.Encounter, tx *gorm.DB) error + Func func(input *e.Encounter) error } +type createLogMw struct { + Name string + Func func(input *elog.SimxLogDto) error +} + +type updateMw struct { + Name string + Func func(input *e.Encounter) error +} + +type deleteMw struct { + Name string + Func func(input *e.DeleteDto) error +} type readListMw struct { Name string Func func(input *e.ReadListDto, data *e.Encounter, tx *gorm.DB) error @@ -29,16 +44,17 @@ type readDetailMw struct { Func func(input *e.ReadDetailDto, data *e.Encounter, tx *gorm.DB) error } -type UpdateMw = readDetailMw -type DeleteMw = readDetailMw +type UpdateMw = updateMw +type DeleteMw = deleteMw -var createPreMw []createMw // preprocess middleware -var createPostMw []createMw // postprocess middleware +var createPreMw []createMw // preprocess middleware +var createPostMw []createMw // postprocess middleware +var createSimxLogMw []createLogMw var readListPreMw []readListMw // .. var readListPostMw []readListMw // .. var readDetailPreMw []readDetailMw var readDetailPostMw []readDetailMw -var updatePreMw []readDetailMw +var updatePreMw []updateMw var updatePostMw []readDetailMw -var deletePreMw []readDetailMw +var deletePreMw []deleteMw var deletePostMw []readDetailMw diff --git a/internal/use-case/main-use-case/patient/case.go b/internal/use-case/main-use-case/patient/case.go index 0ed93bbe..24aa4394 100644 --- a/internal/use-case/main-use-case/patient/case.go +++ b/internal/use-case/main-use-case/patient/case.go @@ -351,8 +351,6 @@ func Delete(input e.DeleteDto) (*d.Data, error) { return err } - input.Id = data.Id - // Delete Patient if err := DeleteData(data, &event, tx); err != nil { return err diff --git a/internal/use-case/simgos-sync-use-case/encounter/case.go b/internal/use-case/simgos-sync-use-case/encounter/case.go index 57650594..591dae36 100644 --- a/internal/use-case/simgos-sync-use-case/encounter/case.go +++ b/internal/use-case/simgos-sync-use-case/encounter/case.go @@ -8,18 +8,18 @@ import ( db "simrs-vx/pkg/dualtrx-helper" - e "simrs-vx/internal/domain/main-entities/division" - esimgos "simrs-vx/internal/domain/simgos-entities/division" - esync "simrs-vx/internal/domain/sync-entities/division" + e "simrs-vx/internal/domain/main-entities/encounter" + esimgos "simrs-vx/internal/domain/simgos-entities/encounter" + esync "simrs-vx/internal/domain/sync-entities/encounter" elog "simrs-vx/internal/domain/sync-entities/log" ) -const source = "division" +const source = "encounter" -func Create(input e.CreateDto) (*d.Data, error) { +func Create(input e.Encounter) (*d.Data, error) { var ( - sgData *esimgos.MUnit - syncLink *esync.DivisionLink + sgData *esimgos.TPendaftaran + syncLink *esync.EncounterLink err error ) @@ -39,7 +39,7 @@ func Create(input e.CreateDto) (*d.Data, error) { } // STEP 2: Insert to Link - syncLink, err = CreateLinkData(*input.Id, sgData.KodeUnit, &event, tx.Sync) + syncLink, err = CreateLinkData(input.Id, sgData.Idxdaftar, &event, tx.Sync) if err != nil { return err } @@ -99,7 +99,7 @@ func CreateSimxLog(input elog.SimxLogDto) (*d.Data, error) { }, nil } -func Update(input e.UpdateDto) (*d.Data, error) { +func Update(input e.Encounter) (*d.Data, error) { event := pl.Event{ Feature: "Update", Source: source, @@ -109,7 +109,7 @@ func Update(input e.UpdateDto) (*d.Data, error) { pl.SetLogInfo(&event, input, "started", "update") // STEP 1: Get Link - syncLink, err := ReadDetailLinkData(*input.Id, &event) + syncLink, err := ReadDetailLinkData(uint16(input.Id), &event) if err != nil { return nil, err } @@ -147,7 +147,7 @@ func Delete(input e.DeleteDto) (*d.Data, error) { pl.SetLogInfo(&event, input, "started", "delete") // STEP 1: Get Link - syncLink, err := ReadDetailLinkData(*input.Id, &event) + syncLink, err := ReadDetailLinkData(input.Id, &event) if err != nil { return nil, err } @@ -178,7 +178,7 @@ func Delete(input e.DeleteDto) (*d.Data, error) { if err != nil { if isLinkDeleted { go func() { - _, _ = CreateLinkData(uint(*input.Id), sgData.KodeUnit, &event) + _, _ = CreateLinkData(uint(input.Id), sgData.Idxdaftar, &event) }() } return nil, err diff --git a/internal/use-case/simgos-sync-use-case/encounter/helper.go b/internal/use-case/simgos-sync-use-case/encounter/helper.go index 6fb47ac9..b9daa7de 100644 --- a/internal/use-case/simgos-sync-use-case/encounter/helper.go +++ b/internal/use-case/simgos-sync-use-case/encounter/helper.go @@ -6,6 +6,8 @@ package encounter import ( "encoding/json" + epr "simrs-vx/internal/domain/main-entities/person-relative" + erp "simrs-vx/internal/domain/references/person" "strconv" erc "simrs-vx/internal/domain/references/common" @@ -14,21 +16,68 @@ import ( e "simrs-vx/internal/domain/main-entities/encounter" esimgos "simrs-vx/internal/domain/simgos-entities/encounter" esync "simrs-vx/internal/domain/sync-entities/encounter" - esyncLog "simrs-vx/internal/domain/sync-entities/encounter" + esyncLog "simrs-vx/internal/domain/sync-entities/log" ) func setDataSimgos(input *e.Encounter) (data esimgos.TPendaftaran) { data.Nomr = *input.Patient.Number data.Tglreg = input.RegisteredAt + // set kddokter kddokter, _ := strconv.Atoi(*input.Appointment_Doctor_Code) data.Kddokter = uint(kddokter) + // set kdpoly kdpoly, _ := strconv.Atoi(*input.Unit_Code) data.Kdpoly = uint(kdpoly) + // set kdrujuk setKdrujuk(input.RefType_Code, data) - + + // set kdcarabayar + setKdcarabayar(input.PaymentMethod_Code, data) + + // TODO: shift + + // set status + setStatus(input.Discharge_Method_Code, data) + if input.Status_Code == erc.DSCCancel { + data.Status = 11 + } + + // set pasienbaru + if input.NewStatus { + data.Pasienbaru = 1 + } + + if emp := input.Adm_Employee; emp != nil { + if user := emp.User; user != nil { + data.Nip = user.Name + } + } + + data.Masukpoly = input.StartedAt + data.Keluarpoly = input.FinishedAt + + if input.RefSource_Name != nil { + data.Ketrujuk = *input.RefSource_Name + } else { + data.Ketrujuk = "TR" + } + + // TODO: preload person.relative, person.vclaimMember + if p := input.Patient.Person; p != nil { + mapRelative(p.Relatives, data) + + if bpjs := p.VclaimMember; bpjs != nil { + data.Nokartu = *bpjs.CardNumber + } + } + + data.Jamreg = input.RegisteredAt + + // TODO: norujukan, tglrujukan, dokumen_pendukung sep_file + return } @@ -45,7 +94,91 @@ func setKdrujuk(input *ere.RefTypeCode, data esimgos.TPendaftaran) { } } -func setDataSimxLog(input *esyncLog.SimxLogDto) (data esync.DivisionSimxLog) { +func setKdcarabayar(input ere.AllPaymentMethodCode, data esimgos.TPendaftaran) { + switch input { + case ere.APMCPks: + data.Kdcarabayar = 12 + case ere.APMCJkn: + data.Kdcarabayar = 5 + case ere.APMCJkmm: + data.Kdcarabayar = 9 + case ere.APMCSpm: + data.Kdcarabayar = 10 + default: + data.Kdcarabayar = 1 + } +} + +func setStatus(code *ere.DischargeMethodCode, data esimgos.TPendaftaran) { + switch *code { + case ere.DMCHome: + data.Status = 1 + case ere.DMCInpatient: + data.Status = 2 + case ere.DMCDeathOnArrival: + data.Status = 3 + case ere.DMCDeath: + data.Status = 8 + case ere.DMCHomeReq: + data.Status = 7 + case ere.DMCConsulPoly: + data.Status = 5 + case ere.DMCExtRef: + data.Status = 6 + case ere.DMCConsulChDay: + data.Status = 12 + case ere.DMCEmergency: + data.Status = 10 + case ere.DMCEmergencyCovid: + data.Status = 13 + case ere.DMCConsulExecutive: + data.Status = 15 + case ere.DMCConsulBack: + data.Status = 100 + default: + data.Status = 0 + } +} + +func mapRelative(relative *[]epr.PersonRelative, data esimgos.TPendaftaran) { + if relative == nil || len(*relative) == 0 { + return + } + + for _, r := range *relative { + if r.Responsible { + data.PenanggungjawabNama = *r.Name + + switch r.Relationship_Code { + case erp.RCMother, erp.RCFather: + data.PenanggungjawabHubungan = "ORANG TUA" + case erp.RCChild: + data.PenanggungjawabHubungan = "ANAK" + case erp.RCSibling: + data.PenanggungjawabHubungan = "SAUDARA" + case erp.RCUncle, erp.RCAunt, + erp.RCGdMother, erp.RCGdFather, + erp.RCNephew, erp.RCGdChild: + data.PenanggungjawabHubungan = "KELUARGA LAIN" + case erp.RCFriend: + data.PenanggungjawabHubungan = "TEMAN" + case erp.RCSpouse: + data.PenanggungjawabHubungan = "SUAMI/ISTRI" + case erp.RCSelf: + data.PenanggungjawabHubungan = "DIRI SENDIRI" + default: + data.PenanggungjawabHubungan = "LAINNYA ..." + } + + data.PenanggungjawabAlamat = *r.Address + data.PenanggungjawabPhone = *r.PhoneNumber + + break + } + } +} + +func setDataSimxLog(input *esyncLog.SimxLogDto) (data esync.EncounterSimxLog) { // encode to JSON jsonData, _ := json.MarshalIndent(input.Payload, "", " ") jsonString := string(jsonData) @@ -67,7 +200,7 @@ func setDataSimxLog(input *esyncLog.SimxLogDto) (data esync.DivisionSimxLog) { return } -func setDataSimxLink(simxId, simgosId uint) (data esync.DivisionLink) { +func setDataSimxLink(simxId, simgosId uint) (data esync.EncounterLink) { data.Simx_Id = simxId data.Simgos_Id = simgosId return diff --git a/internal/use-case/simgos-sync-use-case/encounter/lib.go b/internal/use-case/simgos-sync-use-case/encounter/lib.go index f713ca6c..9ccf433c 100644 --- a/internal/use-case/simgos-sync-use-case/encounter/lib.go +++ b/internal/use-case/simgos-sync-use-case/encounter/lib.go @@ -9,15 +9,15 @@ import ( dg "github.com/karincake/apem/db-gorm-pg" "gorm.io/gorm" - e "simrs-vx/internal/domain/main-entities/division" - esimgos "simrs-vx/internal/domain/simgos-entities/division" - esync "simrs-vx/internal/domain/sync-entities/division" + e "simrs-vx/internal/domain/main-entities/encounter" + esimgos "simrs-vx/internal/domain/simgos-entities/encounter" + esync "simrs-vx/internal/domain/sync-entities/encounter" esynclog "simrs-vx/internal/domain/sync-entities/log" ) var now = time.Now() -func CreateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*esimgos.MUnit, error) { +func CreateSimgosData(input e.Encounter, event *pl.Event, dbx ...*gorm.DB) (*esimgos.TPendaftaran, error) { pl.SetLogInfo(event, nil, "started", "DBCreate") data := setDataSimgos(&input) @@ -37,14 +37,14 @@ func CreateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*esi return &data, nil } -func ReadDetailSimgosData(simgosId uint16, event *pl.Event) (*esimgos.MUnit, error) { +func ReadDetailSimgosData(simgosId uint16, event *pl.Event) (*esimgos.TPendaftaran, error) { pl.SetLogInfo(event, simgosId, "started", "DBReadDetail") - data := esimgos.MUnit{} + data := esimgos.TPendaftaran{} var tx = dg.IS["simrs"] if err := tx. - Where("\"kode_unit\" = ?", simgosId). + Where("\"idxdaftar\" = ?", simgosId). First(&data).Error; err != nil { if processedErr := pu.HandleReadError(err, event, source, simgosId, data); processedErr != nil { return nil, processedErr @@ -55,11 +55,11 @@ func ReadDetailSimgosData(simgosId uint16, event *pl.Event) (*esimgos.MUnit, err return &data, nil } -func UpdateSimgosData(input e.UpdateDto, dataSimgos *esync.DivisionLink, event *pl.Event, dbx ...*gorm.DB) error { +func UpdateSimgosData(input e.Encounter, dataSimgos *esync.EncounterLink, event *pl.Event, dbx ...*gorm.DB) error { pl.SetLogInfo(event, input, "started", "DBUpdate") data := setDataSimgos(&input) - data.KodeUnit = dataSimgos.Simgos_Id + data.Idxdaftar = dataSimgos.Simgos_Id var tx *gorm.DB if len(dbx) > 0 { @@ -82,7 +82,7 @@ func UpdateSimgosData(input e.UpdateDto, dataSimgos *esync.DivisionLink, event * return nil } -func HardDeleteSimgosData(data *esimgos.MUnit, event *pl.Event, dbx ...*gorm.DB) error { +func HardDeleteSimgosData(data *esimgos.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) error { pl.SetLogInfo(event, data, "started", "DBDelete") var tx *gorm.DB @@ -107,7 +107,7 @@ func HardDeleteSimgosData(data *esimgos.MUnit, event *pl.Event, dbx ...*gorm.DB) return nil } -func CreateLinkData(simxId, simgosId uint, event *pl.Event, dbx ...*gorm.DB) (*esync.DivisionLink, error) { +func CreateLinkData(simxId, simgosId uint, event *pl.Event, dbx ...*gorm.DB) (*esync.EncounterLink, error) { pl.SetLogInfo(event, nil, "started", "DBCreate") data := setDataSimxLink(simxId, simgosId) @@ -126,9 +126,9 @@ func CreateLinkData(simxId, simgosId uint, event *pl.Event, dbx ...*gorm.DB) (*e return &data, nil } -func ReadDetailLinkData(simxId uint16, event *pl.Event) (*esync.DivisionLink, error) { +func ReadDetailLinkData(simxId uint16, event *pl.Event) (*esync.EncounterLink, error) { pl.SetLogInfo(event, simxId, "started", "DBReadDetail") - data := esync.DivisionLink{} + data := esync.EncounterLink{} var tx = dg.I @@ -144,7 +144,7 @@ func ReadDetailLinkData(simxId uint16, event *pl.Event) (*esync.DivisionLink, er return &data, nil } -func DeleteLinkData(data *esync.DivisionLink, event *pl.Event, dbx ...*gorm.DB) error { +func DeleteLinkData(data *esync.EncounterLink, event *pl.Event, dbx ...*gorm.DB) error { pl.SetLogInfo(event, data, "started", "DBDelete") var tx *gorm.DB From c997c2472eb9107bb320917daea466320f272970 Mon Sep 17 00:00:00 2001 From: vanilia Date: Fri, 21 Nov 2025 20:21:28 +0700 Subject: [PATCH 3/6] add vclaim reference --- .../domain/main-entities/encounter/dto.go | 57 ++-- .../bpjs-use-case/vclaim-reference/case.go | 277 ++++++++++++++++++ .../bpjs-use-case/vclaim-reference/helper.go | 25 ++ .../bpjs-use-case/vclaim-reference/lib.go | 140 +++++++++ .../vclaim-reference/middleware-runner.go | 103 +++++++ .../vclaim-reference/middleware.go | 9 + .../bpjs-use-case/vclaim-reference/tycovar.go | 44 +++ .../simgos-sync-use-case/encounter/helper.go | 90 +++++- 8 files changed, 709 insertions(+), 36 deletions(-) create mode 100644 internal/use-case/bpjs-use-case/vclaim-reference/case.go create mode 100644 internal/use-case/bpjs-use-case/vclaim-reference/helper.go create mode 100644 internal/use-case/bpjs-use-case/vclaim-reference/lib.go create mode 100644 internal/use-case/bpjs-use-case/vclaim-reference/middleware-runner.go create mode 100644 internal/use-case/bpjs-use-case/vclaim-reference/middleware.go create mode 100644 internal/use-case/bpjs-use-case/vclaim-reference/tycovar.go diff --git a/internal/domain/main-entities/encounter/dto.go b/internal/domain/main-entities/encounter/dto.go index f43a1de9..e2fe33ac 100644 --- a/internal/domain/main-entities/encounter/dto.go +++ b/internal/domain/main-entities/encounter/dto.go @@ -34,27 +34,28 @@ import ( ) type CreateDto struct { - Patient_Id *uint `json:"patient_id"` - RegisteredAt *time.Time `json:"registeredAt"` - Class_Code ere.EncounterClassCode `json:"class_code" validate:"maxLength=10"` - SubClass_Code *string `json:"subClass_code" validate:"maxLength=10"` // for sub - Infra_Code *string `json:"infra_code"` // for inpatient - Unit_Code *string `json:"unit_code"` - Specialist_Code *string `json:"specialist_code"` - Subspecialist_Code *string `json:"subspecialist_code"` - VisitDate time.Time `json:"visitDate"` - PaymentMethod_Code erc.PaymentMethodCode `json:"paymentMethod_code" gorm:"size:10"` - InsuranceCompany_Code *string `json:"insuranceCompany_code"` - Member_Number *string `json:"member_number" validate:"maxLength=20"` - Ref_Number *string `json:"ref_number" validate:"maxLength=20"` - Trx_Number *string `json:"trx_number" validate:"maxLength=20"` - Appointment_Doctor_Code *string `json:"appointment_doctor_code"` - Adm_Employee_Id *uint `json:"-"` - Responsible_Doctor_Code *string `json:"responsible_doctor_code"` - RefSource_Name *string `json:"refSource_name" validate:"maxLength=100"` - Appointment_Id *uint `json:"appointment_id"` - RefTypeCode ere.RefTypeCode `json:"refTypeCode"` - NewStatus bool `json:"newStatus"` + Patient_Id *uint `json:"patient_id"` + RegisteredAt *time.Time `json:"registeredAt"` + Class_Code ere.EncounterClassCode `json:"class_code" validate:"maxLength=10"` + SubClass_Code *string `json:"subClass_code" validate:"maxLength=10"` // for sub + Infra_Code *string `json:"infra_code"` // for inpatient + Unit_Code *string `json:"unit_code"` + Specialist_Code *string `json:"specialist_code"` + Subspecialist_Code *string `json:"subspecialist_code"` + VisitDate time.Time `json:"visitDate"` + PaymentMethod_Code ere.AllPaymentMethodCode `json:"paymentMethod_code" gorm:"size:10"` + InsuranceCompany_Code *string `json:"insuranceCompany_code"` + Member_Number *string `json:"member_number" validate:"maxLength=20"` + Ref_Number *string `json:"ref_number" validate:"maxLength=20"` + Trx_Number *string `json:"trx_number" validate:"maxLength=20"` + Appointment_Doctor_Code *string `json:"appointment_doctor_code"` + Adm_Employee_Id *uint `json:"-"` + Responsible_Doctor_Code *string `json:"responsible_doctor_code"` + RefSource_Name *string `json:"refSource_name" validate:"maxLength=100"` + Appointment_Id *uint `json:"appointment_id"` + RefTypeCode ere.RefTypeCode `json:"refTypeCode"` + NewStatus bool `json:"newStatus"` + VclaimReference *TRujukan `json:"vclaimReference"` Id uint `json:"-"` RecentEncounterAdm *Encounter `json:"-"` // if subClass_Code is rehab @@ -63,6 +64,18 @@ type CreateDto struct { pa.AuthInfo } +type TRujukan struct { + NoSep string `json:"noSep"` + TglRujukan string `json:"tglRujukan"` + PpkDirujuk string `json:"ppkDirujuk"` + JnsPelayanan string `json:"jnsPelayanan"` + Catatan string `json:"catatan"` + DiagRujukan string `json:"diagRujukan"` + TipeRujukan string `json:"tipeRujukan"` + PoliRujukan string `json:"poliRujukan"` + User string `json:"user"` +} + type ReadListDto struct { FilterDto Includes string `json:"includes"` @@ -161,7 +174,7 @@ type ResponseDto struct { Subspecialist *ess.Subspecialist `json:"subspecialist,omitempty"` Unit *eu.Unit `json:"unit,omitempty"` VisitDate time.Time `json:"visitDate"` - PaymentMethod_Code erc.PaymentMethodCode `json:"paymentMethod_code"` + PaymentMethod_Code ere.AllPaymentMethodCode `json:"paymentMethod_code"` InsuranceCompany_Code *string `json:"insuranceCompany_code"` Member_Number *string `json:"member_number"` Ref_Number *string `json:"ref_number"` diff --git a/internal/use-case/bpjs-use-case/vclaim-reference/case.go b/internal/use-case/bpjs-use-case/vclaim-reference/case.go new file mode 100644 index 00000000..bfbfea34 --- /dev/null +++ b/internal/use-case/bpjs-use-case/vclaim-reference/case.go @@ -0,0 +1,277 @@ +package vclaimreference + +import ( + "strconv" + + dg "github.com/karincake/apem/db-gorm-pg" + d "github.com/karincake/dodol" + + pl "simrs-vx/pkg/logger" + pu "simrs-vx/pkg/use-case-helper" + + "gorm.io/gorm" + + e "simrs-vx/internal/domain/bpjs-entities/vclaim-reference" +) + +const source = "vclaim-reference" + +func Create(input e.CreateDto) (*d.Data, error) { + data := e.VclaimReference{} + + 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 + } + + 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 +} + +func ReadList(input e.ReadListDto) (*d.Data, error) { + var data *e.VclaimReference + var dataList []e.VclaimReference + 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.VclaimReference + 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: input.Id} + var data *e.VclaimReference + 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 err := UpdateData(input, 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: input.Id} + var data *e.VclaimReference + 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/bpjs-use-case/vclaim-reference/helper.go b/internal/use-case/bpjs-use-case/vclaim-reference/helper.go new file mode 100644 index 00000000..9127921f --- /dev/null +++ b/internal/use-case/bpjs-use-case/vclaim-reference/helper.go @@ -0,0 +1,25 @@ +/* +DESCRIPTION: +Any functions that are used internally by the use-case +*/ +package vclaimreference + +import ( + e "simrs-vx/internal/domain/bpjs-entities/vclaim-reference" +) + +func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.VclaimReference) { + var inputSrc *e.CreateDto + if inputT, ok := any(input).(*e.CreateDto); ok { + inputSrc = inputT + } else { + inputTemp := any(input).(*e.UpdateDto) + inputSrc = &inputTemp.CreateDto + } + + data.Encounter_Id = inputSrc.Encounter_Id + data.Date = inputSrc.Date + data.SrcCode = inputSrc.SrcCode + data.SrcName = inputSrc.SrcName + data.Number = inputSrc.Number +} diff --git a/internal/use-case/bpjs-use-case/vclaim-reference/lib.go b/internal/use-case/bpjs-use-case/vclaim-reference/lib.go new file mode 100644 index 00000000..3f784edf --- /dev/null +++ b/internal/use-case/bpjs-use-case/vclaim-reference/lib.go @@ -0,0 +1,140 @@ +package vclaimreference + +import ( + plh "simrs-vx/pkg/lib-helper" + pl "simrs-vx/pkg/logger" + pu "simrs-vx/pkg/use-case-helper" + + "github.com/AzureAD/microsoft-authentication-library-for-go/apps/errors" + dg "github.com/karincake/apem/db-gorm-pg" + gh "github.com/karincake/getuk" + "gorm.io/gorm" + + e "simrs-vx/internal/domain/bpjs-entities/vclaim-reference" +) + +func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.VclaimReference, error) { + pl.SetLogInfo(event, nil, "started", "DBCreate") + + data := e.VclaimReference{} + + 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.VclaimReference, *e.MetaDto, error) { + pl.SetLogInfo(event, input, "started", "DBReadList") + data := []e.VclaimReference{} + 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.VclaimReference{}). + Scopes(gh.Preload(input.Includes)). + Scopes(gh.Filter(input.FilterDto)). + Count(&count). + Scopes(gh.Paginate(input, &pagination)). + Scopes(gh.Sort(input.Sort)) + + 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.VclaimReference, error) { + pl.SetLogInfo(event, input, "started", "DBReadDetail") + data := e.VclaimReference{} + + 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.VclaimReference, 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.VclaimReference, 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 +} diff --git a/internal/use-case/bpjs-use-case/vclaim-reference/middleware-runner.go b/internal/use-case/bpjs-use-case/vclaim-reference/middleware-runner.go new file mode 100644 index 00000000..c8ad1e8f --- /dev/null +++ b/internal/use-case/bpjs-use-case/vclaim-reference/middleware-runner.go @@ -0,0 +1,103 @@ +package vclaimreference + +import ( + e "simrs-vx/internal/domain/bpjs-entities/vclaim-reference" + 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.VclaimReference) 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.VclaimReference) 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.VclaimReference) 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.VclaimReference) 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.VclaimReference) 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/bpjs-use-case/vclaim-reference/middleware.go b/internal/use-case/bpjs-use-case/vclaim-reference/middleware.go new file mode 100644 index 00000000..defdfa84 --- /dev/null +++ b/internal/use-case/bpjs-use-case/vclaim-reference/middleware.go @@ -0,0 +1,9 @@ +package vclaimreference + +// 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/bpjs-use-case/vclaim-reference/tycovar.go b/internal/use-case/bpjs-use-case/vclaim-reference/tycovar.go new file mode 100644 index 00000000..29add547 --- /dev/null +++ b/internal/use-case/bpjs-use-case/vclaim-reference/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 vclaimreference + +import ( + "gorm.io/gorm" + + e "simrs-vx/internal/domain/bpjs-entities/vclaim-reference" +) + +type createMw struct { + Name string + Func func(input *e.CreateDto, data *e.VclaimReference, tx *gorm.DB) error +} + +type readListMw struct { + Name string + Func func(input *e.ReadListDto, data *e.VclaimReference, tx *gorm.DB) error +} + +type readDetailMw struct { + Name string + Func func(input *e.ReadDetailDto, data *e.VclaimReference, 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 diff --git a/internal/use-case/simgos-sync-use-case/encounter/helper.go b/internal/use-case/simgos-sync-use-case/encounter/helper.go index b9daa7de..586dbd81 100644 --- a/internal/use-case/simgos-sync-use-case/encounter/helper.go +++ b/internal/use-case/simgos-sync-use-case/encounter/helper.go @@ -17,9 +17,12 @@ import ( esimgos "simrs-vx/internal/domain/simgos-entities/encounter" esync "simrs-vx/internal/domain/sync-entities/encounter" esyncLog "simrs-vx/internal/domain/sync-entities/log" + + dg "github.com/karincake/apem/db-gorm-pg" + "gorm.io/gorm/clause" ) -func setDataSimgos(input *e.Encounter) (data esimgos.TPendaftaran) { +func setDataCreate(input *e.Encounter) (data esimgos.TPendaftaran, err error) { data.Nomr = *input.Patient.Number data.Tglreg = input.RegisteredAt @@ -39,33 +42,28 @@ func setDataSimgos(input *e.Encounter) (data esimgos.TPendaftaran) { // TODO: shift - // set status - setStatus(input.Discharge_Method_Code, data) - if input.Status_Code == erc.DSCCancel { - data.Status = 11 - } - // set pasienbaru if input.NewStatus { data.Pasienbaru = 1 } + // set nip if emp := input.Adm_Employee; emp != nil { if user := emp.User; user != nil { data.Nip = user.Name } } - data.Masukpoly = input.StartedAt - data.Keluarpoly = input.FinishedAt - - if input.RefSource_Name != nil { - data.Ketrujuk = *input.RefSource_Name + if ref := input.VclaimReference; ref != nil { + data.Ketrujuk = *ref.SrcCode + data.Norujukan = *ref.Number + data.Tglrujukan = ref.Date + data.Strujukan = 1 } else { data.Ketrujuk = "TR" + data.Strujukan = 0 } - // TODO: preload person.relative, person.vclaimMember if p := input.Patient.Person; p != nil { mapRelative(p.Relatives, data) @@ -76,7 +74,54 @@ func setDataSimgos(input *e.Encounter) (data esimgos.TPendaftaran) { data.Jamreg = input.RegisteredAt - // TODO: norujukan, tglrujukan, dokumen_pendukung sep_file + // default kelas daftar + data.KelasDaftar = 3 + + // TODO: st_asal_masuk + + // set noAntrian + defaultFromSimx := "rehab" + data.NoAntrian = &defaultFromSimx + + // set no_kunjung + noKunjung, err := generateNoKunjung() + if err != nil { + return esimgos.TPendaftaran{}, err + } + + data.NoKunjung = uint(noKunjung) + + return +} + +func setDataUpdate(input *e.Encounter, data esimgos.TPendaftaran) { + // set kddokter + kddokter, _ := strconv.Atoi(*input.Responsible_Doctor_Code) + data.Kddokter = uint(kddokter) + + // set kdpoly + kdpoly, _ := strconv.Atoi(*input.Unit_Code) + data.Kdpoly = uint(kdpoly) + + // set status + setStatus(input.Discharge_Method_Code, data) + if input.Status_Code == erc.DSCCancel { + data.Status = 11 + } + + data.Masukpoly = input.StartedAt + data.Keluarpoly = input.FinishedAt + + if p := input.Patient.Person; p != nil { + mapRelative(p.Relatives, data) + } + + // set petugas_klinik + if emp := input.Adm_Employee; emp != nil { + if user := emp.User; user != nil { + data.PetugasKlinik = user.Name + } + } return } @@ -205,3 +250,20 @@ func setDataSimxLink(simxId, simgosId uint) (data esync.EncounterLink) { data.Simgos_Id = simgosId return } + +func generateNoKunjung() (int, error) { + var lastNumber int + + // Lock rows for this prefix → prevents race condition + if err := dg.IS["simrs"]. + Table("t_pendaftaran"). + Select("COALESCE(MAX(no_kunjung),0)"). + Where("tglreg = CURRENT_DATE"). + Order("no_kunjung DESC"). + Clauses(clause.Locking{Strength: "UPDATE"}). + Scan(&lastNumber).Error; err != nil { + return 0, err + } + + return lastNumber + 1, nil +} From 157ea603a471cce0ed83811674d23cb20ef9c1ff Mon Sep 17 00:00:00 2001 From: vanilia Date: Mon, 24 Nov 2025 10:17:37 +0700 Subject: [PATCH 4/6] set checkin checkout --- .../domain/main-entities/encounter/dto.go | 4 + .../main-handler/encounter/handler.go | 33 ++- .../simgos-sync-handler/encounter/handler.go | 63 ++++++ .../simgos-sync-handler.go | 2 + .../use-case/main-use-case/encounter/case.go | 200 ++++++++++++------ .../main-use-case/encounter/helper.go | 2 +- .../encounter/middleware-runner.go | 36 ++++ .../main-use-case/encounter/middleware.go | 22 +- .../main-use-case/encounter/tycovar.go | 12 ++ .../simgos-sync-plugin/encounter/plugin.go | 167 +++++++++++++++ .../simgos-sync-use-case/encounter/case.go | 102 ++++++++- .../simgos-sync-use-case/encounter/helper.go | 118 +++++++---- .../simgos-sync-use-case/encounter/lib.go | 69 +++++- 13 files changed, 694 insertions(+), 136 deletions(-) create mode 100644 internal/interface/simgos-sync-handler/encounter/handler.go create mode 100644 internal/use-case/simgos-sync-plugin/encounter/plugin.go diff --git a/internal/domain/main-entities/encounter/dto.go b/internal/domain/main-entities/encounter/dto.go index e2fe33ac..849a5834 100644 --- a/internal/domain/main-entities/encounter/dto.go +++ b/internal/domain/main-entities/encounter/dto.go @@ -140,6 +140,8 @@ type DischargeDto struct { AdmDischargeEducation *string `json:"admDischargeEducation"` DischargeReason *string `json:"dischargeReason"` DeathCause *string `json:"deathCause"` + + pa.AuthInfo } type CheckinDto struct { @@ -148,6 +150,8 @@ type CheckinDto struct { Adm_Employee_Id *uint `json:"adm_employee_id"` StartedAt *time.Time `json:"startedAt"` FinishedAt *time.Time `json:"finishedAt"` + + pa.AuthInfo } type SwitchUnitDto struct { diff --git a/internal/interface/main-handler/encounter/handler.go b/internal/interface/main-handler/encounter/handler.go index c8fcfa1a..0c87b7b2 100644 --- a/internal/interface/main-handler/encounter/handler.go +++ b/internal/interface/main-handler/encounter/handler.go @@ -70,6 +70,11 @@ func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) { } func (obj myBase) Update(w http.ResponseWriter, r *http.Request) { + authInfo, err := pa.GetAuthInfo(r) + if err != nil { + rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil) + } + id := rw.ValidateInt(w, "id", r.PathValue("id")) if id <= 0 { return @@ -80,29 +85,39 @@ func (obj myBase) Update(w http.ResponseWriter, r *http.Request) { return } dto.Id = uint16(id) + dto.AuthInfo = *authInfo + 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 - } authInfo, err := pa.GetAuthInfo(r) if err != nil { rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil) } + id := rw.ValidateInt(w, "id", r.PathValue("id")) + if id <= 0 { + return + } + dto := e.DeleteDto{} dto.Id = uint16(id) dto.AuthInfo = *authInfo + res, err := u.Delete(dto) rw.DataResponse(w, res, err) } func (obj myBase) CheckOut(w http.ResponseWriter, r *http.Request) { dto := e.DischargeDto{} + + authInfo, err := pa.GetAuthInfo(r) + if err != nil { + rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil) + } + id := rw.ValidateInt(w, "id", r.PathValue("id")) if id <= 0 { return @@ -118,12 +133,20 @@ func (obj myBase) CheckOut(w http.ResponseWriter, r *http.Request) { } dto.Id = uint(id) + dto.AuthInfo = *authInfo + res, err := u.CheckOut(dto) rw.DataResponse(w, res, err) } func (obj myBase) CheckIn(w http.ResponseWriter, r *http.Request) { dto := e.CheckinDto{} + + authInfo, err := pa.GetAuthInfo(r) + if err != nil { + rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil) + } + id := rw.ValidateInt(w, "id", r.PathValue("id")) if id <= 0 { return @@ -139,6 +162,8 @@ func (obj myBase) CheckIn(w http.ResponseWriter, r *http.Request) { } dto.Id = uint(id) + dto.AuthInfo = *authInfo + res, err := u.CheckIn(dto) rw.DataResponse(w, res, err) } diff --git a/internal/interface/simgos-sync-handler/encounter/handler.go b/internal/interface/simgos-sync-handler/encounter/handler.go new file mode 100644 index 00000000..41ce9415 --- /dev/null +++ b/internal/interface/simgos-sync-handler/encounter/handler.go @@ -0,0 +1,63 @@ +package encounter + +import ( + "net/http" + + rw "github.com/karincake/risoles" + // ua "github.com/karincake/tumpeng/auth/svc" + + e "simrs-vx/internal/domain/main-entities/encounter" + esync "simrs-vx/internal/domain/sync-entities/log" + u "simrs-vx/internal/use-case/simgos-sync-use-case/encounter" +) + +type myBase struct{} + +var O myBase + +func (obj myBase) Create(w http.ResponseWriter, r *http.Request) { + dto := e.Encounter{} + if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { + return + } + res, err := u.Create(dto) + rw.DataResponse(w, res, err) +} + +func (obj myBase) CreateLog(w http.ResponseWriter, r *http.Request) { + dto := esync.SimxLogDto{} + if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { + return + } + res, err := u.CreateSimxLog(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.Encounter{} + if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { + return + } + dto.Id = uint(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/simgos-sync-handler/simgos-sync-handler.go b/internal/interface/simgos-sync-handler/simgos-sync-handler.go index 2a67b7e9..b5b65507 100644 --- a/internal/interface/simgos-sync-handler/simgos-sync-handler.go +++ b/internal/interface/simgos-sync-handler/simgos-sync-handler.go @@ -19,6 +19,7 @@ import ( /******************** internal ********************/ "simrs-vx/internal/interface/main-handler/home" division "simrs-vx/internal/interface/simgos-sync-handler/division" + encounter "simrs-vx/internal/interface/simgos-sync-handler/encounter" installation "simrs-vx/internal/interface/simgos-sync-handler/installation" patient "simrs-vx/internal/interface/simgos-sync-handler/patient" specialist "simrs-vx/internal/interface/simgos-sync-handler/specialist" @@ -47,6 +48,7 @@ func SetRoutes() http.Handler { hc.SyncCrud(r, prefix+"/v1/subspecialist", subspecialist.O) hc.SyncCrud(r, prefix+"/v1/patient", patient.O) r.HandleFunc(fmt.Sprintf("GET %s/v1/patient-nomr-generator", prefix), patient.O.GenerateNomr) + hc.SyncCrud(r, prefix+"/v1/encounter", encounter.O) return cmw.SetCors(handlerlogger.SetLog(r)) } diff --git a/internal/use-case/main-use-case/encounter/case.go b/internal/use-case/main-use-case/encounter/case.go index 37e08bc5..45a85a00 100644 --- a/internal/use-case/main-use-case/encounter/case.go +++ b/internal/use-case/main-use-case/encounter/case.go @@ -3,6 +3,7 @@ package encounter import ( "errors" "fmt" + "simrs-vx/internal/lib/auth" "strconv" "time" @@ -17,6 +18,7 @@ import ( ere "simrs-vx/internal/domain/references/encounter" erg "simrs-vx/internal/domain/references/organization" + ev "simrs-vx/internal/domain/bpjs-entities/vclaim-reference" eaeh "simrs-vx/internal/domain/main-entities/adm-employee-hist" edc "simrs-vx/internal/domain/main-entities/death-cause" e "simrs-vx/internal/domain/main-entities/encounter" @@ -25,6 +27,7 @@ import ( es "simrs-vx/internal/domain/main-entities/soapi" esync "simrs-vx/internal/domain/sync-entities/log" + uv "simrs-vx/internal/use-case/bpjs-use-case/vclaim-reference" uaeh "simrs-vx/internal/use-case/main-use-case/adm-employee-hist" udc "simrs-vx/internal/use-case/main-use-case/death-cause" uir "simrs-vx/internal/use-case/main-use-case/internal-reference" @@ -51,28 +54,10 @@ func Create(input e.CreateDto) (*d.Data, error) { // Start log pl.SetLogInfo(&event, input, "started", "create") - // check if user has employee position - if !input.AuthInfo.HasEmployeePosition() { - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "auth-forbidden", - Detail: "user has no employee position", - Raw: errors.New("authentication failed"), - } - return nil, pl.SetLogError(&event, input) - } - - // check only user with registration position is allowed to create encounter - if input.AuthInfo.Employee_Position_Code != nil && *input.AuthInfo.Employee_Position_Code != string(erg.EPCReg) { - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "auth-forbidden", - Detail: "user position is not allowed, only user with registration position is allowed to create encounter", - Raw: errors.New("authentication failed"), - } - return nil, pl.SetLogError(&event, input) - } else { - input.Adm_Employee_Id = input.AuthInfo.Employee_Id + roleAllowed := []string{string(erg.EPCReg)} + err = validateAuth(input.AuthInfo, roleAllowed, "create-encounter", &event) + if err != nil { + return nil, err } // validate rehab by bpjs @@ -90,6 +75,7 @@ func Create(input e.CreateDto) (*d.Data, error) { // If recentRehabData is not nil, determine the visitMode_Code: // If the mode is "series", verify whether the visit count still remains // and whether the series has not expired. + // If visitMode is "series", then get encounterAdm input.VisitMode_Code, input.RecentEncounterAdm, err = determineVisitMode(recentRehabData, input, &event) if err != nil { return nil, err @@ -110,6 +96,8 @@ func Create(input e.CreateDto) (*d.Data, error) { // check if patient is new in the hospital input.NewStatus, err = identifyPatientStatus(input) + input.Adm_Employee_Id = input.AuthInfo.Employee_Id + mwRunner := newMiddlewareRunner(&event) err = dg.I.Transaction(func(tx *gorm.DB) error { @@ -127,7 +115,19 @@ func Create(input e.CreateDto) (*d.Data, error) { return err } - // insert adm_employee_hist + // insert vclaimReference + if vr := input.VclaimReference; vr != nil { + t, _ := time.Parse("2006-01-02", vr.TglRujukan) + + _, err = uv.CreateData(ev.CreateDto{ + Encounter_Id: &data.Id, + Date: &t, + SrcCode: input.Ref_Number, + SrcName: input.RefSource_Name, + Number: &vr.NoSep}, &event, tx) + } + + // insert adm_employee_hist (employee with role reg for create) if _, err = uaeh.CreateData(eaeh.CreateDto{ Encounter_Id: &data.Id, Employee_Id: data.Adm_Employee_Id, @@ -137,7 +137,7 @@ func Create(input e.CreateDto) (*d.Data, error) { dataEncounter, err := ReadDetailData(e.ReadDetailDto{ Id: uint16(data.Id), - Includes: "Adm_Employee.User,Patient.Person.Relatives,Patient.Person.VclaimMember"}, + Includes: "Adm_Employee.User,Patient.Person.Relatives,Patient.Person.VclaimMember,VclaimReference"}, &event, tx) if err != nil { return err @@ -280,6 +280,14 @@ func Update(input e.UpdateDto) (*d.Data, error) { // Start log pl.SetLogInfo(&event, input, "started", "update") + + roleAllowed := []string{string(erg.EPCReg)} + err = validateAuth(input.AuthInfo, roleAllowed, "update-encounter", &event) + if err != nil { + return nil, err + } + input.Adm_Employee_Id = input.AuthInfo.Employee_Id + mwRunner := newMiddlewareRunner(&event) err = dg.I.Transaction(func(tx *gorm.DB) error { @@ -349,26 +357,10 @@ func Delete(input e.DeleteDto) (*d.Data, error) { // Start log pl.SetLogInfo(&event, input, "started", "delete") - // check if user has employee position - if !input.AuthInfo.HasEmployeePosition() { - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "auth-forbidden", - Detail: "user has no employee position", - Raw: errors.New("authentication failed"), - } - return nil, pl.SetLogError(&event, input) - } - - // check only user with registration position is allowed to create encounter - if input.AuthInfo.Employee_Position_Code != nil && *input.AuthInfo.Employee_Position_Code != string(erg.EPCReg) { - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "auth-forbidden", - Detail: "user position is not allowed, only user with registration position is allowed to create encounter", - Raw: errors.New("authentication failed"), - } - return nil, pl.SetLogError(&event, input) + roleAllowed := []string{string(erg.EPCReg)} + err = validateAuth(input.AuthInfo, roleAllowed, "delete-encounter", &event) + if err != nil { + return nil, err } mwRunner := newMiddlewareRunner(&event) @@ -379,6 +371,33 @@ func Delete(input e.DeleteDto) (*d.Data, error) { return err } + if data.IsDone() { + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "data-state-mismatch", + Detail: "encounter is done", + Raw: errors.New("encounter is done"), + } + return pl.SetLogError(&event, input) + } + + // Prevent delete if soapi exist + dataSoapi, _, err := us.ReadListData(es.ReadListDto{ + FilterDto: es.FilterDto{Encounter_Id: &data.Id}}, &event, tx) + if err != nil { + return err + } + + if len(dataSoapi) > 0 { + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "cancel-not-allowed", + Detail: "encounter can't be deleted because SOAPI already exists", + Raw: errors.New("encounter has SOAPI records"), + } + return pl.SetLogError(&event, input) + } + if err := DeleteData(data, &event, tx); err != nil { return err } @@ -422,6 +441,14 @@ func CheckOut(input e.DischargeDto) (*d.Data, error) { // Start log pl.SetLogInfo(&event, input, "started", "checkOut") + roleAllowed := []string{string(erg.EPCNur), string(erg.EPCDoc)} + err = validateAuth(input.AuthInfo, roleAllowed, "checkOut-encounter", &event) + if err != nil { + return nil, err + } + + mwRunner := newMiddlewareRunner(&event) + err = dg.I.Transaction(func(tx *gorm.DB) error { pl.SetLogInfo(&event, rdDto, "started", "DBReadDetail") if data, err = ReadDetailData(rdDto, &event, tx); err != nil { @@ -445,7 +472,7 @@ func CheckOut(input e.DischargeDto) (*d.Data, error) { } if data.Ambulatory.Class_Code == ere.ACCRehab { - // verify and update rehabData if visit count has reached the allowed limit + // verify and update rehabData to DONE if visit count has reached the allowed limit if err = verifyRehabLimit(data, &event, tx); err != nil { return err } @@ -488,15 +515,21 @@ func CheckOut(input e.DischargeDto) (*d.Data, error) { } } - pl.SetLogInfo(&event, nil, "complete") + mwRunner.setMwType(pu.MWTPre) + // Run pre-middleware + if err := mwRunner.RunCheckoutMiddleware(checkoutEncounter, &input); err != nil { + return err + } return nil }) - if err != nil { + if err = runLogMiddleware(err, input, mwRunner); err != nil { return nil, err } + pl.SetLogInfo(&event, nil, "complete") + return &d.Data{ Meta: d.IS{ "source": source, @@ -568,11 +601,8 @@ func UpdateStatusCode(input e.UpdateStatusDto) (*d.Data, error) { } // Prevent cancellation if soapi exist - encounterId := uint(input.Id) dataSoapi, _, err := us.ReadListData(es.ReadListDto{ - FilterDto: es.FilterDto{ - Encounter_Id: &encounterId, - }}, &event, tx) + FilterDto: es.FilterDto{Encounter_Id: &data.Id}}, &event, tx) if err != nil { return err } @@ -588,25 +618,12 @@ func UpdateStatusCode(input e.UpdateStatusDto) (*d.Data, error) { } } - //mwRunner := newMiddlewareRunner(&event) - //mwRunner.setMwType(pu.MWTPre) - //// Run pre-middleware - //if err := mwRunner.RunUpdateMiddleware(readDetailPreMw, &rdDto, data); err != nil { - // return err - //} - if err := UpdateStatusData(input, 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 }) @@ -638,6 +655,13 @@ func CheckIn(input e.CheckinDto) (*d.Data, error) { // Start log pl.SetLogInfo(&event, input, "started", "checkIn") + roleAllowed := []string{string(erg.EPCNur), string(erg.EPCDoc)} + err = validateAuth(input.AuthInfo, roleAllowed, "checkIn-encounter", &event) + if err != nil { + return nil, err + } + input.Adm_Employee_Id = input.AuthInfo.Employee_Id + // validate foreign key if err := validateForeignKey(input); err != nil { return nil, err @@ -648,6 +672,8 @@ func CheckIn(input e.CheckinDto) (*d.Data, error) { input.StartedAt = &now } + mwRunner := newMiddlewareRunner(&event) + err = dg.I.Transaction(func(tx *gorm.DB) error { pl.SetLogInfo(&event, rdDto, "started", "DBReadDetail") if data, err = ReadDetailData(rdDto, &event, tx); err != nil { @@ -685,7 +711,7 @@ func CheckIn(input e.CheckinDto) (*d.Data, error) { } // Upsert adm_employee_hist if adm_employee_id has changed - if input.Adm_Employee_Id != nil && *input.Adm_Employee_Id != *data.Adm_Employee_Id { + if *input.Adm_Employee_Id != *data.Adm_Employee_Id { // upsert admEmployeeHist if err = upsertAdmEmployeeHist(eaeh.CreateDto{ Encounter_Id: &data.Id, @@ -701,15 +727,29 @@ func CheckIn(input e.CheckinDto) (*d.Data, error) { return err } - pl.SetLogInfo(&event, nil, "complete") + dataEncounter, err := ReadDetailData(e.ReadDetailDto{ + Id: uint16(data.Id), + Includes: "Adm_Employee.User"}, + &event, tx) + if err != nil { + return err + } + + mwRunner.setMwType(pu.MWTPre) + // Run pre-middleware + if err := mwRunner.RunCheckinMiddleware(checkinEncounterMw, dataEncounter); err != nil { + return err + } return nil }) - if err != nil { + if err = runLogMiddleware(err, input, mwRunner); err != nil { return nil, err } + pl.SetLogInfo(&event, nil, "complete") + return &d.Data{ Meta: d.IS{ "source": source, @@ -951,3 +991,29 @@ func runLogMiddleware(err error, input any, mwRunner *middlewareRunner) error { return nil } + +func validateAuth(a auth.AuthInfo, roleAllowed []string, action string, event *pl.Event) error { + // check if user has employee position + if !a.HasEmployeePosition() { + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "auth-forbidden", + Detail: "missing employee position", + Raw: errors.New("authentication failed"), + } + return pl.SetLogError(event, a) + } + + // check only roleAllowed position is allowed to create encounter + if a.Employee_Position_Code != nil && !pu.Contains(roleAllowed, *a.Employee_Position_Code) { + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "auth-forbidden", + Detail: fmt.Sprintf("position '%s' is not allowed to %s", *a.Employee_Position_Code, action), + Raw: errors.New("authentication failed"), + } + return pl.SetLogError(event, a) + } + + return nil +} diff --git a/internal/use-case/main-use-case/encounter/helper.go b/internal/use-case/main-use-case/encounter/helper.go index 1de331b8..3b215c36 100644 --- a/internal/use-case/main-use-case/encounter/helper.go +++ b/internal/use-case/main-use-case/encounter/helper.go @@ -617,7 +617,7 @@ func getSoapiByTypeCode(encounter *e.Encounter, event *pl.Event, mode string) (e rehab = encounter.Rehab ) - // Set Query for get data Soapi + // Set Query for get data Soapi by doc tx := dg.I. Model(&es.Soapi{}). Joins("JOIN \"Employee\" ON \"Employee\".\"Id\" = \"Soapi\".\"Employee_Id\""). diff --git a/internal/use-case/main-use-case/encounter/middleware-runner.go b/internal/use-case/main-use-case/encounter/middleware-runner.go index b030d286..78558cd0 100644 --- a/internal/use-case/main-use-case/encounter/middleware-runner.go +++ b/internal/use-case/main-use-case/encounter/middleware-runner.go @@ -143,6 +143,42 @@ func (me *middlewareRunner) RunDeleteMiddleware(middlewares []deleteMw, input *e return nil } +func (me *middlewareRunner) RunCheckinMiddleware(middleware checkinMw, input *e.Encounter) error { + if !me.SyncOn { + return nil + } + + logData := pu.GetLogData(input, nil) + + pl.SetLogInfo(me.Event, logData, "started", middleware.Name) + + if err := middleware.Func(input); 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) RunCheckoutMiddleware(middleware checkoutMw, input *e.DischargeDto) error { + if !me.SyncOn { + return nil + } + + logData := pu.GetLogData(input, nil) + + pl.SetLogInfo(me.Event, logData, "started", middleware.Name) + + if err := middleware.Func(input); err != nil { + return pu.HandleMiddlewareError(me.Event, string(me.MwType), middleware.Name, logData, err) + } + + pl.SetLogInfo(me.Event, nil, "complete") + + return nil +} + func (me *middlewareRunner) setMwType(mwType pu.MWType) { me.MwType = mwType } diff --git a/internal/use-case/main-use-case/encounter/middleware.go b/internal/use-case/main-use-case/encounter/middleware.go index 8a047d33..bb5fab3f 100644 --- a/internal/use-case/main-use-case/encounter/middleware.go +++ b/internal/use-case/main-use-case/encounter/middleware.go @@ -1,9 +1,17 @@ package encounter -// example of middleware -// func init() { -// createPreMw = append(createPreMw, -// CreateMw{Name: "modif-input", Func: pm.ModifInput}, -// CreateMw{Name: "check-data", Func: pm.CheckData}, -// ) -// } +import plugin "simrs-vx/internal/use-case/simgos-sync-plugin/encounter" + +func init() { + createPreMw = append(createPreMw, + createMw{Name: "sync-update-encounter", Func: plugin.Create}) + + createSimxLogMw = append(createSimxLogMw, + createLogMw{Name: "create-sync-log", Func: plugin.CreateLog}) + + updatePreMw = append(updatePreMw, + updateMw{Name: "sync-update-patient", Func: plugin.Update}) + + deletePreMw = append(deletePreMw, + deleteMw{Name: "sync-delete-patient", Func: plugin.Delete}) +} diff --git a/internal/use-case/main-use-case/encounter/tycovar.go b/internal/use-case/main-use-case/encounter/tycovar.go index f618bd19..f2309211 100644 --- a/internal/use-case/main-use-case/encounter/tycovar.go +++ b/internal/use-case/main-use-case/encounter/tycovar.go @@ -44,6 +44,16 @@ type readDetailMw struct { Func func(input *e.ReadDetailDto, data *e.Encounter, tx *gorm.DB) error } +type checkinMw struct { + Name string + Func func(input *e.Encounter) error +} + +type checkoutMw struct { + Name string + Func func(input *e.DischargeDto) error +} + type UpdateMw = updateMw type DeleteMw = deleteMw @@ -58,3 +68,5 @@ var updatePreMw []updateMw var updatePostMw []readDetailMw var deletePreMw []deleteMw var deletePostMw []readDetailMw +var checkinEncounterMw checkinMw +var checkoutEncounter checkoutMw diff --git a/internal/use-case/simgos-sync-plugin/encounter/plugin.go b/internal/use-case/simgos-sync-plugin/encounter/plugin.go new file mode 100644 index 00000000..70d3e8be --- /dev/null +++ b/internal/use-case/simgos-sync-plugin/encounter/plugin.go @@ -0,0 +1,167 @@ +package encounter + +import ( + "bytes" + "encoding/json" + "fmt" + "io" + "net/http" + + d "github.com/karincake/dodol" + + sync "simrs-vx/internal/infra/sync-cfg" + + e "simrs-vx/internal/domain/main-entities/encounter" + elog "simrs-vx/internal/domain/sync-entities/log" +) + +func Create(input *e.Encounter) error { + endpoint := getPrefixEndpoint() + + jsonData, err := json.Marshal(input) + if err != nil { + return fmt.Errorf("failed to encode JSON: %w", err) + } + + req, err := http.NewRequest("POST", endpoint, bytes.NewReader(jsonData)) + if err != nil { + return err + } + + req.Header.Set("Content-Type", "application/json") + + resp, err := http.DefaultClient.Do(req) + if err != nil { + return err + } + defer resp.Body.Close() + + bodyBytes, err := io.ReadAll(resp.Body) + if err != nil { + return err + } + + if resp.StatusCode != http.StatusOK { + errors := d.FieldError{} + _ = json.Unmarshal(bodyBytes, &errors) + + return fmt.Errorf(errors.Message) + } + + return nil +} + +func CreateLog(input *elog.SimxLogDto) error { + prefixEndpoint := getPrefixEndpoint() + endpoint := prefixEndpoint + "/log" + + jsonData, err := json.Marshal(input) + if err != nil { + return fmt.Errorf("failed to encode JSON: %w", err) + } + + req, err := http.NewRequest("POST", endpoint, bytes.NewReader(jsonData)) + if err != nil { + return err + } + + req.Header.Set("Content-Type", "application/json") + + resp, err := http.DefaultClient.Do(req) + if err != nil { + return err + } + defer resp.Body.Close() + + bodyBytes, err := io.ReadAll(resp.Body) + if err != nil { + return err + } + + if resp.StatusCode != http.StatusOK { + errors := d.FieldError{} + _ = json.Unmarshal(bodyBytes, &errors) + + return fmt.Errorf(errors.Message) + } + + return nil +} + +func Update(input *e.Encounter) error { + prefixEndpoint := getPrefixEndpoint() + endpoint := fmt.Sprintf("%s/%v", prefixEndpoint, input.Id) + + jsonData, err := json.Marshal(input) + if err != nil { + return fmt.Errorf("failed to encode JSON: %w", err) + } + + req, err := http.NewRequest("PATCH", endpoint, bytes.NewReader(jsonData)) + if err != nil { + return err + } + + req.Header.Set("Content-Type", "application/json") + + resp, err := http.DefaultClient.Do(req) + if err != nil { + return err + } + defer resp.Body.Close() + + bodyBytes, err := io.ReadAll(resp.Body) + if err != nil { + return err + } + + if resp.StatusCode != http.StatusOK { + errors := d.FieldError{} + _ = json.Unmarshal(bodyBytes, &errors) + + return fmt.Errorf(errors.Message) + } + + return nil +} + +func Delete(input *e.DeleteDto) error { + prefixEndpoint := getPrefixEndpoint() + endpoint := fmt.Sprintf("%s/%v", prefixEndpoint, input.Id) + + jsonData, err := json.Marshal(input) + if err != nil { + return fmt.Errorf("failed to encode JSON: %w", err) + } + + req, err := http.NewRequest("DELETE", endpoint, bytes.NewReader(jsonData)) + if err != nil { + return err + } + + req.Header.Set("Content-Type", "application/json") + + resp, err := http.DefaultClient.Do(req) + if err != nil { + return err + } + defer resp.Body.Close() + + bodyBytes, err := io.ReadAll(resp.Body) + if err != nil { + return err + } + + if resp.StatusCode != http.StatusOK { + errors := d.FieldError{} + _ = json.Unmarshal(bodyBytes, &errors) + + return fmt.Errorf(errors.Message) + } + + return nil +} + +func getPrefixEndpoint() string { + return fmt.Sprintf("%s%s/v1/encounter", sync.O.Host, sync.O.Prefix) +} diff --git a/internal/use-case/simgos-sync-use-case/encounter/case.go b/internal/use-case/simgos-sync-use-case/encounter/case.go index 591dae36..50a822ed 100644 --- a/internal/use-case/simgos-sync-use-case/encounter/case.go +++ b/internal/use-case/simgos-sync-use-case/encounter/case.go @@ -33,7 +33,7 @@ func Create(input e.Encounter) (*d.Data, error) { err = db.WithDualTx(func(tx *db.Dualtx) error { // STEP 1: Insert to simgos - sgData, err = CreateSimgosData(input, &event, tx.Simgos) + sgData, err = CreateTPendaftaranData(input, &event, tx.Simgos) if err != nil { return err } @@ -114,10 +114,16 @@ func Update(input e.Encounter) (*d.Data, error) { return nil, err } + // STEP 2: Get Simgos + simgos, err := ReadEncounterDetailData(uint16(syncLink.Simgos_Id), &event) + if err != nil { + return nil, err + } + tx := db.NewTx() err = tx.Simgos.Transaction(func(tx *gorm.DB) error { // Step 2: Update Simgos - if err = UpdateSimgosData(input, syncLink, &event, tx); err != nil { + if err = UpdateTPendaftaranData(input, *simgos, &event, tx); err != nil { return err } @@ -153,14 +159,14 @@ func Delete(input e.DeleteDto) (*d.Data, error) { } // STEP 2: Get Simgos - sgData, err := ReadDetailSimgosData(uint16(syncLink.Simgos_Id), &event) + sgData, err := ReadEncounterDetailData(uint16(syncLink.Simgos_Id), &event) if err != nil { return nil, err } err = db.WithDualTx(func(tx *db.Dualtx) error { // STEP 3: Delete Simgos - err = HardDeleteSimgosData(sgData, &event, tx.Simgos) + err = HardDeleteTPendaftaranData(sgData, &event, tx.Simgos) if err != nil { return err } @@ -195,3 +201,91 @@ func Delete(input e.DeleteDto) (*d.Data, error) { }, nil } + +func CheckIn(input e.Encounter) (*d.Data, error) { + event := pl.Event{ + Feature: "CheckIn", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "check-in") + + // STEP 1: Get Link + syncLink, err := ReadDetailLinkData(uint16(input.Id), &event) + if err != nil { + return nil, err + } + + // STEP 2: Get Simgos + simgos, err := ReadEncounterDetailData(uint16(syncLink.Simgos_Id), &event) + if err != nil { + return nil, err + } + + tx := db.NewTx() + err = tx.Simgos.Transaction(func(tx *gorm.DB) error { + // Step 2: Update Simgos + if err = UpdateCheckinData(input, *simgos, &event, tx); err != nil { + return err + } + + // TODO: insert t_pemeriksaan_hist + + return nil + }) + + pl.SetLogInfo(&event, nil, "complete") + + return &d.Data{ + Meta: d.IS{ + "source": source, + "structure": "single-data", + "status": "updated", + }, + }, nil +} + +func CheckOut(input e.DischargeDto) (*d.Data, error) { + event := pl.Event{ + Feature: "CheckIn", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "check-in") + + // STEP 1: Get Link + syncLink, err := ReadDetailLinkData(uint16(input.Id), &event) + if err != nil { + return nil, err + } + + // STEP 2: Get Simgos + simgos, err := ReadEncounterDetailData(uint16(syncLink.Simgos_Id), &event) + if err != nil { + return nil, err + } + + tx := db.NewTx() + err = tx.Simgos.Transaction(func(tx *gorm.DB) error { + // Step 2: Update Simgos + if err = UpdateCheckoutData(input, *simgos, &event, tx); err != nil { + return err + } + + // TODO: insert t_pemeriksaan_hist + + return nil + }) + + pl.SetLogInfo(&event, nil, "complete") + + return &d.Data{ + Meta: d.IS{ + "source": source, + "structure": "single-data", + "status": "updated", + }, + }, nil +} diff --git a/internal/use-case/simgos-sync-use-case/encounter/helper.go b/internal/use-case/simgos-sync-use-case/encounter/helper.go index 586dbd81..4672daa5 100644 --- a/internal/use-case/simgos-sync-use-case/encounter/helper.go +++ b/internal/use-case/simgos-sync-use-case/encounter/helper.go @@ -7,11 +7,10 @@ package encounter import ( "encoding/json" epr "simrs-vx/internal/domain/main-entities/person-relative" - erp "simrs-vx/internal/domain/references/person" - "strconv" - erc "simrs-vx/internal/domain/references/common" ere "simrs-vx/internal/domain/references/encounter" + erp "simrs-vx/internal/domain/references/person" + "strconv" e "simrs-vx/internal/domain/main-entities/encounter" esimgos "simrs-vx/internal/domain/simgos-entities/encounter" @@ -22,17 +21,47 @@ import ( "gorm.io/gorm/clause" ) -func setDataCreate(input *e.Encounter) (data esimgos.TPendaftaran, err error) { +func setDataCreateTPendaftaran(input *e.Encounter) (data esimgos.TPendaftaran, err error) { data.Nomr = *input.Patient.Number + + // set pasienbaru + if input.NewStatus { + data.Pasienbaru = 1 + } + + // default kelas daftar + data.KelasDaftar = 3 + + // set noAntrian + defaultFromSimx := "rehab" + data.NoAntrian = &defaultFromSimx + + // set no_kunjung + noKunjung, err := generateNoKunjung() + if err != nil { + return esimgos.TPendaftaran{}, err + } + data.NoKunjung = uint(noKunjung) + + setDataTPendaftaran(input, data) + + return +} + +func setDataTPendaftaran(input *e.Encounter, data esimgos.TPendaftaran) { data.Tglreg = input.RegisteredAt // set kddokter - kddokter, _ := strconv.Atoi(*input.Appointment_Doctor_Code) - data.Kddokter = uint(kddokter) + if d := input.Appointment_Doctor_Code; d != nil { + kddokter, _ := strconv.Atoi(*input.Appointment_Doctor_Code) + data.Kddokter = uint(kddokter) + } // set kdpoly - kdpoly, _ := strconv.Atoi(*input.Unit_Code) - data.Kdpoly = uint(kdpoly) + if p := input.Unit_Code; p != nil { + kdpoly, _ := strconv.Atoi(*input.Unit_Code) + data.Kdpoly = uint(kdpoly) + } // set kdrujuk setKdrujuk(input.RefType_Code, data) @@ -42,11 +71,6 @@ func setDataCreate(input *e.Encounter) (data esimgos.TPendaftaran, err error) { // TODO: shift - // set pasienbaru - if input.NewStatus { - data.Pasienbaru = 1 - } - // set nip if emp := input.Adm_Employee; emp != nil { if user := emp.User; user != nil { @@ -74,54 +98,40 @@ func setDataCreate(input *e.Encounter) (data esimgos.TPendaftaran, err error) { data.Jamreg = input.RegisteredAt - // default kelas daftar - data.KelasDaftar = 3 - // TODO: st_asal_masuk - // set noAntrian - defaultFromSimx := "rehab" - data.NoAntrian = &defaultFromSimx - - // set no_kunjung - noKunjung, err := generateNoKunjung() - if err != nil { - return esimgos.TPendaftaran{}, err - } - - data.NoKunjung = uint(noKunjung) - return } -func setDataUpdate(input *e.Encounter, data esimgos.TPendaftaran) { +func setDataCheckIn(input e.Encounter, data esimgos.TPendaftaran) { // set kddokter kddokter, _ := strconv.Atoi(*input.Responsible_Doctor_Code) data.Kddokter = uint(kddokter) - // set kdpoly - kdpoly, _ := strconv.Atoi(*input.Unit_Code) - data.Kdpoly = uint(kdpoly) - - // set status - setStatus(input.Discharge_Method_Code, data) - if input.Status_Code == erc.DSCCancel { - data.Status = 11 + // set petugas_klinik + if data.PetugasKlinik != "" { + if a := input.Adm_Employee; a != nil { + if u := a.User; u != nil { + data.PetugasKlinik = u.Name + } + } } data.Masukpoly = input.StartedAt - data.Keluarpoly = input.FinishedAt + return +} - if p := input.Patient.Person; p != nil { - mapRelative(p.Relatives, data) - } +func setDataCheckOut(input e.DischargeDto, data esimgos.TPendaftaran) { + data.Keluarpoly = &now - // set petugas_klinik - if emp := input.Adm_Employee; emp != nil { - if user := emp.User; user != nil { - data.PetugasKlinik = user.Name - } + // set status + setStatus(input.Discharge_Method_Code, data) + if data.Status == 8 || data.Status == 3 { + data.SebabMati1 = input.DeathCause } + //if input.Status_Code == erc.DSCCancel { + // data.Status = 11 + //} return } @@ -162,18 +172,34 @@ func setStatus(code *ere.DischargeMethodCode, data esimgos.TPendaftaran) { data.Status = 2 case ere.DMCDeathOnArrival: data.Status = 3 + data.StMeninggal = func(u uint) *uint { return &u }(1) + data.DtMeninggal = &now case ere.DMCDeath: data.Status = 8 + data.StMeninggal = func(u uint) *uint { return &u }(1) + data.DtMeninggal = &now case ere.DMCHomeReq: data.Status = 7 case ere.DMCConsulPoly: data.Status = 5 + data.PoliNameHfis = nil + data.SpesialisIdHfis = nil + data.DokterNameHfis = nil + data.DokterIdHfis = nil case ere.DMCExtRef: data.Status = 6 case ere.DMCConsulChDay: data.Status = 12 + data.PoliNameHfis = nil + data.SpesialisIdHfis = nil + data.DokterNameHfis = nil + data.DokterIdHfis = nil case ere.DMCEmergency: data.Status = 10 + data.PoliNameHfis = nil + data.SpesialisIdHfis = nil + data.DokterNameHfis = nil + data.DokterIdHfis = nil case ere.DMCEmergencyCovid: data.Status = 13 case ere.DMCConsulExecutive: diff --git a/internal/use-case/simgos-sync-use-case/encounter/lib.go b/internal/use-case/simgos-sync-use-case/encounter/lib.go index 9ccf433c..f4c0023f 100644 --- a/internal/use-case/simgos-sync-use-case/encounter/lib.go +++ b/internal/use-case/simgos-sync-use-case/encounter/lib.go @@ -17,10 +17,13 @@ import ( var now = time.Now() -func CreateSimgosData(input e.Encounter, event *pl.Event, dbx ...*gorm.DB) (*esimgos.TPendaftaran, error) { +func CreateTPendaftaranData(input e.Encounter, event *pl.Event, dbx ...*gorm.DB) (*esimgos.TPendaftaran, error) { pl.SetLogInfo(event, nil, "started", "DBCreate") - data := setDataSimgos(&input) + data, err := setDataCreateTPendaftaran(&input) + if err != nil { + return nil, plh.HandleCreateError(input, event, err) + } var tx *gorm.DB if len(dbx) > 0 { @@ -37,7 +40,7 @@ func CreateSimgosData(input e.Encounter, event *pl.Event, dbx ...*gorm.DB) (*esi return &data, nil } -func ReadDetailSimgosData(simgosId uint16, event *pl.Event) (*esimgos.TPendaftaran, error) { +func ReadEncounterDetailData(simgosId uint16, event *pl.Event) (*esimgos.TPendaftaran, error) { pl.SetLogInfo(event, simgosId, "started", "DBReadDetail") data := esimgos.TPendaftaran{} @@ -55,11 +58,10 @@ func ReadDetailSimgosData(simgosId uint16, event *pl.Event) (*esimgos.TPendaftar return &data, nil } -func UpdateSimgosData(input e.Encounter, dataSimgos *esync.EncounterLink, event *pl.Event, dbx ...*gorm.DB) error { +func UpdateTPendaftaranData(input e.Encounter, data esimgos.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) error { pl.SetLogInfo(event, input, "started", "DBUpdate") - data := setDataSimgos(&input) - data.Idxdaftar = dataSimgos.Simgos_Id + setDataTPendaftaran(&input, data) var tx *gorm.DB if len(dbx) > 0 { @@ -82,7 +84,7 @@ func UpdateSimgosData(input e.Encounter, dataSimgos *esync.EncounterLink, event return nil } -func HardDeleteSimgosData(data *esimgos.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) error { +func HardDeleteTPendaftaranData(data *esimgos.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) error { pl.SetLogInfo(event, data, "started", "DBDelete") var tx *gorm.DB @@ -107,6 +109,59 @@ func HardDeleteSimgosData(data *esimgos.TPendaftaran, event *pl.Event, dbx ...*g return nil } +func UpdateCheckinData(input e.Encounter, data esimgos.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) error { + pl.SetLogInfo(event, input, "started", "DBUpdate") + + setDataCheckIn(input, data) + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.IS["simrs"] + } + + 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 UpdateCheckoutData(input e.DischargeDto, data esimgos.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) error { + pl.SetLogInfo(event, input, "started", "DBUpdate") + + setDataCheckOut(input, data) + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.IS["simrs"] + } + + 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 CreateTPemeriksaanHist func CreateLinkData(simxId, simgosId uint, event *pl.Event, dbx ...*gorm.DB) (*esync.EncounterLink, error) { pl.SetLogInfo(event, nil, "started", "DBCreate") data := setDataSimxLink(simxId, simgosId) From ca0fee997eb5cb671898688cad179083c99a1a46 Mon Sep 17 00:00:00 2001 From: vanilia Date: Tue, 25 Nov 2025 14:10:01 +0700 Subject: [PATCH 5/6] fix conflict --- README-DB.md | 4 ++-- cmd/main-api/config.yml-example | 2 +- .../new/division/handler.go | 3 ++- .../new/encounter/handler.go | 3 ++- .../new/installation/handler.go | 3 ++- .../new/patient/handler.go | 3 ++- .../new/specialist/handler.go | 3 ++- .../new/subspecialist/handler.go | 2 +- .../simgos-sync-handler/new/unit/handler.go | 3 ++- .../simgos-sync-handler.go | 19 ++++++++++--------- 10 files changed, 26 insertions(+), 19 deletions(-) diff --git a/README-DB.md b/README-DB.md index b99cf08a..c361ca31 100644 --- a/README-DB.md +++ b/README-DB.md @@ -15,7 +15,7 @@
Example: 1. `User_Id` represents the `User` object and the `Id` attribute 2. `BestProduct_Code` represents the `BestProduct` object and the `Code` attribute - 3. When more than one column has a similar definition, a `prefixnew` can be added to indicate the column's purpose. + 3. When more than one column has a similar definition, a `prefix` can be added to indicate the column's purpose.
Example: 1. `Admin_User_Id` represents the `Admin` of the `User` object and the `Id` attribute 2. `Operator_User_Id` refers to the `Operator` of the `User` object and the `Id` column. @@ -25,7 +25,7 @@
Example: 1. `user_id` represents the `User` object and the `Id` attribute. 2. `bestProduct_code` represents the `bestProduct` object and the `code` attribute. - 3. When more than one column has a similar definition, a `prefixnew` can be added to indicate the column's purpose. + 3. When more than one column has a similar definition, a `prefix` can be added to indicate the column's purpose.
Example: 1. `admin_user_id` refers to the `admin` of the `user` object and `id` attribute 2. `operator_user_id` refers to the `operator` of the `user` object, column `id` diff --git a/cmd/main-api/config.yml-example b/cmd/main-api/config.yml-example index 3f6224ad..30351abf 100644 --- a/cmd/main-api/config.yml-example +++ b/cmd/main-api/config.yml-example @@ -71,7 +71,7 @@ bpjsCfg: syncUrlCfg: enable: false host: - prefixnew: new-to-old + prefix: new-to-old docsCfg: path: ../../assets/docs/ \ No newline at end of file diff --git a/internal/interface/simgos-sync-handler/new/division/handler.go b/internal/interface/simgos-sync-handler/new/division/handler.go index 75059cd8..28920d21 100644 --- a/internal/interface/simgos-sync-handler/new/division/handler.go +++ b/internal/interface/simgos-sync-handler/new/division/handler.go @@ -2,13 +2,14 @@ package division import ( "net/http" - u "simrs-vx/internal/use-case/simgos-sync-use-case/new/division" rw "github.com/karincake/risoles" // ua "github.com/karincake/tumpeng/auth/svc" e "simrs-vx/internal/domain/main-entities/division" esync "simrs-vx/internal/domain/sync-entities/log" + + u "simrs-vx/internal/use-case/simgos-sync-use-case/new/division" ) type myBase struct{} diff --git a/internal/interface/simgos-sync-handler/new/encounter/handler.go b/internal/interface/simgos-sync-handler/new/encounter/handler.go index 1f03c38c..e6b0515a 100644 --- a/internal/interface/simgos-sync-handler/new/encounter/handler.go +++ b/internal/interface/simgos-sync-handler/new/encounter/handler.go @@ -2,13 +2,14 @@ package encounter import ( "net/http" - u "simrs-vx/internal/use-case/simgos-sync-use-case/new/encounter" rw "github.com/karincake/risoles" // ua "github.com/karincake/tumpeng/auth/svc" e "simrs-vx/internal/domain/main-entities/encounter" esync "simrs-vx/internal/domain/sync-entities/log" + + u "simrs-vx/internal/use-case/simgos-sync-use-case/new/encounter" ) type myBase struct{} diff --git a/internal/interface/simgos-sync-handler/new/installation/handler.go b/internal/interface/simgos-sync-handler/new/installation/handler.go index eb5fe09d..3a1eca93 100644 --- a/internal/interface/simgos-sync-handler/new/installation/handler.go +++ b/internal/interface/simgos-sync-handler/new/installation/handler.go @@ -2,13 +2,14 @@ package installation import ( "net/http" - u "simrs-vx/internal/use-case/simgos-sync-use-case/new/installation" rw "github.com/karincake/risoles" // ua "github.com/karincake/tumpeng/auth/svc" e "simrs-vx/internal/domain/main-entities/installation" esync "simrs-vx/internal/domain/sync-entities/log" + + u "simrs-vx/internal/use-case/simgos-sync-use-case/new/installation" ) type myBase struct{} diff --git a/internal/interface/simgos-sync-handler/new/patient/handler.go b/internal/interface/simgos-sync-handler/new/patient/handler.go index d3e6d591..f3c3951b 100644 --- a/internal/interface/simgos-sync-handler/new/patient/handler.go +++ b/internal/interface/simgos-sync-handler/new/patient/handler.go @@ -2,13 +2,14 @@ package patient import ( "net/http" - u "simrs-vx/internal/use-case/simgos-sync-use-case/new/patient" rw "github.com/karincake/risoles" // ua "github.com/karincake/tumpeng/auth/svc" e "simrs-vx/internal/domain/main-entities/patient" esync "simrs-vx/internal/domain/sync-entities/log" + + u "simrs-vx/internal/use-case/simgos-sync-use-case/new/patient" ) type myBase struct{} diff --git a/internal/interface/simgos-sync-handler/new/specialist/handler.go b/internal/interface/simgos-sync-handler/new/specialist/handler.go index b1a31dbb..2afe3f13 100644 --- a/internal/interface/simgos-sync-handler/new/specialist/handler.go +++ b/internal/interface/simgos-sync-handler/new/specialist/handler.go @@ -2,13 +2,14 @@ package specialist import ( "net/http" - u "simrs-vx/internal/use-case/simgos-sync-use-case/new/specialist" rw "github.com/karincake/risoles" // ua "github.com/karincake/tumpeng/auth/svc" e "simrs-vx/internal/domain/main-entities/specialist" esync "simrs-vx/internal/domain/sync-entities/log" + + u "simrs-vx/internal/use-case/simgos-sync-use-case/new/specialist" ) type myBase struct{} diff --git a/internal/interface/simgos-sync-handler/new/subspecialist/handler.go b/internal/interface/simgos-sync-handler/new/subspecialist/handler.go index 4cf6dd13..0bfd2226 100644 --- a/internal/interface/simgos-sync-handler/new/subspecialist/handler.go +++ b/internal/interface/simgos-sync-handler/new/subspecialist/handler.go @@ -2,13 +2,13 @@ package subspecialist import ( "net/http" - u "simrs-vx/internal/use-case/simgos-sync-use-case/new/subspecialist" rw "github.com/karincake/risoles" // ua "github.com/karincake/tumpeng/auth/svc" e "simrs-vx/internal/domain/main-entities/subspecialist" esync "simrs-vx/internal/domain/sync-entities/log" + u "simrs-vx/internal/use-case/simgos-sync-use-case/new/subspecialist" ) type myBase struct{} diff --git a/internal/interface/simgos-sync-handler/new/unit/handler.go b/internal/interface/simgos-sync-handler/new/unit/handler.go index 66479db2..95808728 100644 --- a/internal/interface/simgos-sync-handler/new/unit/handler.go +++ b/internal/interface/simgos-sync-handler/new/unit/handler.go @@ -2,13 +2,14 @@ package unit import ( "net/http" - u "simrs-vx/internal/use-case/simgos-sync-use-case/new/unit" rw "github.com/karincake/risoles" // ua "github.com/karincake/tumpeng/auth/svc" e "simrs-vx/internal/domain/main-entities/unit" esync "simrs-vx/internal/domain/sync-entities/log" + + u "simrs-vx/internal/use-case/simgos-sync-use-case/new/unit" ) type myBase struct{} diff --git a/internal/interface/simgos-sync-handler/simgos-sync-handler.go b/internal/interface/simgos-sync-handler/simgos-sync-handler.go index a82e81e6..0fc0d5b3 100644 --- a/internal/interface/simgos-sync-handler/simgos-sync-handler.go +++ b/internal/interface/simgos-sync-handler/simgos-sync-handler.go @@ -2,20 +2,14 @@ package simgossynchandler import ( "net/http" - "simrs-vx/internal/interface/simgos-sync-handler/new/division" - "simrs-vx/internal/interface/simgos-sync-handler/new/encounter" - "simrs-vx/internal/interface/simgos-sync-handler/new/installation" - "simrs-vx/internal/interface/simgos-sync-handler/new/patient" - "simrs-vx/internal/interface/simgos-sync-handler/new/specialist" - "simrs-vx/internal/interface/simgos-sync-handler/new/subspecialist" - "simrs-vx/internal/interface/simgos-sync-handler/new/unit" - hc "simrs-vx/pkg/handler-crud-helper" /******************** infra ********************/ gs "simrs-vx/internal/infra/gorm-setting" simgosdb "simrs-vx/internal/infra/simgos-db" + /******************** pkg ********************/ cmw "simrs-vx/pkg/cors-manager-mw" + hc "simrs-vx/pkg/handler-crud-helper" lh "simrs-vx/pkg/lang-helper" handlerlogger "simrs-vx/pkg/middleware/handler-logger" zlc "simrs-vx/pkg/zerolog-ctx" @@ -26,6 +20,13 @@ import ( /******************** internal ********************/ "simrs-vx/internal/interface/main-handler/home" + "simrs-vx/internal/interface/simgos-sync-handler/new/division" + "simrs-vx/internal/interface/simgos-sync-handler/new/encounter" + "simrs-vx/internal/interface/simgos-sync-handler/new/installation" + "simrs-vx/internal/interface/simgos-sync-handler/new/patient" + "simrs-vx/internal/interface/simgos-sync-handler/new/specialist" + "simrs-vx/internal/interface/simgos-sync-handler/new/subspecialist" + "simrs-vx/internal/interface/simgos-sync-handler/new/unit" ) func SetRoutes() http.Handler { @@ -56,7 +57,7 @@ func SetRoutes() http.Handler { }) hk.GroupRoutes(prefixnew+"/v1/encounter", r, hk.MapHandlerFunc{ "POST /": encounter.O.Create, - "POST /log": encounter.O.CreateLog, + "POST /log": encounter.O.CreateLog,git ad "PATCH /{id}": encounter.O.Update, "DELETE /{id}": encounter.O.Delete, "PATCH /{id}/checkin": encounter.O.Checkin, From 782d272d91249c3a0a36a76d163a980c92e79c85 Mon Sep 17 00:00:00 2001 From: vanilia Date: Tue, 25 Nov 2025 14:10:25 +0700 Subject: [PATCH 6/6] fix conflict --- internal/interface/simgos-sync-handler/simgos-sync-handler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/interface/simgos-sync-handler/simgos-sync-handler.go b/internal/interface/simgos-sync-handler/simgos-sync-handler.go index 0fc0d5b3..ccfa6cda 100644 --- a/internal/interface/simgos-sync-handler/simgos-sync-handler.go +++ b/internal/interface/simgos-sync-handler/simgos-sync-handler.go @@ -57,7 +57,7 @@ func SetRoutes() http.Handler { }) hk.GroupRoutes(prefixnew+"/v1/encounter", r, hk.MapHandlerFunc{ "POST /": encounter.O.Create, - "POST /log": encounter.O.CreateLog,git ad + "POST /log": encounter.O.CreateLog, "PATCH /{id}": encounter.O.Update, "DELETE /{id}": encounter.O.Delete, "PATCH /{id}/checkin": encounter.O.Checkin,