Merge branch 'dev' of https://github.com/dikstub-rssa/simrs-be into feat/functional-position-100

internal/interface/main-handler/main-handler.go

@@ -274,7 +274,7 @@ func SetRoutes() http.Handler {
 		"PATCH /{id}":               patient.O.Update,
 		"DELETE /{id}":              patient.O.Delete,
 		"GET /search/{keyword}":     patient.O.Search,
-		"GET /by-resident-identity": patient.O.SearchByResidentIdentity,
+		"GET /by-resident-identity": patient.O.SearchByResidentIdentityNumber,
 		"POST /{id}/upload":         patient.O.Upload,
 	})
 

internal/interface/main-handler/patient/handler.go

@@ -76,21 +76,22 @@ func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
 
 func (obj myBase) Search(w http.ResponseWriter, r *http.Request) {
 	dto := e.SearchDto{}
+
+	sf.UrlQueryParam(&dto, *r.URL)
 	keyword := rw.ValidateString(w, "keyword", r.PathValue("keyword"))
 	if keyword == "" {
 		rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": "keyword is required"}, nil)
 	}
-	dto.Mode = e.SMIdent
+
 	dto.Search = keyword
 	res, err := u.Search(dto)
 	rw.DataResponse(w, res, err)
 }
 
-func (obj myBase) SearchByResidentIdentity(w http.ResponseWriter, r *http.Request) {
+func (obj myBase) SearchByResidentIdentityNumber(w http.ResponseWriter, r *http.Request) {
 	dto := e.SearchDto{}
 	sf.UrlQueryParam(&dto, *r.URL)
-	dto.Mode = e.SMNik
-	res, err := u.Search(dto)
+	res, err := u.SearchByResidentIdentityNumber(dto)
 	rw.DataResponse(w, res, err)
 }
 

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

@@ -0,0 +1,36 @@
+package mainsynchandler
+
+import (
+	"net/http"
+
+	/******************** infra ********************/
+	gs "simrs-vx/internal/infra/gorm-setting"
+	synccfg "simrs-vx/internal/infra/sync-cfg"
+
+	/******************** pkg ********************/
+	cmw "simrs-vx/pkg/cors-manager-mw"
+	lh "simrs-vx/pkg/lang-helper"
+	handlerlogger "simrs-vx/pkg/middleware/handler-logger"
+	zlc "simrs-vx/pkg/zerolog-ctx"
+
+	/******************** external ********************/
+	a "github.com/karincake/apem"
+
+	/******************** internal ********************/
+	"simrs-vx/internal/interface/main-handler/home"
+)
+
+func SetRoutes() http.Handler {
+	///
+	a.RegisterExtCall(gs.Adjust)
+	a.RegisterExtCall(zlc.Adjust)
+	a.RegisterExtCall(lh.Populate)
+	a.RegisterExtCall(synccfg.SetConfig)
+
+	r := http.NewServeMux()
+
+	/******************** Main ********************/
+	r.HandleFunc("/", home.Home)
+
+	return cmw.SetCors(handlerlogger.SetLog(r))
+}

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

@@ -0,0 +1,36 @@
+package simgossynchandler
+
+import (
+	"net/http"
+
+	/******************** infra ********************/
+	gs "simrs-vx/internal/infra/gorm-setting"
+	synccfg "simrs-vx/internal/infra/sync-cfg"
+
+	/******************** pkg ********************/
+	cmw "simrs-vx/pkg/cors-manager-mw"
+	lh "simrs-vx/pkg/lang-helper"
+	handlerlogger "simrs-vx/pkg/middleware/handler-logger"
+	zlc "simrs-vx/pkg/zerolog-ctx"
+
+	/******************** external ********************/
+	a "github.com/karincake/apem"
+
+	/******************** internal ********************/
+	"simrs-vx/internal/interface/main-handler/home"
+)
+
+func SetRoutes() http.Handler {
+	///
+	a.RegisterExtCall(gs.Adjust)
+	a.RegisterExtCall(zlc.Adjust)
+	a.RegisterExtCall(lh.Populate)
+	a.RegisterExtCall(synccfg.SetConfig)
+
+	r := http.NewServeMux()
+
+	/******************** Main ********************/
+	r.HandleFunc("/", home.Home)
+
+	return cmw.SetCors(handlerlogger.SetLog(r))
+}