finish sync soapi early-medic

internal/domain/main-entities/soapi/dto.go

@@ -37,16 +37,19 @@ type FilterDto struct {
 }
 
 type ReadDetailDto struct {
-	Id uint16 `json:"id"`
+	Id       uint   `json:"id"`
+	Includes string `json:"includes"`
 }
 
 type UpdateDto struct {
-	Id uint16 `json:"id"`
+	Id uint `json:"id"`
 	CreateDto
+	pa.AuthInfo
 }
 
 type DeleteDto struct {
-	Id uint16 `json:"id"`
+	Id uint `json:"id"`
+	pa.AuthInfo
 }
 
 type MetaDto struct {

internal/interface/simgos-sync-handler/new/soapi/handler.go

@@ -0,0 +1,58 @@
+package soapi
+
+import (
+	"net/http"
+
+	rw "github.com/karincake/risoles"
+	// ua "github.com/karincake/tumpeng/auth/svc"
+
+	e "simrs-vx/internal/domain/main-entities/soapi"
+	esync "simrs-vx/internal/domain/sync-entities/log"
+
+	u "simrs-vx/internal/use-case/simgos-sync-use-case/new/soapi"
+)
+
+type myBase struct{}
+
+var O myBase
+
+func (obj myBase) Create(w http.ResponseWriter, r *http.Request) {
+	dto := e.Soapi{}
+	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+		return
+	}
+	res, err := u.Create(dto)
+	rw.DataResponse(w, res, err)
+}
+
+func (obj myBase) CreateLog(w http.ResponseWriter, r *http.Request) {
+	dto := esync.SimxLogDto{}
+	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+		return
+	}
+	res, err := u.CreateSimxLog(dto)
+	rw.DataResponse(w, res, err)
+}
+
+func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
+	dto := e.Soapi{}
+	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+		return
+	}
+
+	res, err := u.Update(dto)
+	rw.DataResponse(w, res, err)
+}
+
+func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
+	id := rw.ValidateInt(w, "id", r.PathValue("id"))
+	if id <= 0 {
+		return
+	}
+
+	dto := e.DeleteDto{}
+	dto.Id = uint(id)
+
+	res, err := u.Delete(dto)
+	rw.DataResponse(w, res, err)
+}

internal/interface/simgos-sync-handler/simgos-sync-handler.go

@@ -24,6 +24,7 @@ import (
 	"simrs-vx/internal/interface/simgos-sync-handler/new/encounter"
 	"simrs-vx/internal/interface/simgos-sync-handler/new/installation"
 	"simrs-vx/internal/interface/simgos-sync-handler/new/patient"
+	"simrs-vx/internal/interface/simgos-sync-handler/new/soapi"
 	"simrs-vx/internal/interface/simgos-sync-handler/new/specialist"
 	"simrs-vx/internal/interface/simgos-sync-handler/new/subspecialist"
 	"simrs-vx/internal/interface/simgos-sync-handler/new/unit"
@@ -67,6 +68,7 @@ func SetRoutes() http.Handler {
 		"PATCH /{id}/approve-switch-unit": encounter.O.ApproveSwitchUnit,
 		"PATCH /{id}/cancel-switch-unit":  encounter.O.CancelSwitchUnit,
 	})
+	hc.SyncCrud(r, prefixnew+"/v1/soapi", soapi.O)
 
 	/******************** SvcToNew ******************/
 	//prefixold := "/old-to-new"

internal/lib/auth/tycovar.go

@@ -22,6 +22,7 @@ type AuthInfo struct {
 	Pharmachist_Code           *string
 	Intern_Position_Code       *string
 	Roles                      []string
+	Sync                       bool
 	// User_DivisionPositions     []DivisionPosition
 }
 

internal/use-case/main-use-case/soapi/case.go

