Merge branch 'feat/sync-from-simx-160' of https://github.com/dikstub-rssa/simrs-be into feat/sync-setting-vanili

# Conflicts:
#	internal/infra/sync-cfg/sync-cfg.go
#	internal/infra/sync-cfg/tycovar.go

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

@@ -525,7 +525,6 @@ func UpdateStatusCode(input e.UpdateStatusDto) (*d.Data, error) {
 	// Start log
 	pl.SetLogInfo(&event, input, "started", "update")
 
-	// TODO: Only "supervisi pendaftaran" could cancel encounter
 	roleAllowed := []string{string(erg.EPCReg), string(erg.EPCNur), string(erg.EPCDoc)}
 	err = validateAuth(input.AuthInfo, roleAllowed, "update-status-encounter", &event)
 	if err != nil {
@@ -575,9 +574,14 @@ func UpdateStatusCode(input e.UpdateStatusDto) (*d.Data, error) {
 			return err
 		}
 
-		if input.StatusCode == erc.DSCProcess || input.StatusCode == erc.DSCCancel {
-			data.Status_Code = input.StatusCode
+		// get data encounter
+		if data, err = ReadDetailData(e.ReadDetailDto{
+			Id:       input.Id,
+			Includes: "Adm_Employee.User"}, &event, tx); err != nil {
+			return err
+		}
 
+		if input.StatusCode == erc.DSCProcess || input.StatusCode == erc.DSCCancel {
 			mwRunner.setMwType(pu.MWTPre)
 			// Run pre-middleware
 			if err := mwRunner.RunUpdateStatusMiddleware(updatestatusEncounter, data); err != nil {

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

@@ -221,7 +221,10 @@ func UpdateStatusData(input e.UpdateStatusDto, event *pl.Event, dbx ...*gorm.DB)
 
 	if err := tx.Model(&e.Encounter{}).
 		Where("\"Id\" = ?", input.Id).
-		Update("Status_Code", input.StatusCode).Error; err != nil {
+		Updates(map[string]interface{}{
+			"Status_Code":     input.StatusCode,
+			"Adm_Employee_Id": input.Employee_Id,
+		}).Error; err != nil {
 		event.Status = "failed"
 		event.ErrInfo = pl.ErrorInfo{
 			Code:   "update-fail",