update procedure report main api

internal/domain/main-entities/action-report/dto.go

@@ -1,90 +0,0 @@
-package actionreport
-
-import (
-	ecore "simrs-vx/internal/domain/base-entities/core"
-	ee "simrs-vx/internal/domain/main-entities/encounter"
-	"time"
-
-	pa "simrs-vx/internal/lib/auth"
-)
-
-type CreateDto struct {
-	Encounter_Id            uint64     `json:"encounter_id" validate:"required"`
-	Date                    *time.Time `json:"date" validate:"required"`
-	Doctor_Code             string     `json:"doctor_code" validate:"required"`
-	Operator_Employe_Id     uint       `json:"operator_employe_id" validate:"required"`
-	Assistant_Employe_Id    uint       `json:"assistant_employe_id" validate:"required"`
-	Instrumentor_Employe_Id uint       `json:"instrumentor_employe_id" validate:"required"`
-	Diagnose                *string    `json:"diagnose"`
-	Nurse_Code              string     `json:"nurse_code" validate:"required"`
-	Value                   string     `json:"value" validate:"required"`
-
-	pa.AuthInfo
-}
-
-type ReadListDto struct {
-	FilterDto
-	Includes   string `json:"includes"`
-	Pagination ecore.Pagination
-}
-
-type FilterDto struct {
-	Encounter_Id *uint `json:"encounter-id"`
-}
-
-type ReadDetailDto struct {
-	Id uint16 `json:"id"`
-}
-
-type UpdateDto struct {
-	Id uint16 `json:"id"`
-	CreateDto
-}
-
-type DeleteDto struct {
-	Id uint16 `json:"id"`
-}
-
-type MetaDto struct {
-	PageNumber int `json:"page_number"`
-	PageSize   int `json:"page_size"`
-	Count      int `json:"count"`
-}
-
-type ResponseDto struct {
-	ecore.Main
-	Encounter_Id            uint64        `json:"encounter_id"`
-	Encounter               *ee.Encounter `json:"encounter,omitempty"`
-	Date                    *time.Time    `json:"date"`
-	Doctor_Code             string        `json:"doctor_code"`
-	Operator_Employe_Id     uint          `json:"operator_employe_id"`
-	Assistant_Employe_Id    uint          `json:"assistant_employe_id"`
-	Instrumentor_Employe_Id uint          `json:"instrumentor_employe_id"`
-	Diagnose                *string       `json:"diagnose"`
-	Nurse_Code              string        `json:"nurse_code"`
-	Value                   *string       `json:"value"`
-}
-
-func (d ActionReport) ToResponse() ResponseDto {
-	resp := ResponseDto{
-		Encounter_Id:            d.Encounter_Id,
-		Encounter:               d.Encounter,
-		Date:                    d.Date,
-		Doctor_Code:             d.Doctor_Code,
-		Operator_Employe_Id:     d.Operator_Employe_Id,
-		Assistant_Employe_Id:    d.Assistant_Employe_Id,
-		Instrumentor_Employe_Id: d.Instrumentor_Employe_Id,
-		Nurse_Code:              d.Nurse_Code,
-		Value:                   &d.Value,
-	}
-	resp.Main = d.Main
-	return resp
-}
-
-func ToResponseList(data []ActionReport) []ResponseDto {
-	resp := make([]ResponseDto, len(data))
-	for i, u := range data {
-		resp[i] = u.ToResponse()
-	}
-	return resp
-}

internal/domain/main-entities/action-report/entity.go

