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

Merge branch 'migration-vanilia' of https://github.com/dikstub-rssa/simrs-be into feat/sync-seeder

Browse Source 
# Conflicts:
#	internal/interface/main-handler/main-handler.go
This commit is contained in:
vanilia
2025-12-11 18:44:36 +07:00
parent a892e5ee43 3e266f1d0c
commit 233918cecf
89 changed files with 562 additions and 2780 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/interface/simgos-sync-handler/new/encounter/handler.go
+8 -8
View File
@@ -87,32 +87,32 @@ func (obj myBase) UpdateStatus(w http.ResponseWriter, r *http.Request) {
rw.DataResponse(w, res, err)
}
func (obj myBase) RequestSwitchUnit(w http.ResponseWriter, r *http.Request) {
func (obj myBase) RequestSwitchSpecialist(w http.ResponseWriter, r *http.Request) {
dto := e.Encounter{}
if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
return
}
res, err := u.RequestSwitchUnit(dto)
res, err := u.RequestSwitchSpecialist(dto)
rw.DataResponse(w, res, err)
}
func (obj myBase) ApproveSwitchUnit(w http.ResponseWriter, r *http.Request) {
dto := e.ApproveCancelUnitDto{}
func (obj myBase) ApproveSwitchSpecialist(w http.ResponseWriter, r *http.Request) {
dto := e.ApproveCancelSpecialistDto{}
if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
return
}
res, err := u.ApproveSwitchUnit(dto)
res, err := u.ApproveSwitchSpecialist(dto)
rw.DataResponse(w, res, err)
}
func (obj myBase) CancelSwitchUnit(w http.ResponseWriter, r *http.Request) {
dto := e.ApproveCancelUnitDto{}
func (obj myBase) CancelSwitchSpecialist(w http.ResponseWriter, r *http.Request) {
dto := e.ApproveCancelSpecialistDto{}
if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
return
}
res, err := u.CancelSwitchUnit(dto)
res, err := u.CancelSwitchSpecialist(dto)
rw.DataResponse(w, res, err)
}
internal/interface/simgos-sync-handler/new/unit/handler.go
-67
View File
@@ -1,67 +0,0 @@
package unit
import (
"net/http"
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{}
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) 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) {
id := rw.ValidateInt(w, "id", r.PathValue("id"))
if id <= 0 {
return
}
dto := e.UpdateDto{}
if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
return
}
val := uint16(id)
dto.Id = &val
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{}
val := uint16(id)
dto.Id = &val
res, err := u.Delete(dto)
rw.DataResponse(w, res, err)
}
internal/interface/simgos-sync-handler/simgos-sync-handler.go
+3 -5
View File
@@ -29,7 +29,6 @@ import (
"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"
sd "simrs-vx/internal/interface/simgos-sync-handler/seeder"
@@ -55,7 +54,6 @@ func SetRoutes() http.Handler {
/******************** SvcToOld ******************/
prefixnew := "/new-to-old"
hc.SyncCrud(r, prefixnew+"/v1/installation", installation.O)
hc.SyncCrud(r, prefixnew+"/v1/unit", unit.O)
hc.SyncCrud(r, prefixnew+"/v1/division", division.O)
hc.SyncCrud(r, prefixnew+"/v1/specialist", specialist.O)
hc.SyncCrud(r, prefixnew+"/v1/subspecialist", subspecialist.O)
@@ -74,9 +72,9 @@ func SetRoutes() http.Handler {
"PATCH /{id}/checkin": encounter.O.Checkin,
"PATCH /{id}/checkout": encounter.O.Checkout,
"PATCH /{id}/update-status": encounter.O.UpdateStatus,
"PATCH /{id}/req-switch-unit": encounter.O.RequestSwitchUnit,
"PATCH /{id}/approve-switch-unit": encounter.O.ApproveSwitchUnit,
"PATCH /{id}/cancel-switch-unit": encounter.O.CancelSwitchUnit,
"PATCH /{id}/req-switch-unit": encounter.O.RequestSwitchSpecialist,
"PATCH /{id}/approve-switch-unit": encounter.O.ApproveSwitchSpecialist,
"PATCH /{id}/cancel-switch-unit": encounter.O.CancelSwitchSpecialist,
})
hc.SyncCrud(r, prefixnew+"/v1/soapi", soapi.O)