munawwirul_jamal/simrsx-be
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
vanilia
2025-11-25 14:10:01 +07:00
parent b188a55a8f
commit ca0fee997e
10 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/interface/simgos-sync-handler/new/division/handler.go
+2 -1
View File
@@ -2,13 +2,14 @@ package division
import (
"net/http"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/division"
rw "github.com/karincake/risoles"
// ua "github.com/karincake/tumpeng/auth/svc"
e "simrs-vx/internal/domain/main-entities/division"
esync "simrs-vx/internal/domain/sync-entities/log"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/division"
)
type myBase struct{}
internal/interface/simgos-sync-handler/new/encounter/handler.go
+2 -1
View File
@@ -2,13 +2,14 @@ package encounter
import (
"net/http"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/encounter"
rw "github.com/karincake/risoles"
// ua "github.com/karincake/tumpeng/auth/svc"
e "simrs-vx/internal/domain/main-entities/encounter"
esync "simrs-vx/internal/domain/sync-entities/log"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/encounter"
)
type myBase struct{}
internal/interface/simgos-sync-handler/new/installation/handler.go
+2 -1
View File
@@ -2,13 +2,14 @@ package installation
import (
"net/http"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/installation"
rw "github.com/karincake/risoles"
// ua "github.com/karincake/tumpeng/auth/svc"
e "simrs-vx/internal/domain/main-entities/installation"
esync "simrs-vx/internal/domain/sync-entities/log"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/installation"
)
type myBase struct{}
internal/interface/simgos-sync-handler/new/patient/handler.go
+2 -1
View File
@@ -2,13 +2,14 @@ package patient
import (
"net/http"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/patient"
rw "github.com/karincake/risoles"
// ua "github.com/karincake/tumpeng/auth/svc"
e "simrs-vx/internal/domain/main-entities/patient"
esync "simrs-vx/internal/domain/sync-entities/log"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/patient"
)
type myBase struct{}
internal/interface/simgos-sync-handler/new/specialist/handler.go
+2 -1
View File
@@ -2,13 +2,14 @@ package specialist
import (
"net/http"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/specialist"
rw "github.com/karincake/risoles"
// ua "github.com/karincake/tumpeng/auth/svc"
e "simrs-vx/internal/domain/main-entities/specialist"
esync "simrs-vx/internal/domain/sync-entities/log"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/specialist"
)
type myBase struct{}
internal/interface/simgos-sync-handler/new/subspecialist/handler.go
+1 -1
View File
@@ -2,13 +2,13 @@ package subspecialist
import (
"net/http"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/subspecialist"
rw "github.com/karincake/risoles"
// ua "github.com/karincake/tumpeng/auth/svc"
e "simrs-vx/internal/domain/main-entities/subspecialist"
esync "simrs-vx/internal/domain/sync-entities/log"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/subspecialist"
)
type myBase struct{}
internal/interface/simgos-sync-handler/new/unit/handler.go
+2 -1
View File
@@ -2,13 +2,14 @@ package unit
import (
"net/http"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/unit"
rw "github.com/karincake/risoles"
// ua "github.com/karincake/tumpeng/auth/svc"
e "simrs-vx/internal/domain/main-entities/unit"
esync "simrs-vx/internal/domain/sync-entities/log"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/unit"
)
type myBase struct{}
internal/interface/simgos-sync-handler/simgos-sync-handler.go
+10 -9
View File
@@ -2,20 +2,14 @@ package simgossynchandler
import (
"net/http"
"simrs-vx/internal/interface/simgos-sync-handler/new/division"
"simrs-vx/internal/interface/simgos-sync-handler/new/encounter"
"simrs-vx/internal/interface/simgos-sync-handler/new/installation"
"simrs-vx/internal/interface/simgos-sync-handler/new/patient"
"simrs-vx/internal/interface/simgos-sync-handler/new/specialist"
"simrs-vx/internal/interface/simgos-sync-handler/new/subspecialist"
"simrs-vx/internal/interface/simgos-sync-handler/new/unit"
hc "simrs-vx/pkg/handler-crud-helper"
/******************** infra ********************/
gs "simrs-vx/internal/infra/gorm-setting"
simgosdb "simrs-vx/internal/infra/simgos-db"
/******************** pkg ********************/
cmw "simrs-vx/pkg/cors-manager-mw"
hc "simrs-vx/pkg/handler-crud-helper"
lh "simrs-vx/pkg/lang-helper"
handlerlogger "simrs-vx/pkg/middleware/handler-logger"
zlc "simrs-vx/pkg/zerolog-ctx"
@@ -26,6 +20,13 @@ import (
/******************** internal ********************/
"simrs-vx/internal/interface/main-handler/home"
"simrs-vx/internal/interface/simgos-sync-handler/new/division"
"simrs-vx/internal/interface/simgos-sync-handler/new/encounter"
"simrs-vx/internal/interface/simgos-sync-handler/new/installation"
"simrs-vx/internal/interface/simgos-sync-handler/new/patient"
"simrs-vx/internal/interface/simgos-sync-handler/new/specialist"
"simrs-vx/internal/interface/simgos-sync-handler/new/subspecialist"
"simrs-vx/internal/interface/simgos-sync-handler/new/unit"
)
func SetRoutes() http.Handler {
@@ -56,7 +57,7 @@ func SetRoutes() http.Handler {
})
hk.GroupRoutes(prefixnew+"/v1/encounter", r, hk.MapHandlerFunc{
"POST /": encounter.O.Create,
"POST /log": encounter.O.CreateLog,
"POST /log": encounter.O.CreateLog,git ad
"PATCH /{id}": encounter.O.Update,
"DELETE /{id}": encounter.O.Delete,
"PATCH /{id}/checkin": encounter.O.Checkin,