From ebc2ca5659e2665f8509c8419dab49d516601435 Mon Sep 17 00:00:00 2001 From: vanilia Date: Thu, 13 Nov 2025 09:57:10 +0700 Subject: [PATCH 01/11] set infra --- cmd/main-sync-api/config.yml-example | 41 --- cmd/main-sync-api/main.go | 15 - cmd/simgos-sync-api/config.yml-example | 6 +- cmd/simgos-sync-migration/Makefile | 18 ++ cmd/simgos-sync-migration/README-ATLAS.MD | 59 ++++ cmd/simgos-sync-migration/atlas.hcl.example | 22 ++ cmd/simgos-sync-migration/migration.go | 9 + internal/infra/sync-cfg/sync-cfg.go | 8 +- internal/infra/sync-cfg/tycovar.go | 5 +- .../interface/main-handler/main-handler.go | 2 + .../main-sync-handler/main-sync-handler.go | 36 --- internal/interface/migration/migration.go | 2 + .../migration/simgos-sync-entities.go | 5 + internal/interface/migration/tycovar.go | 5 +- .../installation/handler.go | 51 ++++ .../simgos-sync-handler.go | 9 +- internal/use-case/main-sync-use-case/.keep | 0 .../simgos-sync-use-case/installation/case.go | 263 ++++++++++++++++++ .../installation/helper.go | 23 ++ .../simgos-sync-use-case/installation/lib.go | 149 ++++++++++ .../installation/middleware-runner.go | 103 +++++++ .../installation/middleware.go | 9 + .../installation/tycovar.go | 44 +++ .../handler-crud-helper.go | 64 +++++ 24 files changed, 843 insertions(+), 105 deletions(-) delete mode 100644 cmd/main-sync-api/config.yml-example delete mode 100644 cmd/main-sync-api/main.go create mode 100644 cmd/simgos-sync-migration/Makefile create mode 100644 cmd/simgos-sync-migration/README-ATLAS.MD create mode 100644 cmd/simgos-sync-migration/atlas.hcl.example create mode 100644 cmd/simgos-sync-migration/migration.go delete mode 100644 internal/interface/main-sync-handler/main-sync-handler.go create mode 100644 internal/interface/migration/simgos-sync-entities.go create mode 100644 internal/interface/simgos-sync-handler/installation/handler.go delete mode 100644 internal/use-case/main-sync-use-case/.keep create mode 100644 internal/use-case/simgos-sync-use-case/installation/case.go create mode 100644 internal/use-case/simgos-sync-use-case/installation/helper.go create mode 100644 internal/use-case/simgos-sync-use-case/installation/lib.go create mode 100644 internal/use-case/simgos-sync-use-case/installation/middleware-runner.go create mode 100644 internal/use-case/simgos-sync-use-case/installation/middleware.go create mode 100644 internal/use-case/simgos-sync-use-case/installation/tycovar.go diff --git a/cmd/main-sync-api/config.yml-example b/cmd/main-sync-api/config.yml-example deleted file mode 100644 index edb5c84b..00000000 --- a/cmd/main-sync-api/config.yml-example +++ /dev/null @@ -1,41 +0,0 @@ -appCfg: - fullName: SIMRS Sync - codeName: simrs-sync - version: 0.1.0 - env: development - lang: en - -dbCfg: - dsn: - maxOpenConns: 5 - maxIdleConns: 5 - maxIdleTime: 100 - -multiDbCfg: - dbs : - - name: simrs_sync - dsn: - maxOpenConns: 5 - maxIdleConns: 5 - maxIdleTime: 100 - -httpCfg: - host: 127.0.0.1 - port: 8003 - -loggerCfg: - hideTime: true - hideLevel: true - -langCfg: - active: en - path: ../../assets/language/en - fileName: data.json - -corsCfg: - allowedOrigin: - allowedMethod: GET, POST, PUT, PATCH, DELETE, OPTIONS - -syncUrlCfg: - target: - host: \ No newline at end of file diff --git a/cmd/main-sync-api/main.go b/cmd/main-sync-api/main.go deleted file mode 100644 index 5bfdd36b..00000000 --- a/cmd/main-sync-api/main.go +++ /dev/null @@ -1,15 +0,0 @@ -package main - -import ( - a "github.com/karincake/apem" - - h "simrs-vx/internal/interface/main-sync-handler" - - d "github.com/karincake/apem/db-gorm-pg" - - l "github.com/karincake/apem/logger-zerolog" -) - -func main() { - a.Run(h.SetRoutes(), &l.O, &d.O) -} diff --git a/cmd/simgos-sync-api/config.yml-example b/cmd/simgos-sync-api/config.yml-example index 153be50e..98544958 100644 --- a/cmd/simgos-sync-api/config.yml-example +++ b/cmd/simgos-sync-api/config.yml-example @@ -34,8 +34,4 @@ langCfg: corsCfg: allowedOrigin: - allowedMethod: GET, POST, PUT, PATCH, DELETE, OPTIONS - -syncUrlCfg: - target: - host: \ No newline at end of file + allowedMethod: GET, POST, PUT, PATCH, DELETE, OPTIONS \ No newline at end of file diff --git a/cmd/simgos-sync-migration/Makefile b/cmd/simgos-sync-migration/Makefile new file mode 100644 index 00000000..e83356e5 --- /dev/null +++ b/cmd/simgos-sync-migration/Makefile @@ -0,0 +1,18 @@ +# Makefile for Atlas migrations + +# Default environment +ENV ?= gorm + +.PHONY: diff apply hash + +## Generate a new migration diff +diff: + atlas migrate diff --env $(ENV) + +## Apply migrations to the database +apply: + atlas migrate apply --env $(ENV) + +## Calculate the schema hash +hash: + atlas migrate hash diff --git a/cmd/simgos-sync-migration/README-ATLAS.MD b/cmd/simgos-sync-migration/README-ATLAS.MD new file mode 100644 index 00000000..da249823 --- /dev/null +++ b/cmd/simgos-sync-migration/README-ATLAS.MD @@ -0,0 +1,59 @@ +# Database Migration with Atlas + +This project uses [Atlas](https://atlasgo.io/) for database schema management and migrations. + +## 📋 Prerequisites + +1. **Download and Install Atlas CLI** + Run the following command in PowerShell or Git Bash: + + ```sh + curl -sSf https://atlasgo.sh | sh + ``` + Verify installation: + + ```sh + atlas version + ``` + +2. Install GORM Provider + Run inside your Go project: + + ```sh + go get -u ariga.io/atlas-provider-gorm + ``` + +3. Create atlas.hcl configuration file + Just create an atlas.hcl file in your project root as example given at atlas.hcl.example +4. Create migrations folder + ```sh + mkdir migrations + ``` +5. Usage +You can use the provided Makefile for common commands: + + Generate a migration diff + ```sh + make diff + ``` + + Apply migrations + ```sh + make apply + ``` + + Compute schema hash + ```sh + make hash + ``` + + If you don’t have make installed, you can run the Atlas commands directly: + ```sh + atlas migrate diff --env gorm + ``` + ```sh + atlas migrate apply --env gorm + ``` + ```sh + atlas migrate hash + ``` \ No newline at end of file diff --git a/cmd/simgos-sync-migration/atlas.hcl.example b/cmd/simgos-sync-migration/atlas.hcl.example new file mode 100644 index 00000000..857d1352 --- /dev/null +++ b/cmd/simgos-sync-migration/atlas.hcl.example @@ -0,0 +1,22 @@ +data "external_schema" "gorm" { + program = [ + "go", + "run", + "-mod=mod", + ".", + ] +} + +env "gorm" { + src = data.external_schema.gorm.url + dev = "" // dsn db to check the diff + migration { + dir = "file://migrations" + } + url = "" // dsn db to apply + format { + migrate { + diff = "{{ sql . \" \" }}" + } + } +} \ No newline at end of file diff --git a/cmd/simgos-sync-migration/migration.go b/cmd/simgos-sync-migration/migration.go new file mode 100644 index 00000000..fdd2c995 --- /dev/null +++ b/cmd/simgos-sync-migration/migration.go @@ -0,0 +1,9 @@ +package main + +import ( + m "simrs-vx/internal/interface/migration" +) + +func main() { + m.Migrate(m.SimgosSync) +} diff --git a/internal/infra/sync-cfg/sync-cfg.go b/internal/infra/sync-cfg/sync-cfg.go index 0368a7c4..a5579219 100644 --- a/internal/infra/sync-cfg/sync-cfg.go +++ b/internal/infra/sync-cfg/sync-cfg.go @@ -7,8 +7,12 @@ import ( func SetConfig() { a.ParseSingleCfg(&O) - if O.Host == "" || O.Target == "" { - panic("sync url config host or target empty") + //if O.Host == "" || O.Target == "" { + // panic("sync url config host or target empty") + //} + + if O.BaseUrl == "" { + panic("config bpjs base url empty") } lo.I.Println("sync url config loaded, status: DONE!!") } diff --git a/internal/infra/sync-cfg/tycovar.go b/internal/infra/sync-cfg/tycovar.go index 9bb59f3d..081ef762 100644 --- a/internal/infra/sync-cfg/tycovar.go +++ b/internal/infra/sync-cfg/tycovar.go @@ -3,6 +3,7 @@ package synccfg var O SyncUrlCfg = SyncUrlCfg{} type SyncUrlCfg struct { - Target string `yaml:"target"` - Host string `yaml:"host"` + Target string `yaml:"target"` + Host string `yaml:"host"` + BaseUrl string `yaml:"baseUrl"` } diff --git a/internal/interface/main-handler/main-handler.go b/internal/interface/main-handler/main-handler.go index 8e885dc3..55f45479 100644 --- a/internal/interface/main-handler/main-handler.go +++ b/internal/interface/main-handler/main-handler.go @@ -60,6 +60,7 @@ import ( gs "simrs-vx/internal/infra/gorm-setting" minio "simrs-vx/internal/infra/minio" ssdb "simrs-vx/internal/infra/ss-db" + simgossync "simrs-vx/internal/infra/sync-cfg" /******************** pkg ********************/ cmw "simrs-vx/pkg/cors-manager-mw" @@ -128,6 +129,7 @@ func SetRoutes() http.Handler { a.RegisterExtCall(mh.I.SetClient) a.RegisterExtCall(ibpjs.SetConfig) a.RegisterExtCall(validation.RegisterValidation) + a.RegisterExtCall(simgossync.SetConfig) r := http.NewServeMux() diff --git a/internal/interface/main-sync-handler/main-sync-handler.go b/internal/interface/main-sync-handler/main-sync-handler.go deleted file mode 100644 index c8ba5144..00000000 --- a/internal/interface/main-sync-handler/main-sync-handler.go +++ /dev/null @@ -1,36 +0,0 @@ -package mainsynchandler - -import ( - "net/http" - - /******************** infra ********************/ - gs "simrs-vx/internal/infra/gorm-setting" - synccfg "simrs-vx/internal/infra/sync-cfg" - - /******************** pkg ********************/ - cmw "simrs-vx/pkg/cors-manager-mw" - lh "simrs-vx/pkg/lang-helper" - handlerlogger "simrs-vx/pkg/middleware/handler-logger" - zlc "simrs-vx/pkg/zerolog-ctx" - - /******************** external ********************/ - a "github.com/karincake/apem" - - /******************** internal ********************/ - "simrs-vx/internal/interface/main-handler/home" -) - -func SetRoutes() http.Handler { - /// - a.RegisterExtCall(gs.Adjust) - a.RegisterExtCall(zlc.Adjust) - a.RegisterExtCall(lh.Populate) - a.RegisterExtCall(synccfg.SetConfig) - - r := http.NewServeMux() - - /******************** Main ********************/ - r.HandleFunc("/", home.Home) - - return cmw.SetCors(handlerlogger.SetLog(r)) -} diff --git a/internal/interface/migration/migration.go b/internal/interface/migration/migration.go index 6cec68dc..a446ac1a 100644 --- a/internal/interface/migration/migration.go +++ b/internal/interface/migration/migration.go @@ -31,6 +31,8 @@ func getEntities(input string) []any { return getMainEntities() case "satusehat": return getSatuSehatEntities() + case "simgos-sync": + return getSimgosSync() } return nil } diff --git a/internal/interface/migration/simgos-sync-entities.go b/internal/interface/migration/simgos-sync-entities.go new file mode 100644 index 00000000..c6b51988 --- /dev/null +++ b/internal/interface/migration/simgos-sync-entities.go @@ -0,0 +1,5 @@ +package migration + +func getSimgosSync() []any { + return []any{} +} diff --git a/internal/interface/migration/tycovar.go b/internal/interface/migration/tycovar.go index f86f855d..977c4689 100644 --- a/internal/interface/migration/tycovar.go +++ b/internal/interface/migration/tycovar.go @@ -2,6 +2,7 @@ package migration const ( - Main = "main" - SatuSehat = "satusehat" + Main = "main" + SatuSehat = "satusehat" + SimgosSync = "simgos-sync" ) diff --git a/internal/interface/simgos-sync-handler/installation/handler.go b/internal/interface/simgos-sync-handler/installation/handler.go new file mode 100644 index 00000000..8e8b15bf --- /dev/null +++ b/internal/interface/simgos-sync-handler/installation/handler.go @@ -0,0 +1,51 @@ +package installation + +import ( + "net/http" + + rw "github.com/karincake/risoles" + // ua "github.com/karincake/tumpeng/auth/svc" + + e "simrs-vx/internal/domain/main-entities/installation" + u "simrs-vx/internal/use-case/main-use-case/installation" +) + +type myBase struct{} + +var O myBase + +func (obj myBase) Create(w http.ResponseWriter, r *http.Request) { + dto := e.CreateDto{} + if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { + return + } + res, err := u.Create(dto) + rw.DataResponse(w, res, err) +} + +func (obj myBase) Update(w http.ResponseWriter, r *http.Request) { + code := rw.ValidateString(w, "code", r.PathValue("code")) + if code == "" { + return + } + + dto := e.UpdateDto{} + if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { + return + } + dto.Code = &code + res, err := u.Update(dto) + rw.DataResponse(w, res, err) +} + +func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) { + code := rw.ValidateString(w, "code", r.PathValue("code")) + if code == "" { + return + } + + dto := e.DeleteDto{} + dto.Code = &code + 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 f51106a9..ed3246f7 100644 --- a/internal/interface/simgos-sync-handler/simgos-sync-handler.go +++ b/internal/interface/simgos-sync-handler/simgos-sync-handler.go @@ -2,10 +2,10 @@ package simgossynchandler import ( "net/http" + hc "simrs-vx/pkg/handler-crud-helper" /******************** infra ********************/ gs "simrs-vx/internal/infra/gorm-setting" - synccfg "simrs-vx/internal/infra/sync-cfg" /******************** pkg ********************/ cmw "simrs-vx/pkg/cors-manager-mw" @@ -18,6 +18,9 @@ import ( /******************** internal ********************/ "simrs-vx/internal/interface/main-handler/home" + + /********************* source *********************/ + installation "simrs-vx/internal/interface/simgos-sync-handler/installation" ) func SetRoutes() http.Handler { @@ -25,12 +28,14 @@ func SetRoutes() http.Handler { a.RegisterExtCall(gs.Adjust) a.RegisterExtCall(zlc.Adjust) a.RegisterExtCall(lh.Populate) - a.RegisterExtCall(synccfg.SetConfig) r := http.NewServeMux() /******************** Main ********************/ r.HandleFunc("/", home.Home) + /******************** Source ******************/ + hc.RegCrudByCode(r, "/v1/installation", installation.O) + return cmw.SetCors(handlerlogger.SetLog(r)) } diff --git a/internal/use-case/main-sync-use-case/.keep b/internal/use-case/main-sync-use-case/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/internal/use-case/simgos-sync-use-case/installation/case.go b/internal/use-case/simgos-sync-use-case/installation/case.go new file mode 100644 index 00000000..7d8187cc --- /dev/null +++ b/internal/use-case/simgos-sync-use-case/installation/case.go @@ -0,0 +1,263 @@ +package installation + +import ( + e "simrs-vx/internal/domain/main-entities/installation" + "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" +) + +const source = "installation" + +func Create(input e.CreateDto) (*d.Data, error) { + data := e.Installation{} + + event := pl.Event{ + Feature: "Create", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "create") + + err := dg.I.Transaction(func(tx *gorm.DB) error { + if resData, err := CreateData(input, &event, tx); err != nil { + return err + } else { + data = *resData + } + + 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.Installation + var dataList []e.Installation + 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.Installation + 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{Code: input.Code} + var data *e.Installation + 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{Code: input.Code} + var data *e.Installation + 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/simgos-sync-use-case/installation/helper.go b/internal/use-case/simgos-sync-use-case/installation/helper.go new file mode 100644 index 00000000..d3d96b5c --- /dev/null +++ b/internal/use-case/simgos-sync-use-case/installation/helper.go @@ -0,0 +1,23 @@ +/* +DESCRIPTION: +Any functions that are used internally by the use-case +*/ +package installation + +import ( + e "simrs-vx/internal/domain/main-entities/installation" +) + +func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Installation) { + var inputSrc *e.CreateDto + if inputT, ok := any(input).(*e.CreateDto); ok { + inputSrc = inputT + } else { + inputTemp := any(input).(*e.UpdateDto) + inputSrc = &inputTemp.CreateDto + } + + data.Code = *inputSrc.Code + data.Name = inputSrc.Name + data.EncounterClass_Code = inputSrc.EncounterClass_Code +} diff --git a/internal/use-case/simgos-sync-use-case/installation/lib.go b/internal/use-case/simgos-sync-use-case/installation/lib.go new file mode 100644 index 00000000..d75b2ecd --- /dev/null +++ b/internal/use-case/simgos-sync-use-case/installation/lib.go @@ -0,0 +1,149 @@ +package installation + +import ( + e "simrs-vx/internal/domain/main-entities/installation" + + plh "simrs-vx/pkg/lib-helper" + pl "simrs-vx/pkg/logger" + pu "simrs-vx/pkg/use-case-helper" + + dg "github.com/karincake/apem/db-gorm-pg" + gh "github.com/karincake/getuk" + "gorm.io/gorm" +) + +func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.Installation, error) { + pl.SetLogInfo(event, nil, "started", "DBCreate") + + data := e.Installation{} + setData(&input, &data) + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + if err := tx.Create(&data).Error; err != nil { + return nil, plh.HandleCreateError(input, event, err) + } + + pl.SetLogInfo(event, nil, "complete") + return &data, nil +} + +func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Installation, *e.MetaDto, error) { + pl.SetLogInfo(event, input, "started", "DBReadList") + data := []e.Installation{} + 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.Installation{}). + 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 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.Installation, error) { + pl.SetLogInfo(event, input, "started", "DBReadDetail") + data := e.Installation{} + + var tx *gorm.DB + if len(dbx) > 0 { + tx = dbx[0] + } else { + tx = dg.I + } + + if input.Code != nil { + tx = tx.Where("\"Code\" = ?", *input.Code) + } + if input.Id != nil { + tx = tx.Where("\"Id\" = ?", *input.Id) + } + + if err := tx. + Scopes(gh.Preload(input.Includes)). + First(&data).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.Installation, 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.Installation, 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/simgos-sync-use-case/installation/middleware-runner.go b/internal/use-case/simgos-sync-use-case/installation/middleware-runner.go new file mode 100644 index 00000000..fce572bb --- /dev/null +++ b/internal/use-case/simgos-sync-use-case/installation/middleware-runner.go @@ -0,0 +1,103 @@ +package installation + +import ( + e "simrs-vx/internal/domain/main-entities/installation" + 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.Installation) 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.Installation) 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.Installation) 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.Installation) 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.Installation) 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/installation/middleware.go b/internal/use-case/simgos-sync-use-case/installation/middleware.go new file mode 100644 index 00000000..3d414c9b --- /dev/null +++ b/internal/use-case/simgos-sync-use-case/installation/middleware.go @@ -0,0 +1,9 @@ +package installation + +// 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/installation/tycovar.go b/internal/use-case/simgos-sync-use-case/installation/tycovar.go new file mode 100644 index 00000000..de8e9c9e --- /dev/null +++ b/internal/use-case/simgos-sync-use-case/installation/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 installation + +import ( + "gorm.io/gorm" + + e "simrs-vx/internal/domain/main-entities/installation" +) + +type createMw struct { + Name string + Func func(input *e.CreateDto, data *e.Installation, tx *gorm.DB) error +} + +type readListMw struct { + Name string + Func func(input *e.ReadListDto, data *e.Installation, tx *gorm.DB) error +} + +type readDetailMw struct { + Name string + Func func(input *e.ReadDetailDto, data *e.Installation, 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/pkg/handler-crud-helper/handler-crud-helper.go b/pkg/handler-crud-helper/handler-crud-helper.go index df475094..a5700dad 100644 --- a/pkg/handler-crud-helper/handler-crud-helper.go +++ b/pkg/handler-crud-helper/handler-crud-helper.go @@ -74,3 +74,67 @@ func RegCrudByCode(r *http.ServeMux, path string, mwAndRouter ...any) { "DELETE /{code}": c.Delete, }) } + +func RegCrudSimgosSync(r *http.ServeMux, path string, mwAndRouter ...any) { + sLength := len(mwAndRouter) + + mwCandidates := mwAndRouter[:sLength-1] + mwList := []hk.HandlerMw{} + for i := range mwCandidates { + // have to do it manually, since casting directly results unexpected result + myType := reflect.TypeOf(mwCandidates[i]) + if myType.String() != "func(http.Handler) http.Handler" { + panic("non middleware included as middleware") + } + mwList = append(mwList, mwCandidates[i].(func(http.Handler) http.Handler)) + + // if g, okHandler := mwCandidates[i].(func(http.Handler) http.Handler); !okHandler { + // panic("non middleware included") + // } else { + // mwList = append(mwList, g) + // } + } + + c, ok := mwAndRouter[sLength-1].(CrudBase) + if !ok { + panic("non CrudBase used in the last paramter") + } + + hk.GroupRoutes(path, r, mwList, hk.MapHandlerFunc{ + "POST /": c.Create, + "PATCH /{id}": c.Update, + "DELETE /{id}": c.Delete, + }) +} + +func RegCrudByCodeSimgosSync(r *http.ServeMux, path string, mwAndRouter ...any) { + sLength := len(mwAndRouter) + + mwCandidates := mwAndRouter[:sLength-1] + mwList := []hk.HandlerMw{} + for i := range mwCandidates { + // have to do it manually, since casting directly results unexpected result + myType := reflect.TypeOf(mwCandidates[i]) + if myType.String() != "func(http.Handler) http.Handler" { + panic("non middleware included as middleware") + } + mwList = append(mwList, mwCandidates[i].(func(http.Handler) http.Handler)) + + // if g, okHandler := mwCandidates[i].(func(http.Handler) http.Handler); !okHandler { + // panic("non middleware included") + // } else { + // mwList = append(mwList, g) + // } + } + + c, ok := mwAndRouter[sLength-1].(CrudBase) + if !ok { + panic("non CrudBase used in the last paramter") + } + + hk.GroupRoutes(path, r, mwList, hk.MapHandlerFunc{ + "POST /": c.Create, + "PATCH /{code}": c.Update, + "DELETE /{code}": c.Delete, + }) +} From 4b78e489ef806ebba23700f1914b1e018ff35f36 Mon Sep 17 00:00:00 2001 From: vanilia Date: Thu, 13 Nov 2025 10:33:37 +0700 Subject: [PATCH 02/11] add instalation entity --- cmd/simgos-sync-migration/Makefile | 18 ++++++ cmd/simgos-sync-migration/README-ATLAS.MD | 59 +++++++++++++++++++ cmd/simgos-sync-migration/atlas.hcl.example | 22 +++++++ cmd/simgos-sync-migration/migration.go | 9 +++ internal/domain/references/common/common.go | 4 ++ .../simgos-entities/installation/entity.go | 12 ++++ internal/domain/simgos-sync-entities/.keep | 0 .../sync-entities/installation/entity.go | 29 +++++++++ internal/interface/migration/migration.go | 2 + .../migration/simgossync-entities.go | 9 +++ internal/interface/migration/tycovar.go | 5 +- 11 files changed, 167 insertions(+), 2 deletions(-) create mode 100644 cmd/simgos-sync-migration/Makefile create mode 100644 cmd/simgos-sync-migration/README-ATLAS.MD create mode 100644 cmd/simgos-sync-migration/atlas.hcl.example create mode 100644 cmd/simgos-sync-migration/migration.go create mode 100644 internal/domain/simgos-entities/installation/entity.go delete mode 100644 internal/domain/simgos-sync-entities/.keep create mode 100644 internal/domain/sync-entities/installation/entity.go create mode 100644 internal/interface/migration/simgossync-entities.go diff --git a/cmd/simgos-sync-migration/Makefile b/cmd/simgos-sync-migration/Makefile new file mode 100644 index 00000000..e83356e5 --- /dev/null +++ b/cmd/simgos-sync-migration/Makefile @@ -0,0 +1,18 @@ +# Makefile for Atlas migrations + +# Default environment +ENV ?= gorm + +.PHONY: diff apply hash + +## Generate a new migration diff +diff: + atlas migrate diff --env $(ENV) + +## Apply migrations to the database +apply: + atlas migrate apply --env $(ENV) + +## Calculate the schema hash +hash: + atlas migrate hash diff --git a/cmd/simgos-sync-migration/README-ATLAS.MD b/cmd/simgos-sync-migration/README-ATLAS.MD new file mode 100644 index 00000000..da249823 --- /dev/null +++ b/cmd/simgos-sync-migration/README-ATLAS.MD @@ -0,0 +1,59 @@ +# Database Migration with Atlas + +This project uses [Atlas](https://atlasgo.io/) for database schema management and migrations. + +## 📋 Prerequisites + +1. **Download and Install Atlas CLI** + Run the following command in PowerShell or Git Bash: + + ```sh + curl -sSf https://atlasgo.sh | sh + ``` + Verify installation: + + ```sh + atlas version + ``` + +2. Install GORM Provider + Run inside your Go project: + + ```sh + go get -u ariga.io/atlas-provider-gorm + ``` + +3. Create atlas.hcl configuration file + Just create an atlas.hcl file in your project root as example given at atlas.hcl.example +4. Create migrations folder + ```sh + mkdir migrations + ``` +5. Usage +You can use the provided Makefile for common commands: + + Generate a migration diff + ```sh + make diff + ``` + + Apply migrations + ```sh + make apply + ``` + + Compute schema hash + ```sh + make hash + ``` + + If you don’t have make installed, you can run the Atlas commands directly: + ```sh + atlas migrate diff --env gorm + ``` + ```sh + atlas migrate apply --env gorm + ``` + ```sh + atlas migrate hash + ``` \ No newline at end of file diff --git a/cmd/simgos-sync-migration/atlas.hcl.example b/cmd/simgos-sync-migration/atlas.hcl.example new file mode 100644 index 00000000..857d1352 --- /dev/null +++ b/cmd/simgos-sync-migration/atlas.hcl.example @@ -0,0 +1,22 @@ +data "external_schema" "gorm" { + program = [ + "go", + "run", + "-mod=mod", + ".", + ] +} + +env "gorm" { + src = data.external_schema.gorm.url + dev = "" // dsn db to check the diff + migration { + dir = "file://migrations" + } + url = "" // dsn db to apply + format { + migrate { + diff = "{{ sql . \" \" }}" + } + } +} \ No newline at end of file diff --git a/cmd/simgos-sync-migration/migration.go b/cmd/simgos-sync-migration/migration.go new file mode 100644 index 00000000..fdd2c995 --- /dev/null +++ b/cmd/simgos-sync-migration/migration.go @@ -0,0 +1,9 @@ +package main + +import ( + m "simrs-vx/internal/interface/migration" +) + +func main() { + m.Migrate(m.SimgosSync) +} diff --git a/internal/domain/references/common/common.go b/internal/domain/references/common/common.go index 2941049c..71396f2a 100644 --- a/internal/domain/references/common/common.go +++ b/internal/domain/references/common/common.go @@ -16,6 +16,7 @@ type ( DataVerifiedCode string CrudCode string DataApprovalCode string + ProcessStatusCode string ) const ( @@ -101,6 +102,9 @@ const ( DACNew DataApprovalCode = "new" DACApproved DataApprovalCode = "approved" DACRejected DataApprovalCode = "rejected" + + PSCSuccess ProcessStatusCode = "success" + PSCFailed ProcessStatusCode = "failed" ) func GetDayCodes() map[DayCode]string { diff --git a/internal/domain/simgos-entities/installation/entity.go b/internal/domain/simgos-entities/installation/entity.go new file mode 100644 index 00000000..88028fc4 --- /dev/null +++ b/internal/domain/simgos-entities/installation/entity.go @@ -0,0 +1,12 @@ +package installation + +type MInstalasi struct { + NoInstalasi uint `json:"no_instalasi"` + NamaInstalasi string `json:"nama_instalasi"` + StatusRawatInap *uint `json:"status_rawat_inap"` + StAktif *uint64 `json:"st_aktif"` +} + +func (MInstalasi) TableName() string { + return "m_instalasi" +} diff --git a/internal/domain/simgos-sync-entities/.keep b/internal/domain/simgos-sync-entities/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/internal/domain/sync-entities/installation/entity.go b/internal/domain/sync-entities/installation/entity.go new file mode 100644 index 00000000..46ffe71b --- /dev/null +++ b/internal/domain/sync-entities/installation/entity.go @@ -0,0 +1,29 @@ +package installation + +import ( + ecore "simrs-vx/internal/domain/base-entities/core" + erc "simrs-vx/internal/domain/references/common" + "time" +) + +type InstallationLink struct { + ecore.Main + Simx_Id string `json:"simx_id" gorm:"unique"` + Simgos_Id uint64 `json:"simgos_id" gorm:"unique"` +} + +type InstallationSimxLog struct { + ecore.Main + Value *string `json:"value"` + Date *time.Time `json:"date"` + Status erc.ProcessStatusCode `json:"status"` + ErrMessage *string `json:"errMessage"` +} + +type InstallationSimgosLog struct { + ecore.Main + Value *string `json:"value"` + Date *time.Time `json:"date"` + Status erc.ProcessStatusCode `json:"status"` + ErrMessage *string `json:"errMessage"` +} diff --git a/internal/interface/migration/migration.go b/internal/interface/migration/migration.go index 6cec68dc..31ec1840 100644 --- a/internal/interface/migration/migration.go +++ b/internal/interface/migration/migration.go @@ -31,6 +31,8 @@ func getEntities(input string) []any { return getMainEntities() case "satusehat": return getSatuSehatEntities() + case "simgossync": + return getSimgosSyncEntities() } return nil } diff --git a/internal/interface/migration/simgossync-entities.go b/internal/interface/migration/simgossync-entities.go new file mode 100644 index 00000000..175a0ba9 --- /dev/null +++ b/internal/interface/migration/simgossync-entities.go @@ -0,0 +1,9 @@ +package migration + +func getSimgosSyncEntities() []any { + return []any{ + //&installation.InstallationLink{}, + //&installation.InstallationSimxLog{}, + //&installation.InstallationSimgosLog{}, + } +} diff --git a/internal/interface/migration/tycovar.go b/internal/interface/migration/tycovar.go index f86f855d..f6c57b4b 100644 --- a/internal/interface/migration/tycovar.go +++ b/internal/interface/migration/tycovar.go @@ -2,6 +2,7 @@ package migration const ( - Main = "main" - SatuSehat = "satusehat" + Main = "main" + SatuSehat = "satusehat" + SimgosSync = "simgossync" ) From 8cfd561a6cc328983a741f3d435a0d4c32d0deb1 Mon Sep 17 00:00:00 2001 From: vanilia Date: Thu, 13 Nov 2025 10:57:53 +0700 Subject: [PATCH 03/11] add migration sync --- .../migrations/20251113035508.sql | 36 +++++++++++++++++++ .../migrations/atlas.sum | 2 ++ .../sync-entities/installation/entity.go | 4 +-- .../migration/simgossync-entities.go | 11 ++++-- 4 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 cmd/simgos-sync-migration/migrations/20251113035508.sql create mode 100644 cmd/simgos-sync-migration/migrations/atlas.sum diff --git a/cmd/simgos-sync-migration/migrations/20251113035508.sql b/cmd/simgos-sync-migration/migrations/20251113035508.sql new file mode 100644 index 00000000..5dddf417 --- /dev/null +++ b/cmd/simgos-sync-migration/migrations/20251113035508.sql @@ -0,0 +1,36 @@ +-- Create "InstallationLink" table +CREATE TABLE "public"."InstallationLink" ( + "Id" bigserial NOT NULL, + "CreatedAt" timestamptz NULL, + "UpdatedAt" timestamptz NULL, + "DeletedAt" timestamptz NULL, + "Simx_Id" bigint NULL, + "Simgos_Id" bigint NULL, + PRIMARY KEY ("Id"), + CONSTRAINT "uni_InstallationLink_Simgos_Id" UNIQUE ("Simgos_Id"), + CONSTRAINT "uni_InstallationLink_Simx_Id" UNIQUE ("Simx_Id") +); +-- Create "InstallationSimgosLog" table +CREATE TABLE "public"."InstallationSimgosLog" ( + "Id" bigserial NOT NULL, + "CreatedAt" timestamptz NULL, + "UpdatedAt" timestamptz NULL, + "DeletedAt" timestamptz NULL, + "Value" text NULL, + "Date" timestamptz NULL, + "Status" text NULL, + "ErrMessage" text NULL, + PRIMARY KEY ("Id") +); +-- Create "InstallationSimxLog" table +CREATE TABLE "public"."InstallationSimxLog" ( + "Id" bigserial NOT NULL, + "CreatedAt" timestamptz NULL, + "UpdatedAt" timestamptz NULL, + "DeletedAt" timestamptz NULL, + "Value" text NULL, + "Date" timestamptz NULL, + "Status" text NULL, + "ErrMessage" text NULL, + PRIMARY KEY ("Id") +); diff --git a/cmd/simgos-sync-migration/migrations/atlas.sum b/cmd/simgos-sync-migration/migrations/atlas.sum new file mode 100644 index 00000000..50f3c7d3 --- /dev/null +++ b/cmd/simgos-sync-migration/migrations/atlas.sum @@ -0,0 +1,2 @@ +h1:OaRZyFJMii/8wQ0XLWEpF9MIL8IXblx3IYvB7LN2XQ4= +20251113035508.sql h1:p/FKefphuiBjEND87ChQLS/lcZcnvn0aT5tRV43Dn5o= diff --git a/internal/domain/sync-entities/installation/entity.go b/internal/domain/sync-entities/installation/entity.go index 46ffe71b..a7818f3f 100644 --- a/internal/domain/sync-entities/installation/entity.go +++ b/internal/domain/sync-entities/installation/entity.go @@ -8,8 +8,8 @@ import ( type InstallationLink struct { ecore.Main - Simx_Id string `json:"simx_id" gorm:"unique"` - Simgos_Id uint64 `json:"simgos_id" gorm:"unique"` + Simx_Id uint `json:"simx_id" gorm:"unique"` + Simgos_Id uint `json:"simgos_id" gorm:"unique"` } type InstallationSimxLog struct { diff --git a/internal/interface/migration/simgossync-entities.go b/internal/interface/migration/simgossync-entities.go index 175a0ba9..3b67265f 100644 --- a/internal/interface/migration/simgossync-entities.go +++ b/internal/interface/migration/simgossync-entities.go @@ -1,9 +1,14 @@ package migration +import ( + /************** Source ***************/ + installation "simrs-vx/internal/domain/sync-entities/installation" +) + func getSimgosSyncEntities() []any { return []any{ - //&installation.InstallationLink{}, - //&installation.InstallationSimxLog{}, - //&installation.InstallationSimgosLog{}, + &installation.InstallationLink{}, + &installation.InstallationSimxLog{}, + &installation.InstallationSimgosLog{}, } } From 91afde0624c73680444965abc6b707d8bd2f0ebd Mon Sep 17 00:00:00 2001 From: vanilia Date: Thu, 13 Nov 2025 11:39:12 +0700 Subject: [PATCH 04/11] on going installation --- .../installation/handler.go | 2 +- .../simgos-sync-handler.go | 11 ++-- .../main-use-case/installation/case.go | 3 +- .../simgos-sync-use-case/installation/case.go | 4 ++ .../installation/helper.go | 5 +- .../simgos-sync-use-case/installation/lib.go | 9 +-- .../handler-crud-helper.go | 64 ------------------- 7 files changed, 22 insertions(+), 76 deletions(-) diff --git a/internal/interface/simgos-sync-handler/installation/handler.go b/internal/interface/simgos-sync-handler/installation/handler.go index 8e8b15bf..01a6beab 100644 --- a/internal/interface/simgos-sync-handler/installation/handler.go +++ b/internal/interface/simgos-sync-handler/installation/handler.go @@ -7,7 +7,7 @@ import ( // ua "github.com/karincake/tumpeng/auth/svc" e "simrs-vx/internal/domain/main-entities/installation" - u "simrs-vx/internal/use-case/main-use-case/installation" + u "simrs-vx/internal/use-case/simgos-sync-use-case/installation" ) 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 ed3246f7..963ec93c 100644 --- a/internal/interface/simgos-sync-handler/simgos-sync-handler.go +++ b/internal/interface/simgos-sync-handler/simgos-sync-handler.go @@ -2,8 +2,6 @@ package simgossynchandler import ( "net/http" - hc "simrs-vx/pkg/handler-crud-helper" - /******************** infra ********************/ gs "simrs-vx/internal/infra/gorm-setting" @@ -15,11 +13,10 @@ import ( /******************** external ********************/ a "github.com/karincake/apem" + hk "github.com/karincake/hongkue" /******************** internal ********************/ "simrs-vx/internal/interface/main-handler/home" - - /********************* source *********************/ installation "simrs-vx/internal/interface/simgos-sync-handler/installation" ) @@ -35,7 +32,11 @@ func SetRoutes() http.Handler { r.HandleFunc("/", home.Home) /******************** Source ******************/ - hc.RegCrudByCode(r, "/v1/installation", installation.O) + hk.GroupRoutes("/v1/installation", r, hk.MapHandlerFunc{ + "POST /": installation.O.Create, + "PATCH /{id}": installation.O.Update, + "DELETE /{id}": installation.O.Delete, + }) return cmw.SetCors(handlerlogger.SetLog(r)) } diff --git a/internal/use-case/main-use-case/installation/case.go b/internal/use-case/main-use-case/installation/case.go index f66bedaf..f3ce5d59 100644 --- a/internal/use-case/main-use-case/installation/case.go +++ b/internal/use-case/main-use-case/installation/case.go @@ -1,7 +1,6 @@ package installation import ( - e "simrs-vx/internal/domain/main-entities/installation" "strconv" dg "github.com/karincake/apem/db-gorm-pg" @@ -11,6 +10,8 @@ import ( pu "simrs-vx/pkg/use-case-helper" "gorm.io/gorm" + + e "simrs-vx/internal/domain/main-entities/installation" ) const source = "installation" diff --git a/internal/use-case/simgos-sync-use-case/installation/case.go b/internal/use-case/simgos-sync-use-case/installation/case.go index 7d8187cc..398289cd 100644 --- a/internal/use-case/simgos-sync-use-case/installation/case.go +++ b/internal/use-case/simgos-sync-use-case/installation/case.go @@ -27,6 +27,10 @@ func Create(input e.CreateDto) (*d.Data, error) { pl.SetLogInfo(&event, input, "started", "create") err := dg.I.Transaction(func(tx *gorm.DB) error { + // TODO: Insert + + // TODO: InsertSimxLog + if resData, err := CreateData(input, &event, tx); err != nil { return err } else { diff --git a/internal/use-case/simgos-sync-use-case/installation/helper.go b/internal/use-case/simgos-sync-use-case/installation/helper.go index d3d96b5c..af56b5c6 100644 --- a/internal/use-case/simgos-sync-use-case/installation/helper.go +++ b/internal/use-case/simgos-sync-use-case/installation/helper.go @@ -6,9 +6,10 @@ package installation import ( e "simrs-vx/internal/domain/main-entities/installation" + esimgos "simrs-vx/internal/domain/simgos-entities/installation" ) -func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Installation) { +func setDataSimgos[T *e.CreateDto | *e.UpdateDto](input T, data *esimgos.MInstalasi) { var inputSrc *e.CreateDto if inputT, ok := any(input).(*e.CreateDto); ok { inputSrc = inputT @@ -17,6 +18,8 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Installation) { inputSrc = &inputTemp.CreateDto } + data.NamaInstalasi = inputSrc.Name + data.StatusRawatInap = 1 data.Code = *inputSrc.Code data.Name = inputSrc.Name data.EncounterClass_Code = inputSrc.EncounterClass_Code diff --git a/internal/use-case/simgos-sync-use-case/installation/lib.go b/internal/use-case/simgos-sync-use-case/installation/lib.go index d75b2ecd..07afe61a 100644 --- a/internal/use-case/simgos-sync-use-case/installation/lib.go +++ b/internal/use-case/simgos-sync-use-case/installation/lib.go @@ -1,8 +1,6 @@ package installation import ( - e "simrs-vx/internal/domain/main-entities/installation" - plh "simrs-vx/pkg/lib-helper" pl "simrs-vx/pkg/logger" pu "simrs-vx/pkg/use-case-helper" @@ -10,12 +8,15 @@ import ( dg "github.com/karincake/apem/db-gorm-pg" gh "github.com/karincake/getuk" "gorm.io/gorm" + + e "simrs-vx/internal/domain/main-entities/installation" + esimgos "simrs-vx/internal/domain/simgos-entities/installation" ) -func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.Installation, error) { +func CreateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*esimgos.MInstalasi, error) { pl.SetLogInfo(event, nil, "started", "DBCreate") - data := e.Installation{} + data := esimgos.MInstalasi{} setData(&input, &data) var tx *gorm.DB diff --git a/pkg/handler-crud-helper/handler-crud-helper.go b/pkg/handler-crud-helper/handler-crud-helper.go index a5700dad..df475094 100644 --- a/pkg/handler-crud-helper/handler-crud-helper.go +++ b/pkg/handler-crud-helper/handler-crud-helper.go @@ -74,67 +74,3 @@ func RegCrudByCode(r *http.ServeMux, path string, mwAndRouter ...any) { "DELETE /{code}": c.Delete, }) } - -func RegCrudSimgosSync(r *http.ServeMux, path string, mwAndRouter ...any) { - sLength := len(mwAndRouter) - - mwCandidates := mwAndRouter[:sLength-1] - mwList := []hk.HandlerMw{} - for i := range mwCandidates { - // have to do it manually, since casting directly results unexpected result - myType := reflect.TypeOf(mwCandidates[i]) - if myType.String() != "func(http.Handler) http.Handler" { - panic("non middleware included as middleware") - } - mwList = append(mwList, mwCandidates[i].(func(http.Handler) http.Handler)) - - // if g, okHandler := mwCandidates[i].(func(http.Handler) http.Handler); !okHandler { - // panic("non middleware included") - // } else { - // mwList = append(mwList, g) - // } - } - - c, ok := mwAndRouter[sLength-1].(CrudBase) - if !ok { - panic("non CrudBase used in the last paramter") - } - - hk.GroupRoutes(path, r, mwList, hk.MapHandlerFunc{ - "POST /": c.Create, - "PATCH /{id}": c.Update, - "DELETE /{id}": c.Delete, - }) -} - -func RegCrudByCodeSimgosSync(r *http.ServeMux, path string, mwAndRouter ...any) { - sLength := len(mwAndRouter) - - mwCandidates := mwAndRouter[:sLength-1] - mwList := []hk.HandlerMw{} - for i := range mwCandidates { - // have to do it manually, since casting directly results unexpected result - myType := reflect.TypeOf(mwCandidates[i]) - if myType.String() != "func(http.Handler) http.Handler" { - panic("non middleware included as middleware") - } - mwList = append(mwList, mwCandidates[i].(func(http.Handler) http.Handler)) - - // if g, okHandler := mwCandidates[i].(func(http.Handler) http.Handler); !okHandler { - // panic("non middleware included") - // } else { - // mwList = append(mwList, g) - // } - } - - c, ok := mwAndRouter[sLength-1].(CrudBase) - if !ok { - panic("non CrudBase used in the last paramter") - } - - hk.GroupRoutes(path, r, mwList, hk.MapHandlerFunc{ - "POST /": c.Create, - "PATCH /{code}": c.Update, - "DELETE /{code}": c.Delete, - }) -} From 4f9663d98ae9ed0c696b695c9b76c072475b690f Mon Sep 17 00:00:00 2001 From: vanilia Date: Thu, 13 Nov 2025 11:41:29 +0700 Subject: [PATCH 05/11] update m_installation --- internal/domain/simgos-entities/installation/entity.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/domain/simgos-entities/installation/entity.go b/internal/domain/simgos-entities/installation/entity.go index 88028fc4..d620af5e 100644 --- a/internal/domain/simgos-entities/installation/entity.go +++ b/internal/domain/simgos-entities/installation/entity.go @@ -1,10 +1,10 @@ package installation type MInstalasi struct { - NoInstalasi uint `json:"no_instalasi"` - NamaInstalasi string `json:"nama_instalasi"` - StatusRawatInap *uint `json:"status_rawat_inap"` - StAktif *uint64 `json:"st_aktif"` + NoInstalasi uint `json:"no_instalasi"` + NamaInstalasi string `json:"nama_instalasi"` + StatusRawatInap uint `json:"status_rawat_inap"` + StAktif uint `json:"st_aktif"` } func (MInstalasi) TableName() string { From e75025f87d202e515d88ecd5d866e4852878b3db Mon Sep 17 00:00:00 2001 From: vanilia Date: Thu, 13 Nov 2025 17:28:20 +0700 Subject: [PATCH 06/11] add create installation --- .../domain/main-entities/installation/dto.go | 1 + .../main-use-case/installation/case.go | 9 +- .../installation/middleware-runner.go | 3 +- .../main-use-case/installation/middleware.go | 15 +- .../main-use-case/installation/tycovar.go | 4 +- .../simgos-sync-plugin/installation/plugin.go | 46 +++++ .../simgos-sync-use-case/installation/case.go | 157 ++++++++++-------- .../installation/helper.go | 39 ++++- .../simgos-sync-use-case/installation/lib.go | 90 +++++++--- 9 files changed, 254 insertions(+), 110 deletions(-) create mode 100644 internal/use-case/simgos-sync-plugin/installation/plugin.go diff --git a/internal/domain/main-entities/installation/dto.go b/internal/domain/main-entities/installation/dto.go index 758efb05..5cc0ed5c 100644 --- a/internal/domain/main-entities/installation/dto.go +++ b/internal/domain/main-entities/installation/dto.go @@ -8,6 +8,7 @@ import ( ) type CreateDto struct { + Id *uint `json:"id"` Code *string `json:"code" validate:"maxLength=10"` Name string `json:"name" validate:"maxLength=50"` EncounterClass_Code ere.EncounterClassCode `json:"encounterClass_code" validate:"maxLength=10"` diff --git a/internal/use-case/main-use-case/installation/case.go b/internal/use-case/main-use-case/installation/case.go index f3ce5d59..8e577a30 100644 --- a/internal/use-case/main-use-case/installation/case.go +++ b/internal/use-case/main-use-case/installation/case.go @@ -1,6 +1,7 @@ package installation import ( + egos "simrs-vx/internal/domain/simgos-entities/installation" "strconv" dg "github.com/karincake/apem/db-gorm-pg" @@ -18,6 +19,7 @@ const source = "installation" func Create(input e.CreateDto) (*d.Data, error) { data := e.Installation{} + sgData := egos.MInstalasi{} event := pl.Event{ Feature: "Create", @@ -29,11 +31,6 @@ func Create(input e.CreateDto) (*d.Data, error) { 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 @@ -43,7 +40,7 @@ func Create(input e.CreateDto) (*d.Data, error) { mwRunner.setMwType(pu.MWTPost) // Run post-middleware - if err := mwRunner.RunCreateMiddleware(createPostMw, &input, &data); err != nil { + if err := mwRunner.RunCreateMiddleware(createPostMw, &input, &sgData); err != nil { return err } diff --git a/internal/use-case/main-use-case/installation/middleware-runner.go b/internal/use-case/main-use-case/installation/middleware-runner.go index fce572bb..0abd6b29 100644 --- a/internal/use-case/main-use-case/installation/middleware-runner.go +++ b/internal/use-case/main-use-case/installation/middleware-runner.go @@ -2,6 +2,7 @@ package installation import ( e "simrs-vx/internal/domain/main-entities/installation" + egos "simrs-vx/internal/domain/simgos-entities/installation" pl "simrs-vx/pkg/logger" pu "simrs-vx/pkg/use-case-helper" @@ -23,7 +24,7 @@ func newMiddlewareRunner(event *pl.Event, tx *gorm.DB) *middlewareRunner { } // ExecuteCreateMiddleware executes create middleware -func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *e.Installation) error { +func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *egos.MInstalasi) error { for _, middleware := range middlewares { logData := pu.GetLogData(input, data) diff --git a/internal/use-case/main-use-case/installation/middleware.go b/internal/use-case/main-use-case/installation/middleware.go index 3d414c9b..46c4be1d 100644 --- a/internal/use-case/main-use-case/installation/middleware.go +++ b/internal/use-case/main-use-case/installation/middleware.go @@ -1,9 +1,12 @@ package installation +import ( + plugin "simrs-vx/internal/use-case/simgos-sync-plugin/installation" +) + // example of middleware -// func init() { -// createPreMw = append(createPreMw, -// CreateMw{Name: "modif-input", Func: pm.ModifInput}, -// CreateMw{Name: "check-data", Func: pm.CheckData}, -// ) -// } +func init() { + createPostMw = append(createPostMw, + createMw{Name: "create-installation", Func: plugin.Create}, + ) +} diff --git a/internal/use-case/main-use-case/installation/tycovar.go b/internal/use-case/main-use-case/installation/tycovar.go index de8e9c9e..975ebd34 100644 --- a/internal/use-case/main-use-case/installation/tycovar.go +++ b/internal/use-case/main-use-case/installation/tycovar.go @@ -9,6 +9,8 @@ functionality. The purpose of this is to make the code more maintainable. package installation import ( + egos "simrs-vx/internal/domain/simgos-entities/installation" + "gorm.io/gorm" e "simrs-vx/internal/domain/main-entities/installation" @@ -16,7 +18,7 @@ import ( type createMw struct { Name string - Func func(input *e.CreateDto, data *e.Installation, tx *gorm.DB) error + Func func(input *e.CreateDto, data *egos.MInstalasi, tx *gorm.DB) error } type readListMw struct { diff --git a/internal/use-case/simgos-sync-plugin/installation/plugin.go b/internal/use-case/simgos-sync-plugin/installation/plugin.go new file mode 100644 index 00000000..92ef479b --- /dev/null +++ b/internal/use-case/simgos-sync-plugin/installation/plugin.go @@ -0,0 +1,46 @@ +package installation + +import ( + "bytes" + "encoding/json" + "fmt" + "io" + "net/http" + sync "simrs-vx/internal/infra/sync-cfg" + + e "simrs-vx/internal/domain/main-entities/installation" + egos "simrs-vx/internal/domain/simgos-entities/installation" + + "gorm.io/gorm" +) + +var endpoint = fmt.Sprintf("%s/v1/installation", sync.O.BaseUrl) + +func Create(input *e.CreateDto, data *egos.MInstalasi, tx *gorm.DB) error { + 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() + + body, err := io.ReadAll(resp.Body) + if err != nil { + return err + } + + if err := json.Unmarshal(body, &data); err != nil { + return fmt.Errorf("failed to parse response JSON: %w", err) + } + + return nil +} diff --git a/internal/use-case/simgos-sync-use-case/installation/case.go b/internal/use-case/simgos-sync-use-case/installation/case.go index 398289cd..2990d5ae 100644 --- a/internal/use-case/simgos-sync-use-case/installation/case.go +++ b/internal/use-case/simgos-sync-use-case/installation/case.go @@ -1,8 +1,9 @@ package installation import ( - e "simrs-vx/internal/domain/main-entities/installation" + erc "simrs-vx/internal/domain/references/common" "strconv" + "time" dg "github.com/karincake/apem/db-gorm-pg" d "github.com/karincake/dodol" @@ -11,13 +12,18 @@ import ( pu "simrs-vx/pkg/use-case-helper" "gorm.io/gorm" + + e "simrs-vx/internal/domain/main-entities/installation" + egos "simrs-vx/internal/domain/simgos-entities/installation" + esync "simrs-vx/internal/domain/sync-entities/installation" ) const source = "installation" -func Create(input e.CreateDto) (*d.Data, error) { - data := e.Installation{} +var now = time.Now() +func Create(input e.CreateDto) (*d.Data, error) { + sgData := egos.MInstalasi{} event := pl.Event{ Feature: "Create", Source: source, @@ -27,14 +33,35 @@ func Create(input e.CreateDto) (*d.Data, error) { pl.SetLogInfo(&event, input, "started", "create") err := dg.I.Transaction(func(tx *gorm.DB) error { - // TODO: Insert + // Insert Simgos + sgData, err := CreateSimgosData(input, &event, tx) + if err != nil { + errMsg := err.Error() + inputLog := esync.InstallationSimxLog{ + Date: &now, + Status: erc.PSCFailed, + ErrMessage: &errMsg, + } - // TODO: InsertSimxLog - - if resData, err := CreateData(input, &event, tx); err != nil { - return err + // InsertSimxLog + if err = CreateSimxLogData(input, inputLog, &event, tx); err != nil { + return err + } } else { - data = *resData + inputLog := esync.InstallationSimxLog{ + Date: &now, + Status: erc.PSCSuccess, + } + + // InsertSimxLog + if err = CreateSimxLogData(input, inputLog, &event, tx); err != nil { + return err + } + } + + // InsertSimxLink + if err = CreateInstallationLinkData(*input.Id, sgData.NoInstalasi, &event, tx); err != nil { + return err } pl.SetLogInfo(&event, nil, "complete") @@ -52,7 +79,7 @@ func Create(input e.CreateDto) (*d.Data, error) { "structure": "single-data", "status": "created", }, - Data: data.ToResponse(), + Data: sgData, }, nil } @@ -156,61 +183,61 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) { }, nil } -func Update(input e.UpdateDto) (*d.Data, error) { - rdDto := e.ReadDetailDto{Code: input.Code} - var data *e.Installation - 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 Update(input e.UpdateDto) (*d.Data, error) { +// rdDto := e.ReadDetailDto{Code: input.Code} +// var data *e.Installation +// 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{Code: input.Code} diff --git a/internal/use-case/simgos-sync-use-case/installation/helper.go b/internal/use-case/simgos-sync-use-case/installation/helper.go index af56b5c6..eae50f99 100644 --- a/internal/use-case/simgos-sync-use-case/installation/helper.go +++ b/internal/use-case/simgos-sync-use-case/installation/helper.go @@ -5,11 +5,13 @@ Any functions that are used internally by the use-case package installation import ( + "encoding/json" e "simrs-vx/internal/domain/main-entities/installation" esimgos "simrs-vx/internal/domain/simgos-entities/installation" + esync "simrs-vx/internal/domain/sync-entities/installation" ) -func setDataSimgos[T *e.CreateDto | *e.UpdateDto](input T, data *esimgos.MInstalasi) { +func setDataSimgos[T *e.CreateDto | *e.UpdateDto](input T) (data esimgos.MInstalasi) { var inputSrc *e.CreateDto if inputT, ok := any(input).(*e.CreateDto); ok { inputSrc = inputT @@ -19,8 +21,35 @@ func setDataSimgos[T *e.CreateDto | *e.UpdateDto](input T, data *esimgos.MInstal } data.NamaInstalasi = inputSrc.Name - data.StatusRawatInap = 1 - data.Code = *inputSrc.Code - data.Name = inputSrc.Name - data.EncounterClass_Code = inputSrc.EncounterClass_Code + data.StatusRawatInap = 0 + data.StAktif = 1 + + return +} + +func setDataSimxLog[T *e.CreateDto | *e.UpdateDto](input T, inputLog esync.InstallationSimxLog) (data esync.InstallationSimxLog) { + var inputSrc *e.CreateDto + if inputT, ok := any(input).(*e.CreateDto); ok { + inputSrc = inputT + } else { + inputTemp := any(input).(*e.UpdateDto) + inputSrc = &inputTemp.CreateDto + } + + // encode to JSON + jsonData, _ := json.Marshal(inputSrc) + jsonString := string(jsonData) + + data.Value = &jsonString + data.Date = &now + data.Status = inputLog.Status + data.ErrMessage = inputLog.ErrMessage + + return +} + +func setDataSimxLink(simxId, simgosId uint) (data esync.InstallationLink) { + data.Simx_Id = simxId + data.Simgos_Id = simgosId + return } diff --git a/internal/use-case/simgos-sync-use-case/installation/lib.go b/internal/use-case/simgos-sync-use-case/installation/lib.go index 07afe61a..e76eb127 100644 --- a/internal/use-case/simgos-sync-use-case/installation/lib.go +++ b/internal/use-case/simgos-sync-use-case/installation/lib.go @@ -11,13 +11,13 @@ import ( e "simrs-vx/internal/domain/main-entities/installation" esimgos "simrs-vx/internal/domain/simgos-entities/installation" + esync "simrs-vx/internal/domain/sync-entities/installation" ) func CreateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*esimgos.MInstalasi, error) { pl.SetLogInfo(event, nil, "started", "DBCreate") - data := esimgos.MInstalasi{} - setData(&input, &data) + data := setDataSimgos(&input) var tx *gorm.DB if len(dbx) > 0 { @@ -34,6 +34,44 @@ func CreateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*esi return &data, nil } +func CreateSimxLogData(input e.CreateDto, inputLog esync.InstallationSimxLog, event *pl.Event, dbx ...*gorm.DB) error { + pl.SetLogInfo(event, nil, "started", "DBCreate") + data := setDataSimxLog(&input, inputLog) + + 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 +} + +func CreateInstallationLinkData(simxId, simgosId uint, event *pl.Event, dbx ...*gorm.DB) 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 plh.HandleCreateError(data, event, err) + } + + pl.SetLogInfo(event, nil, "complete") + return nil +} + func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Installation, *e.MetaDto, error) { pl.SetLogInfo(event, input, "started", "DBReadList") data := []e.Installation{} @@ -101,30 +139,30 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e return &data, nil } -func UpdateData(input e.UpdateDto, data *e.Installation, 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 UpdateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) error { +// pl.SetLogInfo(event, input, "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.Installation, event *pl.Event, dbx ...*gorm.DB) error { pl.SetLogInfo(event, data, "started", "DBDelete") From 403c085d56fa209ddb34ac0f5993ca1c028d5d62 Mon Sep 17 00:00:00 2001 From: vanilia Date: Thu, 13 Nov 2025 17:31:49 +0700 Subject: [PATCH 07/11] revise m_instalasi --- internal/domain/simgos-entities/installation/entity.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/domain/simgos-entities/installation/entity.go b/internal/domain/simgos-entities/installation/entity.go index d620af5e..faf2786e 100644 --- a/internal/domain/simgos-entities/installation/entity.go +++ b/internal/domain/simgos-entities/installation/entity.go @@ -1,10 +1,10 @@ package installation type MInstalasi struct { - NoInstalasi uint `json:"no_instalasi"` - NamaInstalasi string `json:"nama_instalasi"` - StatusRawatInap uint `json:"status_rawat_inap"` - StAktif uint `json:"st_aktif"` + No_Instalasi uint `json:"no_instalasi" gorm:"primaryKey;autoIncrement"` + Nama_Instalasi string `json:"nama_instalasi"` + Status_Rawat_Inap uint `json:"status_rawat_inap"` + St_Aktif uint `json:"st_aktif"` } func (MInstalasi) TableName() string { From 29469d4c50864b442455d88489132a45258c63e8 Mon Sep 17 00:00:00 2001 From: vanilia Date: Thu, 13 Nov 2025 20:54:35 +0700 Subject: [PATCH 08/11] add installation --- internal/domain/sync-entities/log/dto.go | 12 ++ internal/infra/simgos-db/simgos-db.go | 9 + internal/infra/simgos-db/tycovar.go | 5 + internal/infra/sync-cfg/sync-cfg.go | 7 +- internal/infra/sync-cfg/tycovar.go | 5 +- .../installation/handler.go | 46 ++-- .../simgos-sync-handler.go | 8 +- .../main-use-case/installation/case.go | 43 +++- .../installation/middleware-runner.go | 25 ++- .../main-use-case/installation/middleware.go | 6 +- .../main-use-case/installation/tycovar.go | 11 +- .../simgos-sync-plugin/installation/plugin.go | 49 ++++- .../simgos-sync-use-case/installation/case.go | 197 ++++++++++-------- .../installation/helper.go | 33 +-- .../simgos-sync-use-case/installation/lib.go | 20 +- 15 files changed, 313 insertions(+), 163 deletions(-) create mode 100644 internal/domain/sync-entities/log/dto.go create mode 100644 internal/infra/simgos-db/simgos-db.go create mode 100644 internal/infra/simgos-db/tycovar.go diff --git a/internal/domain/sync-entities/log/dto.go b/internal/domain/sync-entities/log/dto.go new file mode 100644 index 00000000..32f5be6f --- /dev/null +++ b/internal/domain/sync-entities/log/dto.go @@ -0,0 +1,12 @@ +package log + +import ( + erc "simrs-vx/internal/domain/references/common" +) + +type SimxLogDto struct { + Payload any `json:"payload"` + IsSuccess bool `json:"isSuccess"` + ErrMessage *string `json:"errMessage"` + Method erc.CrudCode `json:"method"` +} diff --git a/internal/infra/simgos-db/simgos-db.go b/internal/infra/simgos-db/simgos-db.go new file mode 100644 index 00000000..4387ad7f --- /dev/null +++ b/internal/infra/simgos-db/simgos-db.go @@ -0,0 +1,9 @@ +package simgos_db + +import ( + dg "github.com/karincake/apem/db-gorm-pg" +) + +func SetInstance() { + I = dg.IS["simrs"] +} diff --git a/internal/infra/simgos-db/tycovar.go b/internal/infra/simgos-db/tycovar.go new file mode 100644 index 00000000..b9c9f2b3 --- /dev/null +++ b/internal/infra/simgos-db/tycovar.go @@ -0,0 +1,5 @@ +package simgos_db + +import "gorm.io/gorm" + +var I *gorm.DB diff --git a/internal/infra/sync-cfg/sync-cfg.go b/internal/infra/sync-cfg/sync-cfg.go index a5579219..a6a5d703 100644 --- a/internal/infra/sync-cfg/sync-cfg.go +++ b/internal/infra/sync-cfg/sync-cfg.go @@ -7,12 +7,9 @@ import ( func SetConfig() { a.ParseSingleCfg(&O) - //if O.Host == "" || O.Target == "" { - // panic("sync url config host or target empty") - //} - if O.BaseUrl == "" { - panic("config bpjs base url empty") + if O.Host == "" || O.Prefix == "" { + panic("config sync host and prefix empty") } lo.I.Println("sync url config loaded, status: DONE!!") } diff --git a/internal/infra/sync-cfg/tycovar.go b/internal/infra/sync-cfg/tycovar.go index 081ef762..fdcda00b 100644 --- a/internal/infra/sync-cfg/tycovar.go +++ b/internal/infra/sync-cfg/tycovar.go @@ -3,7 +3,6 @@ package synccfg var O SyncUrlCfg = SyncUrlCfg{} type SyncUrlCfg struct { - Target string `yaml:"target"` - Host string `yaml:"host"` - BaseUrl string `yaml:"baseUrl"` + Prefix string `yaml:"prefix"` + Host string `yaml:"host"` } diff --git a/internal/interface/simgos-sync-handler/installation/handler.go b/internal/interface/simgos-sync-handler/installation/handler.go index 01a6beab..6f9a708d 100644 --- a/internal/interface/simgos-sync-handler/installation/handler.go +++ b/internal/interface/simgos-sync-handler/installation/handler.go @@ -7,6 +7,7 @@ import ( // 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/installation" ) @@ -23,29 +24,38 @@ func (obj myBase) Create(w http.ResponseWriter, r *http.Request) { rw.DataResponse(w, res, err) } -func (obj myBase) Update(w http.ResponseWriter, r *http.Request) { - code := rw.ValidateString(w, "code", r.PathValue("code")) - if code == "" { - return - } - - dto := e.UpdateDto{} +func (obj myBase) CreateLog(w http.ResponseWriter, r *http.Request) { + dto := esync.SimxLogDto{} if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { return } - dto.Code = &code - res, err := u.Update(dto) + res, err := u.CreateSimxLog(dto) rw.DataResponse(w, res, err) } +func (obj myBase) Update(w http.ResponseWriter, r *http.Request) { + //code := rw.ValidateString(w, "code", r.PathValue("code")) + //if code == "" { + // return + //} + // + //dto := e.UpdateDto{} + //if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { + // return + //} + //dto.Code = &code + //res, err := u.Update(dto) + //rw.DataResponse(w, res, err) +} + func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) { - code := rw.ValidateString(w, "code", r.PathValue("code")) - if code == "" { - return - } - - dto := e.DeleteDto{} - dto.Code = &code - res, err := u.Delete(dto) - rw.DataResponse(w, res, err) + //code := rw.ValidateString(w, "code", r.PathValue("code")) + //if code == "" { + // return + //} + // + //dto := e.DeleteDto{} + //dto.Code = &code + //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 963ec93c..71002949 100644 --- a/internal/interface/simgos-sync-handler/simgos-sync-handler.go +++ b/internal/interface/simgos-sync-handler/simgos-sync-handler.go @@ -2,8 +2,11 @@ package simgossynchandler import ( "net/http" + /******************** infra ********************/ gs "simrs-vx/internal/infra/gorm-setting" + simgosdb "simrs-vx/internal/infra/simgos-db" + simgossync "simrs-vx/internal/infra/sync-cfg" /******************** pkg ********************/ cmw "simrs-vx/pkg/cors-manager-mw" @@ -25,6 +28,8 @@ func SetRoutes() http.Handler { a.RegisterExtCall(gs.Adjust) a.RegisterExtCall(zlc.Adjust) a.RegisterExtCall(lh.Populate) + a.RegisterExtCall(simgossync.SetConfig) + a.RegisterExtCall(simgosdb.SetInstance) r := http.NewServeMux() @@ -32,8 +37,9 @@ func SetRoutes() http.Handler { r.HandleFunc("/", home.Home) /******************** Source ******************/ - hk.GroupRoutes("/v1/installation", r, hk.MapHandlerFunc{ + hk.GroupRoutes("/new-to-old/v1/installation", r, hk.MapHandlerFunc{ "POST /": installation.O.Create, + "POST /log": installation.O.CreateLog, "PATCH /{id}": installation.O.Update, "DELETE /{id}": installation.O.Delete, }) diff --git a/internal/use-case/main-use-case/installation/case.go b/internal/use-case/main-use-case/installation/case.go index 8e577a30..d0a409c0 100644 --- a/internal/use-case/main-use-case/installation/case.go +++ b/internal/use-case/main-use-case/installation/case.go @@ -1,7 +1,7 @@ package installation import ( - egos "simrs-vx/internal/domain/simgos-entities/installation" + erc "simrs-vx/internal/domain/references/common" "strconv" dg "github.com/karincake/apem/db-gorm-pg" @@ -13,6 +13,8 @@ import ( "gorm.io/gorm" e "simrs-vx/internal/domain/main-entities/installation" + egos "simrs-vx/internal/domain/simgos-entities/installation" + esync "simrs-vx/internal/domain/sync-entities/log" ) const source = "installation" @@ -28,19 +30,18 @@ func Create(input e.CreateDto) (*d.Data, error) { // Start log pl.SetLogInfo(&event, input, "started", "create") + mwRunner := newMiddlewareRunner(&event) err := dg.I.Transaction(func(tx *gorm.DB) error { - mwRunner := newMiddlewareRunner(&event, tx) - 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, &sgData); err != nil { + mwRunner.setMwType(pu.MWTPre) + // Run pre-middleware + if err := mwRunner.RunCreateMiddleware(createPreMw, &input, &sgData); err != nil { return err } @@ -49,7 +50,29 @@ func Create(input e.CreateDto) (*d.Data, error) { return nil }) + 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 err = mwRunner.RunCreateLogMiddleware(createSimxLogMw, &inputLog); err != nil { + return nil, err + } + + return nil, err + } + + // create log success + inputLog.IsSuccess = true + if err = mwRunner.RunCreateLogMiddleware(createSimxLogMw, &inputLog); err != nil { return nil, err } @@ -78,7 +101,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 { @@ -129,7 +152,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 { @@ -182,7 +205,7 @@ func Update(input e.UpdateDto) (*d.Data, error) { return err } - mwRunner := newMiddlewareRunner(&event, tx) + mwRunner := newMiddlewareRunner(&event) mwRunner.setMwType(pu.MWTPre) // Run pre-middleware if err := mwRunner.RunUpdateMiddleware(readDetailPreMw, &rdDto, data); err != nil { @@ -238,7 +261,7 @@ func Delete(input e.DeleteDto) (*d.Data, error) { return err } - mwRunner := newMiddlewareRunner(&event, tx) + mwRunner := newMiddlewareRunner(&event) mwRunner.setMwType(pu.MWTPre) // Run pre-middleware if err := mwRunner.RunDeleteMiddleware(readDetailPreMw, &rdDto, data); err != nil { diff --git a/internal/use-case/main-use-case/installation/middleware-runner.go b/internal/use-case/main-use-case/installation/middleware-runner.go index 0abd6b29..acfaaa47 100644 --- a/internal/use-case/main-use-case/installation/middleware-runner.go +++ b/internal/use-case/main-use-case/installation/middleware-runner.go @@ -1,12 +1,14 @@ package installation import ( - e "simrs-vx/internal/domain/main-entities/installation" - egos "simrs-vx/internal/domain/simgos-entities/installation" pl "simrs-vx/pkg/logger" pu "simrs-vx/pkg/use-case-helper" "gorm.io/gorm" + + e "simrs-vx/internal/domain/main-entities/installation" + egos "simrs-vx/internal/domain/simgos-entities/installation" + esync "simrs-vx/internal/domain/sync-entities/log" ) type middlewareRunner struct { @@ -16,10 +18,9 @@ type middlewareRunner struct { } // 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, } } @@ -39,6 +40,22 @@ func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e return nil } +// ExecuteCreateMiddleware executes create middleware +func (me *middlewareRunner) RunCreateLogMiddleware(middlewares []createLogMw, input *esync.SimxLogDto) error { + 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) + } + + pl.SetLogInfo(me.Event, nil, "complete") + } + return nil +} + func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *e.ReadListDto, data *e.Installation) error { for _, middleware := range middlewares { logData := pu.GetLogData(input, data) diff --git a/internal/use-case/main-use-case/installation/middleware.go b/internal/use-case/main-use-case/installation/middleware.go index 46c4be1d..222ec563 100644 --- a/internal/use-case/main-use-case/installation/middleware.go +++ b/internal/use-case/main-use-case/installation/middleware.go @@ -6,7 +6,11 @@ import ( // example of middleware func init() { - createPostMw = append(createPostMw, + createPreMw = append(createPreMw, createMw{Name: "create-installation", Func: plugin.Create}, ) + + createSimxLogMw = append(createSimxLogMw, + createLogMw{Name: "create-log", Func: plugin.CreateLog}, + ) } diff --git a/internal/use-case/main-use-case/installation/tycovar.go b/internal/use-case/main-use-case/installation/tycovar.go index 975ebd34..e704b3a1 100644 --- a/internal/use-case/main-use-case/installation/tycovar.go +++ b/internal/use-case/main-use-case/installation/tycovar.go @@ -14,6 +14,7 @@ import ( "gorm.io/gorm" e "simrs-vx/internal/domain/main-entities/installation" + elog "simrs-vx/internal/domain/sync-entities/log" ) type createMw struct { @@ -21,6 +22,11 @@ type createMw struct { Func func(input *e.CreateDto, data *egos.MInstalasi, tx *gorm.DB) error } +type createLogMw struct { + Name string + Func func(input *elog.SimxLogDto) error +} + type readListMw struct { Name string Func func(input *e.ReadListDto, data *e.Installation, tx *gorm.DB) error @@ -34,8 +40,9 @@ type readDetailMw struct { type UpdateMw = readDetailMw type DeleteMw = readDetailMw -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 diff --git a/internal/use-case/simgos-sync-plugin/installation/plugin.go b/internal/use-case/simgos-sync-plugin/installation/plugin.go index 92ef479b..b566302b 100644 --- a/internal/use-case/simgos-sync-plugin/installation/plugin.go +++ b/internal/use-case/simgos-sync-plugin/installation/plugin.go @@ -6,25 +6,29 @@ import ( "fmt" "io" "net/http" + + "gorm.io/gorm" + sync "simrs-vx/internal/infra/sync-cfg" e "simrs-vx/internal/domain/main-entities/installation" egos "simrs-vx/internal/domain/simgos-entities/installation" - - "gorm.io/gorm" + elog "simrs-vx/internal/domain/sync-entities/log" ) -var endpoint = fmt.Sprintf("%s/v1/installation", sync.O.BaseUrl) - func Create(input *e.CreateDto, data *egos.MInstalasi, tx *gorm.DB) error { + var endpoint = fmt.Sprintf("%s%s/v1/installation", sync.O.Host, sync.O.Prefix) + 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) @@ -33,6 +37,10 @@ func Create(input *e.CreateDto, data *egos.MInstalasi, tx *gorm.DB) error { } defer resp.Body.Close() + if resp.StatusCode != http.StatusOK { + return fmt.Errorf(resp.Status) + } + body, err := io.ReadAll(resp.Body) if err != nil { return err @@ -44,3 +52,36 @@ func Create(input *e.CreateDto, data *egos.MInstalasi, tx *gorm.DB) error { return nil } + +func CreateLog(input *elog.SimxLogDto) error { + var endpoint = fmt.Sprintf("%s%s/v1/installation/log", sync.O.Host, sync.O.Prefix) + + 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() + + if resp.StatusCode != http.StatusOK { + return fmt.Errorf(resp.Status) + } + + _, err = io.ReadAll(resp.Body) + if err != nil { + return err + } + + return nil +} diff --git a/internal/use-case/simgos-sync-use-case/installation/case.go b/internal/use-case/simgos-sync-use-case/installation/case.go index 2990d5ae..f38cca14 100644 --- a/internal/use-case/simgos-sync-use-case/installation/case.go +++ b/internal/use-case/simgos-sync-use-case/installation/case.go @@ -1,9 +1,8 @@ package installation import ( - erc "simrs-vx/internal/domain/references/common" + esync "simrs-vx/internal/domain/sync-entities/log" "strconv" - "time" dg "github.com/karincake/apem/db-gorm-pg" d "github.com/karincake/dodol" @@ -14,16 +13,63 @@ import ( "gorm.io/gorm" e "simrs-vx/internal/domain/main-entities/installation" - egos "simrs-vx/internal/domain/simgos-entities/installation" - esync "simrs-vx/internal/domain/sync-entities/installation" ) const source = "installation" -var now = time.Now() - func Create(input e.CreateDto) (*d.Data, error) { - sgData := egos.MInstalasi{} + event := pl.Event{ + Feature: "Create", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "create") + + // Define trx + txSync := dg.I.Begin() + txSimgos := dg.IS["simrs"].Begin() + + // STEP 1: Insert to simgos + sgData, err := CreateSimgosData(input, &event, txSimgos) + if err != nil { + return nil, err + } + + // STEP 2: Insert to Link + if err = CreateInstallationLinkData(*input.Id, sgData.No_Instalasi, &event, txSync); err != nil { + txSimgos.Rollback() + return nil, err + } + + // STEP 3: Commit two trx + if err = txSimgos.Commit().Error; err != nil { + txSimgos.Rollback() + txSync.Rollback() + return nil, err + } + + if err = txSync.Commit().Error; err != nil { + // STEP 4: Rollback Partial + go func() { + _ = DeleteSimgosData(sgData, &event) + }() + return nil, err + } + + pl.SetLogInfo(&event, nil, "complete") + + return &d.Data{ + Meta: d.II{ + "source": source, + "structure": "single-data", + "status": "created", + }, + Data: sgData, + }, nil +} + +func CreateSimxLog(input esync.SimxLogDto) (*d.Data, error) { event := pl.Event{ Feature: "Create", Source: source, @@ -33,34 +79,8 @@ func Create(input e.CreateDto) (*d.Data, error) { pl.SetLogInfo(&event, input, "started", "create") err := dg.I.Transaction(func(tx *gorm.DB) error { - // Insert Simgos - sgData, err := CreateSimgosData(input, &event, tx) - if err != nil { - errMsg := err.Error() - inputLog := esync.InstallationSimxLog{ - Date: &now, - Status: erc.PSCFailed, - ErrMessage: &errMsg, - } - - // InsertSimxLog - if err = CreateSimxLogData(input, inputLog, &event, tx); err != nil { - return err - } - } else { - inputLog := esync.InstallationSimxLog{ - Date: &now, - Status: erc.PSCSuccess, - } - - // InsertSimxLog - if err = CreateSimxLogData(input, inputLog, &event, tx); err != nil { - return err - } - } - - // InsertSimxLink - if err = CreateInstallationLinkData(*input.Id, sgData.NoInstalasi, &event, tx); err != nil { + // InsertSimxLog + if err := CreateSimxLogData(input, &event, tx); err != nil { return err } @@ -79,7 +99,6 @@ func Create(input e.CreateDto) (*d.Data, error) { "structure": "single-data", "status": "created", }, - Data: sgData, }, nil } @@ -239,56 +258,56 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) { // //} -func Delete(input e.DeleteDto) (*d.Data, error) { - rdDto := e.ReadDetailDto{Code: input.Code} - var data *e.Installation - 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 - -} +//func Delete(input e.DeleteDto) (*d.Data, error) { +// rdDto := e.ReadDetailDto{Code: input.Code} +// var data *e.Installation +// 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/simgos-sync-use-case/installation/helper.go b/internal/use-case/simgos-sync-use-case/installation/helper.go index eae50f99..51316d79 100644 --- a/internal/use-case/simgos-sync-use-case/installation/helper.go +++ b/internal/use-case/simgos-sync-use-case/installation/helper.go @@ -7,8 +7,10 @@ package installation import ( "encoding/json" e "simrs-vx/internal/domain/main-entities/installation" + erc "simrs-vx/internal/domain/references/common" esimgos "simrs-vx/internal/domain/simgos-entities/installation" esync "simrs-vx/internal/domain/sync-entities/installation" + "simrs-vx/internal/domain/sync-entities/log" ) func setDataSimgos[T *e.CreateDto | *e.UpdateDto](input T) (data esimgos.MInstalasi) { @@ -20,30 +22,31 @@ func setDataSimgos[T *e.CreateDto | *e.UpdateDto](input T) (data esimgos.MInstal inputSrc = &inputTemp.CreateDto } - data.NamaInstalasi = inputSrc.Name - data.StatusRawatInap = 0 - data.StAktif = 1 + data.Nama_Instalasi = inputSrc.Name + data.Status_Rawat_Inap = 0 + data.St_Aktif = 1 return } -func setDataSimxLog[T *e.CreateDto | *e.UpdateDto](input T, inputLog esync.InstallationSimxLog) (data esync.InstallationSimxLog) { - var inputSrc *e.CreateDto - if inputT, ok := any(input).(*e.CreateDto); ok { - inputSrc = inputT - } else { - inputTemp := any(input).(*e.UpdateDto) - inputSrc = &inputTemp.CreateDto - } - +func setDataSimxLog(input *log.SimxLogDto) (data esync.InstallationSimxLog) { // encode to JSON - jsonData, _ := json.Marshal(inputSrc) + 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 = inputLog.Status - data.ErrMessage = inputLog.ErrMessage + data.Status = status return } diff --git a/internal/use-case/simgos-sync-use-case/installation/lib.go b/internal/use-case/simgos-sync-use-case/installation/lib.go index e76eb127..b260776e 100644 --- a/internal/use-case/simgos-sync-use-case/installation/lib.go +++ b/internal/use-case/simgos-sync-use-case/installation/lib.go @@ -1,9 +1,11 @@ package installation import ( + esync "simrs-vx/internal/domain/sync-entities/log" 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" gh "github.com/karincake/getuk" @@ -11,9 +13,10 @@ import ( e "simrs-vx/internal/domain/main-entities/installation" esimgos "simrs-vx/internal/domain/simgos-entities/installation" - esync "simrs-vx/internal/domain/sync-entities/installation" ) +var now = time.Now() + func CreateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*esimgos.MInstalasi, error) { pl.SetLogInfo(event, nil, "started", "DBCreate") @@ -23,7 +26,7 @@ func CreateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*esi if len(dbx) > 0 { tx = dbx[0] } else { - tx = dg.I + tx = dg.IS["simrs"] } if err := tx.Create(&data).Error; err != nil { @@ -34,9 +37,9 @@ func CreateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*esi return &data, nil } -func CreateSimxLogData(input e.CreateDto, inputLog esync.InstallationSimxLog, event *pl.Event, dbx ...*gorm.DB) error { +func CreateSimxLogData(input esync.SimxLogDto, event *pl.Event, dbx ...*gorm.DB) error { pl.SetLogInfo(event, nil, "started", "DBCreate") - data := setDataSimxLog(&input, inputLog) + data := setDataSimxLog(&input) var tx *gorm.DB if len(dbx) > 0 { @@ -164,14 +167,9 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e // return nil //} -func DeleteData(data *e.Installation, event *pl.Event, dbx ...*gorm.DB) error { +func DeleteSimgosData(data *esimgos.MInstalasi, event *pl.Event) error { pl.SetLogInfo(event, data, "started", "DBDelete") - var tx *gorm.DB - if len(dbx) > 0 { - tx = dbx[0] - } else { - tx = dg.I - } + var tx = dg.IS["simrs"] if err := tx.Delete(&data).Error; err != nil { event.Status = "failed" From 435d3512fe93319d8b22c12743c4567efdef4d30 Mon Sep 17 00:00:00 2001 From: vanilia Date: Thu, 13 Nov 2025 21:01:03 +0700 Subject: [PATCH 09/11] revise instalasi entity --- cmd/simgos-sync-migration/migrations/atlas.sum | 4 ++-- internal/domain/simgos-entities/installation/entity.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/simgos-sync-migration/migrations/atlas.sum b/cmd/simgos-sync-migration/migrations/atlas.sum index 50f3c7d3..f1405dd2 100644 --- a/cmd/simgos-sync-migration/migrations/atlas.sum +++ b/cmd/simgos-sync-migration/migrations/atlas.sum @@ -1,2 +1,2 @@ -h1:OaRZyFJMii/8wQ0XLWEpF9MIL8IXblx3IYvB7LN2XQ4= -20251113035508.sql h1:p/FKefphuiBjEND87ChQLS/lcZcnvn0aT5tRV43Dn5o= +h1:8jMmMBxSEls9jaOUrpQQV0wUPlORRwJWd5g9742Z2fQ= +20251113035508.sql h1:rjDlu6yDdy5xv6nrCOr7NialrLSLT23pzduYNq29Hf0= diff --git a/internal/domain/simgos-entities/installation/entity.go b/internal/domain/simgos-entities/installation/entity.go index faf2786e..f2b291f5 100644 --- a/internal/domain/simgos-entities/installation/entity.go +++ b/internal/domain/simgos-entities/installation/entity.go @@ -1,10 +1,10 @@ package installation type MInstalasi struct { - No_Instalasi uint `json:"no_instalasi" gorm:"primaryKey;autoIncrement"` - Nama_Instalasi string `json:"nama_instalasi"` - Status_Rawat_Inap uint `json:"status_rawat_inap"` - St_Aktif uint `json:"st_aktif"` + No_Instalasi uint `json:"no_instalasi" gorm:"primaryKey;autoIncrement;column:no_instalasi"` + Nama_Instalasi string `json:"nama_instalasi" gorm:"column:nama_instalasi"` + Status_Rawat_Inap uint `json:"status_rawat_inap" gorm:"column:status_rawat_inap"` + St_Aktif uint `json:"st_aktif" gorm:"column:st_aktif"` } func (MInstalasi) TableName() string { From 9e4357780b25257f32558400f6fed15cb07f4ea9 Mon Sep 17 00:00:00 2001 From: vanilia Date: Fri, 14 Nov 2025 09:52:50 +0700 Subject: [PATCH 10/11] add sync installation --- .../installation/handler.go | 50 +-- .../main-use-case/installation/case.go | 126 +++---- .../installation/middleware-runner.go | 19 +- .../main-use-case/installation/middleware.go | 6 + .../main-use-case/installation/tycovar.go | 22 +- .../simgos-sync-plugin/installation/plugin.go | 150 +++++--- .../simgos-sync-use-case/installation/case.go | 324 +++++++----------- .../simgos-sync-use-case/installation/lib.go | 186 +++++----- 8 files changed, 442 insertions(+), 441 deletions(-) diff --git a/internal/interface/simgos-sync-handler/installation/handler.go b/internal/interface/simgos-sync-handler/installation/handler.go index 6f9a708d..36424e71 100644 --- a/internal/interface/simgos-sync-handler/installation/handler.go +++ b/internal/interface/simgos-sync-handler/installation/handler.go @@ -2,6 +2,7 @@ package installation import ( "net/http" + "strconv" rw "github.com/karincake/risoles" // ua "github.com/karincake/tumpeng/auth/svc" @@ -34,28 +35,35 @@ func (obj myBase) CreateLog(w http.ResponseWriter, r *http.Request) { } func (obj myBase) Update(w http.ResponseWriter, r *http.Request) { - //code := rw.ValidateString(w, "code", r.PathValue("code")) - //if code == "" { - // return - //} - // - //dto := e.UpdateDto{} - //if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { - // return - //} - //dto.Code = &code - //res, err := u.Update(dto) - //rw.DataResponse(w, res, err) + id := rw.ValidateString(w, "id", r.PathValue("id")) + if id == "" { + return + } + + dto := e.UpdateDto{} + if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res { + return + } + + val, _ := strconv.ParseUint(id, 10, 16) + valUint := uint16(val) + dto.Id = &valUint + + res, err := u.Update(dto) + rw.DataResponse(w, res, err) } func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) { - //code := rw.ValidateString(w, "code", r.PathValue("code")) - //if code == "" { - // return - //} - // - //dto := e.DeleteDto{} - //dto.Code = &code - //res, err := u.Delete(dto) - //rw.DataResponse(w, res, err) + id := rw.ValidateString(w, "id", r.PathValue("id")) + if id == "" { + return + } + + dto := e.DeleteDto{} + val, _ := strconv.ParseUint(id, 10, 16) + valUint := uint16(val) + dto.Id = &valUint + + res, err := u.Delete(dto) + rw.DataResponse(w, res, err) } diff --git a/internal/use-case/main-use-case/installation/case.go b/internal/use-case/main-use-case/installation/case.go index d0a409c0..b80b6ca5 100644 --- a/internal/use-case/main-use-case/installation/case.go +++ b/internal/use-case/main-use-case/installation/case.go @@ -13,7 +13,6 @@ import ( "gorm.io/gorm" e "simrs-vx/internal/domain/main-entities/installation" - egos "simrs-vx/internal/domain/simgos-entities/installation" esync "simrs-vx/internal/domain/sync-entities/log" ) @@ -21,7 +20,6 @@ const source = "installation" func Create(input e.CreateDto) (*d.Data, error) { data := e.Installation{} - sgData := egos.MInstalasi{} event := pl.Event{ Feature: "Create", @@ -37,44 +35,24 @@ func Create(input e.CreateDto) (*d.Data, error) { return err } else { data = *resData + id := uint(data.Id) + input.Id = &id } mwRunner.setMwType(pu.MWTPre) // Run pre-middleware - if err := mwRunner.RunCreateMiddleware(createPreMw, &input, &sgData); err != nil { + if err := mwRunner.RunCreateMiddleware(createPreMw, &input); err != nil { return err } - pl.SetLogInfo(&event, nil, "complete") - return nil }) - 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 err = mwRunner.RunCreateLogMiddleware(createSimxLogMw, &inputLog); err != nil { - return nil, err - } - + if err = runLogMiddleware(err, input, mwRunner); err != nil { return nil, err } - // create log success - inputLog.IsSuccess = true - if err = mwRunner.RunCreateLogMiddleware(createSimxLogMw, &inputLog); err != nil { - return nil, err - } + pl.SetLogInfo(&event, nil, "complete") return &d.Data{ Meta: d.II{ @@ -87,7 +65,6 @@ func Create(input e.CreateDto) (*d.Data, error) { } func ReadList(input e.ReadListDto) (*d.Data, error) { - var data *e.Installation var dataList []e.Installation var metaList *e.MetaDto var err error @@ -101,23 +78,11 @@ 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) - 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 }) @@ -152,23 +117,11 @@ 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) - 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 }) @@ -198,6 +151,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") @@ -205,32 +159,26 @@ func Update(input e.UpdateDto) (*d.Data, error) { return err } - mwRunner := newMiddlewareRunner(&event) - mwRunner.setMwType(pu.MWTPre) - // Run pre-middleware - if err := mwRunner.RunUpdateMiddleware(readDetailPreMw, &rdDto, data); err != nil { - return err - } - + input.Id = &data.Id 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 { + mwRunner.setMwType(pu.MWTPre) + // Run pre-middleware + if err := mwRunner.RunUpdateMiddleware(updatePreMw, &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, @@ -254,6 +202,7 @@ func Delete(input e.DeleteDto) (*d.Data, error) { // Start log pl.SetLogInfo(&event, input, "started", "delete") + mwRunner := newMiddlewareRunner(&event) err = dg.I.Transaction(func(tx *gorm.DB) error { pl.SetLogInfo(&event, rdDto, "started", "DBReadDetail") @@ -261,30 +210,26 @@ func Delete(input e.DeleteDto) (*d.Data, error) { return err } - mwRunner := newMiddlewareRunner(&event) - mwRunner.setMwType(pu.MWTPre) - // Run pre-middleware - if err := mwRunner.RunDeleteMiddleware(readDetailPreMw, &rdDto, data); err != nil { - return err - } - + input.Id = &data.Id 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, @@ -295,3 +240,32 @@ func Delete(input e.DeleteDto) (*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/installation/middleware-runner.go b/internal/use-case/main-use-case/installation/middleware-runner.go index acfaaa47..5a8e2ad0 100644 --- a/internal/use-case/main-use-case/installation/middleware-runner.go +++ b/internal/use-case/main-use-case/installation/middleware-runner.go @@ -7,7 +7,6 @@ import ( "gorm.io/gorm" e "simrs-vx/internal/domain/main-entities/installation" - egos "simrs-vx/internal/domain/simgos-entities/installation" esync "simrs-vx/internal/domain/sync-entities/log" ) @@ -25,13 +24,13 @@ func newMiddlewareRunner(event *pl.Event) *middlewareRunner { } // ExecuteCreateMiddleware executes create middleware -func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *egos.MInstalasi) error { +func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto) error { 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) } @@ -86,13 +85,13 @@ func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, return nil } -func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.Installation) error { +func (me *middlewareRunner) RunUpdateMiddleware(middlewares []UpdateMw, input *e.UpdateDto) error { 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) } @@ -101,13 +100,13 @@ func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, inpu return nil } -func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.Installation) error { +func (me *middlewareRunner) RunDeleteMiddleware(middlewares []DeleteMw, input *e.DeleteDto) error { 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/installation/middleware.go b/internal/use-case/main-use-case/installation/middleware.go index 222ec563..dd4b0b42 100644 --- a/internal/use-case/main-use-case/installation/middleware.go +++ b/internal/use-case/main-use-case/installation/middleware.go @@ -13,4 +13,10 @@ func init() { createSimxLogMw = append(createSimxLogMw, createLogMw{Name: "create-log", Func: plugin.CreateLog}, ) + + updatePreMw = append(updatePreMw, + updateMw{Name: "update-installation", Func: plugin.Update}) + + deletePreMw = append(deletePreMw, + deleteMw{Name: "delete-installation", Func: plugin.Delete}) } diff --git a/internal/use-case/main-use-case/installation/tycovar.go b/internal/use-case/main-use-case/installation/tycovar.go index e704b3a1..262bba8c 100644 --- a/internal/use-case/main-use-case/installation/tycovar.go +++ b/internal/use-case/main-use-case/installation/tycovar.go @@ -9,8 +9,6 @@ functionality. The purpose of this is to make the code more maintainable. package installation import ( - egos "simrs-vx/internal/domain/simgos-entities/installation" - "gorm.io/gorm" e "simrs-vx/internal/domain/main-entities/installation" @@ -19,7 +17,7 @@ import ( type createMw struct { Name string - Func func(input *e.CreateDto, data *egos.MInstalasi, tx *gorm.DB) error + Func func(input *e.CreateDto) error } type createLogMw struct { @@ -27,6 +25,16 @@ type createLogMw struct { Func func(input *elog.SimxLogDto) error } +type updateMw struct { + Name string + Func func(input *e.UpdateDto) error +} + +type deleteMw struct { + Name string + Func func(input *e.DeleteDto) error +} + type readListMw struct { Name string Func func(input *e.ReadListDto, data *e.Installation, tx *gorm.DB) error @@ -37,8 +45,8 @@ type readDetailMw struct { Func func(input *e.ReadDetailDto, data *e.Installation, 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 @@ -47,7 +55,7 @@ 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/simgos-sync-plugin/installation/plugin.go b/internal/use-case/simgos-sync-plugin/installation/plugin.go index b566302b..06c9bebe 100644 --- a/internal/use-case/simgos-sync-plugin/installation/plugin.go +++ b/internal/use-case/simgos-sync-plugin/installation/plugin.go @@ -7,54 +7,14 @@ import ( "io" "net/http" - "gorm.io/gorm" - sync "simrs-vx/internal/infra/sync-cfg" e "simrs-vx/internal/domain/main-entities/installation" - egos "simrs-vx/internal/domain/simgos-entities/installation" elog "simrs-vx/internal/domain/sync-entities/log" ) -func Create(input *e.CreateDto, data *egos.MInstalasi, tx *gorm.DB) error { - var endpoint = fmt.Sprintf("%s%s/v1/installation", sync.O.Host, sync.O.Prefix) - - 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() - - if resp.StatusCode != http.StatusOK { - return fmt.Errorf(resp.Status) - } - - body, err := io.ReadAll(resp.Body) - if err != nil { - return err - } - - if err := json.Unmarshal(body, &data); err != nil { - return fmt.Errorf("failed to parse response JSON: %w", err) - } - - return nil -} - -func CreateLog(input *elog.SimxLogDto) error { - var endpoint = fmt.Sprintf("%s%s/v1/installation/log", sync.O.Host, sync.O.Prefix) +func Create(input *e.CreateDto) error { + endpoint := getPrefixEndpoint() jsonData, err := json.Marshal(input) if err != nil { @@ -85,3 +45,109 @@ func CreateLog(input *elog.SimxLogDto) error { 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() + + if resp.StatusCode != http.StatusOK { + return fmt.Errorf(resp.Status) + } + + _, err = io.ReadAll(resp.Body) + if err != nil { + return err + } + + return nil +} + +func Update(input *e.UpdateDto) 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() + + if resp.StatusCode != http.StatusOK { + return fmt.Errorf(resp.Status) + } + + _, err = io.ReadAll(resp.Body) + if err != nil { + return err + } + + 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() + + if resp.StatusCode != http.StatusOK { + return fmt.Errorf(resp.Status) + } + + _, err = io.ReadAll(resp.Body) + if err != nil { + return err + } + + return nil +} + +func getPrefixEndpoint() string { + return fmt.Sprintf("%s%s/v1/installation", sync.O.Host, sync.O.Prefix) +} diff --git a/internal/use-case/simgos-sync-use-case/installation/case.go b/internal/use-case/simgos-sync-use-case/installation/case.go index f38cca14..6c3a79bd 100644 --- a/internal/use-case/simgos-sync-use-case/installation/case.go +++ b/internal/use-case/simgos-sync-use-case/installation/case.go @@ -1,14 +1,14 @@ package installation import ( + "errors" + esimgos "simrs-vx/internal/domain/simgos-entities/installation" esync "simrs-vx/internal/domain/sync-entities/log" - "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" @@ -18,6 +18,11 @@ import ( const source = "installation" func Create(input e.CreateDto) (*d.Data, error) { + var ( + txSync = dg.I.Begin() + txSimgos = dg.IS["simrs"].Begin() + ) + event := pl.Event{ Feature: "Create", Source: source, @@ -26,10 +31,6 @@ func Create(input e.CreateDto) (*d.Data, error) { // Start log pl.SetLogInfo(&event, input, "started", "create") - // Define trx - txSync := dg.I.Begin() - txSimgos := dg.IS["simrs"].Begin() - // STEP 1: Insert to simgos sgData, err := CreateSimgosData(input, &event, txSimgos) if err != nil { @@ -37,7 +38,7 @@ func Create(input e.CreateDto) (*d.Data, error) { } // STEP 2: Insert to Link - if err = CreateInstallationLinkData(*input.Id, sgData.No_Instalasi, &event, txSync); err != nil { + if err = CreateLinkData(*input.Id, sgData.No_Instalasi, &event, txSync); err != nil { txSimgos.Rollback() return nil, err } @@ -65,7 +66,6 @@ func Create(input e.CreateDto) (*d.Data, error) { "structure": "single-data", "status": "created", }, - Data: sgData, }, nil } @@ -80,7 +80,7 @@ func CreateSimxLog(input esync.SimxLogDto) (*d.Data, error) { err := dg.I.Transaction(func(tx *gorm.DB) error { // InsertSimxLog - if err := CreateSimxLogData(input, &event, tx); err != nil { + if err := CreateLogData(input, &event, tx); err != nil { return err } @@ -93,6 +93,8 @@ func CreateSimxLog(input esync.SimxLogDto) (*d.Data, error) { return nil, err } + pl.SetLogInfo(&event, nil, "complete") + return &d.Data{ Meta: d.II{ "source": source, @@ -102,212 +104,152 @@ func CreateSimxLog(input esync.SimxLogDto) (*d.Data, error) { }, nil } -func ReadList(input e.ReadListDto) (*d.Data, error) { - var data *e.Installation - var dataList []e.Installation - var metaList *e.MetaDto - var err error +func Update(input e.UpdateDto) (*d.Data, error) { + var ( + txSync = dg.I.Begin() + txSimgos = dg.IS["simrs"].Begin() + sgData *esimgos.MInstalasi + err error + ) event := pl.Event{ - Feature: "ReadList", + Feature: "Update", Source: source, } // Start log - pl.SetLogInfo(&event, input, "started", "readList") + pl.SetLogInfo(&event, input, "started", "update") - 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 + // STEP 1: Get Installation Link + syncLink, errGetLink := ReadDetailLinkData(*input.Id, &event) + if errGetLink != nil { + if !errors.Is(err, gorm.ErrRecordNotFound) { + return nil, err + } + } + + if errGetLink != nil && errors.Is(errGetLink, gorm.ErrRecordNotFound) { + // STEP 2.1: Insert to simgos + sgData, err = CreateSimgosData(input.CreateDto, &event, txSimgos) + if err != nil { + return nil, err } - if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { - return err + // STEP 2.2: Insert to Link + simxId := uint(*input.Id) + if err = CreateLinkData(simxId, sgData.No_Instalasi, &event, txSync); err != nil { + txSimgos.Rollback() + return nil, err } - - mwRunner.setMwType(pu.MWTPost) - // Run post-middleware - if err := mwRunner.RunReadListMiddleware(readListPostMw, &input, data); err != nil { - return err + } else { + // Step 3.1: Update Simgos + err = UpdateSimgosData(input, syncLink, &event, txSimgos) + if err != nil { + return nil, err } + } - return nil - }) - - if err != nil { + // STEP 4: Commit two trx + if err = txSimgos.Commit().Error; err != nil { + txSimgos.Rollback() + txSync.Rollback() 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.Installation - var err error - - event := pl.Event{ - Feature: "ReadDetail", - Source: source, + if errGetLink != nil { + if err = txSync.Commit().Error; err != nil { + // STEP 5.1: Rollback Partial + go func() { + _ = DeleteSimgosData(sgData, &event) + }() + return nil, err + } } - // 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 - } + pl.SetLogInfo(&event, nil, "complete") return &d.Data{ Meta: d.IS{ "source": source, "structure": "single-data", - "status": "fetched", + "status": "updated", }, - Data: data.ToResponse(), }, nil } -//func Update(input e.UpdateDto) (*d.Data, error) { -// rdDto := e.ReadDetailDto{Code: input.Code} -// var data *e.Installation -// 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) { + var ( + txSync = dg.I.Begin() + txSimgos = dg.IS["simrs"].Begin() + sgData *esimgos.MInstalasi + err error + ) -//func Delete(input e.DeleteDto) (*d.Data, error) { -// rdDto := e.ReadDetailDto{Code: input.Code} -// var data *e.Installation -// 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 -// -//} + event := pl.Event{ + Feature: "Delete", + Source: source, + } + + // Start log + pl.SetLogInfo(&event, input, "started", "delete") + + // STEP 1: Get Installation Link + syncLink, errGetLink := ReadDetailLinkData(*input.Id, &event) + if errGetLink != nil { + if !errors.Is(err, gorm.ErrRecordNotFound) { + return nil, err + } + } + + if errGetLink == nil { + // STEP 2: Get Simgos + sgData, err = ReadDetailSimgosData(uint16(syncLink.Simgos_Id), &event) + if err != nil { + return nil, err + } + + // STEP 3: Delete M_Instalation Simgos + err = DeleteSimgosData(sgData, &event, txSimgos) + if err != nil { + return nil, err + } + + // STEP 4: Delete Installation Link + err = DeleteLinkData(syncLink, &event, txSync) + if err != nil { + txSimgos.Rollback() + return nil, err + } + + // STEP 4: Commit two trx + if err = txSimgos.Commit().Error; err != nil { + txSimgos.Rollback() + txSync.Rollback() + return nil, err + } + + if err = txSync.Commit().Error; err != nil { + // STEP 5: Rollback Partial + go func() { + inputRollback := e.UpdateDto{ + CreateDto: e.CreateDto{ + Name: sgData.Nama_Instalasi, + }, + } + _ = UpdateSimgosData(inputRollback, syncLink, &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/installation/lib.go b/internal/use-case/simgos-sync-use-case/installation/lib.go index b260776e..3e7ca854 100644 --- a/internal/use-case/simgos-sync-use-case/installation/lib.go +++ b/internal/use-case/simgos-sync-use-case/installation/lib.go @@ -1,18 +1,17 @@ package installation import ( - esync "simrs-vx/internal/domain/sync-entities/log" + esynclog "simrs-vx/internal/domain/sync-entities/log" 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" - gh "github.com/karincake/getuk" "gorm.io/gorm" e "simrs-vx/internal/domain/main-entities/installation" esimgos "simrs-vx/internal/domain/simgos-entities/installation" + esync "simrs-vx/internal/domain/sync-entities/installation" ) var now = time.Now() @@ -37,26 +36,76 @@ func CreateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*esi return &data, nil } -func CreateSimxLogData(input esync.SimxLogDto, event *pl.Event, dbx ...*gorm.DB) error { - pl.SetLogInfo(event, nil, "started", "DBCreate") - data := setDataSimxLog(&input) +func ReadDetailSimgosData(simgosId uint16, event *pl.Event) (*esimgos.MInstalasi, error) { + pl.SetLogInfo(event, simgosId, "started", "DBReadDetail") + data := esimgos.MInstalasi{} + + var tx = dg.IS["simrs"] + + if err := tx. + Where("\"no_instalasi\" = ?", simgosId). + First(&data).Error; err != nil { + return nil, err + } + + pl.SetLogInfo(event, nil, "complete") + return &data, nil +} + +func UpdateSimgosData(input e.UpdateDto, dataSimgos *esync.InstallationLink, event *pl.Event, dbx ...*gorm.DB) error { + pl.SetLogInfo(event, input, "started", "DBUpdate") + + data := setDataSimgos(&input) + data.No_Instalasi = dataSimgos.Simgos_Id var tx *gorm.DB if len(dbx) > 0 { tx = dbx[0] } else { - tx = dg.I + tx = dg.IS["simrs"] } - if err := tx.Create(&data).Error; err != nil { - return plh.HandleCreateError(input, event, err) + 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 CreateInstallationLinkData(simxId, simgosId uint, event *pl.Event, dbx ...*gorm.DB) error { +func DeleteSimgosData(data *esimgos.MInstalasi, 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"] + } + + data.St_Aktif = 0 + + if err := tx.Save(&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) error { pl.SetLogInfo(event, nil, "started", "DBCreate") data := setDataSimxLink(simxId, simgosId) @@ -75,101 +124,31 @@ func CreateInstallationLinkData(simxId, simgosId uint, event *pl.Event, dbx ...* return nil } -func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Installation, *e.MetaDto, error) { - pl.SetLogInfo(event, input, "started", "DBReadList") - data := []e.Installation{} - pagination := gh.Pagination{} - count := int64(0) - meta := e.MetaDto{} +func ReadDetailLinkData(simxId uint16, event *pl.Event) (*esync.InstallationLink, error) { + pl.SetLogInfo(event, simxId, "started", "DBReadDetail") + data := esync.InstallationLink{} - var tx *gorm.DB - if len(dbx) > 0 { - tx = dbx[0] - } else { - tx = dg.I - } - - tx = tx. - Model(&e.Installation{}). - 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 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.Installation, error) { - pl.SetLogInfo(event, input, "started", "DBReadDetail") - data := e.Installation{} - - var tx *gorm.DB - if len(dbx) > 0 { - tx = dbx[0] - } else { - tx = dg.I - } - - if input.Code != nil { - tx = tx.Where("\"Code\" = ?", *input.Code) - } - if input.Id != nil { - tx = tx.Where("\"Id\" = ?", *input.Id) - } + var tx = dg.I if err := tx. - Scopes(gh.Preload(input.Includes)). + Where("\"Simx_Id\" = ?", simxId). First(&data).Error; err != nil { - if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil { - return nil, processedErr - } + return nil, err } pl.SetLogInfo(event, nil, "complete") return &data, nil } -//func UpdateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) error { -// pl.SetLogInfo(event, input, "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 DeleteSimgosData(data *esimgos.MInstalasi, event *pl.Event) error { +func DeleteLinkData(data *esync.InstallationLink, event *pl.Event, dbx ...*gorm.DB) error { pl.SetLogInfo(event, data, "started", "DBDelete") - var tx = dg.IS["simrs"] + + 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" @@ -184,3 +163,22 @@ func DeleteSimgosData(data *esimgos.MInstalasi, event *pl.Event) error { 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 +} From a053a351147b64f2b6125066236239fee537a455 Mon Sep 17 00:00:00 2001 From: vanilia Date: Fri, 14 Nov 2025 10:08:49 +0700 Subject: [PATCH 11/11] update sync --- cmd/main-api/config.yml-example | 6 +++++- internal/interface/migration/simgos-sync-entities.go | 5 ----- .../interface/simgos-sync-handler/simgos-sync-handler.go | 3 --- 3 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 internal/interface/migration/simgos-sync-entities.go diff --git a/cmd/main-api/config.yml-example b/cmd/main-api/config.yml-example index 60b1644c..448cff66 100644 --- a/cmd/main-api/config.yml-example +++ b/cmd/main-api/config.yml-example @@ -66,4 +66,8 @@ corsCfg: allowedMethod: bpjsCfg: - baseUrl: \ No newline at end of file + baseUrl: + +syncUrlCfg: + host: + prefix: new-to-old \ No newline at end of file diff --git a/internal/interface/migration/simgos-sync-entities.go b/internal/interface/migration/simgos-sync-entities.go deleted file mode 100644 index c6b51988..00000000 --- a/internal/interface/migration/simgos-sync-entities.go +++ /dev/null @@ -1,5 +0,0 @@ -package migration - -func getSimgosSync() []any { - return []any{} -} diff --git a/internal/interface/simgos-sync-handler/simgos-sync-handler.go b/internal/interface/simgos-sync-handler/simgos-sync-handler.go index 71002949..ce2b4ab9 100644 --- a/internal/interface/simgos-sync-handler/simgos-sync-handler.go +++ b/internal/interface/simgos-sync-handler/simgos-sync-handler.go @@ -6,8 +6,6 @@ import ( /******************** infra ********************/ gs "simrs-vx/internal/infra/gorm-setting" simgosdb "simrs-vx/internal/infra/simgos-db" - simgossync "simrs-vx/internal/infra/sync-cfg" - /******************** pkg ********************/ cmw "simrs-vx/pkg/cors-manager-mw" lh "simrs-vx/pkg/lang-helper" @@ -28,7 +26,6 @@ func SetRoutes() http.Handler { a.RegisterExtCall(gs.Adjust) a.RegisterExtCall(zlc.Adjust) a.RegisterExtCall(lh.Populate) - a.RegisterExtCall(simgossync.SetConfig) a.RegisterExtCall(simgosdb.SetInstance) r := http.NewServeMux()