Merge branch 'dev' of github.com:dikstub-rssa/simrs-be into feat/data-vaksin-192

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

@@ -68,4 +68,4 @@ func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
 	dto.Id = uint16(id)
 	res, err := u.Delete(dto)
 	rw.DataResponse(w, res, err)
-}
+}

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

@@ -9,9 +9,12 @@ import (
 	sp "github.com/karincake/semprit"
 	sr "github.com/karincake/serabi"
 
+	is "simrs-vx/internal/infra/sync-consumer-cfg"
+	pa "simrs-vx/internal/lib/auth"
+
 	m "simrs-vx/internal/domain/main-entities/user"
 	mf "simrs-vx/internal/domain/main-entities/user-fes"
-	pa "simrs-vx/internal/lib/auth"
+	esga "simrs-vx/internal/domain/sync-entities/authentication"
 	s "simrs-vx/internal/use-case/main-use-case/authentication"
 )
 
@@ -66,12 +69,37 @@ func Logout(w http.ResponseWriter, r *http.Request) {
 }
 
 func GuardMW(next http.Handler) http.Handler {
+	var (
+		accessDetail *pa.AuthInfo
+		err          error
+	)
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		accessDetail, err := s.ExtractToken(r, s.AccessToken)
-		if err != nil {
-			rw.WriteJSON(w, http.StatusUnauthorized, err.(d.FieldError), nil)
-			return
+		// Check if it's from sync
+		credential := esga.CredentialDto{}
+		credential.Source = r.Header.Get("X-Sync-Source")
+		credential.SecretKey = r.Header.Get("X-Sync-SecretKey")
+		credential.UserName = r.Header.Get("X-Sync-UserName")
+		if credential.Source != "" || credential.SecretKey != "" || credential.UserName != "" {
+			// validate secretKey and source
+			if credential.SecretKey != is.O.SecretKey || credential.Source != is.O.Source {
+				rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": "invalid consumer credential"}, nil)
+				return
+			}
+
+			accessDetail, err = s.GetAuthInfoByUserName(credential.UserName)
+			if err != nil {
+				rw.WriteJSON(w, http.StatusUnauthorized, err.(d.FieldError), nil)
+				return
+			}
+		} else {
+			// Normal flow goes here
+			accessDetail, err = s.ExtractToken(r, s.AccessToken)
+			if err != nil {
+				rw.WriteJSON(w, http.StatusUnauthorized, err.(d.FieldError), nil)
+				return
+			}
 		}
+
 		ctx := context.WithValue(r.Context(), pa.AuthKey{}, accessDetail)
 		next.ServeHTTP(w, r.WithContext(ctx))
 	})

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

@@ -0,0 +1,88 @@
+package chemo_protocol
+
+import (
+	"net/http"
+
+	rw "github.com/karincake/risoles"
+	sf "github.com/karincake/semprit"
+
+	e "simrs-vx/internal/domain/main-entities/chemo-plan"
+	ep "simrs-vx/internal/domain/main-entities/chemo-protocol"
+	u "simrs-vx/internal/use-case/main-use-case/chemo-plan"
+)
+
+type myBase struct{}
+
+var O myBase
+
+func (obj myBase) Create(w http.ResponseWriter, r *http.Request) {
+	dto := ep.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)
+}
+
+func (obj myBase) Fail(w http.ResponseWriter, r *http.Request) {
+	id := rw.ValidateInt(w, "id", r.PathValue("id"))
+	if id <= 0 {
+		return
+	}
+
+	dto := e.FailDto{}
+	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+		return
+	}
+
+	dto.Id = uint(id)
+	res, err := u.Fail(dto)
+	rw.DataResponse(w, res, err)
+}

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

@@ -2,7 +2,10 @@ package chemo_protocol
 
 import (
 	"net/http"
+	erc "simrs-vx/internal/domain/references/common"
+	pa "simrs-vx/internal/lib/auth"
 
+	d "github.com/karincake/dodol"
 	rw "github.com/karincake/risoles"
 	sf "github.com/karincake/semprit"
 
@@ -39,7 +42,7 @@ func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) {
 	dto := e.ReadDetailDto{}
 	sf.UrlQueryParam(&dto, *r.URL)
 
-	dto.Id = uint16(id)
+	dto.Id = uint(id)
 	res, err := u.ReadDetail(dto)
 	rw.DataResponse(w, res, err)
 }