@@ -2,6 +2,8 @@ package soapi
 
 import (
 	"errors"
+	erc "simrs-vx/internal/domain/references/common"
+	esync "simrs-vx/internal/domain/sync-entities/log"
 	"strconv"
 
 	e "simrs-vx/internal/domain/main-entities/soapi"
@@ -27,53 +29,50 @@ func Create(input e.CreateDto) (*d.Data, error) {
 
 	// Start log
 	pl.SetLogInfo(&event, input, "started", "create")
+	mwRunner := newMiddlewareRunner(&event, input.Sync)
+
+	if !input.AuthInfo.IsDoctor() && !input.AuthInfo.IsNurse() {
+		event.Status = "failed"
+		event.ErrInfo = pl.ErrorInfo{
+			Code:   "auth-forbidden",
+			Detail: "user position is not allowed",
+			Raw:    errors.New("authentication failed"),
+		}
+		return nil, pl.SetLogError(&event, input)
+	}
 
 	err := dg.I.Transaction(func(tx *gorm.DB) error {
-		mwRunner := newMiddlewareRunner(&event, tx)
-		mwRunner.setMwType(pu.MWTPre)
-		// Run pre-middleware
-		if err := mwRunner.RunCreateMiddleware(createPreMw, &input, &data); err != nil {
-			return err
-		}
-
-		if !input.AuthInfo.IsDoctor() && !input.AuthInfo.IsNurse() {
-			event.Status = "failed"
-			event.ErrInfo = pl.ErrorInfo{
-				Code:   "auth-forbidden",
-				Detail: "user position is not allowed",
-				Raw:    errors.New("authentication failed"),
-			}
-			return pl.SetLogError(&event, input)
-		}
-
-		if input.AuthInfo.Employee_Id != nil {
-			v := uint(*input.AuthInfo.Employee_Id)
-			input.Employee_Id = &v
-		} else {
-			input.Employee_Id = nil
-		}
-
 		if resData, err := CreateData(input, &event, tx); err != nil {
 			return err
 		} else {
 			data = *resData
 		}
 
-		mwRunner.setMwType(pu.MWTPost)
+		// get detail for sync
-		// Run post-middleware
+		soapiData, err := ReadDetailData(e.ReadDetailDto{
-		if err := mwRunner.RunCreateMiddleware(createPostMw, &input, &data); err != nil {
+			Id:       data.Id,
+			Includes: "Encounter,Employee"}, &event)
+		if err != nil {
 			return err
 		}
 
-		pl.SetLogInfo(&event, nil, "complete")
+		mwRunner.setMwType(pu.MWTPre)
+		// Run pre-middleware
+		if err = mwRunner.ExecuteIfSyncOn(func() error {
+			return mwRunner.RunCreateMiddleware(createPostMw, soapiData)
+		}); err != nil {
+			return err
+		}
 
 		return nil
 	})
 
-	if err != nil {
+	if err = runLogMiddleware(err, input, erc.CCCreate, mwRunner); err != nil {
 		return nil, err
 	}
 
+	pl.SetLogInfo(&event, nil, "complete")
+
 	return &d.Data{
 		Meta: d.II{
 			"source":    source,
@@ -85,7 +84,6 @@ func Create(input e.CreateDto) (*d.Data, error) {
 }
 
 func ReadList(input e.ReadListDto) (*d.Data, error) {
-	var data *e.Soapi
 	var dataList []e.Soapi
 	var metaList *e.MetaDto
 	var err error
@@ -99,23 +97,9 @@ 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.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
 	})
 
@@ -150,23 +134,9 @@ 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.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
 	})
 
@@ -196,6 +166,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
 
 	// Start log
 	pl.SetLogInfo(&event, input, "started", "update")
+	mwRunner := newMiddlewareRunner(&event, input.Sync)
 
 	err = dg.I.Transaction(func(tx *gorm.DB) error {
 		pl.SetLogInfo(&event, rdDto, "started", "DBReadDetail")
@@ -203,32 +174,35 @@ func Update(input e.UpdateDto) (*d.Data, error) {
 			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")
+		// get detail for sync
+		soapiData, err := ReadDetailData(e.ReadDetailDto{
+			Id:       data.Id,
+			Includes: "Encounter,Employee"}, &event)
+		if err != nil {
+			return err
+		}
 
-		mwRunner.setMwType(pu.MWTPost)
+		mwRunner.setMwType(pu.MWTPre)
-		// Run post-middleware
+		// Run pre-middleware
-		if err := mwRunner.RunUpdateMiddleware(readDetailPostMw, &rdDto, data); err != nil {
+		if err = mwRunner.ExecuteIfSyncOn(func() error {
+			return mwRunner.RunUpdateMiddleware(updatePreMw, soapiData)
+		}); err != nil {
 			return err
 		}
 
 		return nil
 	})
 
-	if err != nil {
+	if err = runLogMiddleware(err, input, erc.CCUpdate, mwRunner); err != nil {
 		return nil, err
 	}
 
+	pl.SetLogInfo(&event, nil, "complete")
+
 	return &d.Data{
 		Meta: d.IS{
 			"source":    source,
@@ -252,6 +226,7 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
 
 	// Start log
 	pl.SetLogInfo(&event, input, "started", "delete")
+	mwRunner := newMiddlewareRunner(&event, input.Sync)
 
 	err = dg.I.Transaction(func(tx *gorm.DB) error {
 		pl.SetLogInfo(&event, rdDto, "started", "DBReadDetail")
@@ -259,30 +234,27 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
 			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)
+		mwRunner.setMwType(pu.MWTPre)
-		// Run post-middleware
+		// Run pre-middleware
-		if err := mwRunner.RunDeleteMiddleware(readDetailPostMw, &rdDto, data); err != nil {
+		if err = mwRunner.ExecuteIfSyncOn(func() error {
+			return mwRunner.RunDeleteMiddleware(deletePreMw, &input)
+		}); err != nil {
 			return err
 		}
 
 		return nil
 	})
 
-	if err != nil {
+	if err = runLogMiddleware(err, input, erc.CCDelete, mwRunner); err != nil {
 		return nil, err
 	}
 
+	pl.SetLogInfo(&event, nil, "complete")
+
 	return &d.Data{
 		Meta: d.IS{
 			"source":    source,
@@ -293,3 +265,39 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
 	}, nil
 
 }
+
+func runLogMiddleware(err error, input any, method erc.CrudCode, mwRunner *middlewareRunner) error {
+	var errMsg string
+	inputLog := esync.SimxLogDto{
+		Payload: input,
+		Method:  method,
+	}
+
+	if err != nil {
+		// Run log-middleware
+		errMsg = err.Error()
+		inputLog.ErrMessage = &errMsg
+		inputLog.IsSuccess = false
+
+		// create log failed
+		if errMiddleware := mwRunner.ExecuteIfSyncOn(func() error {
+			return mwRunner.RunCreateLogMiddleware(createSimxLogMw, &inputLog)
+		}); errMiddleware != nil {
+			return errMiddleware
+		}
+
+		return err
+	}
+
+	// create log success
+	inputLog.IsSuccess = true
+	err = mwRunner.ExecuteIfSyncOn(func() error {
+		return mwRunner.RunCreateLogMiddleware(createSimxLogMw, &inputLog)
+	})
+
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/use-case/main-use-case/soapi/helper.go

@@ -18,7 +18,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Soapi) {
 	}
 
 	data.Encounter_Id = inputSrc.Encounter_Id
-	data.Employee_Id = inputSrc.Employee_Id
+	data.Employee_Id = inputSrc.AuthInfo.Employee_Id
 	data.Time = inputSrc.Time
 	data.TypeCode = inputSrc.TypeCode
 	data.Value = inputSrc.Value

internal/use-case/main-use-case/soapi/lib.go

@@ -81,7 +81,9 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
 		tx = dg.I
 	}
 
-	if err := tx.First(&data, input.Id).Error; err != nil {
+	if err := tx.
+		Scopes(gh.Preload(input.Includes)).
+		First(&data, input.Id).Error; err != nil {
 		if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
 			return nil, processedErr
 		}

internal/use-case/main-use-case/soapi/middleware-runner.go

@@ -2,6 +2,8 @@ package soapi
 
 import (
 	e "simrs-vx/internal/domain/main-entities/soapi"
+	esync "simrs-vx/internal/domain/sync-entities/log"
+	sync "simrs-vx/internal/infra/sync-cfg"
 	pl "simrs-vx/pkg/logger"
 	pu "simrs-vx/pkg/use-case-helper"
 
@@ -12,24 +14,45 @@ type middlewareRunner struct {
 	Event  *pl.Event
 	Tx     *gorm.DB
 	MwType pu.MWType
+	SyncOn bool
 }
 
 // NewMiddlewareExecutor creates a new middleware executor
-func newMiddlewareRunner(event *pl.Event, tx *gorm.DB) *middlewareRunner {
+func newMiddlewareRunner(event *pl.Event, syncFromOldSource bool) *middlewareRunner {
+	activateSync := sync.O.Enable
+	if syncFromOldSource {
+		activateSync = false
+	}
+
 	return &middlewareRunner{
-		Event: event,
+		Event:  event,
-		Tx:    tx,
+		SyncOn: activateSync,
 	}
 }
 
 // ExecuteCreateMiddleware executes create middleware
-func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *e.Soapi) error {
+func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.Soapi) 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)
+		}
+
+		pl.SetLogInfo(me.Event, nil, "complete")
+	}
+	return nil
+}
+
+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)
 		}
 
@@ -68,13 +91,13 @@ func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw,
 	return nil
 }
 
-func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.Soapi) error {
+func (me *middlewareRunner) RunUpdateMiddleware(middlewares []updateMw, input *e.Soapi) 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)
 		}
 
@@ -83,13 +106,13 @@ func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, inpu
 	return nil
 }
 
