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

changed mcu_id into code in mcu and mcu sub order item

Browse Source
This commit is contained in:
dpurbosakti
2025-11-11 14:39:09 +07:00
parent 7357e0de4d
commit bdc441b8f9
9 changed files with 61 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/domain/main-entities/mcu-order-item/dto.go
+4 -4
View File
@@ -10,7 +10,7 @@ import (
type CreateDto struct {
McuOrder_Id *uint `json:"mcuOrder_id"`
McuSrc_Id *uint `json:"mcuSrc_id"`
McuSrc_Code *string `json:"mcuSrc_code"`
Result *string `json:"result"`
Status_Code erc.DataStatusCode `json:"status_code"`
ExaminationDate *time.Time `json:"examinationDate"`
@@ -24,7 +24,7 @@ type ReadListDto struct {
type FilterDto struct {
McuOrder_Id *uint `json:"mcu-order-id"`
McuSrc_Id *uint `json:"mcu-src-id"`
McuSrc_Code *string `json:"mcu-src-code"`
Result *string `json:"result"`
Status_Code erc.DataStatusCode `json:"status-code"`
}
@@ -56,7 +56,7 @@ type ResponseDto struct {
ecore.Main
McuOrder_Id *uint `json:"mcuOrder_id"`
McuOrder *emo.McuOrder `json:"mcuOrder,omitempty"`
McuSrc_Id *uint `json:"mcuSrc_id"`
McuSrc_Code *string `json:"mcuSrc_code"`
McuSrc *ems.McuSrc `json:"mcuSrc,omitempty"`
Result *string `json:"result"`
Status_Code erc.DataStatusCode `json:"status_code"`
@@ -67,7 +67,7 @@ func (d McuOrderItem) ToResponse() ResponseDto {
resp := ResponseDto{
McuOrder_Id: d.McuOrder_Id,
McuOrder: d.McuOrder,
McuSrc_Id: d.McuSrc_Id,
McuSrc_Code: d.McuSrc_Code,
McuSrc: d.McuSrc,
Result: d.Result,
Status_Code: d.Status_Code,
internal/domain/main-entities/mcu-order-item/entity.go
+1 -2
View File
@@ -13,9 +13,8 @@ type McuOrderItem struct {
ecore.Main // adjust this according to the needs
McuOrder_Id *uint `json:"mcuOrder_id" gorm:"uniqueIndex:idx_order_src"`
McuOrder *emo.McuOrder `json:"mcuOrder,omitempty" gorm:"foreignKey:McuOrder_Id;references:Id"`
McuSrc_Id *uint `json:"mcuSrc_id" gorm:"uniqueIndex:idx_order_src"`
McuSrc_Code *string `json:"mcuSrc_code" gorm:"uniqueIndex:idx_order_src"`
McuSrc *ems.McuSrc `json:"mcuSrc,omitempty" gorm:"foreignKey:McuSrc_Id;references:Id"`
McuSrc *ems.McuSrc `json:"mcuSrc,omitempty" gorm:"foreignKey:McuSrc_Code;references:Code"`
ExaminationDate *time.Time `json:"examinationDate"`
Result *string `json:"result"`
Status_Code erc.DataStatusCode `json:"status_code"`
internal/domain/main-entities/mcu-order-sub-item/dto.go
+4 -4
View File
@@ -8,7 +8,7 @@ import (
)
type CreateDto struct {
McuSubSrc_Id *uint `json:"mcuSubSrc_id"`
McuSubSrc_Code *string `json:"mcuSubSrc_code"`
McuOrderItem_Id *uint `json:"mcuOrderItem_id"`
Result *string `json:"result"`
Status_Code erc.DataStatusCode `json:"status_code"`
@@ -22,7 +22,7 @@ type ReadListDto struct {
type FilterDto struct {
McuOrder_Id *uint `json:"mcuOrder-id"`
McuSrc_Id *uint `json:"mcuSrc-id"`
McuSrc_Code *string `json:"mcuSrc-code"`
Result *string `json:"result"`
Status_Code erc.DataStatusCode `json:"status-code"`
}
@@ -47,7 +47,7 @@ type MetaDto struct {
type ResponseDto struct {
ecore.Main
McuSubSrc_Id *uint `json:"mcuSubSrc_id"`
McuSubSrc_Code *string `json:"mcuSubSrc_code"`
McuSubSrc *emss.McuSubSrc `json:"mcuSubSrc,omitempty"`
McuOrderItem_Id *uint `json:"mcuOrderItem_id"`
McuOrderItem *emoi.McuOrderItem `json:"mcuOrderItem,omitempty"`
@@ -57,7 +57,7 @@ type ResponseDto struct {
func (d McuOrderSubItem) ToResponse() ResponseDto {
resp := ResponseDto{
McuSubSrc_Id: d.McuSubSrc_Id,
McuSubSrc_Code: d.McuSubSrc_Code,
McuSubSrc: d.McuSubSrc,
McuOrderItem_Id: d.McuOrderItem_Id,
McuOrderItem: d.McuOrderItem,
internal/domain/main-entities/mcu-order-sub-item/entity.go
+1 -2
View File
@@ -10,9 +10,8 @@ import (
type McuOrderSubItem struct {
ecore.Main // adjust this according to the needs
McuSubSrc_Id *uint `json:"mcuSubSrc_id" gorm:"uniqueIndex:idx_order_sub_src"`
McuSubSrc_Code *string `json:"mcuSubSrc_code" gorm:"uniqueIndex:idx_order_sub_src"`
McuSubSrc *emss.McuSubSrc `json:"mcuSubSrc,omitempty" gorm:"foreignKey:McuSubSrc_Id;references:Id"`
McuSubSrc *emss.McuSubSrc `json:"mcuSubSrc,omitempty" gorm:"foreignKey:McuSubSrc_Code;references:Code"`
McuOrderItem_Id *uint `json:"mcuOrderItem_id" gorm:"uniqueIndex:idx_order_sub_src"`
McuOrderItem *emoi.McuOrderItem `json:"mcuOrderItem,omitempty" gorm:"foreignKey:McuOrderItem_Id;references:Id"`
Result *string `json:"result"`
internal/use-case/main-use-case/mcu-order-item/helper.go
+1 -1
View File
@@ -18,7 +18,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.McuOrderItem) {
}
data.McuOrder_Id = inputSrc.McuOrder_Id
data.McuSrc_Id = inputSrc.McuSrc_Id
data.McuSrc_Code = inputSrc.McuSrc_Code
data.Result = inputSrc.Result
data.Status_Code = inputSrc.Status_Code
data.ExaminationDate = inputSrc.ExaminationDate
internal/use-case/main-use-case/mcu-order-item/lib.go
+1 -1
View File
@@ -24,7 +24,7 @@ func CreateData(input e.CreateDto, event *pl.Event, dbx ...*gorm.DB) (*e.McuOrde
deletedData := e.McuOrderItem{}
tx.Unscoped().
Where("\"McuOrder_Id\" = ? AND \"McuSrc_Id\" = ?", *input.McuOrder_Id, input.McuSrc_Id).
Where("\"McuOrder_Id\" = ? AND \"McuSrc_Code\" = ?", *input.McuOrder_Id, input.McuSrc_Code).
First(&deletedData)
if deletedData.Id != 0 {
if err := tx.Unscoped().Model(e.McuOrderItem{}).Where("\"Id\" = ?", deletedData.Id).Update("\"DeletedAt\"", nil).Error; err != nil {
internal/use-case/main-use-case/mcu-order-sub-item/helper.go
+1 -1
View File
@@ -17,7 +17,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.McuOrderSubItem) {
inputSrc = &inputTemp.CreateDto
}
data.McuSubSrc_Id = inputSrc.McuSubSrc_Id
data.McuSubSrc_Code = inputSrc.McuSubSrc_Code
data.McuOrderItem_Id = inputSrc.McuOrderItem_Id
data.Result = inputSrc.Result
data.Status_Code = inputSrc.Status_Code