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

Merge branch 'migration' of github.com:dikstub-rssa/simrs-be into feat/orders

Browse Source
This commit is contained in:
dpurbosakti
2025-09-17 11:53:22 +07:00
parent 86a073164d 282cc93c14
commit 8406c4f202
6 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/domain/main-entities/medicine-mix-item/dto.go
+4 -7
View File
@@ -3,7 +3,6 @@ package medicinemixitem
import (
ecore "simrs-vx/internal/domain/base-entities/core"
em "simrs-vx/internal/domain/main-entities/medicine"
emm "simrs-vx/internal/domain/main-entities/medicine-mix"
)
type CreateDto struct {
@@ -49,17 +48,15 @@ type MetaDto struct {
type ResponseDto struct {
ecore.Main
MedicineMix_Id *uint `json:"medicineMix_id"`
MedicineMix *emm.MedicineMix `json:"medicineMix,omitempty"`
Medicine_Id *uint `json:"medicine_id"`
Medicine *em.Medicine `json:"medicine,omitempty"`
Dose *uint8 `json:"dose"`
MedicineMix_Id *uint `json:"medicineMix_id"`
Medicine_Id *uint `json:"medicine_id"`
Medicine *em.Medicine `json:"medicine,omitempty"`
Dose *uint8 `json:"dose"`
}
func (d MedicineMixItem) ToResponse() ResponseDto {
resp := ResponseDto{
MedicineMix_Id: d.MedicineMix_Id,
MedicineMix: d.MedicineMix,
Medicine_Id: d.Medicine_Id,
Medicine: d.Medicine,
Dose: d.Dose,
internal/domain/main-entities/medicine-mix-item/entity.go
+5 -7
View File
@@ -3,14 +3,12 @@ package medicinemixitem
import (
ecore "simrs-vx/internal/domain/base-entities/core"
em "simrs-vx/internal/domain/main-entities/medicine"
emm "simrs-vx/internal/domain/main-entities/medicine-mix"
)
type MedicineMixItem struct {
ecore.Main // adjust this according to the needs
MedicineMix_Id *uint `json:"medicineMix_id"`
MedicineMix *emm.MedicineMix `json:"medicineMix,omitempty" gorm:"foreignKey:MedicineMix_Id;references:Id"`
Medicine_Id *uint `json:"medicine_id"`
Medicine *em.Medicine `json:"medicine,omitempty" gorm:"foreignKey:Medicine_Id;references:Id"`
Dose *uint8 `json:"dose"`
ecore.Main // adjust this according to the needs
MedicineMix_Id *uint `json:"medicineMix_id"`
Medicine_Id *uint `json:"medicine_id"`
Medicine *em.Medicine `json:"medicine,omitempty" gorm:"foreignKey:Medicine_Id;references:Id"`
Dose *uint8 `json:"dose"`
}
internal/domain/main-entities/medicine-mix/dto.go
+6 -2
View File
@@ -2,6 +2,8 @@ package medicinemix
import (
ecore "simrs-vx/internal/domain/base-entities/core"
emmi "simrs-vx/internal/domain/main-entities/medicine-mix-item"
)
type CreateDto struct {
@@ -37,12 +39,14 @@ type MetaDto struct {
type ResponseDto struct {
ecore.Main
Name string `json:"name"`
Name string `json:"name"`
MixItems []*emmi.MedicineMixItem `json:"mixItems"`
}
func (d MedicineMix) ToResponse() ResponseDto {
resp := ResponseDto{
Name: d.Name,
Name: d.Name,
MixItems: d.MixItems,
}
resp.Main = d.Main
return resp
internal/domain/main-entities/medicine-mix/entity.go
+5 -3
View File
@@ -2,10 +2,12 @@ package medicinemix
import (
ecore "simrs-vx/internal/domain/base-entities/core"
emmi "simrs-vx/internal/domain/main-entities/medicine-mix-item"
)
type MedicineMix struct {
ecore.Main // adjust this according to the needs
Name string `json:"name" gorm:"size:50"`
Note *string `json:"note" gom:"size:1024"`
ecore.Main // adjust this according to the needs
Name string `json:"name" gorm:"size:50"`
Note *string `json:"note" gom:"size:1024"`
MixItems []*emmi.MedicineMixItem `json:"mixItems" gorm:"foreignKey:MedicineMix_Id;references:Id"`
}