Merge branch 'dev' of https://github.com/dikstub-rssa/simrs-be into feat/sync-from-simx-160

# Conflicts:
#	internal/use-case/main-use-case/generate-file/tycovar.go

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

@@ -0,0 +1,72 @@
+package generalconsent
+
+import (
+	"net/http"
+
+	rw "github.com/karincake/risoles"
+	sf "github.com/karincake/semprit"
+
+	// ua "github.com/karincake/tumpeng/auth/svc"
+
+	e "simrs-vx/internal/domain/main-entities/general-consent"
+	u "simrs-vx/internal/use-case/main-use-case/general-consent"
+)
+
+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) GetList(w http.ResponseWriter, r *http.Request) {
+	dto := e.ReadListDto{}
+	sf.UrlQueryParam(&dto, *r.URL)
+	res, err := u.ReadList(dto)
+	rw.DataResponse(w, res, err)
+}
+
+func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) {
+	id := rw.ValidateInt(w, "id", r.PathValue("id"))
+	if id <= 0 {
+		return
+	}
+	dto := e.ReadDetailDto{}
+	sf.UrlQueryParam(&dto, *r.URL)
+	dto.Id = uint(id)
+	res, err := u.ReadDetail(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
+	}
+	dto.Id = uint(id)
+	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{}
+	dto.Id = uint(id)
+	res, err := u.Delete(dto)
+	rw.DataResponse(w, res, err)
+}

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

@@ -0,0 +1,18 @@
+package generatefile
+
+import (
+	"net/http"
+
+	rw "github.com/karincake/risoles"
+
+	u "simrs-vx/internal/use-case/main-use-case/generate-file"
+)
+
+func Generate(w http.ResponseWriter, r *http.Request) {
+	dto := u.GenerateDto{}
+	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+		return
+	}
+	res, err := u.Generate(dto)
+	rw.DataResponse(w, res, err)
+}

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

@@ -17,6 +17,8 @@ import (
 	deviceorderitem "simrs-vx/internal/interface/main-handler/device-order-item"
 	encounter "simrs-vx/internal/interface/main-handler/encounter"
 	encounterdocument "simrs-vx/internal/interface/main-handler/encounter-document"
+	generalconsent "simrs-vx/internal/interface/main-handler/general-consent"
+	generatefile "simrs-vx/internal/interface/main-handler/generate-file"
 	internalreference "simrs-vx/internal/interface/main-handler/internal-reference"
 	materialorder "simrs-vx/internal/interface/main-handler/material-order"
 	materialorderitem "simrs-vx/internal/interface/main-handler/material-order-item"
@@ -34,7 +36,7 @@ import (
 	responsibledoctorhist "simrs-vx/internal/interface/main-handler/responsible-doctor-hist"
 	sbar "simrs-vx/internal/interface/main-handler/sbar"
 	soapi "simrs-vx/internal/interface/main-handler/soapi"
-	upload "simrs-vx/internal/interface/main-handler/upload"
+	uploadfile "simrs-vx/internal/interface/main-handler/upload-file"
 
 	/******************** actor ********************/
 	authpartner "simrs-vx/internal/interface/main-handler/auth-partner"
@@ -57,6 +59,7 @@ import (
 
 	/******************** infra ********************/
 	ibpjs "simrs-vx/internal/infra/bpjs"
+	docscfg "simrs-vx/internal/infra/docs-cfg"
 	gs "simrs-vx/internal/infra/gorm-setting"
 	minio "simrs-vx/internal/infra/minio"
 	ssdb "simrs-vx/internal/infra/ss-db"
@@ -131,6 +134,7 @@ func SetRoutes() http.Handler {
 	a.RegisterExtCall(ibpjs.SetConfig)
 	a.RegisterExtCall(validation.RegisterValidation)
 	a.RegisterExtCall(simgossync.SetConfig)
+	a.RegisterExtCall(docscfg.ParseCfg)
 
 	r := http.NewServeMux()
 
@@ -274,8 +278,10 @@ func SetRoutes() http.Handler {
 		"PATCH /{id}/reject": therapyprotocol.O.Reject,
 	})
 	hc.RegCrud(r, "/v1/chemo-protocol", chemoprotocol.O)
-	hc.RegCrud(r, "/v1/upload", upload.O)
+	hc.RegCrud(r, "/v1/upload-file", uploadfile.O)
 	hc.RegCrud(r, "/v1/encounter-document", encounterdocument.O)
+	hc.RegCrud(r, "/v1/general-consent", generalconsent.O)
+	r.HandleFunc("POST /v1/generate-file", generatefile.Generate)
 
 	/******************** actor ********************/
 	hc.RegCrud(r, "/v1/person", person.O)

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

@@ -1,4 +1,4 @@
-package upload
+package uploadfile
 
 import (
 	"net/http"
@@ -7,10 +7,9 @@ import (
 	d "github.com/karincake/dodol"
 	rw "github.com/karincake/risoles"
 
-	eru "simrs-vx/internal/domain/references/upload"
+	ere "simrs-vx/internal/domain/references/encounter"
 
-	e "simrs-vx/internal/domain/main-entities/upload"
-	u "simrs-vx/internal/use-case/main-use-case/upload"
+	u "simrs-vx/internal/use-case/main-use-case/upload-file"
 )
 
 type myBase struct{}
@@ -49,10 +48,10 @@ func (obj myBase) Create(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	dto := e.CreateDto{
-		EntityType_Code:    eru.EntityTypeCode(r.FormValue("entityType_code")),
+	dto := u.CreateDto{
+		EntityType_Code:    ere.EntityTypeCode(r.FormValue("entityType_code")),
 		Ref_Id:             refID,
-		Type_Code:          eru.DocTypeCode(r.FormValue("type_code")),
+		Type_Code:          ere.DocTypeCode(r.FormValue("type_code")),
 		Name:               r.FormValue("name"),
 		Upload_Employee_Id: employeeId,
 		File:               file,

internal/interface/main-handler/upload-file/validate-request.go

@@ -1,10 +1,10 @@
-package upload
+package uploadfile
 
 import (
-	e "simrs-vx/internal/domain/main-entities/upload"
+	u "simrs-vx/internal/use-case/main-use-case/upload-file"
 )
 
-func validateCreate(dto e.CreateDto) string {
+func validateCreate(dto u.CreateDto) string {
 
 	switch {
 	case dto.EntityType_Code == "":