From faf6134caf7a034f8ff0ed253c42c9b70be4daea Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Fri, 29 Aug 2025 14:35:20 +0700 Subject: [PATCH] feat (medicine): adjust medicine --- internal/domain/main-entities/medicine/dto.go | 19 +++++++++---------- .../use-case/main-use-case/medicine/helper.go | 13 +++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/internal/domain/main-entities/medicine/dto.go b/internal/domain/main-entities/medicine/dto.go index a0ed5d1b..9e505b8b 100644 --- a/internal/domain/main-entities/medicine/dto.go +++ b/internal/domain/main-entities/medicine/dto.go @@ -10,16 +10,15 @@ import ( ) type CreateDto struct { - Code string `json:"code"` - Name string `json:"name"` - MedicineGroup_Code *string `json:"medicineGroup_code"` - MedicineMethod_Code *string `json:"medicineMethod_code"` - Uom_Code *string `json:"uom_code"` - Dose uint8 `json:"dose"` - Infra_Id *uint16 `json:"infra_id"` - Stock *int `json:"stock"` - Item_Id *uint `json:"item_id"` - InsuranceCompany_Code *string `json:"insuranceCompany_code"` + Code string `json:"code"` + Name string `json:"name"` + MedicineGroup_Code *string `json:"medicineGroup_code"` + MedicineMethod_Code *string `json:"medicineMethod_code"` + Uom_Code *string `json:"uom_code"` + Dose uint8 `json:"dose"` + Infra_Id *uint16 `json:"infra_id"` + Stock *int `json:"stock"` + Item_Id *uint `json:"item_id"` } type ReadListDto struct { diff --git a/internal/use-case/main-use-case/medicine/helper.go b/internal/use-case/main-use-case/medicine/helper.go index 1414b966..94a8a514 100644 --- a/internal/use-case/main-use-case/medicine/helper.go +++ b/internal/use-case/main-use-case/medicine/helper.go @@ -12,6 +12,8 @@ import ( ui "simrs-vx/internal/use-case/main-use-case/item" uip "simrs-vx/internal/use-case/main-use-case/item-price" + ero "simrs-vx/internal/domain/references/organization" + pl "simrs-vx/pkg/logger" pu "simrs-vx/pkg/use-case-helper" @@ -39,7 +41,7 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Medicine) { } func createItem(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error { - igcMed := "Medicine" + igcMed := string(ero.ITGCMedicine) itemCreate := ei.CreateDto{ Code: pu.AddPrefix("med-", input.Code), Name: input.Name, @@ -57,11 +59,10 @@ func createItem(input *e.CreateDto, event *pl.Event, tx *gorm.DB) error { return nil } -func createItemPrice(input *e.CreateDto, event *pl.Event, tx *gorm.DB, item_id *uint) error { +func createItemPrice(event *pl.Event, tx *gorm.DB, item_id *uint) error { itemPriceCreate := eip.CreateDto{ - Item_Id: item_id, - Price: 0, - InsuranceCompany_Code: input.InsuranceCompany_Code, + Item_Id: item_id, + Price: 0, } _, err := uip.CreateData(itemPriceCreate, event, tx) return err @@ -72,7 +73,7 @@ func createItemWithDefaultPrice(input *e.CreateDto, event *pl.Event, tx *gorm.DB return err } - if err := createItemPrice(input, event, tx, input.Item_Id); err != nil { + if err := createItemPrice(event, tx, input.Item_Id); err != nil { return err }