fix conflict
This commit is contained in:
vanilia
+2
-2
@@ -15,7 +15,7 @@
|
||||
<br />Example:
|
||||
1. `User_Id` represents the `User` object and the `Id` attribute
|
||||
2. `BestProduct_Code` represents the `BestProduct` object and the `Code` attribute
|
||||
3. When more than one column has a similar definition, a `prefixnew` can be added to indicate the column's purpose.
|
||||
3. When more than one column has a similar definition, a `prefix` can be added to indicate the column's purpose.
|
||||
<br />Example:
|
||||
1. `Admin_User_Id` represents the `Admin` of the `User` object and the `Id` attribute
|
||||
2. `Operator_User_Id` refers to the `Operator` of the `User` object and the `Id` column.
|
||||
@@ -25,7 +25,7 @@
|
||||
<br />Example:
|
||||
1. `user_id` represents the `User` object and the `Id` attribute.
|
||||
2. `bestProduct_code` represents the `bestProduct` object and the `code` attribute.
|
||||
3. When more than one column has a similar definition, a `prefixnew` can be added to indicate the column's purpose.
|
||||
3. When more than one column has a similar definition, a `prefix` can be added to indicate the column's purpose.
|
||||
<br />Example:
|
||||
1. `admin_user_id` refers to the `admin` of the `user` object and `id` attribute
|
||||
2. `operator_user_id` refers to the `operator` of the `user` object, column `id`
|
||||
|
||||
@@ -71,7 +71,7 @@ bpjsCfg:
|
||||
syncUrlCfg:
|
||||
enable: false
|
||||
host:
|
||||
prefixnew: new-to-old
|
||||
prefix: new-to-old
|
||||
|
||||
docsCfg:
|
||||
path: ../../assets/docs/
|
||||
@@ -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{}
|
||||
|
||||
@@ -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{}
|
||||
|
||||
@@ -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{}
|
||||
|
||||
@@ -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{}
|
||||
|
||||
@@ -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{}
|
||||
|
||||
@@ -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{}
|
||||
|
||||
@@ -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{}
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user