@@ -54,7 +57,7 @@ func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
 	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
 		return
 	}
-	dto.Id = uint16(id)
+	dto.Id = uint(id)
 	res, err := u.Update(dto)
 	rw.DataResponse(w, res, err)
 }
@@ -66,7 +69,46 @@ func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
 	}
 
 	dto := e.DeleteDto{}
-	dto.Id = uint16(id)
+	dto.Id = uint(id)
 	res, err := u.Delete(dto)
 	rw.DataResponse(w, res, err)
 }
+
+func (obj myBase) Verify(w http.ResponseWriter, r *http.Request) {
+	id := rw.ValidateInt(w, "id", r.PathValue("id"))
+	if id <= 0 {
+		return
+	}
+
+	dto := e.VerifyDto{}
+	dto.Id = uint(id)
+
+	authInfo, err := pa.GetAuthInfo(r)
+	if err != nil {
+		rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil)
+	}
+
+	dto.AuthInfo = *authInfo
+	dto.Status_Code = erc.DVCVerified
+	res, err := u.Verify(dto)
+	rw.DataResponse(w, res, err)
+}
+
+func (obj myBase) Reject(w http.ResponseWriter, r *http.Request) {
+	id := rw.ValidateInt(w, "id", r.PathValue("id"))
+	if id <= 0 {
+		return
+	}
+
+	dto := e.VerifyDto{}
+	dto.Id = uint(id)
+	authInfo, err := pa.GetAuthInfo(r)
+	if err != nil {
+		rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil)
+	}
+
+	dto.AuthInfo = *authInfo
+	dto.Status_Code = erc.DVCRejected
+	res, err := u.Verify(dto)
+	rw.DataResponse(w, res, err)
+}

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

@@ -3,20 +3,16 @@ package chemo
 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/chemo"
-
-	erc "simrs-vx/internal/domain/references/common"
-
-	u "simrs-vx/internal/use-case/main-use-case/chemo"
-
 	pa "simrs-vx/internal/lib/auth"
 
 	d "github.com/karincake/dodol"
+	rw "github.com/karincake/risoles"
+	sf "github.com/karincake/semprit"
+
+	erc "simrs-vx/internal/domain/references/common"
+
+	e "simrs-vx/internal/domain/main-entities/chemo"
+	u "simrs-vx/internal/use-case/main-use-case/chemo"
 )
 
 type myBase struct{}
@@ -45,7 +41,8 @@ func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	dto := e.ReadDetailDto{}
-	dto.Id = uint16(id)
+	sf.UrlQueryParam(&dto, *r.URL)
+	dto.Id = uint(id)
 	res, err := u.ReadDetail(dto)
 	rw.DataResponse(w, res, err)
 }
@@ -60,7 +57,7 @@ func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
 	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
 		return
 	}
-	dto.Id = uint16(id)
+	dto.Id = uint(id)
 	res, err := u.Update(dto)
 	rw.DataResponse(w, res, err)
 }
@@ -72,7 +69,7 @@ func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
 	}
 
 	dto := e.DeleteDto{}
-	dto.Id = uint16(id)
+	dto.Id = uint(id)
 	res, err := u.Delete(dto)
 	rw.DataResponse(w, res, err)
 }