@@ -1,51 +0,0 @@
-package actionreport
-
-import (
-	ecore "simrs-vx/internal/domain/base-entities/core"
-	ed "simrs-vx/internal/domain/main-entities/doctor"
-	eem "simrs-vx/internal/domain/main-entities/employee"
-	ee "simrs-vx/internal/domain/main-entities/encounter"
-	en "simrs-vx/internal/domain/main-entities/nurse"
-	"time"
-)
-
-type ActionReport struct {
-	ecore.Main                            // adjust this according to the needs
-	Encounter_Id            uint64        `json:"encounter_id"  gorm:"foreignKey"`
-	Encounter               *ee.Encounter `json:"encounter,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
-	Date                    *time.Time    `json:"date" gorm:"not null;size:20"`
-	Doctor_Code             string        `json:"doctor_code" gorm:"size:10"`
-	Doctor                  *ed.Doctor    `json:"doctor,omitempty" gorm:"foreignKey:Doctor_Code;references:Code"`
-	Operator_Employe_Id     uint          `json:"operator_employe_id"`
-	Operator_Employe        *eem.Employee `json:"operator_employe,omitempty" gorm:"foreignKey:Operator_Employe_Id;references:Id"`
-	Assistant_Employe_Id    uint          `json:"assistant_employe_id"`
-	Instrumentor_Employe_Id uint          `json:"instrumentor_employe_id"`
-	Instrumentor_Employe    *eem.Employee `json:"instrumentor_employe,omitempty" gorm:"foreignKey:Instrumentor_Employe_Id;references:Id"`
-	Diagnose                *string       `json:"diagnose" gorm:"size:1024"`
-	Nurse_Code              string        `json:"nurse_code" gorm:"size:10"`
-	Nurse                   *en.Nurse     `json:"nurse,omitempty" gorm:"foreignKey:Nurse_Code;references:Code"`
-	Value                   string        `json:"value"`
-	// SurgerySize_Code      *string `json:"surgerySize_code" gorm:"size:10"`
-	// Billing_Code          *string `json:"billing_code" gorm:"size:10"`
-	// SurgerySystem_Code    *string `json:"surgerySystem_code" gorm:"size:10"`
-	// StartAt               *string `json:"startAt" gorm:"size:20"`
-	// EndAt                 *string `json:"endAt" gorm:"size:20"`
-	// AnesthesiaStartAt     *string `json:"anesthesiaStartAt" gorm:"size:20"`
-	// AnesthesiaEndAt       *string `json:"anesthesiaEndAt" gorm:"size:20"`
-	// SurgeryType_Code      *string `json:"surgeryType_code" gorm:"size:10"`
-	// SurgeryStage_Code     *string `json:"surgeryStage_code" gorm:"size:10"`
-	// BornMortality_Code    *string `json:"bornMortality_code" gorm:"size:10"`
-	// BornLocation_Code     *string `json:"bornLocation_code" gorm:"size:10"`
-	// Weight                *string `json:"weight" gorm:"size:10"`
-	// BornNotes             *string `json:"bornNotes" gorm:"size:1024"`
-	// Description           *string `json:"notes" gorm:"size:1024"`
-	// BleedingAmount        *uint16 `json:"bleedingAmount" gorm:"size:10"`
-	// BloodInType_Code      *string `json:"bloodInType_code" gorm:"size:10"`
-	// BloodInAmount         *uint16 `json:"bloodInAmount" gorm:"size:10"`
-	// Brand                 *string `json:"brand" gorm:"size:100"`
-	// ImplantName           *string `json:"implantName" gorm:"size:100"`
-	// ImplantRegisterNumber *string `json:"implantRegisterNumber" gorm:"size:100"`
-	// ImplantCompanionName  *string `json:"implantCompanionName" gorm:"size:100"`
-	// SpecimentDest_Code    *string `json:"specimentDest" gorm:"size:100"`
-	// TissueInfo            *string `json:"tissueInfo" gorm:"size:100"`
-}

internal/domain/main-entities/procedure-report/dto.go

@@ -0,0 +1,110 @@
+package procedurereport
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+	ee "simrs-vx/internal/domain/main-entities/encounter"
+	"time"
+
+	pa "simrs-vx/internal/lib/auth"
+)
+
+type CreateDto struct {
+	Encounter_Id           uint64     `json:"encounter_id" validate:"required"`
+	Date                   *time.Time `json:"date" validate:"required"`
+	Doctor_Code            string     `json:"doctor_code" validate:"required"`
+	Operator_Name          string     `json:"operator_name" validate:"required"`
+	Assistant_Name         string     `json:"assistant_name" validate:"required"`
+	Instrumentor_Name      string     `json:"instrumentor_name" validate:"required"`
+	Anesthesia_Doctor_Code string     `json:"anesthesia_doctor_code" validate:"required"`
+	Anesthesia_Nurse_Name  string     `json:"anesthesia_nurse_name" validate:"required"`
+	Diagnose               *string    `json:"diagnose"`
+	Nurse_Name             string     `json:"nurse_name" validate:"required"`
+	ProcedureValue         string     `json:"procedure_value" validate:"required"`
+	ExecutionValue         string     `json:"execution_value" validate:"required"`
+	Type                   string     `json:"type" validate:"required"`
+
+	pa.AuthInfo
+
+	// PROPER
+	// Operator_Employe_Id         uint       `json:"operator_employe_id" validate:"required"`
+	// Assistant_Employe_Id        uint       `json:"assistant_employe_id" validate:"required"`
+	// Instrumentor_Employe_Id     uint       `json:"instrumentor_employe_id" validate:"required"`
+	// Anesthesia_Doctor_Code      string     `json:"anesthesia_doctor_code" validate:"required"`
+	// Anesthesia_Nurse_Employe_Id uint       `json:"anesthesia_nurse_employe_id" validate:"required"`
+	// Nurse_Code                  string     `json:"nurse_code" validate:"required"`
+}
+
+type ReadListDto struct {
+	FilterDto
+	Includes   string `json:"includes"`
+	Pagination ecore.Pagination
+}
+
+type FilterDto struct {
+	Encounter_Id *uint `json:"encounter-id"`
+}
+
+type ReadDetailDto struct {
+	Id uint16 `json:"id"`
+}
+
+type UpdateDto struct {
+	Id uint16 `json:"id"`
+	CreateDto
+}
+
+type DeleteDto struct {
+	Id uint16 `json:"id"`
+}
+
+type MetaDto struct {
+	PageNumber int `json:"page_number"`
+	PageSize   int `json:"page_size"`
+	Count      int `json:"count"`
+}
+
+type ResponseDto struct {
+	ecore.Main
+	Encounter_Id           uint64        `json:"encounter_id"`
+	Encounter              *ee.Encounter `json:"encounter,omitempty"`
+	Date                   *time.Time    `json:"date"`
+	Doctor_Code            string        `json:"doctor_code"`
+	Operator_Name          string        `json:"operator_name"`
+	Assistant_Name         string        `json:"assistant_name"`
+	Instrumentor_Name      string        `json:"instrumentor_name"`
+	Anesthesia_Doctor_Code string        `json:"anesthesia_doctor_code"`
+	Anesthesia_Nurse_Name  string        `json:"anesthesia_nurse_name"`
+	Diagnose               *string       `json:"diagnose"`
+	Nurse_Name             string        `json:"nurse_name"`
+	ProcedureValue         *string       `json:"procedure_value"`
+	ExecutionValue         *string       `json:"execution_value"`
+	Type                   string        `json:"type"`
+}
+
+func (d ProcedureReport) ToResponse() ResponseDto {
+	resp := ResponseDto{
+		Encounter_Id:           d.Encounter_Id,
+		Encounter:              d.Encounter,
+		Date:                   d.Date,
+		Doctor_Code:            d.Doctor_Code,
+		Operator_Name:          d.Operator_Name,
+		Assistant_Name:         d.Assistant_Name,
+		Instrumentor_Name:      d.Instrumentor_Name,
+		Anesthesia_Doctor_Code: d.Anesthesia_Doctor_Code,
+		Anesthesia_Nurse_Name:  d.Anesthesia_Nurse_Name,
+		Nurse_Name:             d.Nurse_Name,
+		ProcedureValue:         &d.ProcedureValue,
+		ExecutionValue:         &d.ExecutionValue,
+		Type:                   d.Type,
+	}
+	resp.Main = d.Main
+	return resp
+}
+
+func ToResponseList(data []ProcedureReport) []ResponseDto {
+	resp := make([]ResponseDto, len(data))
+	for i, u := range data {
+		resp[i] = u.ToResponse()
+	}
+	return resp
+}

internal/domain/main-entities/procedure-report/entity.go

@@ -0,0 +1,68 @@
+package procedurereport
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+	ed "simrs-vx/internal/domain/main-entities/doctor"
+	eem "simrs-vx/internal/domain/main-entities/employee"
+	ee "simrs-vx/internal/domain/main-entities/encounter"
+	"time"
+)
+
+type ProcedureReport struct {
+	ecore.Main                           // adjust this according to the needs
+	Encounter_Id           uint64        `json:"encounter_id"  gorm:"foreignKey"`
+	Encounter              *ee.Encounter `json:"encounter,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
+	Date                   *time.Time    `json:"date" gorm:"not null;size:20"`
+	Doctor_Code            string        `json:"doctor_code" gorm:"size:10"`
+	Doctor                 *ed.Doctor    `json:"doctor,omitempty" gorm:"foreignKey:Doctor_Code;references:Code"`
+	Operator_Name          string        `json:"operator_name"`
+	Assistant_Name         string        `json:"assistant_name"`
+	Instrumentor_Name      string        `json:"instrumentor_name"`
+	Diagnose               *string       `json:"diagnose" gorm:"size:1024"`
+	Nurse_Name             string        `json:"nurse_code" gorm:"size:10"`
+	Anesthesia_Doctor_Code string        `json:"anesthesia_doctor_code" gorm:"size:10"`
+	Anesthesia             *eem.Employee `json:"anesthesia,omitempty" gorm:"foreignKey:Anesthesia_Doctor_Code;references:Code"`
+	Anesthesia_Nurse_Name  string        `json:"anesthesia_nurse_name"`
+	ProcedureValue         string        `json:"procedure_value"`
+	ExecutionValue         string        `json:"execution_value"`
+	Type                   string        `json:"type"`
+
+	// SurgerySize_Code      *string `json:"surgerySize_code" gorm:"size:10"`
+	// Billing_Code          *string `json:"billing_code" gorm:"size:10"`
+	// SurgerySystem_Code    *string `json:"surgerySystem_code" gorm:"size:10"`
+	// StartAt               *string `json:"startAt" gorm:"size:20"`
+	// EndAt                 *string `json:"endAt" gorm:"size:20"`
+	// AnesthesiaStartAt     *string `json:"anesthesiaStartAt" gorm:"size:20"`
+	// AnesthesiaEndAt       *string `json:"anesthesiaEndAt" gorm:"size:20"`
+	// SurgeryType_Code      *string `json:"surgeryType_code" gorm:"size:10"`
+	// SurgeryStage_Code     *string `json:"surgeryStage_code" gorm:"size:10"`
+	// BornMortality_Code    *string `json:"bornMortality_code" gorm:"size:10"`
+	// BornLocation_Code     *string `json:"bornLocation_code" gorm:"size:10"`
+	// Weight                *string `json:"weight" gorm:"size:10"`
+	// BornNotes             *string `json:"bornNotes" gorm:"size:1024"`
+	// Description           *string `json:"notes" gorm:"size:1024"`
+	// BleedingAmount        *uint16 `json:"bleedingAmount" gorm:"size:10"`
+	// BloodInType_Code      *string `json:"bloodInType_code" gorm:"size:10"`
+	// BloodInAmount         *uint16 `json:"bloodInAmount" gorm:"size:10"`
+	// Brand                 *string `json:"brand" gorm:"size:100"`
+	// ImplantName           *string `json:"implantName" gorm:"size:100"`
+	// ImplantRegisterNumber *string `json:"implantRegisterNumber" gorm:"size:100"`
+	// ImplantCompanionName  *string `json:"implantCompanionName" gorm:"size:100"`
+	// SpecimentDest_Code    *string `json:"specimentDest" gorm:"size:100"`
+	// TissueInfo            *string `json:"tissueInfo" gorm:"size:100"`
+
+	//PROPER
+	// Doctor_Code                 string        `json:"doctor_code" gorm:"size:10"`
+	// Doctor                      *ed.Doctor    `json:"doctor,omitempty" gorm:"foreignKey:Doctor_Code;references:Code"`
+	// Operator_Employe_Id         uint          `json:"operator_employe_id"`
+	// Operator_Employe            *eem.Employee `json:"operator_employe,omitempty" gorm:"foreignKey:Operator_Employe_Id;references:Id"`
+	// Assistant_Employe_Id        uint          `json:"assistant_employe_id"`
+	// Instrumentor_Employe_Id     uint          `json:"instrumentor_employe_id"`
+	// Instrumentor_Employe        *eem.Employee `json:"instrumentor_employe,omitempty" gorm:"foreignKey:Instrumentor_Employe_Id;references:Id"`
+	// Nurse_Code                  string        `json:"nurse_code" gorm:"size:10"`
+	// Nurse                       *en.Nurse     `json:"nurse,omitempty" gorm:"foreignKey:Nurse_Code;references:Code"`
+	// Anesthesia_Doctor_Code      string        `json:"anesthesia_doctor_code" gorm:"size:10"`
+	// Anesthesia                  *eem.Employee `json:"anesthesia,omitempty" gorm:"foreignKey:Anesthesia_Doctor_Code;references:Code"`
+	// Anesthesia_Nurse_Employe_Id uint          `json:"anesthesia_nurse_employe_id"`
+	// Anesthesia_Nurse            *eem.Employee `json:"anesthesia_nurse,omitempty" gorm:"foreignKey:Anesthesia_Nurse_Employe_Id;references:Id"`
+}

