munawwirul_jamal/simrsx-be
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change id into code for device and material order item

Browse Source
This commit is contained in:
dpurbosakti
2025-11-10 16:29:03 +07:00
parent 9479a67493
commit 8d301af4e3
8 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/domain/main-entities/device-order-item/dto.go
+8 -8
View File
@@ -7,9 +7,9 @@ import (
)
type CreateDto struct {
DeviceOrder_Id *uint `json:"deviceOrder_id"`
Device_Id *uint `json:"device_id"`
Count uint8 `json:"count"`
DeviceOrder_Id *uint `json:"deviceOrder_id"`
Device_Code *string `json:"device_code"`
Count uint8 `json:"count"`
}
type ReadListDto struct {
@@ -19,9 +19,9 @@ type ReadListDto struct {
}
type FilterDto struct {
DeviceOrder_Id *uint `json:"deviceOrder-id"`
Device_Id *uint `json:"device-id"`
Count uint8 `json:"count"`
DeviceOrder_Id *uint `json:"deviceOrder-id"`
Device_Code *string `json:"device-code"`
Count uint8 `json:"count"`
}
type ReadDetailDto struct {
Id uint16 `json:"id"`
@@ -46,7 +46,7 @@ type ResponseDto struct {
ecore.Main
DeviceOrder_Id *uint `json:"deviceOrder_id"`
DeviceOrder *edo.DeviceOrder `json:"deviceOrder,omitempty"`
Device_Id *uint `json:"device_id"`
Device_Code *string `json:"device_code"`
Device *ed.Device `json:"device,omitempty"`
Count uint8 `json:"count"`
}
@@ -55,7 +55,7 @@ func (d DeviceOrderItem) ToResponse() ResponseDto {
resp := ResponseDto{
DeviceOrder_Id: d.DeviceOrder_Id,
DeviceOrder: d.DeviceOrder,
Device_Id: d.Device_Id,
Device_Code: d.Device_Code,
Device: d.Device,
Count: d.Count,
}
internal/domain/main-entities/device-order-item/entity.go
+1 -2
View File
@@ -10,8 +10,7 @@ type DeviceOrderItem struct {
ecore.Main // adjust this according to the needs
DeviceOrder_Id *uint `json:"deviceOrder_id"`
DeviceOrder *edo.DeviceOrder `json:"deviceOrder,omitempty" gorm:"foreignKey:DeviceOrder_Id;references:Id"`
Device_Id *uint `json:"device_id"`
Device_Code *string `json:"device_code"`
Device *ed.Device `json:"device,omitempty" gorm:"foreignKey:Device_Id;references:Id"`
Device *ed.Device `json:"device,omitempty" gorm:"foreignKey:Device_Code;references:Code"`
Count uint8 `json:"count"`
}
internal/domain/main-entities/material-order-item/dto.go
+4 -4
View File
@@ -8,7 +8,7 @@ import (
type CreateDto struct {
MaterialOrder_Id *uint `json:"materialOrder_id"`
Material_Id *uint `json:"material_id"`
Material_Code *string `json:"material_code"`
Count *uint16 `json:"count"`
}
@@ -20,7 +20,7 @@ type ReadListDto struct {
type FilterDto struct {
MaterialOrder_Id *uint `json:"materialOrder-id"`
Material_Id *uint `json:"material-id"`
Material_Code *string `json:"material-code"`
Count *uint16 `json:"count"`
}
type ReadDetailDto struct {
@@ -46,7 +46,7 @@ type ResponseDto struct {
ecore.Main
MaterialOrder_Id *uint `json:"materialOrder_id"`
MaterialOrder *emo.MaterialOrder `json:"materialOrder,omitempty"`
Material_Id *uint `json:"material_id"`
Material_Code *string `json:"material_code"`
Material *em.Material `json:"material,omitempty"`
Count *uint16 `json:"count"`
}
@@ -55,7 +55,7 @@ func (d MaterialOrderItem) ToResponse() ResponseDto {
resp := ResponseDto{
MaterialOrder_Id: d.MaterialOrder_Id,
MaterialOrder: d.MaterialOrder,
Material_Id: d.Material_Id,
Material_Code: d.Material_Code,
Material: d.Material,
Count: d.Count,
}
internal/domain/main-entities/material-order-item/entity.go
+1 -2
View File
@@ -10,8 +10,7 @@ type MaterialOrderItem struct {
ecore.Main // adjust this according to the needs
MaterialOrder_Id *uint `json:"materialOrder_id"`
MaterialOrder *emo.MaterialOrder `json:"materialOrder,omitempty" gorm:"foreignKey:MaterialOrder_Id;references:Id"`
Material_Id *uint `json:"material_id"`
Material_Code *string `json:"material_code"`
Material *em.Material `json:"material,omitempty" gorm:"foreignKey:Material_Id;references:Id"`
Material *em.Material `json:"material,omitempty" gorm:"foreignKey:Material_Code;references:Code"`
Count *uint16 `json:"count"`
}
internal/use-case/main-use-case/device-order-item/helper.go
+1 -1
View File
@@ -18,6 +18,6 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.DeviceOrderItem) {
}
data.DeviceOrder_Id = inputSrc.DeviceOrder_Id
data.Device_Id = inputSrc.Device_Id
data.Device_Code = inputSrc.Device_Code
data.Count = inputSrc.Count
}
internal/use-case/main-use-case/material-order-item/helper.go
+1 -1
View File
@@ -18,6 +18,6 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.MaterialOrderItem)
}
data.MaterialOrder_Id = inputSrc.MaterialOrder_Id
data.Material_Id = inputSrc.Material_Id
data.Material_Code = inputSrc.Material_Code
data.Count = inputSrc.Count
}