From 5794256f621d27d8ba20a29c3dacca628ff92d28 Mon Sep 17 00:00:00 2001 From: dpurbosakti Date: Mon, 6 Oct 2025 11:08:43 +0700 Subject: [PATCH] fix json convention for list --- internal/domain/main-entities/adime/dto.go | 4 ++-- .../domain/main-entities/ambulatory/dto.go | 4 ++-- .../domain/main-entities/appointment/dto.go | 12 ++++++------ internal/domain/main-entities/chemo/dto.go | 14 +++++++------- internal/domain/main-entities/chemo/entity.go | 4 ++-- .../domain/main-entities/consultation/dto.go | 6 +++--- internal/domain/main-entities/counter/dto.go | 6 +++--- .../main-entities/device-order-item/dto.go | 4 ++-- .../domain/main-entities/device-order/dto.go | 6 +++--- internal/domain/main-entities/device/dto.go | 6 +++--- internal/domain/main-entities/district/dto.go | 2 +- .../main-entities/division-position/dto.go | 2 +- internal/domain/main-entities/division/dto.go | 2 +- .../domain/main-entities/doctor-fee/dto.go | 6 +++--- internal/domain/main-entities/doctor/dto.go | 12 ++++++------ internal/domain/main-entities/emergency/dto.go | 4 ++-- internal/domain/main-entities/employee/dto.go | 8 ++++---- internal/domain/main-entities/encounter/dto.go | 18 +++++++++--------- internal/domain/main-entities/infra/dto.go | 6 +++--- internal/domain/main-entities/inpatient/dto.go | 6 +++--- .../domain/main-entities/installation/dto.go | 2 +- .../main-entities/insurance-company/dto.go | 2 +- .../domain/main-entities/item-price/dto.go | 4 ++-- internal/domain/main-entities/item/dto.go | 6 +++--- internal/domain/main-entities/laborant/dto.go | 4 ++-- .../main-entities/material-order-item/dto.go | 4 ++-- .../domain/main-entities/material-order/dto.go | 2 +- internal/domain/main-entities/material/dto.go | 6 +++--- .../domain/main-entities/mcu-order-item/dto.go | 6 +++--- .../main-entities/mcu-order-sub-item/dto.go | 6 +++--- internal/domain/main-entities/mcu-order/dto.go | 8 ++++---- .../main-entities/mcu-src-category/dto.go | 2 +- internal/domain/main-entities/mcu-src/dto.go | 2 +- .../domain/main-entities/mcu-sub-src/dto.go | 2 +- .../medical-action-src-item/dto.go | 6 +++--- .../main-entities/medical-action-src/dto.go | 2 +- .../main-entities/medication-item-dist/dto.go | 4 ++-- .../main-entities/medication-item/dto.go | 8 ++++---- .../domain/main-entities/medication/dto.go | 6 +++--- .../main-entities/medicine-mix-item/dto.go | 4 ++-- .../domain/main-entities/medicine-mix/dto.go | 2 +- internal/domain/main-entities/medicine/dto.go | 10 +++++----- internal/domain/main-entities/nurse/dto.go | 8 ++++---- .../domain/main-entities/nutritionist/dto.go | 4 ++-- internal/domain/main-entities/patient/dto.go | 4 ++-- .../main-entities/person-relative/dto.go | 15 +++++++-------- internal/domain/main-entities/person/dto.go | 16 ++++++++-------- .../domain/main-entities/pharmacist/dto.go | 4 ++-- .../main-entities/pharmacy-company/dto.go | 2 +- .../main-entities/practice-schedule/dto.go | 6 +++--- .../main-entities/prescription-item/dto.go | 8 ++++---- .../domain/main-entities/prescription/dto.go | 6 +++--- internal/domain/main-entities/regency/dto.go | 2 +- internal/domain/main-entities/room/dto.go | 8 ++++---- internal/domain/main-entities/sbar/dto.go | 4 ++-- internal/domain/main-entities/soapi/dto.go | 4 ++-- .../main-entities/specialist-intern/dto.go | 8 ++++---- .../domain/main-entities/specialist/dto.go | 2 +- .../domain/main-entities/subspecialist/dto.go | 2 +- internal/domain/main-entities/unit/dto.go | 2 +- internal/domain/main-entities/user/dto.go | 2 +- internal/domain/main-entities/village/dto.go | 2 +- 62 files changed, 169 insertions(+), 170 deletions(-) diff --git a/internal/domain/main-entities/adime/dto.go b/internal/domain/main-entities/adime/dto.go index e1c67451..d121c24b 100644 --- a/internal/domain/main-entities/adime/dto.go +++ b/internal/domain/main-entities/adime/dto.go @@ -27,8 +27,8 @@ type ReadListDto struct { } type FilterDto struct { - Encounter_Id *uint `json:"encounter_id"` - Employee_Id *uint `json:"employee_id"` + Encounter_Id *uint `json:"encounter-id"` + Employee_Id *uint `json:"employee-id"` Time *time.Time `json:"time"` Value *string `json:"value"` } diff --git a/internal/domain/main-entities/ambulatory/dto.go b/internal/domain/main-entities/ambulatory/dto.go index 4236f6bd..79a69807 100644 --- a/internal/domain/main-entities/ambulatory/dto.go +++ b/internal/domain/main-entities/ambulatory/dto.go @@ -19,8 +19,8 @@ type ReadListDto struct { } type FilterDto struct { - Encounter_Id *uint `json:"encounter_id"` - Class_Code ere.AmbulatoryClassCode `json:"class_code"` + Encounter_Id *uint `json:"encounter-id"` + Class_Code ere.AmbulatoryClassCode `json:"class-code"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/appointment/dto.go b/internal/domain/main-entities/appointment/dto.go index 356abf5a..3f7fcea9 100644 --- a/internal/domain/main-entities/appointment/dto.go +++ b/internal/domain/main-entities/appointment/dto.go @@ -18,12 +18,12 @@ type CreateDto struct { } type ReadListDto struct { - PracticeSchedule_Id *uint `json:"practiceSchedule_id"` - Patient_Id *uint `json:"patient_id"` - Person_ResidentIdentityNumber string `json:"person_residentIdentityNumber"` - Person_Name string `json:"person_name"` - Person_PhoneNumber string `json:"person_phoneNumber"` - PaymentMethod_Code erc.PaymentMethodCode `json:"paymentMethod_code"` + PracticeSchedule_Id *uint `json:"practiceSchedule-id"` + Patient_Id *uint `json:"patient-id"` + Person_ResidentIdentityNumber string `json:"person-residentIdentityNumber"` + Person_Name string `json:"person-name"` + Person_PhoneNumber string `json:"person-phoneNumber"` + PaymentMethod_Code erc.PaymentMethodCode `json:"paymentMethod-code"` RefNumber string `json:"refNumber"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/chemo/dto.go b/internal/domain/main-entities/chemo/dto.go index 9b50b37c..dd432d43 100644 --- a/internal/domain/main-entities/chemo/dto.go +++ b/internal/domain/main-entities/chemo/dto.go @@ -16,7 +16,7 @@ import ( type CreateDto struct { Encounter_Id *uint `json:"encounter_id"` Status_Code erc.DataVerifiedCode `json:"status_code"` - SrcUnit_Id *uint `json:"src_unit_id"` + SrcUnit_Id *uint `json:"srcUnit_id"` } type ReadListDto struct { @@ -27,10 +27,10 @@ type ReadListDto struct { } type FilterDto struct { - Encounter_Id *uint `json:"encounter_id"` - Status_Code *erc.DataVerifiedCode `json:"status_code"` - VerifiedBy_User_Id *uint `json:"verifiedBy_user_id"` - SrcUnit_Id *uint `json:"src_unit_id"` + Encounter_Id *uint `json:"encounter-id"` + Status_Code *erc.DataVerifiedCode `json:"status-code"` + VerifiedBy_User_Id *uint `json:"verifiedBy-user-id"` + SrcUnit_Id *uint `json:"srcUnit-id"` } type ReadDetailDto struct { @@ -67,8 +67,8 @@ type ResponseDto struct { VerifiedAt *time.Time `json:"verifiedAt"` VerifiedBy_User_Id *uint `json:"verifiedBy_user_id"` VerifiedBy *eus.User `json:"verifiedBy,omitempty"` - SrcUnit_Id *uint `json:"src_unit_id"` - SrcUnit *eun.Unit `json:"src_unit,omitempty"` + SrcUnit_Id *uint `json:"srcUnit_id"` + SrcUnit *eun.Unit `json:"srcUnit,omitempty"` } func (d Chemo) ToResponse() ResponseDto { diff --git a/internal/domain/main-entities/chemo/entity.go b/internal/domain/main-entities/chemo/entity.go index 2ba83990..f80d5bc1 100644 --- a/internal/domain/main-entities/chemo/entity.go +++ b/internal/domain/main-entities/chemo/entity.go @@ -19,6 +19,6 @@ type Chemo struct { VerifiedAt *time.Time `json:"verifiedAt"` VerifiedBy_User_Id *uint `json:"verifiedBy_user_id"` VerifiedBy *eus.User `json:"verifiedBy,omitempty" gorm:"foreignKey:VerifiedBy_User_Id;references:Id"` - SrcUnit_Id *uint `json:"src_unit_id"` - SrcUnit *eun.Unit `json:"src_unit,omitempty" gorm:"foreignKey:SrcUnit_Id;references:Id"` + SrcUnit_Id *uint `json:"srcUnit_id"` + SrcUnit *eun.Unit `json:"srcUnit,omitempty" gorm:"foreignKey:SrcUnit_Id;references:Id"` } diff --git a/internal/domain/main-entities/consultation/dto.go b/internal/domain/main-entities/consultation/dto.go index 7b53f90f..ea141ace 100644 --- a/internal/domain/main-entities/consultation/dto.go +++ b/internal/domain/main-entities/consultation/dto.go @@ -26,9 +26,9 @@ type ReadListDto struct { } type FilterDto struct { - Encounter_Id *uint `json:"encounter_id"` - DstUnit_Id *uint `json:"dstUnit_id"` - DstDoctor_Id *uint `json:"dstDoctor_id"` + Encounter_Id *uint `json:"encounter-id"` + DstUnit_Id *uint `json:"dstUnit-id"` + DstDoctor_Id *uint `json:"dstDoctor-id"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/counter/dto.go b/internal/domain/main-entities/counter/dto.go index ae2a2e18..ad11f7a0 100644 --- a/internal/domain/main-entities/counter/dto.go +++ b/internal/domain/main-entities/counter/dto.go @@ -17,9 +17,9 @@ type ReadListDto struct { Code string `json:"code"` Name string `json:"name"` Number uint8 `json:"number"` - Parent_Id *uint16 `json:"parent_id"` - Type_Code string `json:"type_code"` - Queue_Code string `json:"queue_code"` + Parent_Id *uint16 `json:"parent-id"` + Type_Code string `json:"type-code"` + Queue_Code string `json:"queue-code"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/device-order-item/dto.go b/internal/domain/main-entities/device-order-item/dto.go index 90c6ea2b..7206e7db 100644 --- a/internal/domain/main-entities/device-order-item/dto.go +++ b/internal/domain/main-entities/device-order-item/dto.go @@ -20,8 +20,8 @@ type ReadListDto struct { } type FilterDto struct { - DeviceOrder_Id *uint `json:"deviceOrder_id"` - Device_Id *uint `json:"device_id"` + DeviceOrder_Id *uint `json:"deviceOrder-id"` + Device_Id *uint `json:"device-id"` Count uint8 `json:"count"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/device-order/dto.go b/internal/domain/main-entities/device-order/dto.go index a045a096..e1c5c1ea 100644 --- a/internal/domain/main-entities/device-order/dto.go +++ b/internal/domain/main-entities/device-order/dto.go @@ -26,9 +26,9 @@ type ReadListDto struct { } type FilterDto struct { - Encounter_Id *uint `json:"encounter_id"` - Status_Code erc.DataStatusCode `json:"status_code"` - Doctor_Id *uint `json:"doctor_id"` + Encounter_Id *uint `json:"encounter-id"` + Status_Code erc.DataStatusCode `json:"status-code"` + Doctor_Id *uint `json:"doctor-id"` } type ReadDetailDto struct { Id uint16 `json:"id"` diff --git a/internal/domain/main-entities/device/dto.go b/internal/domain/main-entities/device/dto.go index b8046c75..5a00ca18 100644 --- a/internal/domain/main-entities/device/dto.go +++ b/internal/domain/main-entities/device/dto.go @@ -26,9 +26,9 @@ type ReadListDto struct { type FilterDto struct { Code string `json:"code"` Name string `json:"name"` - Uom_Code string `json:"uom_code"` - Infra_Id *uint16 `json:"infra_id"` - Item_Id *uint `json:"item_id"` + Uom_Code string `json:"uom-code"` + Infra_Id *uint16 `json:"infra-id"` + Item_Id *uint `json:"item-id"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/district/dto.go b/internal/domain/main-entities/district/dto.go index 869aa9c2..be0f6c01 100644 --- a/internal/domain/main-entities/district/dto.go +++ b/internal/domain/main-entities/district/dto.go @@ -12,7 +12,7 @@ type CreateDto struct { } type ReadListDto struct { - Regency_Code string `json:"regency_code"` + Regency_Code string `json:"regency-code"` Code string `json:"code"` Name string `json:"name"` Pagination ecore.Pagination diff --git a/internal/domain/main-entities/division-position/dto.go b/internal/domain/main-entities/division-position/dto.go index 20664a7e..66aa43db 100644 --- a/internal/domain/main-entities/division-position/dto.go +++ b/internal/domain/main-entities/division-position/dto.go @@ -19,7 +19,7 @@ type ReadListDto struct { } type FilterDto struct { - Division_Id *uint16 `json:"division_id"` + Division_Id *uint16 `json:"division-id"` Code string `json:"code"` Name string `json:"name"` } diff --git a/internal/domain/main-entities/division/dto.go b/internal/domain/main-entities/division/dto.go index 2babaf28..87f1a5f7 100644 --- a/internal/domain/main-entities/division/dto.go +++ b/internal/domain/main-entities/division/dto.go @@ -22,7 +22,7 @@ type ReadListDto struct { type FilterDto struct { Code string `json:"code"` Name string `json:"name"` - Parent_Id *uint16 `json:"parent_id"` + Parent_Id *uint16 `json:"parent-id"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/doctor-fee/dto.go b/internal/domain/main-entities/doctor-fee/dto.go index c11467dd..4bec752e 100644 --- a/internal/domain/main-entities/doctor-fee/dto.go +++ b/internal/domain/main-entities/doctor-fee/dto.go @@ -22,10 +22,10 @@ type ReadListDto struct { } type FilterDto struct { - Doctor_Id *uint `json:"doctor_id"` - FeeType_Code *ero.DoctorFeeTypeCode `json:"feeType_code"` + Doctor_Id *uint `json:"doctor-id"` + FeeType_Code *ero.DoctorFeeTypeCode `json:"feeType-code"` Price *float64 `json:"price"` - Item_Id *uint `json:"item_id"` + Item_Id *uint `json:"item-id"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/doctor/dto.go b/internal/domain/main-entities/doctor/dto.go index b6177607..4f298795 100644 --- a/internal/domain/main-entities/doctor/dto.go +++ b/internal/domain/main-entities/doctor/dto.go @@ -25,12 +25,12 @@ type ReadListDto struct { } type FilterDto struct { - Employee_Id *uint `json:"employee_id"` - IHS_Number *string `json:"ihs_number" validate:"maxLength=20"` - SIP_Number *string `json:"sip_number" validate:"maxLength=20"` - Unit_Id *uint `json:"unit_id"` - Specialist_Id *uint16 `json:"specialist_id"` - Subspecialist_Id *uint16 `json:"subspecialist_id"` + Employee_Id *uint `json:"employee-id"` + IHS_Number *string `json:"ihs-number" validate:"maxLength=20"` + SIP_Number *string `json:"sip-number" validate:"maxLength=20"` + Unit_Id *uint `json:"unit-id"` + Specialist_Id *uint16 `json:"specialist-id"` + Subspecialist_Id *uint16 `json:"subspecialist-id"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/emergency/dto.go b/internal/domain/main-entities/emergency/dto.go index ff9041a6..e37ba95d 100644 --- a/internal/domain/main-entities/emergency/dto.go +++ b/internal/domain/main-entities/emergency/dto.go @@ -19,8 +19,8 @@ type ReadListDto struct { } type FilterDto struct { - Encounter_Id *uint `json:"encounter_id"` - Class_Code ere.EmergencyClassCode `json:"class_code"` + Encounter_Id *uint `json:"encounter-id"` + Class_Code ere.EmergencyClassCode `json:"class-code"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/employee/dto.go b/internal/domain/main-entities/employee/dto.go index fa0a240c..d7b723f9 100644 --- a/internal/domain/main-entities/employee/dto.go +++ b/internal/domain/main-entities/employee/dto.go @@ -25,11 +25,11 @@ type ReadListDto struct { } type FilterDto struct { - User_Id *uint `json:"user_id"` - Person_Id *uint `json:"person_id"` - Division_Code *string `json:"division_code"` + User_Id *uint `json:"user-id"` + Person_Id *uint `json:"person-id"` + Division_Code *string `json:"division-code"` Number *string `json:"number"` - Status_Code erc.ActiveStatusCode `json:"status_code"` + Status_Code erc.ActiveStatusCode `json:"status-code"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/encounter/dto.go b/internal/domain/main-entities/encounter/dto.go index b0415901..b9057610 100644 --- a/internal/domain/main-entities/encounter/dto.go +++ b/internal/domain/main-entities/encounter/dto.go @@ -39,19 +39,19 @@ type ReadListDto struct { } type FilterDto struct { - Patient_Id *uint `json:"patient_id"` + Patient_Id *uint `json:"patient-id"` Patient *ep.Patient `json:"patient,omitempty"` RegisteredAt *time.Time `json:"registeredAt"` Class_Code ere.EncounterClassCode `json:"class_code" validate:"maxLength=10"` - Unit_Id *uint `json:"unit_id"` - Specialist_Id *uint16 `json:"specialist_id"` - Subspecialist_Id *uint16 `json:"subspecialist_id"` + Unit_Id *uint `json:"unit-id"` + Specialist_Id *uint16 `json:"specialist-id"` + Subspecialist_Id *uint16 `json:"subspecialist-id"` VisitDate time.Time `json:"visitDate"` - Appoinment_Doctor_Id *uint `json:"appointment_doctor_id"` - Responsible_Doctor_Id *uint `json:"responsible_doctor_id"` - DischargeMethod_Code ere.DischargeMethodCode `json:"dischargeMethod_code" validate:"maxLength=10"` - RefSource_Name *string `json:"refSource_name" validate:"maxLength=100"` - Appointment_Id *uint `json:"appointment_id"` + Appoinment_Doctor_Id *uint `json:"appointment-doctor-id"` + Responsible_Doctor_Id *uint `json:"responsible-doctor-id"` + DischargeMethod_Code ere.DischargeMethodCode `json:"dischargeMethod-code" validate:"maxLength=10"` + RefSource_Name *string `json:"refSource-name" validate:"maxLength=100"` + Appointment_Id *uint `json:"appointment-id"` EarlyEducation *string `json:"earlyEducation"` MedicalDischargeEducation *string `json:"medicalDischargeEducation"` AdmDischargeEducation *string `json:"admDischargeEducation"` diff --git a/internal/domain/main-entities/infra/dto.go b/internal/domain/main-entities/infra/dto.go index fda399e5..34a0774d 100644 --- a/internal/domain/main-entities/infra/dto.go +++ b/internal/domain/main-entities/infra/dto.go @@ -31,9 +31,9 @@ type ReadListDto struct { type FilterDto struct { Code string `json:"code"` Name string `json:"name"` - InfraGroup_Code ero.InfraGroupCode `json:"infraGroup_code"` - Parent_Id *uint16 `json:"parent_id"` - Item_Id *uint `json:"item_id"` + InfraGroup_Code ero.InfraGroupCode `json:"infraGroup-code"` + Parent_Id *uint16 `json:"parent-id"` + Item_Id *uint `json:"item-id"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/inpatient/dto.go b/internal/domain/main-entities/inpatient/dto.go index 6592db69..c2191c6b 100644 --- a/internal/domain/main-entities/inpatient/dto.go +++ b/internal/domain/main-entities/inpatient/dto.go @@ -22,9 +22,9 @@ type ReadListDto struct { } type FilterDto struct { - Encounter_Id *uint `json:"encounter_id"` - Class_Code ere.InpatientClassCode `json:"class_code"` - Infra_Id *uint16 `json:"infra_id"` + Encounter_Id *uint `json:"encounter-id"` + Class_Code ere.InpatientClassCode `json:"class-code"` + Infra_Id *uint16 `json:"infra-id"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/installation/dto.go b/internal/domain/main-entities/installation/dto.go index ee307677..f6d8ef03 100644 --- a/internal/domain/main-entities/installation/dto.go +++ b/internal/domain/main-entities/installation/dto.go @@ -15,7 +15,7 @@ type CreateDto struct { type ReadListDto struct { Code string `json:"code"` Name string `json:"name"` - EncounterClass_Code ere.EncounterClassCode `json:"encounterClass_code"` + EncounterClass_Code ere.EncounterClassCode `json:"encounterClass-code"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/insurance-company/dto.go b/internal/domain/main-entities/insurance-company/dto.go index b99b546e..93966c71 100644 --- a/internal/domain/main-entities/insurance-company/dto.go +++ b/internal/domain/main-entities/insurance-company/dto.go @@ -23,7 +23,7 @@ type ReadListDto struct { type FilterDto struct { Code string `json:"code"` Name string `json:"name"` - Regency_Code *string `json:"regency_code"` + Regency_Code *string `json:"regency-code"` Address string `json:"address"` PhoneNumber string `json:"phoneNumber"` } diff --git a/internal/domain/main-entities/item-price/dto.go b/internal/domain/main-entities/item-price/dto.go index a8ec2f55..1a4ca2a4 100644 --- a/internal/domain/main-entities/item-price/dto.go +++ b/internal/domain/main-entities/item-price/dto.go @@ -20,9 +20,9 @@ type ReadListDto struct { } type FilterDto struct { - Item_Id *uint `json:"item_id"` + Item_Id *uint `json:"item-id"` Price float64 `json:"price"` - InsuranceCompany_Code *string `json:"insuranceCompany_code"` + InsuranceCompany_Code *string `json:"insuranceCompany-code"` } type ReadDetailDto struct { Id uint16 `json:"id"` diff --git a/internal/domain/main-entities/item/dto.go b/internal/domain/main-entities/item/dto.go index 32844b43..3d48e2bb 100644 --- a/internal/domain/main-entities/item/dto.go +++ b/internal/domain/main-entities/item/dto.go @@ -25,9 +25,9 @@ type ReadListDto struct { type FilterDto struct { Code string `json:"code"` Name string `json:"name"` - ItemGroup_Code ero.ItemGroupCode `json:"itemGroup_code"` - Uom_Code *string `json:"uom_code"` - Infra_Id *uint16 `json:"infra_id"` + ItemGroup_Code ero.ItemGroupCode `json:"itemGroup-code"` + Uom_Code *string `json:"uom-code"` + Infra_Id *uint16 `json:"infra-id"` Stock *int `json:"stock"` } diff --git a/internal/domain/main-entities/laborant/dto.go b/internal/domain/main-entities/laborant/dto.go index aff95200..3648455c 100644 --- a/internal/domain/main-entities/laborant/dto.go +++ b/internal/domain/main-entities/laborant/dto.go @@ -18,8 +18,8 @@ type ReadListDto struct { } type FilterDto struct { - Employee_Id *uint `json:"employee_id"` - IHS_Number *string `json:"ihs_number"` + Employee_Id *uint `json:"employee-id"` + IHS_Number *string `json:"ihs-number"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/material-order-item/dto.go b/internal/domain/main-entities/material-order-item/dto.go index 91e3c52d..74b1f05f 100644 --- a/internal/domain/main-entities/material-order-item/dto.go +++ b/internal/domain/main-entities/material-order-item/dto.go @@ -20,8 +20,8 @@ type ReadListDto struct { } type FilterDto struct { - MaterialOrder_Id *uint `json:"materialOrder_id"` - Material_Id *uint `json:"material_id"` + MaterialOrder_Id *uint `json:"materialOrder-id"` + Material_Id *uint `json:"material-id"` Count *uint16 `json:"count"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/material-order/dto.go b/internal/domain/main-entities/material-order/dto.go index 553347eb..d2971a85 100644 --- a/internal/domain/main-entities/material-order/dto.go +++ b/internal/domain/main-entities/material-order/dto.go @@ -26,7 +26,7 @@ type ReadListDto struct { } type FilterDto struct { - Encounter_Id *uint `json:"encounter_id"` + Encounter_Id *uint `json:"encounter-id"` Status_Code erc.DataStatusCode `json:"status_code"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/material/dto.go b/internal/domain/main-entities/material/dto.go index 16f6b7c7..695b3d11 100644 --- a/internal/domain/main-entities/material/dto.go +++ b/internal/domain/main-entities/material/dto.go @@ -27,10 +27,10 @@ type ReadListDto struct { type FilterDto struct { Code string `json:"code"` Name string `json:"name"` - Uom_Code string `json:"uom_code"` - Infra_Id *uint16 `json:"infra_id"` + Uom_Code string `json:"uom-code"` + Infra_Id *uint16 `json:"infra-id"` Stock *int `json:"stock"` - Item_Id *uint `json:"item_id"` + Item_Id *uint `json:"item-id"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/mcu-order-item/dto.go b/internal/domain/main-entities/mcu-order-item/dto.go index 61590ffc..06ebd781 100644 --- a/internal/domain/main-entities/mcu-order-item/dto.go +++ b/internal/domain/main-entities/mcu-order-item/dto.go @@ -24,10 +24,10 @@ type ReadListDto struct { } type FilterDto struct { - McuOrder_Id *uint `json:"mcuOrder_id"` - McuSrc_Id *uint `json:"mcuSrc_id"` + McuOrder_Id *uint `json:"mcuOrder-id"` + McuSrc_Id *uint `json:"mcuSrc-id"` Result *string `json:"result"` - Status_Code erc.DataStatusCode `json:"status_code"` + Status_Code erc.DataStatusCode `json:"status-code"` } type ReadDetailDto struct { Id uint `json:"id"` diff --git a/internal/domain/main-entities/mcu-order-sub-item/dto.go b/internal/domain/main-entities/mcu-order-sub-item/dto.go index bfd2312a..a38376d3 100644 --- a/internal/domain/main-entities/mcu-order-sub-item/dto.go +++ b/internal/domain/main-entities/mcu-order-sub-item/dto.go @@ -22,10 +22,10 @@ type ReadListDto struct { } type FilterDto struct { - McuOrder_Id *uint `json:"mcuOrder_id"` - McuSrc_Id *uint `json:"mcuSrc_id"` + McuOrder_Id *uint `json:"mcuOrder-id"` + McuSrc_Id *uint `json:"mcuSrc-id"` Result *string `json:"result"` - Status_Code erc.DataStatusCode `json:"status_code"` + Status_Code erc.DataStatusCode `json:"status-code"` } type ReadDetailDto struct { Id uint `json:"id"` diff --git a/internal/domain/main-entities/mcu-order/dto.go b/internal/domain/main-entities/mcu-order/dto.go index 75f3647f..a5e09f5e 100644 --- a/internal/domain/main-entities/mcu-order/dto.go +++ b/internal/domain/main-entities/mcu-order/dto.go @@ -33,14 +33,14 @@ type ReadListDto struct { } type FilterDto struct { - Encounter_Id *uint `json:"encounter_id"` - Status_Code erc.DataStatusCode `json:"status_code" gorm:"not null;size:10"` - Doctor_Id *uint `json:"doctor_id"` + Encounter_Id *uint `json:"encounter-id"` + Status_Code erc.DataStatusCode `json:"status-code" gorm:"not null;size:10"` + Doctor_Id *uint `json:"doctor-id"` SpecimenPickTime *time.Time `json:"specimenPickTime"` ExaminationDate *time.Time `json:"examinationDate"` Number uint8 `json:"number"` Temperature float64 `json:"temperature"` - McuUrgencyLevel_Code ercl.McuUrgencyLevelCode `json:"mcuUrgencyLevel_code""` + McuUrgencyLevel_Code ercl.McuUrgencyLevelCode `json:"mcuUrgencyLevel-code""` } type ReadDetailDto struct { Id uint `json:"id"` diff --git a/internal/domain/main-entities/mcu-src-category/dto.go b/internal/domain/main-entities/mcu-src-category/dto.go index 06ab351c..bf2deb4a 100644 --- a/internal/domain/main-entities/mcu-src-category/dto.go +++ b/internal/domain/main-entities/mcu-src-category/dto.go @@ -15,7 +15,7 @@ type CreateDto struct { type ReadListDto struct { Code string `json:"code"` Name string `json:"name"` - Scope_Code *ere.CheckupScopeCode `json:"scope_code"` + Scope_Code *ere.CheckupScopeCode `json:"scope-code"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/mcu-src/dto.go b/internal/domain/main-entities/mcu-src/dto.go index 447bb64f..be1c14bf 100644 --- a/internal/domain/main-entities/mcu-src/dto.go +++ b/internal/domain/main-entities/mcu-src/dto.go @@ -23,7 +23,7 @@ type ReadListDto struct { type FilterDto struct { Code string `json:"code"` Name string `json:"name"` - McuSrcCategory_Code *string `json:"mcuSrcCategory_code"` + McuSrcCategory_Code *string `json:"mcuSrcCategory-code"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/mcu-sub-src/dto.go b/internal/domain/main-entities/mcu-sub-src/dto.go index eb3a2c5b..0a3f52a9 100644 --- a/internal/domain/main-entities/mcu-sub-src/dto.go +++ b/internal/domain/main-entities/mcu-sub-src/dto.go @@ -24,7 +24,7 @@ type ReadListDto struct { type FilterDto struct { Code string `json:"code"` Name string `json:"name"` - CheckupCategory_Code *string `json:"checkupCategory_code"` + CheckupCategory_Code *string `json:"checkupCategory-code"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/medical-action-src-item/dto.go b/internal/domain/main-entities/medical-action-src-item/dto.go index 357d5f1b..e60a12ed 100644 --- a/internal/domain/main-entities/medical-action-src-item/dto.go +++ b/internal/domain/main-entities/medical-action-src-item/dto.go @@ -21,9 +21,9 @@ type ReadListDto struct { } type FilterDto struct { - MedicalActionSrc_Id *uint `json:"medicalActionSrc_id"` - ProcedureSrc_Id *uint `json:"procedureSrc_id"` - Item_Id *uint `json:"item_id"` + MedicalActionSrc_Id *uint `json:"medicalActionSrc-id"` + ProcedureSrc_Id *uint `json:"procedureSrc-id"` + Item_Id *uint `json:"item-id"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/medical-action-src/dto.go b/internal/domain/main-entities/medical-action-src/dto.go index a6178e71..509f5b49 100644 --- a/internal/domain/main-entities/medical-action-src/dto.go +++ b/internal/domain/main-entities/medical-action-src/dto.go @@ -22,7 +22,7 @@ type ReadListDto struct { type FilterDto struct { Code string `json:"code"` Name string `json:"name"` - Item_Id *uint `json:"item_id"` + Item_Id *uint `json:"item-id"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/medication-item-dist/dto.go b/internal/domain/main-entities/medication-item-dist/dto.go index ffafede0..5186b99c 100644 --- a/internal/domain/main-entities/medication-item-dist/dto.go +++ b/internal/domain/main-entities/medication-item-dist/dto.go @@ -24,10 +24,10 @@ type ReadListDto struct { } type FilterDto struct { - MedicationItem_Id *uint `json:"medicationItem_id"` + MedicationItem_Id *uint `json:"medicationItem-id"` DateTime *time.Time `json:"dateTime"` Remain float64 `json:"remain"` - Nurse_Id *uint `json:"nurse_id"` + Nurse_Id *uint `json:"nurse-id"` } type ReadDetailDto struct { Id uint16 `json:"id"` diff --git a/internal/domain/main-entities/medication-item/dto.go b/internal/domain/main-entities/medication-item/dto.go index bf9d9f28..26a5b35e 100644 --- a/internal/domain/main-entities/medication-item/dto.go +++ b/internal/domain/main-entities/medication-item/dto.go @@ -33,13 +33,13 @@ type ReadListDto struct { } type FilterDto struct { - Medication_Id *uint `json:"medication_id"` + Medication_Id *uint `json:"medication-id"` IsMix bool `json:"isMix"` - Medicine_Id *uint `json:"medicine_id"` - MedicineMix_Id *uint `json:"medicineMix_id"` + Medicine_Id *uint `json:"medicine-id"` + MedicineMix_Id *uint `json:"medicineMix-id"` Usage float64 `json:"usage"` Interval uint8 `json:"interval"` - IntervalUnit_Code erc.TimeUnitCode `json:"intervalUnit_code"` + IntervalUnit_Code erc.TimeUnitCode `json:"intervalUnit-code"` IsRedeemed bool `json:"isRedeemed"` Quantity float64 `json:"quantity"` Note *string `json:"note" gorm:"size:1024"` diff --git a/internal/domain/main-entities/medication/dto.go b/internal/domain/main-entities/medication/dto.go index 0db720f4..abf91fc7 100644 --- a/internal/domain/main-entities/medication/dto.go +++ b/internal/domain/main-entities/medication/dto.go @@ -27,10 +27,10 @@ type ReadListDto struct { } type FilterDto struct { - Encounter_Id *uint `json:"encounter_id"` + Encounter_Id *uint `json:"encounter-id"` IssuedAt *time.Time `json:"issuedAt"` - Pharmacist_Id *uint `json:"pharmacist_id"` - Status_Code erc.DataStatusCode `json:"status_code"` + Pharmacist_Id *uint `json:"pharmacist-id"` + Status_Code erc.DataStatusCode `json:"status-code"` } type ReadDetailDto struct { Id uint `json:"id"` diff --git a/internal/domain/main-entities/medicine-mix-item/dto.go b/internal/domain/main-entities/medicine-mix-item/dto.go index 5c372654..1790a207 100644 --- a/internal/domain/main-entities/medicine-mix-item/dto.go +++ b/internal/domain/main-entities/medicine-mix-item/dto.go @@ -20,8 +20,8 @@ type ReadListDto struct { } type FilterDto struct { - MedicineMix_Id *uint `json:"medicineMix_id"` - Medicine_Id *uint `json:"medicine_id"` + MedicineMix_Id *uint `json:"medicineMix-id"` + Medicine_Id *uint `json:"medicine-id"` Dose *uint8 `json:"dose"` Note *string `json:"note" gom:"size:1024"` } diff --git a/internal/domain/main-entities/medicine-mix/dto.go b/internal/domain/main-entities/medicine-mix/dto.go index 8c9b2c7f..6cb8cb1a 100644 --- a/internal/domain/main-entities/medicine-mix/dto.go +++ b/internal/domain/main-entities/medicine-mix/dto.go @@ -13,7 +13,7 @@ type CreateDto struct { type ReadListDto struct { Name string `json:"name"` - Uom_Code *string `json:"uom_code"` + Uom_Code *string `json:"uom-code"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/medicine/dto.go b/internal/domain/main-entities/medicine/dto.go index 08352c20..6b6517f9 100644 --- a/internal/domain/main-entities/medicine/dto.go +++ b/internal/domain/main-entities/medicine/dto.go @@ -32,13 +32,13 @@ type ReadListDto struct { type FilterDto 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"` + 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"` + Infra_Id *uint16 `json:"infra-id"` Stock *int `json:"stock"` - Item_Id *uint `json:"item_id"` + Item_Id *uint `json:"item-id"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/nurse/dto.go b/internal/domain/main-entities/nurse/dto.go index 4aa37c25..11d4bfb8 100644 --- a/internal/domain/main-entities/nurse/dto.go +++ b/internal/domain/main-entities/nurse/dto.go @@ -22,10 +22,10 @@ type ReadListDto struct { } type FilterDto struct { - Employee_Id *uint `json:"employee_id"` - IHS_Number *string `json:"ihs_number"` - Unit_Id *uint16 `json:"unit_id"` - Infra_Id *uint16 `json:"infra_id"` + Employee_Id *uint `json:"employee-id"` + IHS_Number *string `json:"ihs-number"` + Unit_Id *uint16 `json:"unit-id"` + Infra_Id *uint16 `json:"infra-id"` } type ReadDetailDto struct { Id uint16 `json:"id"` diff --git a/internal/domain/main-entities/nutritionist/dto.go b/internal/domain/main-entities/nutritionist/dto.go index b884e413..f48160a2 100644 --- a/internal/domain/main-entities/nutritionist/dto.go +++ b/internal/domain/main-entities/nutritionist/dto.go @@ -18,8 +18,8 @@ type ReadListDto struct { } type FilterDto struct { - Employee_Id *uint `json:"employee_id"` - IHS_Number *string `json:"ihs_number"` + Employee_Id *uint `json:"employee-id"` + IHS_Number *string `json:"ihs-number"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/patient/dto.go b/internal/domain/main-entities/patient/dto.go index 1c084a54..394d1ee7 100644 --- a/internal/domain/main-entities/patient/dto.go +++ b/internal/domain/main-entities/patient/dto.go @@ -32,9 +32,9 @@ type ReadListDto struct { } type FilterDto struct { - Person_Id *uint `json:"person_id"` + Person_Id *uint `json:"person-id"` RegisteredAt *time.Time `json:"registeredAt"` - Status_Code erc.ActiveStatusCode `json:"status_code"` + Status_Code erc.ActiveStatusCode `json:"status-code"` Number *string `json:"number"` } diff --git a/internal/domain/main-entities/person-relative/dto.go b/internal/domain/main-entities/person-relative/dto.go index 76276f92..f56e68c7 100644 --- a/internal/domain/main-entities/person-relative/dto.go +++ b/internal/domain/main-entities/person-relative/dto.go @@ -28,17 +28,16 @@ type ReadListDto struct { } type FilterDto struct { - Person_Id uint `json:"person_id"` - Relationship_Code erp.RelationshipCode `json:"relationship_code" ` + Person_Id uint `json:"person-id"` + Relationship_Code erp.RelationshipCode `json:"relationship-code" ` Name *string `json:"name"` Address *string `json:"address"` - Village_Code *string `json:"village_code"` - Village *ev.Village `json:"village,omitempty"` - Gender_Code *erp.GenderCode `json:"gender_code"` + Village_Code *string `json:"village-code"` + Gender_Code *erp.GenderCode `json:"gender-code"` PhoneNumber *string `json:"phoneNumber"` - Education_Code *erp.EducationCode `json:"education_code"` - Occupation_Code *erp.OcupationCode `json:"occupation_code"` - Occupation_Name *string `json:"occupation_name"` + Education_Code *erp.EducationCode `json:"education-code"` + Occupation_Code *erp.OcupationCode `json:"occupation-code"` + Occupation_Name *string `json:"occupation-name"` Responsible bool `json:"responsible"` } diff --git a/internal/domain/main-entities/person/dto.go b/internal/domain/main-entities/person/dto.go index 3cfe18f2..7490d579 100644 --- a/internal/domain/main-entities/person/dto.go +++ b/internal/domain/main-entities/person/dto.go @@ -43,18 +43,18 @@ type FilterDto struct { FrontTitle *string `json:"frontTitle"` EndTitle *string `json:"endTitle"` BirthDate *time.Time `json:"birthDate,omitempty"` - BirthRegency_Code *string `json:"birthRegency_code"` - Gender_Code *erp.GenderCode `json:"gender_code"` + BirthRegency_Code *string `json:"birthRegency-code"` + Gender_Code *erp.GenderCode `json:"gender-code"` ResidentIdentityNumber *string `json:"residentIdentityNumber"` PassportNumber *string `json:"passportNumber"` DrivingLicenseNumber *string `json:"drivingLicenseNumber"` - Religion_Code *erp.ReligionCode `json:"religion_code"` - Education_Code *erp.EducationCode `json:"education_code"` - Ocupation_Code *erp.OcupationCode `json:"occupation_code"` - Ocupation_Name *string `json:"occupation_name"` + Religion_Code *erp.ReligionCode `json:"religion-code"` + Education_Code *erp.EducationCode `json:"education-code"` + Ocupation_Code *erp.OcupationCode `json:"occupation-code"` + Ocupation_Name *string `json:"occupation-name"` Nationality *string `json:"nationality"` - Ethnic_Code *string `json:"ethnic_code"` - Language_Code *string `json:"language_code"` + Ethnic_Code *string `json:"ethnic-code"` + Language_Code *string `json:"language-code"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/pharmacist/dto.go b/internal/domain/main-entities/pharmacist/dto.go index 9a42f2ca..fd1bde79 100644 --- a/internal/domain/main-entities/pharmacist/dto.go +++ b/internal/domain/main-entities/pharmacist/dto.go @@ -18,8 +18,8 @@ type ReadListDto struct { } type FilterDto struct { - Employee_Id *uint `json:"employee_id"` - IHS_Number *string `json:"ihs_number"` + Employee_Id *uint `json:"employee-id"` + IHS_Number *string `json:"ihs-number"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/pharmacy-company/dto.go b/internal/domain/main-entities/pharmacy-company/dto.go index d28de67e..ed61fd61 100644 --- a/internal/domain/main-entities/pharmacy-company/dto.go +++ b/internal/domain/main-entities/pharmacy-company/dto.go @@ -13,7 +13,7 @@ type CreateDto struct { type ReadListDto struct { Code string `json:"code"` Name string `json:"name"` - Regency_Code string `json:"regency_code"` + Regency_Code string `json:"regency-code"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/practice-schedule/dto.go b/internal/domain/main-entities/practice-schedule/dto.go index 5ec6fd2e..48f61543 100644 --- a/internal/domain/main-entities/practice-schedule/dto.go +++ b/internal/domain/main-entities/practice-schedule/dto.go @@ -21,9 +21,9 @@ type ReadListDto struct { } type FilterDto struct { - Doctor_Id *uint `json:"doctor_id"` - Unit_Code *string `json:"unit_code"` - Day_Code *erc.DayCode `json:"day_code"` + Doctor_Id *uint `json:"doctor-id"` + Unit_Code *string `json:"unit-code"` + Day_Code *erc.DayCode `json:"day-code"` StartTime *string `json:"startTime"` EndTime *string `json:"endTime"` } diff --git a/internal/domain/main-entities/prescription-item/dto.go b/internal/domain/main-entities/prescription-item/dto.go index 3b70394f..91922664 100644 --- a/internal/domain/main-entities/prescription-item/dto.go +++ b/internal/domain/main-entities/prescription-item/dto.go @@ -31,13 +31,13 @@ type ReadListDto struct { } type FilterDto struct { - Prescription_Id *uint `json:"prescription_id"` + Prescription_Id *uint `json:"prescription-id"` IsMix bool `json:"isMix"` - Medicine_Id *uint `json:"medicine_id"` - MedicineMix_Id *uint `json:"medicineMix_id"` + Medicine_Id *uint `json:"medicine-id"` + MedicineMix_Id *uint `json:"medicineMix-id"` Usage float64 `json:"usage"` Interval uint8 `json:"interval"` - IntervalUnit_Code erc.TimeUnitCode `json:"intervalUnit_code"` + IntervalUnit_Code erc.TimeUnitCode `json:"intervalUnit-code"` Quantity float64 `json:"quantity"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/prescription/dto.go b/internal/domain/main-entities/prescription/dto.go index bc538517..e05db349 100644 --- a/internal/domain/main-entities/prescription/dto.go +++ b/internal/domain/main-entities/prescription/dto.go @@ -25,10 +25,10 @@ type ReadListDto struct { } type FilterDto struct { - Encounter_Id *uint `json:"encounter_id"` - Doctor_Id *uint `json:"doctor_id"` + Encounter_Id *uint `json:"encounter-id"` + Doctor_Id *uint `json:"doctor-id"` IssuedAt *time.Time `json:"issuedAt"` - Status_Code *erc.DataStatusCode `json:"status_code"` + Status_Code *erc.DataStatusCode `json:"status-code"` } type ReadDetailDto struct { Id uint `json:"id"` diff --git a/internal/domain/main-entities/regency/dto.go b/internal/domain/main-entities/regency/dto.go index e4d76df2..61c131fe 100644 --- a/internal/domain/main-entities/regency/dto.go +++ b/internal/domain/main-entities/regency/dto.go @@ -12,7 +12,7 @@ type CreateDto struct { } type ReadListDto struct { - Province_Code string `json:"province_code"` + Province_Code string `json:"province-code"` Code string `json:"code"` Name string `json:"name"` Pagination ecore.Pagination diff --git a/internal/domain/main-entities/room/dto.go b/internal/domain/main-entities/room/dto.go index acee005e..808e1ee2 100644 --- a/internal/domain/main-entities/room/dto.go +++ b/internal/domain/main-entities/room/dto.go @@ -23,10 +23,10 @@ type ReadListDto struct { } type FilterDto struct { - Infra_Id *uint16 `json:"infra_id"` - Unit_Id *uint16 `json:"unit_id"` - Specialist_Id *uint16 `json:"specialist_id"` - Subspecialist_Id *uint16 `json:"subspecialist_id"` + Infra_Id *uint16 `json:"infra-id"` + Unit_Id *uint16 `json:"unit-id"` + Specialist_Id *uint16 `json:"specialist-id"` + Subspecialist_Id *uint16 `json:"subspecialist-id"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/sbar/dto.go b/internal/domain/main-entities/sbar/dto.go index 40f992e4..4e3317a8 100644 --- a/internal/domain/main-entities/sbar/dto.go +++ b/internal/domain/main-entities/sbar/dto.go @@ -27,8 +27,8 @@ type ReadListDto struct { } type FilterDto struct { - Encounter_Id *uint `json:"encounter_id"` - Employee_Id *uint `json:"employee_id"` + Encounter_Id *uint `json:"encounter-id"` + Employee_Id *uint `json:"employee-id"` Time *time.Time `json:"time"` Value *string `json:"value"` } diff --git a/internal/domain/main-entities/soapi/dto.go b/internal/domain/main-entities/soapi/dto.go index b2830d32..2a431942 100644 --- a/internal/domain/main-entities/soapi/dto.go +++ b/internal/domain/main-entities/soapi/dto.go @@ -30,8 +30,8 @@ type ReadListDto struct { } type FilterDto struct { - Encounter_Id *uint `json:"encounter_id"` - Employee_Id *uint `json:"employee_id"` + Encounter_Id *uint `json:"encounter-id"` + Employee_Id *uint `json:"employee-id"` Time *time.Time `json:"time"` TypeCode erc.SoapiTypeCode `json:"typeCode"` Value *string `json:"value"` diff --git a/internal/domain/main-entities/specialist-intern/dto.go b/internal/domain/main-entities/specialist-intern/dto.go index 46563c8d..1090793c 100644 --- a/internal/domain/main-entities/specialist-intern/dto.go +++ b/internal/domain/main-entities/specialist-intern/dto.go @@ -23,10 +23,10 @@ type ReadListDto struct { } type FilterDto struct { - Person_Id *uint `json:"person_id"` - Specialist_Id *uint16 `json:"specialist_id"` - Subspecialist_Id *uint16 `json:"subspecialist_id"` - User_Id *uint `json:"user_id"` + Person_Id *uint `json:"person-id"` + Specialist_Id *uint16 `json:"specialist-id"` + Subspecialist_Id *uint16 `json:"subspecialist-id"` + User_Id *uint `json:"user-id"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/specialist/dto.go b/internal/domain/main-entities/specialist/dto.go index 2ab153bb..a7dc48e9 100644 --- a/internal/domain/main-entities/specialist/dto.go +++ b/internal/domain/main-entities/specialist/dto.go @@ -21,7 +21,7 @@ type ReadListDto struct { type FilterDto struct { Code string `json:"code"` Name string `json:"name"` - Unit_Id *uint16 `json:"unit_id"` + Unit_Id *uint16 `json:"unit-id"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/subspecialist/dto.go b/internal/domain/main-entities/subspecialist/dto.go index 41073313..1a98906f 100644 --- a/internal/domain/main-entities/subspecialist/dto.go +++ b/internal/domain/main-entities/subspecialist/dto.go @@ -21,7 +21,7 @@ type ReadListDto struct { type FilterDto struct { Code *string `json:"code"` Name *string `json:"name"` - Specialist_Id *uint16 `json:"specialist_id"` + Specialist_Id *uint16 `json:"specialist-id"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/unit/dto.go b/internal/domain/main-entities/unit/dto.go index bf589aa5..6f11f849 100644 --- a/internal/domain/main-entities/unit/dto.go +++ b/internal/domain/main-entities/unit/dto.go @@ -20,7 +20,7 @@ type ReadListDto struct { } type FilterDto struct { - Installation_Id *uint16 `json:"installation_id"` + Installation_Id *uint16 `json:"installation-id"` Code string `json:"code"` Name string `json:"name"` } diff --git a/internal/domain/main-entities/user/dto.go b/internal/domain/main-entities/user/dto.go index 62a0c587..9f948fe7 100644 --- a/internal/domain/main-entities/user/dto.go +++ b/internal/domain/main-entities/user/dto.go @@ -32,7 +32,7 @@ type CreateDto struct { type ReadListDto struct { Name string `json:"name"` - Status_Code erc.UserStatusCode `json:"status_code"` + Status_Code erc.UserStatusCode `json:"status-code"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/village/dto.go b/internal/domain/main-entities/village/dto.go index ca42f073..842a1cb6 100644 --- a/internal/domain/main-entities/village/dto.go +++ b/internal/domain/main-entities/village/dto.go @@ -11,7 +11,7 @@ type CreateDto struct { } type ReadListDto struct { - District_Code string `json:"district_code"` + District_Code string `json:"district-code"` Code string `json:"code"` Name string `json:"name"` Pagination ecore.Pagination