internal/domain/references/clinical/clinical.go

@@ -204,26 +204,26 @@ const (
 	MSCMicroLab  McuScopeCode          = "micro-lab"
 	MSCApLab     McuScopeCode          = "ap-lab"
 
-	SSCSmall   SurgerySizeCode = ""
+	SSCSmall   SurgerySizeCode = "small"
-	SSCMedium  SurgerySizeCode = ""
+	SSCMedium  SurgerySizeCode = "medium"
-	SSCLarge   SurgerySizeCode = ""
+	SSCLarge   SurgerySizeCode = "large"
-	SSCSpecial SurgerySizeCode = ""
+	SSCSpecial SurgerySizeCode = "special"
 
-	SSyCCito     SurgerySystemCode = ""
+	SSyCCito     SurgerySystemCode = "cito"
-	SSyCUrgent   SurgerySystemCode = ""
+	SSyCUrgent   SurgerySystemCode = "urgent"
-	SSyCEfective SurgerySystemCode = ""
+	SSyCEfective SurgerySystemCode = "efective"
-	SSyCSpecial  SurgerySystemCode = ""
+	SSyCSpecial  SurgerySystemCode = "special"
 
-	STCClean      SurgeryTypeCode = ""
+	STCClean      SurgeryTypeCode = "clean"
-	STCCleanCtm   SurgeryTypeCode = ""
+	STCCleanCtm   SurgeryTypeCode = "clean-ctm"
-	STCUncleanCtm SurgeryTypeCode = ""
+	STCUncleanCtm SurgeryTypeCode = "unclean-ctm"
-	STCUnclean    SurgeryTypeCode = ""
+	STCUnclean    SurgeryTypeCode = "unclean"
 
-	SStCFirst  SurgeryStageCode = ""
+	SStCFirst  SurgeryStageCode = "first"
-	SStCRepeat SurgeryStageCode = ""
+	SStCRepeat SurgeryStageCode = "repeat"
 
-	BMCAlive BornMortalityCode = ""
+	BMCAlive BornMortalityCode = "alive"
-	BMCDead  BornMortalityCode = ""
+	BMCDead  BornMortalityCode = "dead"
 
 	BLCExtMiw       BornLocationCode = ""
 	BLCExtDoc       BornLocationCode = ""
@@ -360,8 +360,11 @@ type HeadToToe struct {
 	BodyOthers  string `json:"body-others,omitempty"`
 }
 
-type RecordAction struct {
+type ProcedureRecord struct {
-	Procedures            []string `json:"procedures"`
+	Procedures []CodeWithName `json:"procedures"`
+}
+
+type ProcedureExecution struct {
 	SurgerySize_Code      *string  `json:"surgerySize_code"`
 	Billing_Code          *string  `json:"billing_code"`
 	SurgerySystem_Code    *string  `json:"surgerySystem_code"`

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

@@ -4,7 +4,6 @@ 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"
@@ -34,6 +33,7 @@ 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"
 	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"
@@ -176,7 +176,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{

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"
+	e "simrs-vx/internal/domain/main-entities/procedure-report"
-	u "simrs-vx/internal/use-case/main-use-case/action-report"
+	u "simrs-vx/internal/use-case/main-use-case/procedure-report"
 
 	pa "simrs-vx/internal/lib/auth"
 

internal/interface/migration/main-entities.go

@@ -1,7 +1,6 @@
 package migration
 
 import (
-	actionreport "simrs-vx/internal/domain/main-entities/action-report"
 	adime "simrs-vx/internal/domain/main-entities/adime"
 	admemployeehist "simrs-vx/internal/domain/main-entities/adm-employee-hist"
 	ambulancetransportreq "simrs-vx/internal/domain/main-entities/ambulance-transport-req"
@@ -82,6 +81,7 @@ import (
 	practiceschedule "simrs-vx/internal/domain/main-entities/practice-schedule"
 	prescription "simrs-vx/internal/domain/main-entities/prescription"
 	prescriptionitem "simrs-vx/internal/domain/main-entities/prescription-item"
+	procedurereport "simrs-vx/internal/domain/main-entities/procedure-report"
 	procedureroom "simrs-vx/internal/domain/main-entities/procedure-room"
 	procedureroomorder "simrs-vx/internal/domain/main-entities/procedure-room-order"
 	procedureroomorderitem "simrs-vx/internal/domain/main-entities/procedure-room-order-item"
@@ -234,6 +234,6 @@ func getMainEntities() []any {
 		&resume.Resume{},
 		&vclaimreference.VclaimReference{},
 		&screening.Screening{},
-		&actionreport.ActionReport{},
+		&procedurereport.ProcedureReport{},
 	}
 }

internal/use-case/main-use-case/action-report/helper.go

@@ -1,28 +0,0 @@
-/*
-DESCRIPTION:
-Any functions that are used internally by the use-case
-*/
-package actionreport
-
-import (
-	e "simrs-vx/internal/domain/main-entities/action-report"
-)
-
-func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.ActionReport) {
-	var inputSrc *e.CreateDto
-	if inputT, ok := any(input).(*e.CreateDto); ok {
-		inputSrc = inputT
-	} else {
-		inputTemp := any(input).(*e.UpdateDto)
-		inputSrc = &inputTemp.CreateDto
-	}
-
-	data.Encounter_Id = inputSrc.Encounter_Id
-	data.Date = inputSrc.Date
-	data.Doctor_Code = inputSrc.Doctor_Code
-	data.Operator_Employe_Id = inputSrc.Operator_Employe_Id
-	data.Assistant_Employe_Id = inputSrc.Assistant_Employe_Id
-	data.Instrumentor_Employe_Id = inputSrc.Instrumentor_Employe_Id
-	data.Nurse_Code = inputSrc.Nurse_Code
-	data.Value = inputSrc.Value
-}

internal/use-case/main-use-case/procedure-report/case.go

@@ -1,10 +1,10 @@
-package actionreport
+package procedurereport
 
 import (
 	"errors"
 	"strconv"
 
-	e "simrs-vx/internal/domain/main-entities/action-report"
+	e "simrs-vx/internal/domain/main-entities/procedure-report"
 
 	dg "github.com/karincake/apem/db-gorm-pg"
 	d "github.com/karincake/dodol"
@@ -15,10 +15,10 @@ import (
 	"gorm.io/gorm"
 )
 
-const source = "action-report"
+const source = "procedure-report"
 
 func Create(input e.CreateDto) (*d.Data, error) {
-	data := e.ActionReport{}
+	data := e.ProcedureReport{}
 
 	event := pl.Event{
 		Feature: "Create",
@@ -85,8 +85,8 @@ func Create(input e.CreateDto) (*d.Data, error) {
 }
 
 func ReadList(input e.ReadListDto) (*d.Data, error) {
-	var data *e.ActionReport
+	var data *e.ProcedureReport
-	var dataList []e.ActionReport
+	var dataList []e.ProcedureReport
 	var metaList *e.MetaDto
 	var err error
 
@@ -138,7 +138,7 @@ func ReadList(input e.ReadListDto) (*d.Data, error) {
 }
 
 func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
-	var data *e.ActionReport
+	var data *e.ProcedureReport
 	var err error
 
 	event := pl.Event{
@@ -186,7 +186,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
 
 func Update(input e.UpdateDto) (*d.Data, error) {
 	rdDto := e.ReadDetailDto{Id: input.Id}
-	var data *e.ActionReport
+	var data *e.ProcedureReport
 	var err error
 
 	event := pl.Event{
@@ -242,7 +242,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
 
 func Delete(input e.DeleteDto) (*d.Data, error) {
 	rdDto := e.ReadDetailDto{Id: input.Id}
-	var data *e.ActionReport
+	var data *e.ProcedureReport
 	var err error
 
 	event := pl.Event{

internal/use-case/main-use-case/procedure-report/helper.go

@@ -0,0 +1,39 @@
+/*
+DESCRIPTION:
+Any functions that are used internally by the use-case
+*/
+package procedurereport
+
+import (
+	e "simrs-vx/internal/domain/main-entities/procedure-report"
+)
+
+func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.ProcedureReport) {
+	var inputSrc *e.CreateDto
+	if inputT, ok := any(input).(*e.CreateDto); ok {
+		inputSrc = inputT
+	} else {
+		inputTemp := any(input).(*e.UpdateDto)
+		inputSrc = &inputTemp.CreateDto
+	}
+
+	data.Encounter_Id = inputSrc.Encounter_Id
+	data.Date = inputSrc.Date
+	data.Doctor_Code = inputSrc.Doctor_Code
+	data.Operator_Name = inputSrc.Operator_Name
+	data.Assistant_Name = inputSrc.Assistant_Name
+	data.Instrumentor_Name = inputSrc.Instrumentor_Name
+	data.Anesthesia_Doctor_Code = inputSrc.Anesthesia_Doctor_Code
+	data.Anesthesia_Nurse_Name = inputSrc.Anesthesia_Nurse_Name
+	data.Diagnose = inputSrc.Diagnose
+	data.Nurse_Name = inputSrc.Nurse_Name
+	data.ProcedureValue = inputSrc.ProcedureValue
+	data.ExecutionValue = inputSrc.ExecutionValue
+	data.Type = inputSrc.Type
+
+	//PROPER
+	// data.Operator_Employe_Id = inputSrc.Operator_Employe_Id
+	// data.Assistant_Employe_Id = inputSrc.Assistant_Employe_Id
+	// data.Instrumentor_Employe_Id = inputSrc.Instrumentor_Employe_Id
+	// data.Nurse_Code = inputSrc.Nurse_Code
+}

internal/use-case/main-use-case/procedure-report/lib.go

@@ -1,7 +1,7 @@
-package actionreport
+package procedurereport
 
 import (
-	e "simrs-vx/internal/domain/main-entities/action-report"
+	e "simrs-vx/internal/domain/main-entities/procedure-report"
 
 	plh "simrs-vx/pkg/lib-helper"
 	pl "simrs-vx/pkg/logger"
@@ -12,10 +12,10 @@ import (
 	"gorm.io/gorm"
 )
 
-func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.ActionReport, error) {
+func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.ProcedureReport, error) {
 	pl.SetLogInfo(event, nil, "started", "DBCreate")
 
-	data := e.ActionReport{}
+	data := e.ProcedureReport{}
 	setData(&input, &data)
 
 	var tx *gorm.DB
@@ -33,9 +33,9 @@ func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.ActionR
 	return &data, nil
 }
 
-func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.ActionReport, *e.MetaDto, error) {
+func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.ProcedureReport, *e.MetaDto, error) {
 	pl.SetLogInfo(event, input, "started", "DBReadList")
-	data := []e.ActionReport{}
+	data := []e.ProcedureReport{}
 	pagination := gh.Pagination{}
 	count := int64(0)
 	meta := e.MetaDto{}
@@ -48,7 +48,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ac
 	}
 
 	tx = tx.
-		Model(&e.ActionReport{}).
+		Model(&e.ProcedureReport{}).
 		Scopes(gh.Preload(input.Includes)).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
@@ -70,9 +70,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ac
 	return data, &meta, nil
 }
 
-func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e.ActionReport, error) {
+func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e.ProcedureReport, error) {
 	pl.SetLogInfo(event, input, "started", "DBReadDetail")
-	data := e.ActionReport{}
+	data := e.ProcedureReport{}
 
 	var tx *gorm.DB
 	if len(dbx) > 0 {
@@ -91,7 +91,7 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
 	return &data, nil
 }
 
-func UpdateData(input e.UpdateDto, data *e.ActionReport, event *pl.Event, dbx ...*gorm.DB) error {
+func UpdateData(input e.UpdateDto, data *e.ProcedureReport, event *pl.Event, dbx ...*gorm.DB) error {
 	pl.SetLogInfo(event, data, "started", "DBUpdate")
 	setData(&input, data)
 
@@ -116,7 +116,7 @@ func UpdateData(input e.UpdateDto, data *e.ActionReport, event *pl.Event, dbx ..
 	return nil
 }
 
-func DeleteData(data *e.ActionReport, event *pl.Event, dbx ...*gorm.DB) error {
+func DeleteData(data *e.ProcedureReport, event *pl.Event, dbx ...*gorm.DB) error {
 	pl.SetLogInfo(event, data, "started", "DBDelete")
 	var tx *gorm.DB
 	if len(dbx) > 0 {

internal/use-case/main-use-case/procedure-report/middleware-runner.go

@@ -1,7 +1,7 @@
-package actionreport
+package procedurereport
 
 import (
-	e "simrs-vx/internal/domain/main-entities/action-report"
+	e "simrs-vx/internal/domain/main-entities/procedure-report"
 	pl "simrs-vx/pkg/logger"
 	pu "simrs-vx/pkg/use-case-helper"
 
@@ -23,7 +23,7 @@ func newMiddlewareRunner(event *pl.Event, tx *gorm.DB) *middlewareRunner {
 }
 
 // ExecuteCreateMiddleware executes create middleware
-func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *e.ActionReport) error {
+func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e.CreateDto, data *e.ProcedureReport) error {
 	for _, middleware := range middlewares {
 		logData := pu.GetLogData(input, data)
 
@@ -38,7 +38,7 @@ func (me *middlewareRunner) RunCreateMiddleware(middlewares []createMw, input *e
 	return nil
 }
 
-func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *e.ReadListDto, data *e.ActionReport) error {
+func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, input *e.ReadListDto, data *e.ProcedureReport) error {
 	for _, middleware := range middlewares {
 		logData := pu.GetLogData(input, data)
 
@@ -53,7 +53,7 @@ func (me *middlewareRunner) RunReadListMiddleware(middlewares []readListMw, inpu
 	return nil
 }
 
-func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.ActionReport) error {
+func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.ProcedureReport) error {
 	for _, middleware := range middlewares {
 		logData := pu.GetLogData(input, data)
 
@@ -68,7 +68,7 @@ func (me *middlewareRunner) RunReadDetailMiddleware(middlewares []readDetailMw,
 	return nil
 }
 
-func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.ActionReport) error {
+func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.ProcedureReport) error {
 	for _, middleware := range middlewares {
 		logData := pu.GetLogData(input, data)
 
@@ -83,7 +83,7 @@ func (me *middlewareRunner) RunUpdateMiddleware(middlewares []readDetailMw, inpu
 	return nil
 }
 
-func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.ActionReport) error {
+func (me *middlewareRunner) RunDeleteMiddleware(middlewares []readDetailMw, input *e.ReadDetailDto, data *e.ProcedureReport) error {
 	for _, middleware := range middlewares {
 		logData := pu.GetLogData(input, data)
 

internal/use-case/main-use-case/procedure-report/middleware.go

@@ -1,4 +1,4 @@
-package actionreport
+package procedurereport
 
 // example of middleware
 // func init() {

internal/use-case/main-use-case/procedure-report/tycovar.go

@@ -6,27 +6,27 @@ In this sample it also provides type and variable regarding the needs of the
 middleware to separate from main use-case which has the basic CRUD
 functionality. The purpose of this is to make the code more maintainable.
 */
-package actionreport
+package procedurereport
 
 import (
 	"gorm.io/gorm"
 
-	e "simrs-vx/internal/domain/main-entities/action-report"
+	e "simrs-vx/internal/domain/main-entities/procedure-report"
 )
 
 type createMw struct {
 	Name string
-	Func func(input *e.CreateDto, data *e.ActionReport, tx *gorm.DB) error
+	Func func(input *e.CreateDto, data *e.ProcedureReport, tx *gorm.DB) error
 }
 
 type readListMw struct {
 	Name string
-	Func func(input *e.ReadListDto, data *e.ActionReport, tx *gorm.DB) error
+	Func func(input *e.ReadListDto, data *e.ProcedureReport, tx *gorm.DB) error
 }
 
 type readDetailMw struct {
 	Name string
-	Func func(input *e.ReadDetailDto, data *e.ActionReport, tx *gorm.DB) error
+	Func func(input *e.ReadDetailDto, data *e.ProcedureReport, tx *gorm.DB) error
 }
 
 type UpdateMw = readDetailMw