From 49f0509273fafd5e91861d968109fb4abf98d717 Mon Sep 17 00:00:00 2001
From: vanilia <vanilia.cahya23@gmail.com>
Date: Fri, 24 Oct 2025 14:53:44 +0700
Subject: [PATCH] adjustment division-position

---
 .../division-position/base/entity.go          | 14 ++++++-----
 .../main-entities/division-position/entity.go |  2 --
 internal/domain/main-entities/employee/dto.go | 25 ++++++++-----------
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/internal/domain/main-entities/division-position/base/entity.go b/internal/domain/main-entities/division-position/base/entity.go
index d44c0b86..ce8f3175 100644
--- a/internal/domain/main-entities/division-position/base/entity.go
+++ b/internal/domain/main-entities/division-position/base/entity.go
@@ -2,15 +2,17 @@ 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"`
+	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 {
diff --git a/internal/domain/main-entities/division-position/entity.go b/internal/domain/main-entities/division-position/entity.go
index 79379b52..d71ba01c 100644
--- a/internal/domain/main-entities/division-position/entity.go
+++ b/internal/domain/main-entities/division-position/entity.go
@@ -3,11 +3,9 @@ package divisionposition
 import (
 	ed "simrs-vx/internal/domain/main-entities/division"
 	eb "simrs-vx/internal/domain/main-entities/division-position/base"
-	ee "simrs-vx/internal/domain/main-entities/employee"
 )
 
 type DivisionPosition struct {
 	eb.Basic
 	Division *ed.Division `json:"division" gorm:"foreignKey:Division_Id;references:Id"`
-	Employee *ee.Employee `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
 }
diff --git a/internal/domain/main-entities/employee/dto.go b/internal/domain/main-entities/employee/dto.go
index ff8f6adf..d11ccae0 100644
--- a/internal/domain/main-entities/employee/dto.go
+++ b/internal/domain/main-entities/employee/dto.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"
 
@@ -10,11 +9,10 @@ import (
 )
 
 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"`
+	User_Id     *uint                `json:"user_id"`
+	Person_Id   *uint                `json:"person_id"`
+	Number      *string              `json:"number" validate:"maxLength=20"`
+	Status_Code erc.ActiveStatusCode `json:"status_code" validate:"maxLength=10"`
 }
 
 type ReadListDto struct {
@@ -26,7 +24,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"`
@@ -56,14 +53,12 @@ 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"`
-	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 {