feat (item, infra): remove pointer on group

This commit is contained in:
dpurbosakti
2025-08-29 15:23:17 +07:00
parent c62bc414a9
commit 5231c177e3
7 changed files with 66 additions and 67 deletions

No files matched your search

+2 -2
View File
@@ -1,2 +1,2 @@
h1:GkE3HIJ9M82/ti7zJNqapdIZW4D9hFb21ii0uzbb5Es= h1:UO+I1wZYLfwSyDcWbSN/dgiNfkPYW567Smq1CT+Xeng=
20250829081406.sql h1:ZLNXBAoMVVK0zib9NcgF49Ctv/f/pNrf3ciGgae8JVQ= 20250829081952.sql h1:WgG/R3VjMqxFwOaqOACdoDVM9UKQDcaKAq77LxfIDWo=
+22 -22
View File
@@ -8,19 +8,19 @@ import (
) )
type CreateDto struct { type CreateDto struct {
Code string `json:"code"` Code string `json:"code"`
Name string `json:"name"` Name string `json:"name"`
InfraGroup_Code *ero.InfraGroupCode `json:"infraGroup_code"` InfraGroup_Code ero.InfraGroupCode `json:"infraGroup_code"`
Parent_Id *int16 `json:"parent_id"` Parent_Id *int16 `json:"parent_id"`
Item_Id *uint `json:"item_id"` Item_Id *uint `json:"item_id"`
} }
type ReadListDto struct { type ReadListDto struct {
Code string `json:"code"` Code string `json:"code"`
Name string `json:"name"` Name string `json:"name"`
InfraGroup_Code *ero.InfraGroupCode `json:"infraGroup_code"` InfraGroup_Code ero.InfraGroupCode `json:"infraGroup_code"`
Parent_Id *int16 `json:"parent_id"` Parent_Id *int16 `json:"parent_id"`
Item_Id *uint `json:"item_id"` Item_Id *uint `json:"item_id"`
Page int `json:"page"` Page int `json:"page"`
PageSize int `json:"page_size"` PageSize int `json:"page_size"`
@@ -28,12 +28,12 @@ type ReadListDto struct {
} }
type ReadDetailDto struct { type ReadDetailDto struct {
Id uint16 `json:"id"` Id uint16 `json:"id"`
Code string `json:"code"` Code string `json:"code"`
Name string `json:"name"` Name string `json:"name"`
InfraGroup_Code *ero.InfraGroupCode `json:"infraGroup_code"` InfraGroup_Code ero.InfraGroupCode `json:"infraGroup_code"`
Parent_Id *int16 `json:"parent_id"` Parent_Id *int16 `json:"parent_id"`
Item_Id *uint `json:"item_id"` Item_Id *uint `json:"item_id"`
} }
type UpdateDto struct { type UpdateDto struct {
@@ -53,12 +53,12 @@ type MetaDto struct {
type ResponseDto struct { type ResponseDto struct {
ecore.SmallMain ecore.SmallMain
Code string `json:"code"` Code string `json:"code"`
Name string `json:"name"` Name string `json:"name"`
InfraGroup_Code *ero.InfraGroupCode `json:"infraGroup_code"` InfraGroup_Code ero.InfraGroupCode `json:"infraGroup_code"`
Parent_Id *int16 `json:"parent_id"` Parent_Id *int16 `json:"parent_id"`
Item_Id *uint `json:"item_id"` Item_Id *uint `json:"item_id"`
Item *ei.Item `json:"item,omitempty"` Item *ei.Item `json:"item,omitempty"`
} }
func (d Infra) ToResponse() ResponseDto { func (d Infra) ToResponse() ResponseDto {
@@ -8,11 +8,11 @@ import (
) )
type Infra struct { type Infra struct {
ecore.SmallMain // adjust this according to the needs ecore.SmallMain // adjust this according to the needs
Code string `json:"code" gorm:"unique;size:10"` Code string `json:"code" gorm:"unique;size:10"`
Name string `json:"name" gorm:"size:50"` Name string `json:"name" gorm:"size:50"`
InfraGroup_Code *ero.InfraGroupCode `json:"infraGroup_code" gorm:"size:10"` InfraGroup_Code ero.InfraGroupCode `json:"infraGroup_code" gorm:"size:10"`
Parent_Id *int16 `json:"parent_id"` Parent_Id *int16 `json:"parent_id"`
Item_Id *uint `json:"item_id"` Item_Id *uint `json:"item_id"`
Item *ei.Item `json:"item,omitempty" gorm:"foreignKey:Item_Id;references:Id"` Item *ei.Item `json:"item,omitempty" gorm:"foreignKey:Item_Id;references:Id"`
} }
+26 -26
View File
@@ -7,21 +7,21 @@ import (
) )
type CreateDto struct { type CreateDto struct {
Code string `json:"code"` Code string `json:"code"`
Name string `json:"name"` Name string `json:"name"`
ItemGroup_Code *ero.ItemGroupCode `json:"itemGroup_code"` ItemGroup_Code ero.ItemGroupCode `json:"itemGroup_code"`
Uom_Code *string `json:"uom_code"` Uom_Code *string `json:"uom_code"`
Infra_Id *uint16 `json:"infra_id"` Infra_Id *uint16 `json:"infra_id"`
Stock *int `json:"stock"` Stock *int `json:"stock"`
} }
type ReadListDto struct { type ReadListDto struct {
Code string `json:"code"` Code string `json:"code"`
Name string `json:"name"` Name string `json:"name"`
ItemGroup_Code *ero.ItemGroupCode `json:"itemGroup_code"` ItemGroup_Code ero.ItemGroupCode `json:"itemGroup_code"`
Uom_Code *string `json:"uom_code"` Uom_Code *string `json:"uom_code"`
Infra_Id *uint16 `json:"infra_id"` Infra_Id *uint16 `json:"infra_id"`
Stock *int `json:"stock"` Stock *int `json:"stock"`
Page int `json:"page"` Page int `json:"page"`
PageSize int `json:"page_size"` PageSize int `json:"page_size"`
@@ -29,13 +29,13 @@ type ReadListDto struct {
} }
type ReadDetailDto struct { type ReadDetailDto struct {
Id uint16 `json:"id"` Id uint16 `json:"id"`
Code string `json:"code"` Code string `json:"code"`
Name string `json:"name"` Name string `json:"name"`
ItemGroup_Code *ero.ItemGroupCode `json:"itemGroup_code"` ItemGroup_Code ero.ItemGroupCode `json:"itemGroup_code"`
Uom_Code *string `json:"uom_code"` Uom_Code *string `json:"uom_code"`
Infra_Id *int16 `json:"infra_id"` Infra_Id *int16 `json:"infra_id"`
Stock *int `json:"stock"` Stock *int `json:"stock"`
} }
type UpdateDto struct { type UpdateDto struct {
@@ -55,13 +55,13 @@ type MetaDto struct {
type ResponseDto struct { type ResponseDto struct {
ecore.Main ecore.Main
Code string `json:"code"` Code string `json:"code"`
Name string `json:"name"` Name string `json:"name"`
ItemGroup_Code *ero.ItemGroupCode `json:"itemGroup_code"` ItemGroup_Code ero.ItemGroupCode `json:"itemGroup_code"`
Uom_Code *string `json:"uom_code"` Uom_Code *string `json:"uom_code"`
Uom *eu.Uom `json:"uom,omitempty"` Uom *eu.Uom `json:"uom,omitempty"`
Infra_Id *uint16 `json:"infra_id"` Infra_Id *uint16 `json:"infra_id"`
Stock *int `json:"stock"` Stock *int `json:"stock"`
} }
func (d Item) ToResponse() ResponseDto { func (d Item) ToResponse() ResponseDto {
+8 -8
View File
@@ -8,12 +8,12 @@ import (
) )
type Item struct { type Item struct {
ecore.Main // adjust this according to the needs ecore.Main // adjust this according to the needs
Code string `json:"code" gorm:"unique;size:50"` Code string `json:"code" gorm:"unique;size:50"`
Name string `json:"name" gorm:"size:100"` Name string `json:"name" gorm:"size:100"`
ItemGroup_Code *ero.ItemGroupCode `json:"itemGroup_code" gorm:"size:10"` ItemGroup_Code ero.ItemGroupCode `json:"itemGroup_code" gorm:"size:10"`
Uom_Code *string `json:"uom_code" gorm:"size:10"` Uom_Code *string `json:"uom_code" gorm:"size:10"`
Uom *eu.Uom `json:"uom,omitempty" gorm:"foreignKey:Uom_Code;references:Code"` Uom *eu.Uom `json:"uom,omitempty" gorm:"foreignKey:Uom_Code;references:Code"`
Infra_Id *uint16 `json:"infra_id"` Infra_Id *uint16 `json:"infra_id"`
Stock *int `json:"stock"` Stock *int `json:"stock"`
} }
@@ -41,11 +41,10 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Medicine) {
} }
func createItem(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error { func createItem(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error {
igcMed := ero.ITGCMedicine
itemCreate := ei.CreateDto{ itemCreate := ei.CreateDto{
Code: pu.AddPrefix("med-", input.Code), Code: pu.AddPrefix("med-", input.Code),
Name: input.Name, Name: input.Name,
ItemGroup_Code: &igcMed, ItemGroup_Code: ero.ITGCMedicine,
Uom_Code: input.Uom_Code, Uom_Code: input.Uom_Code,
Infra_Id: input.Infra_Id, Infra_Id: input.Infra_Id,
Stock: input.Stock, Stock: input.Stock,