-func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.Soapi) 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)
 		}
 
@@ -101,3 +124,10 @@ func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, inpu
 func (me *middlewareRunner) setMwType(mwType pu.MWType) {
 	me.MwType = mwType
 }
+
+func (me *middlewareRunner) ExecuteIfSyncOn(fn func() error) error {
+	if !me.SyncOn {
+		return nil
+	}
+	return fn()
+}

internal/use-case/main-use-case/soapi/middleware.go

@@ -1,9 +1,17 @@
 package soapi
 
-// example of middleware
+import plugin "simrs-vx/internal/use-case/simgos-sync-plugin/new/soapi"
-// func init() {
+
-// 	createPreMw = append(createPreMw,
+func init() {
-// 		CreateMw{Name: "modif-input", Func: pm.ModifInput},
+	createPreMw = append(createPreMw,
-// 		CreateMw{Name: "check-data", Func: pm.CheckData},
+		createMw{Name: "sync-update-soapi", Func: plugin.Create})
-// 	)
+
-// }
+	createSimxLogMw = append(createSimxLogMw,
+		createLogMw{Name: "create-sync-log", Func: plugin.CreateLog})
+
+	updatePreMw = append(updatePreMw,
+		updateMw{Name: "sync-update-soapi", Func: plugin.Update})
+
+	deletePreMw = append(deletePreMw,
+		deleteMw{Name: "sync-delete-soapi", Func: plugin.Delete})
+}

internal/use-case/main-use-case/soapi/tycovar.go

