fix conflict

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

@@ -1,13 +1,16 @@
 package adime
 
 import (
+	// std
 	"time"
 
+	// internal - lib
+	pa "simrs-vx/internal/lib/auth"
+
+	// internal - domain
 	ecore "simrs-vx/internal/domain/base-entities/core"
 	eem "simrs-vx/internal/domain/main-entities/employee"
 	ee "simrs-vx/internal/domain/main-entities/encounter"
-
-	pa "simrs-vx/pkg/auth-helper"
 )
 
 type CreateDto struct {

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

@@ -1,16 +1,20 @@
 package chemo
 
 import (
+	// std
 	"time"
 
+	// internal - lib
+	pa "simrs-vx/internal/lib/auth"
+
+	// internal - domain - references
+	erc "simrs-vx/internal/domain/references/common"
+
+	// internal - domain - main-entities
 	ecore "simrs-vx/internal/domain/base-entities/core"
 	ee "simrs-vx/internal/domain/main-entities/encounter"
 	eun "simrs-vx/internal/domain/main-entities/unit"
 	eus "simrs-vx/internal/domain/main-entities/user"
-
-	erc "simrs-vx/internal/domain/references/common"
-
-	pa "simrs-vx/pkg/auth-helper"
 )
 
 type CreateDto struct {

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

@@ -1,14 +1,19 @@
 package consultation
 
 import (
+	// std
 	"time"
 
+	// internal - lib
+	pa "simrs-vx/internal/lib/auth"
+
+	// internal - domain - base-entities
 	ecore "simrs-vx/internal/domain/base-entities/core"
+
+	// internal - domain - main-entities
 	ed "simrs-vx/internal/domain/main-entities/doctor"
 	ee "simrs-vx/internal/domain/main-entities/encounter"
 	eu "simrs-vx/internal/domain/main-entities/unit"
-
-	pa "simrs-vx/pkg/auth-helper"
 )
 
 type CreateDto struct {

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

@@ -1,13 +1,18 @@
 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"
+	// internal - lib
+	pa "simrs-vx/internal/lib/auth"
 
+	// internal - domain - base-entities
+	ecore "simrs-vx/internal/domain/base-entities/core"
+
+	// internal - domain - references
 	erc "simrs-vx/internal/domain/references/common"
 
-	pa "simrs-vx/pkg/auth-helper"
+	// internal - domain - main-entities
+	ed "simrs-vx/internal/domain/main-entities/doctor"
+	ee "simrs-vx/internal/domain/main-entities/encounter"
 )
 
 type CreateDto struct {

internal/domain/main-entities/division-position/base/entity.go

@@ -0,0 +1,20 @@
+package base
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+	ee "simrs-vx/internal/domain/main-entities/employee"
+)
+
+type Basic struct {
+	ecore.SmallMain              // adjust this according to the needs
+	Division_Id     *uint16      `json:"division_id"`
+	Code            string       `json:"code" gorm:"unique;size:10"`
+	Name            string       `json:"name" gorm:"size:50"`
+	HeadStatus      bool         `json:"headStatus"`
+	Employee_Id     *uint        `json:"employee_id"`
+	Employee        *ee.Employee `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
+}
+
+func (Basic) TableName() string {
+	return "DivisionPosition"
+}

internal/domain/main-entities/division-position/entity.go

@@ -1,18 +1,11 @@
 package divisionposition
 
 import (
-	ecore "simrs-vx/internal/domain/base-entities/core"
 	ed "simrs-vx/internal/domain/main-entities/division"
-	ee "simrs-vx/internal/domain/main-entities/employee"
+	eb "simrs-vx/internal/domain/main-entities/division-position/base"
 )
 
 type DivisionPosition struct {
-	ecore.SmallMain              // adjust this according to the needs
-	Division_Id     *uint16      `json:"division_id"`
-	Division        *ed.Division `json:"division" gorm:"foreignKey:Division_Id;references:Id"`
-	Code            string       `json:"code" gorm:"unique;size:10"`
-	Name            string       `json:"name" gorm:"size:50"`
-	HeadStatus      bool         `json:"headStatus"`
-	Employee_Id     *uint        `json:"employee_id"`
-	Employee        *ee.Employee `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
+	eb.Basic
+	Division *ed.Division `json:"division" gorm:"foreignKey:Division_Id;references:Id"`
 }

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

@@ -2,6 +2,7 @@ package division
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
+	edpb "simrs-vx/internal/domain/main-entities/division-position/base"
 )
 
 type CreateDto struct {
@@ -26,8 +27,9 @@ type FilterDto struct {
 }
 
 type ReadDetailDto struct {
-	Id   uint16  `json:"id"`
-	Code *string `json:"code"`
+	Id       uint16  `json:"id"`
+	Code     *string `json:"code"`
+	Includes string  `json:"includes"`
 }
 
 type UpdateDto struct {
@@ -47,20 +49,22 @@ type MetaDto struct {
 
 type ResponseDto struct {
 	ecore.SmallMain
-	Code      string     `json:"code"`
-	Name      string     `json:"name"`
-	Parent_Id *uint16    `json:"parent_id"`
-	Parent    *Division  `json:"parent,omitempty"`
-	Childrens []Division `json:"childrens,omitempty"`
+	Code             string       `json:"code"`
+	Name             string       `json:"name"`
+	Parent_Id        *uint16      `json:"parent_id"`
+	Parent           *Division    `json:"parent,omitempty"`
+	Childrens        []Division   `json:"childrens,omitempty"`
+	DivisionPosition []edpb.Basic `json:"divisionPositions,omitempty"`
 }
 
 func (d Division) ToResponse() ResponseDto {
 	resp := ResponseDto{
-		Code:      d.Code,
-		Name:      d.Name,
-		Parent_Id: d.Parent_Id,
-		Parent:    d.Parent,
-		Childrens: d.Childrens,
+		Code:             d.Code,
+		Name:             d.Name,
+		Parent_Id:        d.Parent_Id,
+		Parent:           d.Parent,
+		Childrens:        d.Childrens,
+		DivisionPosition: d.DivisionPositions,
 	}
 	resp.SmallMain = d.SmallMain
 	return resp

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

@@ -2,13 +2,15 @@ package division
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
+	edpb "simrs-vx/internal/domain/main-entities/division-position/base"
 )
 
 type Division struct {
-	ecore.SmallMain            // adjust this according to the needs
-	Code            string     `json:"code" gorm:"unique;size:10"`
-	Name            string     `json:"name" gorm:"size:50"`
-	Parent_Id       *uint16    `json:"parent_id"`
-	Parent          *Division  `json:"parent" gorm:"foreignKey:Parent_Id;references:Id"`
-	Childrens       []Division `json:"childrens" gorm:"foreignKey:Parent_Id"` // may need references to self
+	ecore.SmallMain                // adjust this according to the needs
+	Code              string       `json:"code" gorm:"unique;size:10"`
+	Name              string       `json:"name" gorm:"size:50"`
+	Parent_Id         *uint16      `json:"parent_id"`
+	Parent            *Division    `json:"parent" gorm:"foreignKey:Parent_Id;references:Id"`
+	Childrens         []Division   `json:"childrens" gorm:"foreignKey:Parent_Id"` // may need references to self
+	DivisionPositions []edpb.Basic `json:"divisionPositions,omitempty" gorm:"foreignKey:Division_Id;references:Id"`
 }

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

@@ -2,18 +2,16 @@ package employee
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
-	ed "simrs-vx/internal/domain/main-entities/division"
 	ep "simrs-vx/internal/domain/main-entities/person"
 	eu "simrs-vx/internal/domain/main-entities/user"
-	erg "simrs-vx/internal/domain/references/organization"
 
 	erc "simrs-vx/internal/domain/references/common"
+	erg "simrs-vx/internal/domain/references/organization"
 )
 
 type CreateDto struct {
 	User_Id       *uint                     `json:"user_id"`
 	Person_Id     *uint                     `json:"person_id"`
-	Division_Code *string                   `json:"division_code"`
 	Number        *string                   `json:"number" validate:"maxLength=20"`
 	Status_Code   erc.ActiveStatusCode      `json:"status_code" validate:"maxLength=10"`
 	Position_Code *erg.EmployeePositionCode `json:"position_code"`
@@ -28,7 +26,6 @@ type ReadListDto struct {
 type FilterDto struct {
 	User_Id       *uint                `json:"user-id"`
 	Person_Id     *uint                `json:"person-id"`
-	Division_Code *string              `json:"division-code"`
 	Position_Code *string              `json:"position-code"`
 	Number        *string              `json:"number"`
 	Status_Code   erc.ActiveStatusCode `json:"status-code"`
@@ -58,28 +55,22 @@ type MetaDto struct {
 
 type ResponseDto struct {
 	ecore.Main
-	User_Id       *uint                     `json:"user_id"`
-	User          *eu.User                  `json:"user,omitempty"`
-	Person_Id     *uint                     `json:"person_id"`
-	Person        *ep.Person                `json:"person,omitempty"`
-	Division_Code *string                   `json:"division_code"`
-	Division      *ed.Division              `json:"division,omitempty"`
-	Position_Code *erg.EmployeePositionCode `json:"position_code"`
-	Number        *string                   `json:"number"`
-	Status_Code   erc.ActiveStatusCode      `json:"status_code"`
+	User_Id     *uint                `json:"user_id"`
+	User        *eu.User             `json:"user,omitempty"`
+	Person_Id   *uint                `json:"person_id"`
+	Person      *ep.Person           `json:"person,omitempty"`
+	Number      *string              `json:"number"`
+	Status_Code erc.ActiveStatusCode `json:"status_code"`
 }
 
 func (d Employee) ToResponse() ResponseDto {
 	resp := ResponseDto{
-		User_Id:       d.User_Id,
-		User:          d.User,
-		Person_Id:     d.Person_Id,
-		Person:        d.Person,
-		Division_Code: d.Division_Code,
-		Division:      d.Division,
-		Number:        d.Number,
-		Status_Code:   d.Status_Code,
-		Position_Code: d.Position_Code,
+		User_Id:     d.User_Id,
+		User:        d.User,
+		Person_Id:   d.Person_Id,
+		Person:      d.Person,
+		Number:      d.Number,
+		Status_Code: d.Status_Code,
 	}
 	resp.Main = d.Main
 	return resp

internal/domain/main-entities/employee/entity.go

@@ -2,7 +2,6 @@ package employee
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
-	ed "simrs-vx/internal/domain/main-entities/division"
 	ep "simrs-vx/internal/domain/main-entities/person"
 	eu "simrs-vx/internal/domain/main-entities/user"
 	erc "simrs-vx/internal/domain/references/common"
@@ -16,8 +15,6 @@ type Employee struct {
 	Person_Id     *uint                     `json:"person_id"`
 	Person        *ep.Person                `json:"person,omitempty" gorm:"foreignKey:Person_Id;references:Id"`
 	Position_Code *erg.EmployeePositionCode `json:"position_code" gorm:"size:20"`
-	Division_Code *string                   `json:"division_code"`
-	Division      *ed.Division              `json:"division,omitempty" gorm:"foreignKey:Division_Code;references:Code"`
 	Number        *string                   `json:"number" gorm:"size:20"`
 	Status_Code   erc.ActiveStatusCode      `json:"status_code" gorm:"not null;size:10"`
 }

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

@@ -1,9 +1,20 @@
 package encounter
 
 import (
+	// std
 	"time"
 
+	// internal - lib
+	pa "simrs-vx/internal/lib/auth"
+
+	// internal - domain - base-entities
 	ecore "simrs-vx/internal/domain/base-entities/core"
+
+	// internal - domain - references
+	erc "simrs-vx/internal/domain/references/common"
+	ere "simrs-vx/internal/domain/references/encounter"
+
+	// internal - domain - main-entities
 	evs "simrs-vx/internal/domain/bpjs-entities/vclaim-sep"
 	ea "simrs-vx/internal/domain/main-entities/appointment"
 	ed "simrs-vx/internal/domain/main-entities/doctor"
@@ -13,11 +24,6 @@ import (
 	es "simrs-vx/internal/domain/main-entities/specialist"
 	ess "simrs-vx/internal/domain/main-entities/subspecialist"
 	eu "simrs-vx/internal/domain/main-entities/unit"
-
-	erc "simrs-vx/internal/domain/references/common"
-	ere "simrs-vx/internal/domain/references/encounter"
-
-	pa "simrs-vx/pkg/auth-helper"
 )
 
 type CreateDto struct {
@@ -48,6 +54,8 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string `json:"includes"`
 	Pagination ecore.Pagination
+
+	pa.AuthInfo
 }
 
 type FilterDto struct {

internal/domain/main-entities/installation-position/base/entity.go

@@ -0,0 +1,20 @@
+package base
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+	ee "simrs-vx/internal/domain/main-entities/employee"
+)
+
+type Basic struct {
+	ecore.SmallMain              // adjust this according to the needs
+	Installation_Id *uint16      `json:"installation_id" gorm:"not null"`
+	Code            string       `json:"code" gorm:"unique;size:10;not null"`
+	Name            string       `json:"name" gorm:"size:30;not null"`
+	HeadStatus      bool         `json:"headStatus"`
+	Employee_Id     *uint        `json:"employee_id"`
+	Employee        *ee.Employee `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
+}
+
+func (Basic) TableName() string {
+	return "InstallationPosition"
+}

internal/domain/main-entities/installation-position/entity.go

@@ -1,18 +1,11 @@
 package installation_position
 
 import (
-	ecore "simrs-vx/internal/domain/base-entities/core"
-	ee "simrs-vx/internal/domain/main-entities/employee"
 	ei "simrs-vx/internal/domain/main-entities/installation"
+	eib "simrs-vx/internal/domain/main-entities/installation-position/base"
 )
 
 type InstallationPosition struct {
-	ecore.SmallMain                  // adjust this according to the needs
-	Installation_Id *uint16          `json:"installation_id" gorm:"not null"`
-	Installation    *ei.Installation `json:"installation,omitempty" gorm:"foreignKey:Installation_Id;references:Id"`
-	Code            string           `json:"code" gorm:"unique;size:10;not null"`
-	Name            string           `json:"name" gorm:"size:30;not null"`
-	HeadStatus      bool             `json:"headStatus"`
-	Employee_Id     *uint            `json:"employee_id"`
-	Employee        *ee.Employee     `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
+	eib.Basic                     // adjust this according to the needs
+	Installation *ei.Installation `json:"installation,omitempty" gorm:"foreignKey:Installation_Id;references:Id"`
 }

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

@@ -2,6 +2,7 @@ package installation
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
+	eipb "simrs-vx/internal/domain/main-entities/installation-position/base"
 
 	ere "simrs-vx/internal/domain/references/encounter"
 )
@@ -27,8 +28,9 @@ type FilterDto struct {
 }
 
 type ReadDetailDto struct {
-	Id   uint16  `json:"id"`
-	Code *string `json:"code"`
+	Id       uint16  `json:"id"`
+	Code     *string `json:"code"`
+	Includes string  `json:"includes"`
 }
 
 type UpdateDto struct {
@@ -48,16 +50,18 @@ type MetaDto struct {
 
 type ResponseDto struct {
 	ecore.SmallMain
-	Code                string                 `json:"code"`
-	Name                string                 `json:"name"`
-	EncounterClass_Code ere.EncounterClassCode `json:"encounterClass_code"`
+	Code                  string                 `json:"code"`
+	Name                  string                 `json:"name"`
+	EncounterClass_Code   ere.EncounterClassCode `json:"encounterClass_code"`
+	InstallationPositions []eipb.Basic           `json:"installationPositions,omitempty"`
 }
 
 func (d Installation) ToResponse() ResponseDto {
 	resp := ResponseDto{
-		Code:                d.Code,
-		Name:                d.Name,
-		EncounterClass_Code: d.EncounterClass_Code,
+		Code:                  d.Code,
+		Name:                  d.Name,
+		EncounterClass_Code:   d.EncounterClass_Code,
+		InstallationPositions: d.InstallationPositions,
 	}
 	resp.SmallMain = d.SmallMain
 	return resp

internal/domain/main-entities/installation/entity.go

@@ -2,12 +2,14 @@ package installation
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
+	eipb "simrs-vx/internal/domain/main-entities/installation-position/base"
 	ere "simrs-vx/internal/domain/references/encounter"
 )
 
 type Installation struct {
-	ecore.SmallMain                            // adjust this according to the needs
-	Code                string                 `json:"code" gorm:"unique;size:10"`
-	Name                string                 `json:"name" gorm:"size:50"`
-	EncounterClass_Code ere.EncounterClassCode `json:"encounterClass_code" gorm:"size:10"`
+	ecore.SmallMain                              // adjust this according to the needs
+	Code                  string                 `json:"code" gorm:"unique;size:10"`
+	Name                  string                 `json:"name" gorm:"size:50"`
+	EncounterClass_Code   ere.EncounterClassCode `json:"encounterClass_code" gorm:"size:10"`
+	InstallationPositions []eipb.Basic           `json:"installationPositions,omitempty" gorm:"foreignKey:Installation_Id;references:Id"`
 }

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

@@ -1,13 +1,18 @@
 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"
+	// internal - lib
+	pa "simrs-vx/internal/lib/auth"
 
+	// internal - domain - base-entities
+	ecore "simrs-vx/internal/domain/base-entities/core"
+
+	// internal - domain - references
 	erc "simrs-vx/internal/domain/references/common"
 
-	pa "simrs-vx/pkg/auth-helper"
+	// internal - domain - main-entities
+	ed "simrs-vx/internal/domain/main-entities/doctor"
+	ee "simrs-vx/internal/domain/main-entities/encounter"
 )
 
 type CreateDto struct {

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

@@ -1,15 +1,22 @@
 package mcuorder
 
 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"
+	// std
 	"time"
 
+	// internal - lib
+	pa "simrs-vx/internal/lib/auth"
+
+	// internal - domain - base-entities
+	ecore "simrs-vx/internal/domain/base-entities/core"
+
+	// internal - domain - references
 	ercl "simrs-vx/internal/domain/references/clinical"
 	erc "simrs-vx/internal/domain/references/common"
 
-	pa "simrs-vx/pkg/auth-helper"
+	// internal - domain - main-entities
+	ed "simrs-vx/internal/domain/main-entities/doctor"
+	ee "simrs-vx/internal/domain/main-entities/encounter"
 )
 
 type CreateDto struct {
@@ -20,7 +27,7 @@ type CreateDto struct {
 	ExaminationDate      *time.Time               `json:"examinationDate"`
 	Number               uint8                    `json:"number"`
 	Temperature          float64                  `json:"temperature"`
-	McuUrgencyLevel_Code ercl.McuUrgencyLevelCode `json:"mcuUrgencyLevel_code""`
+	McuUrgencyLevel_Code ercl.McuUrgencyLevelCode `json:"mcuUrgencyLevel_code"`
 
 	pa.AuthInfo
 }
@@ -39,7 +46,7 @@ type FilterDto struct {
 	ExaminationDate      *time.Time               `json:"examinationDate"`
 	Number               uint8                    `json:"number"`
 	Temperature          float64                  `json:"temperature"`
-	McuUrgencyLevel_Code ercl.McuUrgencyLevelCode `json:"mcuUrgencyLevel-code""`
+	McuUrgencyLevel_Code ercl.McuUrgencyLevelCode `json:"mcuUrgencyLevel-code"`
 }
 type ReadDetailDto struct {
 	Id uint `json:"id"`

internal/domain/main-entities/medication-item-dist/dto.go

@@ -1,12 +1,17 @@
 package medicationitem
 
 import (
-	ecore "simrs-vx/internal/domain/base-entities/core"
-	emi "simrs-vx/internal/domain/main-entities/medication-item"
-
-	pa "simrs-vx/pkg/auth-helper"
-
+	// std
 	"time"
+
+	// internal - lib
+	pa "simrs-vx/internal/lib/auth"
+
+	// internal - domain - base-entities
+	ecore "simrs-vx/internal/domain/base-entities/core"
+
+	// internal - domain - main-entities
+	emi "simrs-vx/internal/domain/main-entities/medication-item"
 )
 
 type CreateDto struct {

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

@@ -1,15 +1,21 @@
 package medication
 
 import (
+	// std
 	"time"
 
-	ecore "simrs-vx/internal/domain/base-entities/core"
-	ee "simrs-vx/internal/domain/main-entities/encounter"
-	ep "simrs-vx/internal/domain/main-entities/pharmacist"
+	// internal - lib
+	pa "simrs-vx/internal/lib/auth"
 
+	// internal - domain - base-entities
+	ecore "simrs-vx/internal/domain/base-entities/core"
+
+	// internal - domain - references
 	erc "simrs-vx/internal/domain/references/common"
 
-	pa "simrs-vx/pkg/auth-helper"
+	// internal - domain - main-entities
+	ee "simrs-vx/internal/domain/main-entities/encounter"
+	ep "simrs-vx/internal/domain/main-entities/pharmacist"
 )
 
 type CreateDto struct {

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

@@ -57,8 +57,8 @@ type DeleteDto struct {
 }
 
 type SearchDto struct {
-	Search string     `json:"search"`
-	Mode   SearchMode `json:"mode"`
+	Search     string `json:"search"`
+	Pagination ecore.Pagination
 }
 
 type UploadDto struct {

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

@@ -7,6 +7,8 @@ import (
 	ed "simrs-vx/internal/domain/main-entities/doctor"
 	ee "simrs-vx/internal/domain/main-entities/encounter"
 
+	pa "simrs-vx/internal/lib/auth"
+
 	erc "simrs-vx/internal/domain/references/common"
 )
 
@@ -15,6 +17,8 @@ type CreateDto struct {
 	Doctor_Id    *uint              `json:"doctor_id"`
 	IssuedAt     *time.Time         `json:"issuedAt"`
 	Status_Code  erc.DataStatusCode `json:"status_code"`
+
+	pa.AuthInfo
 }
 
 type ReadListDto struct {

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

@@ -1,13 +1,18 @@
 package sbar
 
 import (
+	// std
 	"time"
 
+	// internal - lib
+	pa "simrs-vx/internal/lib/auth"
+
+	// internal - domain - base-entities
 	ecore "simrs-vx/internal/domain/base-entities/core"
+
+	// internal - domain - main-entities
 	eem "simrs-vx/internal/domain/main-entities/employee"
 	ee "simrs-vx/internal/domain/main-entities/encounter"
-
-	pa "simrs-vx/pkg/auth-helper"
 )
 
 type CreateDto struct {

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

@@ -9,7 +9,7 @@ import (
 
 	erc "simrs-vx/internal/domain/references/clinical"
 
-	pa "simrs-vx/pkg/auth-helper"
+	pa "simrs-vx/internal/lib/auth"
 )
 
 type CreateDto struct {

internal/domain/main-entities/specialist-position/base/entity.go

@@ -0,0 +1,20 @@
+package base
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+	ee "simrs-vx/internal/domain/main-entities/employee"
+)
+
+type Basic struct {
+	ecore.SmallMain              // adjust this according to the needs
+	Specialist_Id   *uint16      `json:"specialist_id" gorm:"not null"`
+	Code            string       `json:"code" gorm:"unique;size:10;not null"`
+	Name            string       `json:"name" gorm:"size:30;not null"`
+	HeadStatus      bool         `json:"headStatus"`
+	Employee_Id     *uint        `json:"employee_id"`
+	Employee        *ee.Employee `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
+}
+
+func (Basic) TableName() string {
+	return "SpecialistPosition"
+}

internal/domain/main-entities/specialist-position/entity.go

@@ -1,18 +1,11 @@
 package specialist_position
 
 import (
-	ecore "simrs-vx/internal/domain/base-entities/core"
-	ee "simrs-vx/internal/domain/main-entities/employee"
 	es "simrs-vx/internal/domain/main-entities/specialist"
+	esb "simrs-vx/internal/domain/main-entities/specialist-position/base"
 )
 
 type SpecialistPosition struct {
-	ecore.SmallMain                // adjust this according to the needs
-	Specialist_Id   *uint16        `json:"specialist_id" gorm:"not null"`
-	Specialist      *es.Specialist `json:"specialist,omitempty" gorm:"foreignKey:Specialist_Id;references:Id"`
-	Code            string         `json:"code" gorm:"unique;size:10;not null"`
-	Name            string         `json:"name" gorm:"size:30;not null"`
-	HeadStatus      bool           `json:"headStatus"`
-	Employee_Id     *uint          `json:"employee_id"`
-	Employee        *ee.Employee   `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
+	esb.Basic
+	Specialist *es.Specialist `json:"specialist,omitempty" gorm:"foreignKey:Specialist_Id;references:Id"`
 }

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

@@ -2,6 +2,7 @@ package specialist
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
+	espb "simrs-vx/internal/domain/main-entities/specialist-position/base"
 )
 
 type CreateDto struct {
@@ -25,8 +26,9 @@ type FilterDto struct {
 }
 
 type ReadDetailDto struct {
-	Id   uint16  `json:"id"`
-	Code *string `json:"code"`
+	Id       uint16  `json:"id"`
+	Code     *string `json:"code"`
+	Includes string  `json:"includes"`
 }
 
 type UpdateDto struct {
@@ -46,16 +48,18 @@ type MetaDto struct {
 
 type ResponseDto struct {
 	ecore.SmallMain
-	Code    string  `json:"code"`
-	Name    string  `json:"name"`
-	Unit_Id *uint16 `json:"unit_id"`
+	Code                string       `json:"code"`
+	Name                string       `json:"name"`
+	Unit_Id             *uint16      `json:"unit_id"`
+	SpecialistPositions []espb.Basic `json:"specialistPositions,omitempty"`
 }
 
 func (d Specialist) ToResponse() ResponseDto {
 	resp := ResponseDto{
-		Code:    d.Code,
-		Name:    d.Name,
-		Unit_Id: d.Unit_Id,
+		Code:                d.Code,
+		Name:                d.Name,
+		Unit_Id:             d.Unit_Id,
+		SpecialistPositions: d.SpecialistPositions,
 	}
 	resp.SmallMain = d.SmallMain
 	return resp

internal/domain/main-entities/specialist/entity.go

@@ -2,13 +2,15 @@ package specialist
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
+	eub "simrs-vx/internal/domain/main-entities/specialist-position/base"
 	eu "simrs-vx/internal/domain/main-entities/unit"
 )
 
 type Specialist struct {
-	ecore.SmallMain          // adjust this according to the needs
-	Code            string   `json:"code" gorm:"unique;size:10"`
-	Name            string   `json:"name" gorm:"size:50"`
-	Unit_Id         *uint16  `json:"unit_id"`
-	Unit            *eu.Unit `json:"unit,omitempty" gorm:"foreignKey:Unit_Id"`
+	ecore.SmallMain                 // adjust this according to the needs
+	Code                string      `json:"code" gorm:"unique;size:10"`
+	Name                string      `json:"name" gorm:"size:50"`
+	Unit_Id             *uint16     `json:"unit_id"`
+	Unit                *eu.Unit    `json:"unit,omitempty" gorm:"foreignKey:Unit_Id"`
+	SpecialistPositions []eub.Basic `json:"specialistPositions,omitempty" gorm:"foreignKey:Specialist_Id;references:Id"`
 }

internal/domain/main-entities/subspecialist-position/base/entity.go

@@ -0,0 +1,20 @@
+package base
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+	ee "simrs-vx/internal/domain/main-entities/employee"
+)
+
+type Basic struct {
+	ecore.SmallMain               // adjust this according to the needs
+	Subspecialist_Id *uint16      `json:"subspecialist_id" gorm:"not null"`
+	Code             string       `json:"code" gorm:"unique;size:10;not null"`
+	Name             string       `json:"name" gorm:"size:30;not null"`
+	HeadStatus       bool         `json:"headStatus"`
+	Employee_Id      *uint        `json:"employee_id"`
+	Employee         *ee.Employee `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
+}
+
+func (Basic) TableName() string {
+	return "SubspecialistPosition"
+}

internal/domain/main-entities/subspecialist-position/entity.go

@@ -1,18 +1,11 @@
 package subspecialist_position
 
 import (
-	ecore "simrs-vx/internal/domain/base-entities/core"
-	ee "simrs-vx/internal/domain/main-entities/employee"
 	es "simrs-vx/internal/domain/main-entities/subspecialist"
+	esb "simrs-vx/internal/domain/main-entities/subspecialist-position/base"
 )
 
 type SubspecialistPosition struct {
-	ecore.SmallMain                    // adjust this according to the needs
-	Subspecialist_Id *uint16           `json:"subspecialist_id" gorm:"not null"`
-	Subspecialist    *es.Subspecialist `json:"subspecialist,omitempty" gorm:"foreignKey:Subspecialist_Id;references:Id"`
-	Code             string            `json:"code" gorm:"unique;size:10;not null"`
-	Name             string            `json:"name" gorm:"size:30;not null"`
-	HeadStatus       bool              `json:"headStatus"`
-	Employee_Id      *uint             `json:"employee_id"`
-	Employee         *ee.Employee      `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
+	esb.Basic
+	Subspecialist *es.Subspecialist `json:"subspecialist,omitempty" gorm:"foreignKey:Subspecialist_Id;references:Id"`
 }

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

@@ -2,6 +2,7 @@ package subspecialist
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
+	espb "simrs-vx/internal/domain/main-entities/subspecialist-position/base"
 )
 
 type CreateDto struct {
@@ -25,8 +26,9 @@ type FilterDto struct {
 }
 
 type ReadDetailDto struct {
-	Id   uint16  `json:"id"`
-	Code *string `json:"code"`
+	Id       uint16  `json:"id"`
+	Code     *string `json:"code"`
+	Includes string  `json:"includes"`
 }
 
 type UpdateDto struct {
@@ -46,9 +48,10 @@ type MetaDto struct {
 
 type ResponseDto struct {
 	ecore.SmallMain
-	Code          string  `json:"code"`
-	Name          string  `json:"name"`
-	Specialist_Id *uint16 `json:"specialist_id"`
+	Code          string       `json:"code"`
+	Name          string       `json:"name"`
+	Specialist_Id *uint16      `json:"specialist_id"`
+	Subspecialist []espb.Basic `json:"subspecialistPositions,omitempty"`
 }
 
 func (d Subspecialist) ToResponse() ResponseDto {
@@ -56,6 +59,7 @@ func (d Subspecialist) ToResponse() ResponseDto {
 		Code:          d.Code,
 		Name:          d.Name,
 		Specialist_Id: d.Specialist_Id,
+		Subspecialist: d.SubspecialistPositions,
 	}
 	resp.SmallMain = d.SmallMain
 	return resp

internal/domain/main-entities/subspecialist/entity.go

@@ -3,12 +3,14 @@ package subspecialist
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
 	es "simrs-vx/internal/domain/main-entities/specialist"
+	espb "simrs-vx/internal/domain/main-entities/subspecialist-position/base"
 )
 
 type Subspecialist struct {
-	ecore.SmallMain                // adjust this according to the needs
-	Code            string         `json:"code" gorm:"unique;size:10"`
-	Name            string         `json:"name" gorm:"size:50"`
-	Specialist_Id   *uint16        `json:"specialist_id"`
-	Specialist      *es.Specialist `json:"specialist,omitempty" gorm:"foreignKey:Specialist_Id"`
+	ecore.SmallMain                       // adjust this according to the needs
+	Code                   string         `json:"code" gorm:"unique;size:10"`
+	Name                   string         `json:"name" gorm:"size:50"`
+	Specialist_Id          *uint16        `json:"specialist_id"`
+	Specialist             *es.Specialist `json:"specialist,omitempty" gorm:"foreignKey:Specialist_Id"`
+	SubspecialistPositions []espb.Basic   `json:"subspecialistPositions,omitempty" gorm:"foreignKey:Subspecialist_Id;references:Id"`
 }

internal/domain/main-entities/unit-position/base/entity.go

@@ -0,0 +1,20 @@
+package base
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+	ee "simrs-vx/internal/domain/main-entities/employee"
+)
+
+type Basic struct {
+	ecore.SmallMain              // adjust this according to the needs
+	Unit_Id         *uint16      `json:"unit_id" gorm:"not null"`
+	Code            string       `json:"code" gorm:"unique;size:10;not null"`
+	Name            string       `json:"name" gorm:"size:30;not null"`
+	HeadStatus      bool         `json:"headStatus"`
+	Employee_Id     *uint        `json:"employee_id"`
+	Employee        *ee.Employee `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
+}
+
+func (Basic) TableName() string {
+	return "UnitPosition"
+}

internal/domain/main-entities/unit-position/entity.go

@@ -1,18 +1,11 @@
 package unit_position
 
 import (
-	ecore "simrs-vx/internal/domain/base-entities/core"
-	ee "simrs-vx/internal/domain/main-entities/employee"
 	eu "simrs-vx/internal/domain/main-entities/unit"
+	eub "simrs-vx/internal/domain/main-entities/unit-position/base"
 )
 
 type UnitPosition struct {
-	ecore.SmallMain              // adjust this according to the needs
-	Unit_Id         *uint16      `json:"unit_id" gorm:"not null"`
-	Unit            *eu.Unit     `json:"unit,omitempty" gorm:"foreignKey:Unit_Id;references:Id"`
-	Code            string       `json:"code" gorm:"unique;size:10;not null"`
-	Name            string       `json:"name" gorm:"size:30;not null"`
-	HeadStatus      bool         `json:"headStatus"`
-	Employee_Id     *uint        `json:"employee_id"`
-	Employee        *ee.Employee `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
+	eub.Basic
+	Unit *eu.Unit `json:"unit,omitempty" gorm:"foreignKey:Unit_Id;references:Id"`
 }

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

@@ -3,6 +3,7 @@ package unit
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
 	ei "simrs-vx/internal/domain/main-entities/installation"
+	eipb "simrs-vx/internal/domain/main-entities/unit-position/base"
 )
 
 type CreateDto struct {
@@ -29,6 +30,7 @@ type ReadDetailDto struct {
 	Id              uint16  `json:"id"`
 	Installation_Id *uint16 `json:"installation_id"`
 	Code            *string `json:"code"`
+	Includes        string  `json:"includes"`
 }
 
 type UpdateDto struct {
@@ -50,8 +52,9 @@ type ResponseDto struct {
 	ecore.SmallMain
 	Installation_Id *uint16 `json:"installation_id"`
 	Installation    *ei.Installation
-	Code            string `json:"code"`
-	Name            string `json:"name"`
+	Code            string       `json:"code"`
+	Name            string       `json:"name"`
+	UnitPositions   []eipb.Basic `json:"unitPositions,omitempty"`
 }
 
 func (d Unit) ToResponse() ResponseDto {
@@ -59,6 +62,7 @@ func (d Unit) ToResponse() ResponseDto {
 		Installation_Id: d.Installation_Id,
 		Code:            d.Code,
 		Name:            d.Name,
+		UnitPositions:   d.UnitPositions,
 	}
 	resp.SmallMain = d.SmallMain
 	if d.Installation != nil {

internal/domain/main-entities/unit/entity.go

@@ -3,6 +3,7 @@ package unit
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
 	ei "simrs-vx/internal/domain/main-entities/installation"
+	eub "simrs-vx/internal/domain/main-entities/unit-position/base"
 	ero "simrs-vx/internal/domain/references/organization"
 )
 
@@ -13,4 +14,5 @@ type Unit struct {
 	Code            string            `json:"code" gorm:"unique;size:10"`
 	Name            string            `json:"name" gorm:"size:50"`
 	Type_Code       *ero.UnitTypeCode `json:"type_code"`
+	UnitPositions   []eub.Basic       `json:"unitPositions,omitempty" gorm:"foreignKey:Unit_Id;references:Id"`
 }