material, device-order required doctor_id, infra search and parent,childrens

internal/domain/main-entities/device-order/dto.go

@@ -2,13 +2,20 @@ package deviceorder
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
+	ed "simrs-vx/internal/domain/main-entities/doctor"
 	ee "simrs-vx/internal/domain/main-entities/encounter"
+
 	erc "simrs-vx/internal/domain/references/common"
+
+	pa "simrs-vx/pkg/auth-helper"
 )
 
 type CreateDto struct {
 	Encounter_Id *uint              `json:"encounter_id"`
 	Status_Code  erc.DataStatusCode `json:"status_code"`
+	Doctor_Id    *uint              `json:"doctor_id"`
+
+	pa.AuthInfo
 }
 
 type ReadListDto struct {
@@ -48,6 +55,8 @@ type ResponseDto struct {
 	ecore.Main
 	Encounter_Id *uint              `json:"encounter_id"`
 	Encounter    *ee.Encounter      `json:"encounter,omitempty"`
+	Doctor_Id    *uint              `json:"doctor_id"`
+	Doctor       *ed.Doctor         `json:"doctor,omitempty"`
 	Status_Code  erc.DataStatusCode `json:"status_code"`
 }
 
@@ -55,6 +64,8 @@ func (d DeviceOrder) ToResponse() ResponseDto {
 	resp := ResponseDto{
 		Encounter_Id: d.Encounter_Id,
 		Encounter:    d.Encounter,
+		Doctor_Id:    d.Doctor_Id,
+		Doctor:       d.Doctor,
 		Status_Code:  d.Status_Code,
 	}
 	resp.Main = d.Main

internal/domain/main-entities/device-order/entity.go

@@ -20,3 +20,7 @@ type DeviceOrder struct {
 func (d DeviceOrder) IsCompleted() bool {
 	return d.Status_Code == erc.DSCDone
 }
+
+func (d DeviceOrder) IsSameDoctor(doctor_id *uint) bool {
+	return d.Doctor_Id == doctor_id
+}

internal/domain/main-entities/division/dto.go

@@ -14,6 +14,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes string   `json:"includes"`
 	Preloads []string `json:"-"`
+	Search   string   `json:"search"`
 }
 
 type FilterDto struct {
@@ -51,8 +52,8 @@ type ResponseDto struct {
 	Code      string     `json:"code"`
 	Name      string     `json:"name"`
 	Parent_Id *uint16    `json:"parent_id"`
-	Parent    *Division  `json:"parent"`
-	Childrens []Division `json:"childrens"`
+	Parent    *Division  `json:"parent,omitempty"`
+	Childrens []Division `json:"childrens,omitempty"`
 }
 
 func (d Division) ToResponse() ResponseDto {

internal/domain/main-entities/infra/dto.go

@@ -23,6 +23,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes string   `json:"includes"`
 	Preloads []string `json:"-"`
+	Search   string   `json:"search"`
 }
 
 type FilterDto struct {
@@ -64,6 +65,8 @@ type ResponseDto struct {
 	Name            string             `json:"name"`
 	InfraGroup_Code ero.InfraGroupCode `json:"infraGroup_code"`
 	Parent_Id       *uint16            `json:"parent_id"`
+	Parent          *Infra             `json:"parent,omitempty"`
+	Childrens       []Infra            `json:"childrens,omitempty"`
 	Item_Id         *uint              `json:"item_id"`
 	Item            *ei.Item           `json:"item,omitempty"`
 }
@@ -74,6 +77,8 @@ func (d Infra) ToResponse() ResponseDto {
 		Name:            d.Name,
 		InfraGroup_Code: d.InfraGroup_Code,
 		Parent_Id:       d.Parent_Id,
+		Parent:          d.Parent,
+		Childrens:       d.Childrens,
 		Item_Id:         d.Item_Id,
 		Item:            d.Item,
 	}

internal/domain/main-entities/material-order/dto.go

@@ -2,13 +2,20 @@ package materialorder
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
+	ed "simrs-vx/internal/domain/main-entities/doctor"
 	ee "simrs-vx/internal/domain/main-entities/encounter"
+
 	erc "simrs-vx/internal/domain/references/common"
+
+	pa "simrs-vx/pkg/auth-helper"
 )
 
 type CreateDto struct {
 	Encounter_Id *uint              `json:"encounter_id"`
 	Status_Code  erc.DataStatusCode `json:"status_code"`
+	Doctor_Id    *uint              `json:"doctor_id"`
+
+	pa.AuthInfo
 }
 
 type ReadListDto struct {
@@ -48,6 +55,8 @@ type ResponseDto struct {
 	ecore.Main
 	Encounter_Id *uint              `json:"encounter_id"`
 	Encounter    *ee.Encounter      `json:"encounter,omitempty"`
+	Doctor_Id    *uint              `json:"doctor_id"`
+	Doctor       *ed.Doctor         `json:"doctor,omitempty"`
 	Status_Code  erc.DataStatusCode `json:"status_code"`
 }
 
@@ -55,6 +64,8 @@ func (d MaterialOrder) ToResponse() ResponseDto {
 	resp := ResponseDto{
 		Encounter_Id: d.Encounter_Id,
 		Encounter:    d.Encounter,
+		Doctor_Id:    d.Doctor_Id,
+		Doctor:       d.Doctor,
 		Status_Code:  d.Status_Code,
 	}
 	resp.Main = d.Main

internal/domain/main-entities/material-order/entity.go

@@ -20,3 +20,7 @@ type MaterialOrder struct {
 func (d MaterialOrder) IsCompleted() bool {
 	return d.Status_Code == erc.DSCDone
 }
+
+func (d MaterialOrder) IsSameDoctor(doctor_id *uint) bool {
+	return d.Doctor_Id == doctor_id
+}