@@ -12,11 +12,27 @@ import (
 	"gorm.io/gorm"
 
 	e "simrs-vx/internal/domain/main-entities/soapi"
+	elog "simrs-vx/internal/domain/sync-entities/log"
 )
 
 type createMw struct {
 	Name string
-	Func func(input *e.CreateDto, data *e.Soapi, tx *gorm.DB) error
+	Func func(input *e.Soapi) error
+}
+
+type createLogMw struct {
+	Name string
+	Func func(input *elog.SimxLogDto) error
+}
+
+type updateMw struct {
+	Name string
+	Func func(input *e.Soapi) error
+}
+
+type deleteMw struct {
+	Name string
+	Func func(input *e.DeleteDto) error
 }
 
 type readListMw struct {
@@ -29,8 +45,8 @@ type readDetailMw struct {
 	Func func(input *e.ReadDetailDto, data *e.Soapi, tx *gorm.DB) error
 }
 
-type UpdateMw = readDetailMw
+type UpdateMw = updateMw
-type DeleteMw = readDetailMw
+type DeleteMw = deleteMw
 
 var createPreMw []createMw      // preprocess middleware
 var createPostMw []createMw     // postprocess middleware
@@ -38,7 +54,8 @@ 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
+var createSimxLogMw []createLogMw

internal/use-case/simgos-sync-plugin/new/soapi/plugin.go

@@ -0,0 +1,36 @@
+package soapi
+
+import (
+	"fmt"
+	sync "simrs-vx/internal/infra/sync-cfg"
+	helper "simrs-vx/internal/use-case/simgos-sync-plugin/new"
+
+	e "simrs-vx/internal/domain/main-entities/soapi"
+	elog "simrs-vx/internal/domain/sync-entities/log"
+)
+
+func Create(input *e.Soapi) error {
+	return helper.DoJsonRequest(input, "POST", getPrefixEndpoint())
+}
+
+func CreateLog(input *elog.SimxLogDto) error {
+	prefixEndpoint := getPrefixEndpoint()
+	endpoint := prefixEndpoint + "/log"
+	return helper.DoJsonRequest(input, "POST", endpoint)
+}
+
+func Update(input *e.Soapi) error {
+	prefixEndpoint := getPrefixEndpoint()
+	endpoint := fmt.Sprintf("%s/%v", prefixEndpoint, input.Id)
+	return helper.DoJsonRequest(input, "PATCH", endpoint)
+}
+
+func Delete(input *e.DeleteDto) error {
+	prefixEndpoint := getPrefixEndpoint()
+	endpoint := fmt.Sprintf("%s/%v", prefixEndpoint, input.Id)
+	return helper.DoJsonRequest(input, "DELETE", endpoint)
+}
+
+func getPrefixEndpoint() string {
+	return fmt.Sprintf("%s%s/v1/encounter", sync.O.TargetHost, sync.O.Prefix)
+}

internal/use-case/simgos-sync-use-case/new/encounter/case.go

@@ -35,24 +35,24 @@ func Create(input e.Encounter) (*d.Data, error) {
 	pl.SetLogInfo(&event, input, "started", "create")
 
 	err = db.WithDualTx(func(tx *db.Dualtx) error {
-		// STEP 1: Insert to simgos
+		// STEP 1: Insert TPendaftaran
 		sgData, err = CreateTPendaftaranData(input, &event, tx.Simgos)
 		if err != nil {
 			return err
 		}
 
-		// STEP 2: Insert to Link
-		syncLink, err = CreateLinkData(input.Id, sgData.Idxdaftar, &event, tx.Sync)
-		if err != nil {
-			return err
-		}
-
 		// STEP 3: Update MPasien
 		err = updatePatientCaraBayar(*sgData, &event, tx.Simgos)
 		if err != nil {
 			return err
 		}
 
+		// STEP 2: Insert to Link
+		syncLink, err = CreateLinkData(input.Id, sgData.Idxdaftar, &event, tx.Sync)
+		if err != nil {
+			return err
+		}
+
 		return nil
 	})
 

internal/use-case/simgos-sync-use-case/new/soapi/case.go

@@ -8,18 +8,19 @@ import (
 
 	db "simrs-vx/pkg/dualtrx-helper"
 
-	e "simrs-vx/internal/domain/main-entities/division"
+	e "simrs-vx/internal/domain/main-entities/soapi"
-	esimgos "simrs-vx/internal/domain/simgos-entities/m-unit"
+
-	esync "simrs-vx/internal/domain/sync-entities/division"
 	elog "simrs-vx/internal/domain/sync-entities/log"
+	esync "simrs-vx/internal/domain/sync-entities/soapi"
+
+	ue "simrs-vx/internal/use-case/simgos-sync-use-case/new/encounter"
 )
 
 const source = "soapi"
 
-func Create(input e.CreateDto) (*d.Data, error) {
+func Create(input e.Soapi) (*d.Data, error) {
 	var (
-		sgData   *esimgos.MUnit
+		syncLink *esync.SoapiLink
-		syncLink *esync.DivisionLink
 		err      error
 	)
 
@@ -31,15 +32,39 @@ func Create(input e.CreateDto) (*d.Data, error) {
 	// Start log
 	pl.SetLogInfo(&event, input, "started", "create")
 
+	// get encounter Link
+	eLink, err := ue.ReadDetailLinkData(*input.Encounter_Id, &event)
+	if err != nil {
+		return nil, err
+	}
+
+	// get Tpendaftaran
+	tPendaftaran, err := ue.ReadTPendaftaranDetailData(eLink.Simgos_Id, &event)
+	if err != nil {
+		return nil, err
+	}
+
 	err = db.WithDualTx(func(tx *db.Dualtx) error {
-		// STEP 1: Insert to simgos
+		// STEP 1: Insert to TDiagnosaDanTerapi
-		sgData, err = CreateSimgosData(input, &event, tx.Simgos)
+		tDiagTherapy, err := CreateTDiagnosaDanTerapi(input, tPendaftaran, &event, tx.Simgos)
 		if err != nil {
 			return err
 		}
 
-		// STEP 2: Insert to Link
+		// STEP 2: Insert to TICD
-		syncLink, err = CreateLinkData(*input.Id, sgData.KodeUnit, &event, tx.Sync)
+		_, err = CreateTIcd(input, tPendaftaran, &event, tx.Simgos)
+		if err != nil {
+			return err
+		}
+
+		// STEP 3: Insert to TICD-CM
+		_, err = CreateTIcdCm(input, tPendaftaran, &event, tx.Simgos)
+		if err != nil {
+			return err
+		}
+
+		// STEP 4: Insert to Link
+		syncLink, err = CreateLinkData(input.Id, tDiagTherapy.Idxterapi, &event, tx.Sync)
 		if err != nil {
 			return err
 		}
@@ -99,7 +124,7 @@ func CreateSimxLog(input elog.SimxLogDto) (*d.Data, error) {
 	}, nil
 }
 
-func Update(input e.UpdateDto) (*d.Data, error) {
+func Update(input e.Soapi) (*d.Data, error) {
 	event := pl.Event{
 		Feature: "Update",
 		Source:  source,
@@ -108,16 +133,59 @@ func Update(input e.UpdateDto) (*d.Data, error) {
 	// Start log
 	pl.SetLogInfo(&event, input, "started", "update")
 
-	// STEP 1: Get Link
+	// Get Soapi Link
-	syncLink, err := ReadDetailLinkData(*input.Id, &event)
+	sLink, err := ReadDetailLinkData(input.Id, &event)
+	if err != nil {
+		return nil, err
+	}
+
+	// Get TDiagnosadanTerapi
+	tDiagTherapy, err := ReadDetailTDiagnosaDanTerapi(sLink.Simgos_Id, &event)
+	if err != nil {
+		return nil, err
+	}
+
+	// Get Encounter Link
+	eLink, err := ue.ReadDetailLinkData(*input.Encounter_Id, &event)
+	if err != nil {
+		return nil, err
+	}
+
+	// Get TPendaftaran
+	tPendaftaran, err := ue.ReadTPendaftaranDetailData(eLink.Simgos_Id, &event)
 	if err != nil {
 		return nil, err
 	}
 
 	tx := db.NewTx()
 	err = tx.Simgos.Transaction(func(tx *gorm.DB) error {
-		// Step 2: Update Simgos
+		// SET LOCAL
-		if err = UpdateSimgosData(input, syncLink, &event, tx); err != nil {
+		if err = tx.Exec(`SET LOCAL simx.sync_source = 'new'`).Error; err != nil {
+			return err
+		}
+
+		// Step 1: Update TDiagnosaDanTerapi
+		if err = UpdateTDiagnosaDanTerapi(input, tDiagTherapy, &event, tx); err != nil {
+			return err
+		}
+
+		// STEP 2: Delete TIcd
+		if err = HardDeleteTIcd(tDiagTherapy.Idxdaftar, &event, tx); err != nil {
+			return err
+		}
+
+		// STEP 3: Delete TIcdCm
+		if err = HardDeleteTIcdCm(tDiagTherapy.Idxdaftar, &event, tx); err != nil {
+			return err
+		}
+
+		// STEP 4: Insert TIcd
+		if _, err = CreateTIcd(input, tPendaftaran, &event, tx); err != nil {
+			return err
+		}
+
+		// STEP 5: Insert TIcd-cm
+		if _, err = CreateTIcdCm(input, tPendaftaran, &event, tx); err != nil {
 			return err
 		}
 
@@ -146,22 +214,31 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
 	// Start log
 	pl.SetLogInfo(&event, input, "started", "delete")
 
-	// STEP 1: Get Link
+	// Get Soapi Link
-	syncLink, err := ReadDetailLinkData(*input.Id, &event)
+	syncLink, err := ReadDetailLinkData(input.Id, &event)
 	if err != nil {
 		return nil, err
 	}
 
-	// STEP 2: Get Simgos
+	// Get TDiagnosa&Terapi
-	sgData, err := ReadDetailSimgosData(uint16(syncLink.Simgos_Id), &event)
+	tDiagTh, err := ReadDetailTDiagnosaDanTerapi(syncLink.Simgos_Id, &event)
 	if err != nil {
 		return nil, err
 	}
 
 	err = db.WithDualTx(func(tx *db.Dualtx) error {
-		// STEP 3: Delete Simgos
+		// STEP 1: Delete TDiagnosa&Terapi Simgos
-		err = HardDeleteSimgosData(sgData, &event, tx.Simgos)
+		if err = HardDeleteTDiagnosaDanTerapi(tDiagTh, &event, tx.Simgos); err != nil {
-		if err != nil {
+			return err
+		}
+
+		// STEP 2: Delete TIcd
+		if err = HardDeleteTIcd(tDiagTh.Idxdaftar, &event, tx.Simgos); err != nil {
+			return err
+		}
+
+		// STEP 3: Delete TIcdCm
+		if err = HardDeleteTIcdCm(tDiagTh.Idxdaftar, &event, tx.Simgos); err != nil {
 			return err
 		}
 
@@ -178,7 +255,7 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
 	if err != nil {
 		if isLinkDeleted {
 			go func() {
-				_, _ = CreateLinkData(uint(*input.Id), sgData.KodeUnit, &event)
+				_, _ = CreateLinkData(input.Id, tDiagTh.Idxterapi, &event)
 			}()
 		}
 		return nil, err

internal/use-case/simgos-sync-use-case/new/soapi/helper.go

@@ -9,24 +9,56 @@ import (
 	"fmt"
 	ere "simrs-vx/internal/domain/references/encounter"
 	"strconv"
+	"time"
 
 	ercl "simrs-vx/internal/domain/references/clinical"
 	erc "simrs-vx/internal/domain/references/common"
 
 	es "simrs-vx/internal/domain/main-entities/soapi"
 
-	esimgos "simrs-vx/internal/domain/simgos-entities/t-diagnosadanterapi"
+	etdt "simrs-vx/internal/domain/simgos-entities/t-diagnosadanterapi"
+	eicd "simrs-vx/internal/domain/simgos-entities/t-icd"
+	eicdcm "simrs-vx/internal/domain/simgos-entities/t-icd-cm"
+	etp "simrs-vx/internal/domain/simgos-entities/t-pendaftaran"
+
 	esyncLog "simrs-vx/internal/domain/sync-entities/log"
 	esync "simrs-vx/internal/domain/sync-entities/soapi"
 )
 
-func setDataEarlyMedic(input es.Soapi) (data esimgos.DiagnosaDanTerapi) {
+func setDataCreateTDiagnosaDanTerapi(input es.Soapi, enc *etp.TPendaftaran) (data etdt.TDiagnosaDanTerapi) {
+	switch input.TypeCode {
+	case ercl.STCEEarlyMedic:
+		data.Idxdaftar = enc.Idxdaftar
+		data.Nomr = enc.Nomr
+		data.Kdpoly = enc.Kdpoly
+		data.Kddokter = enc.Kddokter
+
+		if e := input.Encounter; e != nil {
+			data.Tanggal = e.VisitDate
+			if e.Class_Code == ere.ECAmbulatory {
+				data.Rajal = 1
+			}
+
+		}
+
+		if e := input.Employee; e != nil {
+			if u := e.User; u != nil {
+				data.Nip = u.Name
+			}
+		}
+
+		setEarlyMedicTDT(input, &data)
+		return
+	}
+
+	return
+}
+
+func setEarlyMedicTDT(input es.Soapi, data *etdt.TDiagnosaDanTerapi) {
 	value := ercl.EarlyMedicValue{}
 	_ = json.Unmarshal([]byte(*input.Value), &value)
 
-	data.Idxdaftar = *input.Encounter_Id
 	data.TekananDarah = fmt.Sprintf("%v/%v", value.SystolicBloodPressure, value.DiastolicBloodPressure)
-
 	data.GolonganDarah = value.BloodType
 	if value.BloodType == "" {
 		data.GolonganDarah = "X"
@@ -38,27 +70,6 @@ func setDataEarlyMedic(input es.Soapi) (data esimgos.DiagnosaDanTerapi) {
 	data.Terapi = value.Therapy
 	data.Anamnesa = value.PrimaryComplain
 
-	if e := input.Encounter; e != nil {
-		if p := e.Patient; p != nil {
-			data.Nomr = *p.Number
-		}
-
-		data.Tanggal = e.VisitDate
-		data.Kdpoly = stringtouint(*e.Unit_Code)
-		data.Kddokter = stringtouint(*e.Appointment_Doctor_Code)
-
-		if e.Class_Code == ere.ECAmbulatory {
-			data.Rajal = 1
-		}
-
-	}
-
-	if e := input.Employee; e != nil {
-		if u := e.User; u != nil {
-			data.Nip = u.Name
-		}
-	}
-
 	// TODO : status, tindakan_mdeis (?)
 	data.KunjunganBl = uint(value.EncounterStatus)
 	data.KasusBl = uint(value.CaseStatus)
@@ -79,14 +90,77 @@ func setDataEarlyMedic(input es.Soapi) (data esimgos.DiagnosaDanTerapi) {
 
 	if o := value.ExpectedOutcome; len(o) > 0 {
 		expectedOutput := []string{}
-
 		for _, v := range o {
 			expectedOutput = append(expectedOutput, v.Name)
 		}
-
 		jsonData, _ := json.MarshalIndent(value.ExpectedOutcome, "", "  ")
 		data.TargetCapaian = string(jsonData)
 	}
+	return
+}
+
+func setDataIcd(input es.Soapi, enc *etp.TPendaftaran) (data []eicd.TIcd) {
+	value := ercl.EarlyMedicValue{}
+	_ = json.Unmarshal([]byte(*input.Value), &value)
+
+	var (
+		visitDate  time.Time
+		ambulatory uint16
+	)
+
+	if e := input.Encounter; e != nil {
+		visitDate = e.VisitDate
+		if e.Class_Code == ere.ECAmbulatory {
+			ambulatory = 1
+		}
+
+	}
+
+	if d := value.DiagnoseSrc; len(d) > 0 {
+		for _, v := range d {
+			data = append(data, eicd.TIcd{
+				Nomr:        enc.Nomr,
+				Idxdaftar:   enc.Idxdaftar,
+				Kddokter:    enc.Kddokter,
+				Icd:         v.Code,
+				StatusRajal: ambulatory,
+				Tanggal:     visitDate,
+			})
+		}
+	}
+
+	return
+}
+
+func setDataIcdCm(input es.Soapi, enc *etp.TPendaftaran) (data []eicdcm.TIcdCm) {
+	value := ercl.EarlyMedicValue{}
+	_ = json.Unmarshal([]byte(*input.Value), &value)
+
+	var (
+		visitDate  time.Time
+		ambulatory uint16
+	)
+
+	if e := input.Encounter; e != nil {
+		visitDate = e.VisitDate
+		if e.Class_Code == ere.ECAmbulatory {
+			ambulatory = 1
+		}
+
+	}
+
+	if p := value.ProcedureSrc; len(p) > 0 {
+		for _, v := range p {
+			data = append(data, eicdcm.TIcdCm{
+				Nomr:        enc.Nomr,
+				Idxdaftar:   enc.Idxdaftar,
+				Kddokter:    enc.Kddokter,
+				Icd:         v.Code,
+				StatusRajal: ambulatory,
+				Tanggal:     visitDate,
+			})
+		}
+	}
 
 	return
 }

internal/use-case/simgos-sync-use-case/new/soapi/lib.go

@@ -1,6 +1,7 @@
 package soapi
 
 import (
+	"errors"
 	plh "simrs-vx/pkg/lib-helper"
 	pl "simrs-vx/pkg/logger"
 	pu "simrs-vx/pkg/use-case-helper"
@@ -9,18 +10,22 @@ import (
 	dg "github.com/karincake/apem/db-gorm-pg"
 	"gorm.io/gorm"
 
-	e "simrs-vx/internal/domain/main-entities/division"
+	e "simrs-vx/internal/domain/main-entities/soapi"
-	esimgos "simrs-vx/internal/domain/simgos-entities/m-unit"
+
-	esync "simrs-vx/internal/domain/sync-entities/division"
+	etdt "simrs-vx/internal/domain/simgos-entities/t-diagnosadanterapi"
+	eicd "simrs-vx/internal/domain/simgos-entities/t-icd"
+	eicdcm "simrs-vx/internal/domain/simgos-entities/t-icd-cm"
+	ep "simrs-vx/internal/domain/simgos-entities/t-pendaftaran"
+
 	esynclog "simrs-vx/internal/domain/sync-entities/log"
+	esync "simrs-vx/internal/domain/sync-entities/soapi"
 )
 
 var now = time.Now()
 
-func CreateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*esimgos.MUnit, error) {
+func CreateTDiagnosaDanTerapi(input e.Soapi, tdaftar *ep.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) (*etdt.TDiagnosaDanTerapi, error) {
 	pl.SetLogInfo(event, nil, "started", "DBCreate")
-
+	data := setDataCreateTDiagnosaDanTerapi(input, tdaftar)
-	data := setDataSimgos(&input)
 
 	var tx *gorm.DB
 	if len(dbx) > 0 {
@@ -37,14 +42,14 @@ func CreateSimgosData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*esi
 	return &data, nil
 }
 
-func ReadDetailSimgosData(simgosId uint16, event *pl.Event) (*esimgos.MUnit, error) {
+func ReadDetailTDiagnosaDanTerapi(simgosId uint, event *pl.Event) (*etdt.TDiagnosaDanTerapi, error) {
 	pl.SetLogInfo(event, simgosId, "started", "DBReadDetail")
-	data := esimgos.MUnit{}
+	data := etdt.TDiagnosaDanTerapi{}
 
 	var tx = dg.IS["simrs"]
 
 	if err := tx.
-		Where("\"kode_unit\" = ?", simgosId).
+		Where("\"idxterapi\" = ?", simgosId).
 		First(&data).Error; err != nil {
 		if processedErr := pu.HandleReadError(err, event, source, simgosId, data); processedErr != nil {
 			return nil, processedErr
@@ -55,11 +60,10 @@ func ReadDetailSimgosData(simgosId uint16, event *pl.Event) (*esimgos.MUnit, err
 	return &data, nil
 }
 
-func UpdateSimgosData(input e.UpdateDto, dataSimgos *esync.DivisionLink, event *pl.Event, dbx ...*gorm.DB) error {
+func UpdateTDiagnosaDanTerapi(input e.Soapi, data *etdt.TDiagnosaDanTerapi, event *pl.Event, dbx ...*gorm.DB) error {
 	pl.SetLogInfo(event, input, "started", "DBUpdate")
 
-	data := setDataSimgos(&input)
+	setEarlyMedicTDT(input, data)
-	data.KodeUnit = dataSimgos.Simgos_Id
 
 	var tx *gorm.DB
 	if len(dbx) > 0 {
@@ -82,7 +86,7 @@ func UpdateSimgosData(input e.UpdateDto, dataSimgos *esync.DivisionLink, event *
 	return nil
 }
 
-func HardDeleteSimgosData(data *esimgos.MUnit, event *pl.Event, dbx ...*gorm.DB) error {
+func HardDeleteTDiagnosaDanTerapi(data *etdt.TDiagnosaDanTerapi, event *pl.Event, dbx ...*gorm.DB) error {
 	pl.SetLogInfo(event, data, "started", "DBDelete")
 
 	var tx *gorm.DB
@@ -107,7 +111,149 @@ func HardDeleteSimgosData(data *esimgos.MUnit, event *pl.Event, dbx ...*gorm.DB)
 	return nil
 }
 
-func CreateLinkData(simxId, simgosId uint, event *pl.Event, dbx ...*gorm.DB) (*esync.DivisionLink, error) {
+func CreateTIcd(input e.Soapi, tdaftar *ep.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) (*[]eicd.TIcd, error) {
+	pl.SetLogInfo(event, nil, "started", "DBCreate")
+	data := setDataIcd(input, tdaftar)
+
+	var tx *gorm.DB
+	if len(dbx) > 0 {
+		tx = dbx[0]
+	} else {
+		tx = dg.IS["simrs"]
+	}
+
+	if err := tx.Create(&data).Error; err != nil {
+		return nil, plh.HandleCreateError(input, event, err)
+	}
+
+	pl.SetLogInfo(event, nil, "complete")
+	return &data, nil
+}
+
+func ReadListTIcd(idxdaftar string, event *pl.Event, dbx ...*gorm.DB) ([]eicd.TIcd, error) {
+	pl.SetLogInfo(event, idxdaftar, "started", "DBReadList")
+	data := []eicd.TIcd{}
+
+	var tx *gorm.DB
+	if len(dbx) > 0 {
+		tx = dbx[0]
+	} else {
+		tx = dg.I
+	}
+
+	tx = tx.
+		Model(&eicd.TIcd{}).
+		Where("idxdaftar = ?", idxdaftar)
+
+	if err := tx.Find(&data).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, nil
+		}
+		return nil, plh.HandleListError(idxdaftar, event, err)
+	}
+
+	pl.SetLogInfo(event, nil, "complete")
+	return data, nil
+}
+
+func HardDeleteTIcd(idxdaftar uint, event *pl.Event, dbx ...*gorm.DB) error {
+	pl.SetLogInfo(event, idxdaftar, "started", "DBDelete")
+
+	var tx *gorm.DB
+	if len(dbx) > 0 {
+		tx = dbx[0]
+	} else {
+		tx = dg.IS["simrs"]
+	}
+
+	if err := tx.
+		Where("idxdaftar = ?", idxdaftar).
+		Delete(&eicd.TIcd{}).Error; err != nil {
+		event.Status = "failed"
+		event.ErrInfo = pl.ErrorInfo{
+			Code:   "data-delete-fail",
+			Detail: "Database delete failed",
+			Raw:    err,
+		}
+		return pl.SetLogError(event, idxdaftar)
+	}
+
+	pl.SetLogInfo(event, nil, "complete")
+	return nil
+}
+
+func CreateTIcdCm(input e.Soapi, tdaftar *ep.TPendaftaran, event *pl.Event, dbx ...*gorm.DB) (*[]eicdcm.TIcdCm, error) {
+	pl.SetLogInfo(event, nil, "started", "DBCreate")
+	data := setDataIcdCm(input, tdaftar)
+
+	var tx *gorm.DB
+	if len(dbx) > 0 {
+		tx = dbx[0]
+	} else {
+		tx = dg.IS["simrs"]
+	}
+
+	if err := tx.Create(&data).Error; err != nil {
+		return nil, plh.HandleCreateError(input, event, err)
+	}
+
+	pl.SetLogInfo(event, nil, "complete")
+	return &data, nil
+}
+
+func ReadListTIcdCm(idxdaftar string, event *pl.Event, dbx ...*gorm.DB) ([]eicdcm.TIcdCm, error) {
+	pl.SetLogInfo(event, idxdaftar, "started", "DBReadList")
+	data := []eicdcm.TIcdCm{}
+
+	var tx *gorm.DB
+	if len(dbx) > 0 {
+		tx = dbx[0]
+	} else {
+		tx = dg.I
+	}
+
+	tx = tx.
+		Model(&eicdcm.TIcdCm{}).
+		Where("idxdaftar = ?", idxdaftar)
+
+	if err := tx.Find(&data).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, nil
+		}
+		return nil, plh.HandleListError(idxdaftar, event, err)
+	}
+
+	pl.SetLogInfo(event, nil, "complete")
+	return data, nil
+}
+
+func HardDeleteTIcdCm(idxdaftar uint, event *pl.Event, dbx ...*gorm.DB) error {
+	pl.SetLogInfo(event, idxdaftar, "started", "DBDelete")
+
+	var tx *gorm.DB
+	if len(dbx) > 0 {
+		tx = dbx[0]
+	} else {
+		tx = dg.IS["simrs"]
+	}
+
+	if err := tx.
+		Where("idxdaftar = ?", idxdaftar).
+		Delete(&eicdcm.TIcdCm{}).Error; err != nil {
+		event.Status = "failed"
+		event.ErrInfo = pl.ErrorInfo{
+			Code:   "data-delete-fail",
+			Detail: "Database delete failed",
+			Raw:    err,
+		}
+		return pl.SetLogError(event, idxdaftar)
+	}
+
+	pl.SetLogInfo(event, nil, "complete")
+	return nil
+}
+
+func CreateLinkData(simxId, simgosId uint, event *pl.Event, dbx ...*gorm.DB) (*esync.SoapiLink, error) {
 	pl.SetLogInfo(event, nil, "started", "DBCreate")
 	data := setDataSimxLink(simxId, simgosId)
 
@@ -126,9 +272,9 @@ func CreateLinkData(simxId, simgosId uint, event *pl.Event, dbx ...*gorm.DB) (*e
 	return &data, nil
 }
 
-func ReadDetailLinkData(simxId uint16, event *pl.Event) (*esync.DivisionLink, error) {
+func ReadDetailLinkData(simxId uint, event *pl.Event) (*esync.SoapiLink, error) {
 	pl.SetLogInfo(event, simxId, "started", "DBReadDetail")
-	data := esync.DivisionLink{}
+	data := esync.SoapiLink{}
 
 	var tx = dg.I
 
@@ -144,7 +290,7 @@ func ReadDetailLinkData(simxId uint16, event *pl.Event) (*esync.DivisionLink, er
 	return &data, nil
 }
 
-func DeleteLinkData(data *esync.DivisionLink, event *pl.Event, dbx ...*gorm.DB) error {
+func DeleteLinkData(data *esync.SoapiLink, event *pl.Event, dbx ...*gorm.DB) error {
 	pl.SetLogInfo(event, data, "started", "DBDelete")
 
 	var tx *gorm.DB

internal/use-case/simgos-sync-use-case/new/soapi/middleware.go

@@ -1,9 +1 @@
 package soapi
-
-// example of middleware
-// func init() {
-// 	createPreMw = append(createPreMw,
-// 		CreateMw{Name: "modif-input", Func: pm.ModifInput},
-// 		CreateMw{Name: "check-data", Func: pm.CheckData},
-// 	)
-// }