@@ -88,7 +85,7 @@ func (obj myBase) Verify(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	dto.Id = uint16(id)
+	dto.Id = uint(id)
 	authInfo, err := pa.GetAuthInfo(r)
 	if err != nil {
 		rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil)
@@ -107,7 +104,7 @@ func (obj myBase) Reject(w http.ResponseWriter, r *http.Request) {
 	}
 
 	dto := e.VerifyDto{}
-	dto.Id = uint16(id)
+	dto.Id = uint(id)
 	authInfo, err := pa.GetAuthInfo(r)
 	if err != nil {
 		rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil)

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

@@ -240,8 +240,8 @@ func (obj myBase) Skip(w http.ResponseWriter, r *http.Request) {
 	rw.DataResponse(w, res, err)
 }
 
-func (obj myBase) RequestSwitchUnit(w http.ResponseWriter, r *http.Request) {
-	dto := e.SwitchUnitDto{}
+func (obj myBase) RequestSwitchSpecialist(w http.ResponseWriter, r *http.Request) {
+	dto := e.SwitchSpecialistDto{}
 	id := rw.ValidateInt(w, "id", r.PathValue("id"))
 	if id <= 0 {
 		return
@@ -252,7 +252,7 @@ func (obj myBase) RequestSwitchUnit(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// validate request body
-	if valid := validateRequestSwitchUnit(w, dto); !valid {
+	if valid := validateRequestSwitchSpecialist(w, dto); !valid {
 		return
 	}
 
@@ -263,12 +263,12 @@ func (obj myBase) RequestSwitchUnit(w http.ResponseWriter, r *http.Request) {
 
 	dto.AuthInfo = *authInfo
 	dto.Id = uint(id)
-	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{}
 	id := rw.ValidateInt(w, "id", r.PathValue("id"))
 	if id <= 0 {
 		return
@@ -286,12 +286,12 @@ func (obj myBase) ApproveSwitchUnit(w http.ResponseWriter, r *http.Request) {
 	dto.AuthInfo = *authInfo
 	dto.Id = uint(id)
 
-	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{}
 	id := rw.ValidateInt(w, "id", r.PathValue("id"))
 	if id <= 0 {
 		return
@@ -309,6 +309,32 @@ func (obj myBase) CancelSwitchUnit(w http.ResponseWriter, r *http.Request) {
 	dto.AuthInfo = *authInfo
 	dto.Id = uint(id)
 
-	res, err := u.CancelSwitchUnit(dto)
+	res, err := u.CancelSwitchSpecialist(dto)
+	rw.DataResponse(w, res, err)
+}
+
+func (obj myBase) CreateWithPatient(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.CreateWithPatientDto{}
+	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+		return
+	}
+
+	// validate SubClass
+	if err := verifyClassCode(dto.CreateDto); err != nil {
+		rw.DataResponse(w, nil, d.FieldError{
+			Code:    dataValidationFail,
+			Message: err.Error(),
+		})
+		return
+	}
+
+	dto.AuthInfo = *authInfo
+	dto.Patient.AuthInfo = *authInfo
+	res, err := u.CreateWithPatient(dto)
 	rw.DataResponse(w, res, err)
 }

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

@@ -58,7 +58,7 @@ func validateRequestCheckIn(w http.ResponseWriter, i e.CheckinDto) (valid bool)
 	return true
 }
 
-func validateRequestSwitchUnit(w http.ResponseWriter, i e.SwitchUnitDto) (valid bool) {
+func validateRequestSwitchSpecialist(w http.ResponseWriter, i e.SwitchSpecialistDto) (valid bool) {
 	// validate poly-switch-code
 	if i.PolySwitchCode == nil {
 		rw.DataResponse(w, nil, d.FieldError{
@@ -84,7 +84,7 @@ func validateRequestSwitchUnit(w http.ResponseWriter, i e.SwitchUnitDto) (valid
 	}
 
 	for _, v := range *i.InternalReferences {
-		if v.Unit_Code == nil {
+		if v.Specialist_Code == nil {
 			rw.DataResponse(w, nil, d.FieldError{
 				Code:    dataValidationFail,
 				Message: "internalReferences.unit_code required",

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

@@ -71,3 +71,12 @@ func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
 	res, err := u.Delete(dto)
 	rw.DataResponse(w, res, err)
 }
+
+func (obj myBase) CreateBulk(w http.ResponseWriter, r *http.Request) {
+	dto := e.CreateBulkDto{}
+	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+		return
+	}
+	res, err := u.CreateBulk(dto)
+	rw.DataResponse(w, res, err)
+}

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

@@ -4,13 +4,11 @@ import (
 	"net/http"
 
 	/******************** main / transaction ********************/
-	actionreport "simrs-vx/internal/interface/main-handler/action-report"
 	adime "simrs-vx/internal/interface/main-handler/adime"
 	admemployeehist "simrs-vx/internal/interface/main-handler/adm-employee-hist"
 	ambulancetransportrequest "simrs-vx/internal/interface/main-handler/ambulance-transport-req"
 	auth "simrs-vx/internal/interface/main-handler/authentication"
 	chemo "simrs-vx/internal/interface/main-handler/chemo"
-	chemoprotocol "simrs-vx/internal/interface/main-handler/chemo-protocol"
 	consultation "simrs-vx/internal/interface/main-handler/consultation"
 	controlletter "simrs-vx/internal/interface/main-handler/control-letter"
 	counter "simrs-vx/internal/interface/main-handler/counter"
@@ -34,9 +32,14 @@ import (
 	practiceschedule "simrs-vx/internal/interface/main-handler/practice-schedule"
 	prescription "simrs-vx/internal/interface/main-handler/prescription"
 	prescriptionitem "simrs-vx/internal/interface/main-handler/prescription-item"
+	procedurereport "simrs-vx/internal/interface/main-handler/procedure-report"
+	procedureroom "simrs-vx/internal/interface/main-handler/procedure-room"
+	procedureroomorder "simrs-vx/internal/interface/main-handler/procedure-room-order"
+	procedureroomorderitem "simrs-vx/internal/interface/main-handler/procedure-room-order-item"
 	responsibledoctorhist "simrs-vx/internal/interface/main-handler/responsible-doctor-hist"
 	resume "simrs-vx/internal/interface/main-handler/resume"
 	sbar "simrs-vx/internal/interface/main-handler/sbar"
+	screening "simrs-vx/internal/interface/main-handler/screening"
 	soapi "simrs-vx/internal/interface/main-handler/soapi"
 	uploadfile "simrs-vx/internal/interface/main-handler/upload-file"
 	vaccineData "simrs-vx/internal/interface/main-handler/vaccine-data"
@@ -66,7 +69,7 @@ import (
 	gs "simrs-vx/internal/infra/gorm-setting"
 	minio "simrs-vx/internal/infra/minio"
 	ssdb "simrs-vx/internal/infra/ss-db"
-	simgossync "simrs-vx/internal/infra/sync-cfg"
+	sync "simrs-vx/internal/infra/sync-consumer-cfg"
 
 	/******************** pkg ********************/
 	cmw "simrs-vx/pkg/cors-manager-mw"
@@ -79,6 +82,8 @@ import (
 	/******************** sources ********************/
 	antibioticsrc "simrs-vx/internal/interface/main-handler/antibiotic-src"
 	antibioticsrccat "simrs-vx/internal/interface/main-handler/antibiotic-src-category"
+	chemoplan "simrs-vx/internal/interface/main-handler/chemo-plan"
+	chemoprotocol "simrs-vx/internal/interface/main-handler/chemo-protocol"
 	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"
@@ -94,6 +99,8 @@ import (
 	itemprice "simrs-vx/internal/interface/main-handler/item-price"
 	language "simrs-vx/internal/interface/main-handler/language"
 	material "simrs-vx/internal/interface/main-handler/material"
+	materialpackage "simrs-vx/internal/interface/main-handler/material-package"
+	materialpackageitem "simrs-vx/internal/interface/main-handler/material-package-item"
 	mcusrc "simrs-vx/internal/interface/main-handler/mcu-src"
 	mcusrccategory "simrs-vx/internal/interface/main-handler/mcu-src-category"
 	mcusubsrc "simrs-vx/internal/interface/main-handler/mcu-sub-src"
@@ -110,8 +117,6 @@ import (
 	subspecialist "simrs-vx/internal/interface/main-handler/subspecialist"
 	subspecialistposition "simrs-vx/internal/interface/main-handler/subspecialist-position"
 	therapyprotocol "simrs-vx/internal/interface/main-handler/therapy-protocol"
-	unit "simrs-vx/internal/interface/main-handler/unit"
-	unitposition "simrs-vx/internal/interface/main-handler/unit-position"
 	uom "simrs-vx/internal/interface/main-handler/uom"
 	vehicle "simrs-vx/internal/interface/main-handler/vehicle"
 	vehiclehist "simrs-vx/internal/interface/main-handler/vehicle-hist"
@@ -133,6 +138,7 @@ import (
 	reference "simrs-vx/internal/interface/main-handler/reference"
 	referral "simrs-vx/internal/interface/main-handler/referral"
 	vclaimsep "simrs-vx/internal/interface/main-handler/vclaim-sep"
+	vclaimsepcontrolletter "simrs-vx/internal/interface/main-handler/vclaim-sep-control-letter"
 	vclaimsephist "simrs-vx/internal/interface/main-handler/vclaim-sep-hist"
 	vclaimsepprint "simrs-vx/internal/interface/main-handler/vclaim-sep-print"
 )
@@ -148,7 +154,7 @@ func SetRoutes() http.Handler {
 	a.RegisterExtCall(mh.I.SetClient)
 	a.RegisterExtCall(ibpjs.SetConfig)
 	a.RegisterExtCall(validation.RegisterValidation)
-	a.RegisterExtCall(simgossync.SetConfig)
+	a.RegisterExtCall(sync.SetConfig)
 	a.RegisterExtCall(docscfg.ParseCfg)
 	a.RegisterExtCall(ibpjs.SetConfig)
 
@@ -173,7 +179,7 @@ func SetRoutes() http.Handler {
 	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/action-report", auth.GuardMW, actionreport.O)
+	hc.RegCrud(r, "/v1/procedure-report", auth.GuardMW, procedurereport.O)
 
 	hc.RegCrud(r, "/v1/material-order-item", materialorderitem.O)
 	hk.GroupRoutes("/v1/encounter", r, auth.GuardMW, hk.MapHandlerFunc{
@@ -188,9 +194,10 @@ func SetRoutes() http.Handler {
 		"PATCH /{id}/cancel":              encounter.O.Cancel,
 		"PATCH /{id}/reject":              encounter.O.Reject,
 		"PATCH /{id}/skip":                encounter.O.Skip,
-		"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,
+		"POST /create-with-patient":       encounter.O.CreateWithPatient,
 	})
 	hk.GroupRoutes("/v1/mcu-order", r, auth.GuardMW, hk.MapHandlerFunc{
 		"GET /":                    mcuorder.O.GetList,
@@ -268,6 +275,16 @@ func SetRoutes() http.Handler {
 		"DELETE /{id}":         materialorder.O.Delete,
 		"PATCH /{id}/complete": materialorder.O.Complete,
 	})
+	hc.RegCrud(r, "/v1/procedure-room", procedureroom.O)
+	hk.GroupRoutes("/v1/procedure-room-order", r, auth.GuardMW, hk.MapHandlerFunc{
+		"GET /":              procedureroomorder.O.GetList,
+		"GET /{id}":          procedureroomorder.O.GetDetail,
+		"POST /":             procedureroomorder.O.Create,
+		"PATCH /{id}":        procedureroomorder.O.Update,
+		"DELETE /{id}":       procedureroomorder.O.Delete,
+		"PATCH /{id}/submit": procedureroomorder.O.Submit,
+	})
+	hc.RegCrud(r, "/v1/procedure-room-order-item", procedureroomorderitem.O)
 	hk.GroupRoutes("/v1/consultation", r, auth.GuardMW, hk.MapHandlerFunc{
 		"GET /":             consultation.O.GetList,
 		"GET /{id}":         consultation.O.GetDetail,
@@ -299,7 +316,18 @@ func SetRoutes() http.Handler {
 		"PATCH /{id}/verify": therapyprotocol.O.Verify,
 		"PATCH /{id}/reject": therapyprotocol.O.Reject,
 	})
-	hc.RegCrud(r, "/v1/chemo-protocol", chemoprotocol.O)
+	hk.GroupRoutes("/v1/chemo-protocol", r, auth.GuardMW, hk.MapHandlerFunc{
+		"GET /":              chemoprotocol.O.GetList,
+		"GET /{id}":          chemoprotocol.O.GetDetail,
+		"POST /":             chemoprotocol.O.Create,
+		"PATCH /{id}":        chemoprotocol.O.Update,
+		"DELETE /{id}":       chemoprotocol.O.Delete,
+		"PATCH /{id}/verify": chemoprotocol.O.Verify,
+		"PATCH /{id}/reject": chemoprotocol.O.Reject,
+	})
+	hk.GroupRoutes("/v1/chemo-plan", r, auth.GuardMW, hk.MapHandlerFunc{
+		"PATCH /{id}/fail": chemoplan.O.Fail,
+	})
 	hc.RegCrud(r, "/v1/upload-file", uploadfile.O)
 	hc.RegCrud(r, "/v1/vaccine-data", vaccineData.O)
 	hc.RegCrud(r, "/v1/encounter-document", encounterdocument.O)
@@ -314,7 +342,11 @@ func SetRoutes() http.Handler {
 		"PATCH /{id}/verify":   resume.Verify,
 		"PATCH /{id}/validate": resume.Validate,
 	})
-
+	hk.GroupRoutes("/v1/screening", r, auth.GuardMW, hk.MapHandlerFunc{
+		"POST /":    screening.O.Create,
+		"GET /":     screening.O.GetList,
+		"GET /{id}": screening.O.GetDetail,
+	})
 	/******************** actor ********************/
 	hc.RegCrud(r, "/v1/person", person.O)
 	hc.RegCrud(r, "/v1/person-address", personaddress.O)
@@ -348,12 +380,31 @@ func SetRoutes() http.Handler {
 	/******************** sources ********************/
 	hc.RegCrudByCode(r, "/v1/division", division.O)
 	hc.RegCrudByCode(r, "/v1/division-position", divisionposition.O)
-	hc.RegCrudByCode(r, "/v1/installation", installation.O)
-	hc.RegCrudByCode(r, "/v1/unit", unit.O)
+	hk.GroupRoutes("/v1/installation", r, hk.MapHandlerFunc{
+		"GET /":        installation.O.GetList,
+		"GET /{id}":    installation.O.GetDetail,
+		"POST /":       installation.O.Create,
+		"PATCH /{id}":  installation.O.Update,
+		"DELETE /{id}": installation.O.Delete,
+		"POST /bulk":   installation.O.CreateBulk,
+	})
 	hc.RegCrudByCode(r, "/v1/installation-position", installationposition.O)
-	hc.RegCrudByCode(r, "/v1/unit-position", unitposition.O)
-	hc.RegCrudByCode(r, "/v1/specialist", specialist.O)
-	hc.RegCrudByCode(r, "/v1/subspecialist", subspecialist.O)
+	hk.GroupRoutes("/v1/specialist", r, hk.MapHandlerFunc{
+		"GET /":        specialist.O.GetList,
+		"GET /{id}":    specialist.O.GetDetail,
+		"POST /":       specialist.O.Create,
+		"PATCH /{id}":  specialist.O.Update,
+		"DELETE /{id}": specialist.O.Delete,
+		"POST /bulk":   specialist.O.CreateBulk,
+	})
+	hk.GroupRoutes("/v1/subspecialist", r, hk.MapHandlerFunc{
+		"GET /":        subspecialist.O.GetList,
+		"GET /{id}":    subspecialist.O.GetDetail,
+		"POST /":       subspecialist.O.Create,
+		"PATCH /{id}":  subspecialist.O.Update,
+		"DELETE /{id}": subspecialist.O.Delete,
+		"POST /bulk":   subspecialist.O.CreateBulk,
+	})
 	hc.RegCrudByCode(r, "/v1/specialist-position", specialistposition.O)
 	hc.RegCrudByCode(r, "/v1/subspecialist-position", subspecialistposition.O)
 	hc.RegCrudByCode(r, "/v1/infra", infra.O)
@@ -372,6 +423,8 @@ func SetRoutes() http.Handler {
 	hc.RegCrudByCode(r, "/v1/medicine", medicine.O)
 	hc.RegCrudByCode(r, "/v1/device", device.O)
 	hc.RegCrudByCode(r, "/v1/material", material.O)
+	hc.RegCrudByCode(r, "/v1/material-package", materialpackage.O)
+	hc.RegCrud(r, "/v1/material-package-item", materialpackageitem.O)
 	hc.RegCrud(r, "/v1/doctor-fee", doctorfee.O)
 	hc.RegCrudByCode(r, "/v1/medical-action-src", medicalactionsrc.O)
 	hc.RegCrud(r, "/v1/medical-action-src-item", medicalactionsrcitem.O)
@@ -394,6 +447,12 @@ func SetRoutes() http.Handler {
 		"DELETE /{number}": vclaimsep.O.Delete,
 	})
 
+	hk.GroupRoutes("/v1/vclaim-sep-control-letter", r, hk.MapHandlerFunc{
+		"POST /":           vclaimsepcontrolletter.O.Create,
+		"GET /{number}":    vclaimsepcontrolletter.O.GetDetail,
+		"DELETE /{number}": vclaimsepcontrolletter.O.Delete,
+	})
+
 	hk.GroupRoutes("/v1/vclaim-sep-hist", r, hk.MapHandlerFunc{
 		"GET /": vclaimsephist.O.GetList,
 	})

internal/interface/main-handler/material-package-item/handler.go

@@ -1,4 +1,4 @@
-package unit
+package material
 
 import (
 	"net/http"
@@ -8,8 +8,8 @@ import (
 
 	// ua "github.com/karincake/tumpeng/auth/svc"
 
-	e "simrs-vx/internal/domain/main-entities/unit"
-	u "simrs-vx/internal/use-case/main-use-case/unit"
+	e "simrs-vx/internal/domain/main-entities/material-package-item"
+	u "simrs-vx/internal/use-case/main-use-case/material-package-item"
 )
 
 type myBase struct{}
@@ -33,21 +33,19 @@ func (obj myBase) GetList(w http.ResponseWriter, r *http.Request) {
 }
 
 func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) {
-	code := rw.ValidateString(w, "code", r.PathValue("code"))
-	if code == "" {
+	id := rw.ValidateInt(w, "id", r.PathValue("id"))
+	if id == 0 {
 		return
 	}
 	dto := e.ReadDetailDto{}
-
-	sf.UrlQueryParam(&dto, *r.URL)
-	dto.Code = &code
+	dto.Id = uint(id)
 	res, err := u.ReadDetail(dto)
 	rw.DataResponse(w, res, err)
 }
 
 func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
-	code := rw.ValidateString(w, "code", r.PathValue("code"))
-	if code == "" {
+	id := rw.ValidateInt(w, "id", r.PathValue("id"))
+	if id == 0 {
 		return
 	}
 
@@ -55,19 +53,19 @@ func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
 	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
 		return
 	}
-	dto.Code = code
+	dto.Id = uint(id)
 	res, err := u.Update(dto)
 	rw.DataResponse(w, res, err)
 }
 
 func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
-	code := rw.ValidateString(w, "code", r.PathValue("code"))
-	if code == "" {
+	id := rw.ValidateInt(w, "id", r.PathValue("id"))
+	if id == 0 {
 		return
 	}
 
 	dto := e.DeleteDto{}
-	dto.Code = &code
+	dto.Id = uint(id)
 	res, err := u.Delete(dto)
 	rw.DataResponse(w, res, err)
 }

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

@@ -1,4 +1,4 @@
-package unit_position
+package material
 
 import (
 	"net/http"
@@ -8,8 +8,8 @@ import (
 
 	// ua "github.com/karincake/tumpeng/auth/svc"
 
-	e "simrs-vx/internal/domain/main-entities/unit-position"
-	u "simrs-vx/internal/use-case/main-use-case/unit-position"
+	e "simrs-vx/internal/domain/main-entities/material-package"
+	u "simrs-vx/internal/use-case/main-use-case/material-package"
 )
 
 type myBase struct{}

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

@@ -59,11 +59,18 @@ func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	authInfo, err := pa.GetAuthInfo(r)
+	if err != nil {
+		rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil)
+	}
+
 	dto := e.UpdateDto{}
 	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
 		return
 	}
+
 	dto.Id = uint(id)
+	dto.AuthInfo = *authInfo
 	res, err := u.Update(dto)
 	rw.DataResponse(w, res, err)
 }
@@ -75,7 +82,15 @@ func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
 	}
 
 	dto := e.DeleteDto{}
+
+	authInfo, err := pa.GetAuthInfo(r)
+	if err != nil {
+		rw.WriteJSON(w, http.StatusUnauthorized, d.IS{"message": err.Error()}, nil)
+	}
+
 	dto.Id = uint(id)
+	dto.AuthInfo = *authInfo
+
 	res, err := u.Delete(dto)
 	rw.DataResponse(w, res, err)
 }

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

@@ -8,8 +8,8 @@ import (
 
 	// ua "github.com/karincake/tumpeng/auth/svc"
 
-	e "simrs-vx/internal/domain/main-entities/action-report"
-	u "simrs-vx/internal/use-case/main-use-case/action-report"
+	e "simrs-vx/internal/domain/main-entities/procedure-report"
+	u "simrs-vx/internal/use-case/main-use-case/procedure-report"
 
 	pa "simrs-vx/internal/lib/auth"
 

internal/interface/main-handler/procedure-room-order-item/handler.go

@@ -0,0 +1,71 @@
+package procedureroomorder
+
+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/procedure-room-order-item"
+	u "simrs-vx/internal/use-case/main-use-case/procedure-room-order-item"
+)
+
+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 = uint64(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 = uint64(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 = uint64(id)
+	res, err := u.Delete(dto)
+	rw.DataResponse(w, res, err)
+}

internal/interface/main-handler/procedure-room-order/handler.go

@@ -0,0 +1,83 @@
+package procedureroomorder
+
+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/procedure-room-order"
+	u "simrs-vx/internal/use-case/main-use-case/procedure-room-order"
+)
+
+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 = uint64(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 = uint64(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 = uint64(id)
+	res, err := u.Delete(dto)
+	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 = uint64(id)
+	res, err := u.Submit(dto)
+	rw.DataResponse(w, res, err)
+}

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

@@ -0,0 +1,71 @@
+package procedureroom
+
+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/procedure-room"
+	u "simrs-vx/internal/use-case/main-use-case/procedure-room"
+)
+
+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/screening/handler.go

@@ -0,0 +1,80 @@
+package screening
+
+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/screening"
+	u "simrs-vx/internal/use-case/main-use-case/screening"
+
+	pa "simrs-vx/internal/lib/auth"
+
+	d "github.com/karincake/dodol"
+)
+
+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)
+}
+
+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 = 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 = 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/soapi/handler.go

@@ -47,7 +47,7 @@ func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	dto := e.ReadDetailDto{}
-	dto.Id = uint16(id)
+	dto.Id = uint(id)
 	res, err := u.ReadDetail(dto)
 	rw.DataResponse(w, res, err)
 }
@@ -62,7 +62,7 @@ func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
 	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
 		return
 	}
-	dto.Id = uint16(id)
+	dto.Id = uint(id)
 	res, err := u.Update(dto)
 	rw.DataResponse(w, res, err)
 }
@@ -74,7 +74,7 @@ func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
 	}
 
 	dto := e.DeleteDto{}
-	dto.Id = uint16(id)
+	dto.Id = uint(id)
 	res, err := u.Delete(dto)
 	rw.DataResponse(w, res, err)
 }

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

@@ -71,3 +71,12 @@ func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
 	res, err := u.Delete(dto)
 	rw.DataResponse(w, res, err)
 }
+
+func (obj myBase) CreateBulk(w http.ResponseWriter, r *http.Request) {
+	dto := e.CreateBulkDto{}
+	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+		return
+	}
+	res, err := u.CreateBulk(dto)
+	rw.DataResponse(w, res, err)
+}

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

@@ -71,3 +71,12 @@ func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
 	res, err := u.Delete(dto)
 	rw.DataResponse(w, res, err)
 }
+
+func (obj myBase) CreateBulk(w http.ResponseWriter, r *http.Request) {
+	dto := e.CreateBulkDto{}
+	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+		return
+	}
+	res, err := u.CreateBulk(dto)
+	rw.DataResponse(w, res, err)
+}

internal/interface/main-handler/vclaim-sep-control-letter/handler.go

@@ -0,0 +1,67 @@
+package vclaimsepcontrolletter
+
+import (
+	"net/http"
+
+	rw "github.com/karincake/risoles"
+
+	e "simrs-vx/internal/domain/bpjs-entities/vclaim-sep-control-letter"
+	u "simrs-vx/internal/use-case/bpjs-use-case/vclaim-sep-control-letter"
+)
+
+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) {
+	number := rw.ValidateString(w, "number", r.PathValue("number"))
+	if number == "" {
+		return
+	}
+	dto := e.ReadDetailDto{}
+	dto.Number = &number
+	res, err := u.ReadDetail(dto)
+	rw.DataResponse(w, res, err)
+}
+
+// func (obj myBase) Update(w http.ResponseWriter, r *http.Request) {
+// 	number := rw.ValidateString(w, "number", r.PathValue("number"))
+// 	if number != "" {
+// 		return
+// 	}
+
+// 	dto := e.UpdateDto{}
+// 	if res := rw.ValidateStructByIOR(w, r.Body, &dto); !res {
+// 		return
+// 	}
+// 	dto.Number = &number
+// 	res, err := u.Update(dto)
+// 	rw.DataResponse(w, res, err)
+// }
+
+func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
+	number := rw.ValidateString(w, "number", r.PathValue("number"))
+	if number == "" {
+		return
+	}
+	dto := e.DeleteDto{}
+	dto.Number = &number
+	res, err := u.Delete(dto)
+	rw.DataResponse(w, res, err)
+}

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

@@ -56,12 +56,12 @@ func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) {
 // }
 
 func (obj myBase) Delete(w http.ResponseWriter, r *http.Request) {
-	id := rw.ValidateInt(w, "id", r.PathValue("id"))
-	if id <= 0 {
+	number := rw.ValidateString(w, "number", r.PathValue("number"))
+	if number == "" {
 		return
 	}
 	dto := e.DeleteDto{}
-	dto.Id = uint(id)
+	dto.Number = &number
 	res, err := u.Delete(dto)
 	rw.DataResponse(w, res, err)
 }