resolve conflict

internal/interface/main-handler/antibiotic-src-category/handler.go

@@ -0,0 +1,74 @@
+package mcusrccategory
+
+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/mcu-src-category"
+	u "simrs-vx/internal/use-case/main-use-case/mcu-src-category"
+)
+
+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) {
+	intId := rw.ValidateInt(w, "id", r.PathValue("id"))
+	if intId <= 0 {
+		return
+	}
+	id := uint16(intId)
+	dto := e.ReadDetailDto{}
+	dto.Id = &id
+	res, err := u.ReadDetail(dto)
+	rw.DataResponse(w, res, err)
+}
+
+func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
+	intId := rw.ValidateInt(w, "id", r.PathValue("id"))
+	if intId <= 0 {
+		return
+	}
+	id := uint16(intId)
+
+	dto := e.UpdateDto{}
+	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+		return
+	}
+	dto.Id = &id
+	res, err := u.Update(dto)
+	rw.DataResponse(w, res, err)
+}
+
+func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
+	intId := rw.ValidateInt(w, "id", r.PathValue("id"))
+	if intId <= 0 {
+		return
+	}
+	id := uint16(intId)
+
+	dto := e.DeleteDto{}
+	dto.Id = &id
+	res, err := u.Delete(dto)
+	rw.DataResponse(w, res, err)
+}

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

@@ -0,0 +1,71 @@
+package antibioticsrc
+
+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/antibiotic-src"
+	u "simrs-vx/internal/use-case/main-use-case/antibiotic-src"
+)
+
+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{}
+	dto.Id = uint16(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 = uint16(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 = uint16(id)
+	res, err := u.Delete(dto)
+	rw.DataResponse(w, res, err)
+}

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

@@ -74,6 +74,8 @@ import (
 	zlc "simrs-vx/pkg/zerolog-ctx"
 
 	/******************** sources ********************/
+	antibioticsrc "simrs-vx/internal/interface/main-handler/antibiotic-src"
+	antibioticsrccat "simrs-vx/internal/interface/main-handler/antibiotic-src-category"
 	device "simrs-vx/internal/interface/main-handler/device"
 	diagnosesrc "simrs-vx/internal/interface/main-handler/diagnose-src"
 	division "simrs-vx/internal/interface/main-handler/division"
@@ -150,11 +152,14 @@ func SetRoutes() http.Handler {
 	hc.RegCrudByCode(r, "/v1/medicine-form", medicineform.O)
 	hc.RegCrud(r, "/v1/medicine-mix", medicicinemix.O)
 	hc.RegCrud(r, "/v1/medicine-mix-item", medicicinemixitem.O)
+	hc.RegCrud(r, "/v1/antibiotic-src-category", antibioticsrccat.O)
+	hc.RegCrud(r, "/v1/antibiotic-src", antibioticsrc.O)
 	hc.RegCrud(r, "/v1/soapi", auth.GuardMW, soapi.O)
 	hc.RegCrud(r, "/v1/adime", auth.GuardMW, adime.O)
 	hc.RegCrud(r, "/v1/sbar", auth.GuardMW, sbar.O)
 	hc.RegCrud(r, "/v1/prescription-item", prescriptionitem.O)
 	hc.RegCrud(r, "/v1/device-order-item", deviceorderitem.O)
+
 	hc.RegCrud(r, "/v1/material-order-item", materialorderitem.O)
 	hk.GroupRoutes("/v1/encounter", r, auth.GuardMW, hk.MapHandlerFunc{
 		"GET /":                           encounter.O.GetList,
@@ -177,6 +182,7 @@ func SetRoutes() http.Handler {
 		"POST /":                   mcuorder.O.Create,
 		"PATCH /{id}":              mcuorder.O.Update,
 		"DELETE /{id}":             mcuorder.O.Delete,
+		"PATCH /{id}/submit":       mcuorder.O.Submit,
 		"PATCH /{id}/complete":     mcuorder.O.Complete,
 		"PATCH /{id}/set-schedule": mcuorder.O.SetSchedule,
 	})

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

@@ -85,6 +85,18 @@ func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
 	rw.DataResponse(w, res, err)
 }
 
+func (obj myBase) Submit(w http.ResponseWriter, r *http.Request) {
+	id := rw.ValidateInt(w, "id", r.PathValue("id"))
+	if id <= 0 {
+		return
+	}
+
+	dto := e.ReadDetailDto{}
+	dto.Id = uint(id)
+	res, err := u.Submit(dto)
+	rw.DataResponse(w, res, err)
+}
+
 func (obj myBase) Complete(w http.ResponseWriter, r *http.Request) {
 	id := rw.ValidateInt(w, "id", r.PathValue("id"))
 	if id <= 0 {