Merge branch 'dev' of github.com:dikstub-rssa/simrs-be into feat/file-generator-169

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

@@ -70,6 +70,11 @@ func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) {
 }
 
 func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
+	authInfo, err := pa.GetAuthInfo(r)
+	if err != nil {
+		rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil)
+	}
+
 	id := rw.ValidateInt(w, "id", r.PathValue("id"))
 	if id <= 0 {
 		return
@@ -80,29 +85,39 @@ func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	dto.Id = uint16(id)
+	dto.AuthInfo = *authInfo
+
 	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
-	}
 	authInfo, err := pa.GetAuthInfo(r)
 	if err != nil {
 		rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil)
 	}
 
+	id := rw.ValidateInt(w, "id", r.PathValue("id"))
+	if id <= 0 {
+		return
+	}
+
 	dto := e.DeleteDto{}
 	dto.Id = uint16(id)
 	dto.AuthInfo = *authInfo
+
 	res, err := u.Delete(dto)
 	rw.DataResponse(w, res, err)
 }
 
 func (obj myBase) CheckOut(w http.ResponseWriter, r *http.Request) {
 	dto := e.DischargeDto{}
+
+	authInfo, err := pa.GetAuthInfo(r)
+	if err != nil {
+		rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil)
+	}
+
 	id := rw.ValidateInt(w, "id", r.PathValue("id"))
 	if id <= 0 {
 		return
@@ -118,12 +133,20 @@ func (obj myBase) CheckOut(w http.ResponseWriter, r *http.Request) {
 	}
 
 	dto.Id = uint(id)
+	dto.AuthInfo = *authInfo
+
 	res, err := u.CheckOut(dto)
 	rw.DataResponse(w, res, err)
 }
 
 func (obj myBase) CheckIn(w http.ResponseWriter, r *http.Request) {
 	dto := e.CheckinDto{}
+
+	authInfo, err := pa.GetAuthInfo(r)
+	if err != nil {
+		rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil)
+	}
+
 	id := rw.ValidateInt(w, "id", r.PathValue("id"))
 	if id <= 0 {
 		return
@@ -139,6 +162,8 @@ func (obj myBase) CheckIn(w http.ResponseWriter, r *http.Request) {
 	}
 
 	dto.Id = uint(id)
+	dto.AuthInfo = *authInfo
+
 	res, err := u.CheckIn(dto)
 	rw.DataResponse(w, res, err)
 }

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

@@ -319,7 +319,7 @@ func SetRoutes() http.Handler {
 		"PATCH /{id}/active": user.O.Active,
 	})
 	hc.RegCrud(r, "/v1/user-fes", userfes.O)
-	hk.GroupRoutes("/v1/patient", r, hk.MapHandlerFunc{
+	hk.GroupRoutes("/v1/patient", r, auth.GuardMW, hk.MapHandlerFunc{
 		"GET /":                     patient.O.GetList,
 		"GET /{id}":                 patient.O.GetDetail,
 		"POST /":                    patient.O.Create,

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

@@ -2,6 +2,7 @@ package patient
 
 import (
 	"net/http"
+	pa "simrs-vx/internal/lib/auth"
 
 	rw "github.com/karincake/risoles"
 	sf "github.com/karincake/semprit"
@@ -19,10 +20,17 @@ type myBase struct{}
 var O myBase
 
 func (obj myBase) Create(w http.ResponseWriter, r *http.Request) {
+	authInfo, err := pa.GetAuthInfo(r)
+	if err != nil {
+		rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil)
+	}
+
 	dto := e.CreateDto{}
 	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
 		return
 	}
+
+	dto.AuthInfo = *authInfo
 	res, err := u.Create(dto)
 	rw.DataResponse(w, res, err)
 }