diff --git a/go.mod b/go.mod index 18b17db3..26a41b29 100644 --- a/go.mod +++ b/go.mod @@ -11,11 +11,11 @@ require ( github.com/jackc/pgx/v5 v5.5.5 github.com/karincake/apem v0.0.17 github.com/karincake/dodol v0.0.1 - github.com/karincake/getuk v0.1.0 + github.com/karincake/getuk v0.1.1 github.com/karincake/hongkue v0.0.4 github.com/karincake/lepet v0.0.1 github.com/karincake/risoles v0.0.3 - github.com/karincake/semprit v0.0.3 + github.com/karincake/semprit v0.0.6 github.com/karincake/serabi v0.0.14 github.com/minio/minio-go/v7 v7.0.95 github.com/rs/zerolog v1.33.0 @@ -38,6 +38,7 @@ require ( github.com/jackc/puddle/v2 v2.2.1 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect + github.com/karincake/pentol v0.0.3 // indirect github.com/klauspost/compress v1.18.0 // indirect github.com/klauspost/cpuid/v2 v2.2.11 // indirect github.com/mattn/go-colorable v0.1.13 // indirect diff --git a/go.sum b/go.sum index 8f09ca78..b0534e4d 100644 --- a/go.sum +++ b/go.sum @@ -79,16 +79,18 @@ github.com/karincake/apem v0.0.17 h1:y3WXCr9GWLFFFH4Qyq/VWlWWpijHh5zpTc3Lm96twa4 github.com/karincake/apem v0.0.17/go.mod h1:cQP2sJfDrLRIiwWoaLWw/z8uAya+DWu/FpmYeinMQXM= github.com/karincake/dodol v0.0.1 h1:jUXmJh1r0Ei4fmHPZ6IUkoplW/V9d27L63JEl6zudL0= github.com/karincake/dodol v0.0.1/go.mod h1:2f1NcvkvY0J3GMUkwILNDYVvRUpz0W3lpPp/Ha/Ld24= -github.com/karincake/getuk v0.1.0 h1:jcIsASrr0UDE528GN7Ua6n9UFyRgUypsWh8Or8wzCO0= -github.com/karincake/getuk v0.1.0/go.mod h1:NVnvxSGAkQ/xuq99FzWACvY5efyKPLFla1cKB8czm7c= +github.com/karincake/getuk v0.1.1 h1:zygZ9N5tk+sWwiRSo1SmlNwcAdl+qQVxmOG6jbQ7X1g= +github.com/karincake/getuk v0.1.1/go.mod h1:NVnvxSGAkQ/xuq99FzWACvY5efyKPLFla1cKB8czm7c= github.com/karincake/hongkue v0.0.4 h1:oWthq6cDg5DvDm1Z3e7mCLOATQf+oAdtHxN9OPnCfA8= github.com/karincake/hongkue v0.0.4/go.mod h1:YVi5Lyh3DE+GRHx2OSODOr7FwvLi8U4idvcPHO7yeag= github.com/karincake/lepet v0.0.1 h1:eq/cwn5BBg0jWZ1c/MmvhFIBma0zBpVs2LwkfDOncy4= github.com/karincake/lepet v0.0.1/go.mod h1:U84w7olXO3BPJw2Hu6MBonFmJmPKaFjtyAj1HTu3z1A= +github.com/karincake/pentol v0.0.3 h1:NgiR101yZuqZjYT7LiUkOgsFS+OzUHxceBpL9RbAXeg= +github.com/karincake/pentol v0.0.3/go.mod h1:6F2jlwLkVtNuC0nW/gfdU+B9bZoiIVN+IEdB2WIlKgQ= github.com/karincake/risoles v0.0.3 h1:7VBShf2yC6NqD0PotQcb0i8Xe6mJeTRrHnE0qzKf7NU= github.com/karincake/risoles v0.0.3/go.mod h1:u4YS+rPp92ODTbGC4RUx4DxKoThnmPjBl1CNdnmKD/c= -github.com/karincake/semprit v0.0.3 h1:znleGRu73xrHk6a70+jRQgVh9VF3TAhttQz6vfgNdyM= -github.com/karincake/semprit v0.0.3/go.mod h1:nLtNmWlHkxMKG0IMzqnnfkn1L/RVYGXVW3LchfYQMu8= +github.com/karincake/semprit v0.0.6 h1:TvY9Np2jEmbGcucbxBO7GzdZ9AiIhSVe5+ki1rgoocE= +github.com/karincake/semprit v0.0.6/go.mod h1:pZ63Q2WHw3mrsRPm6LSx999tRD+N8eYzpfN/vP3aEoQ= github.com/karincake/serabi v0.0.14 h1:yK3nBLRXdoUNSUDIfbZqIQxnZ6U6Ij5QEO8d5QzZzsw= github.com/karincake/serabi v0.0.14/go.mod h1:GcnPBWb+UotDxvb/a2CKwourCEyVIL4P9+YxVmZ5zgk= github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= diff --git a/internal/domain/base-entities/core/dto.go b/internal/domain/base-entities/core/dto.go new file mode 100644 index 00000000..f0bfc6b0 --- /dev/null +++ b/internal/domain/base-entities/core/dto.go @@ -0,0 +1,7 @@ +package core + +type Pagination struct { + PageNumber int `json:"page-number"` + PageSize int `json:"page-size"` + PageNoLimit int `json:"page-no-limit"` +} diff --git a/internal/domain/main-entities/adime/dto.go b/internal/domain/main-entities/adime/dto.go index 39c48ab7..e1c67451 100644 --- a/internal/domain/main-entities/adime/dto.go +++ b/internal/domain/main-entities/adime/dto.go @@ -1,12 +1,13 @@ package adime import ( + "time" + ecore "simrs-vx/internal/domain/base-entities/core" eem "simrs-vx/internal/domain/main-entities/employee" ee "simrs-vx/internal/domain/main-entities/encounter" pa "simrs-vx/pkg/auth-helper" - "time" ) type CreateDto struct { @@ -20,8 +21,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -29,10 +31,6 @@ type FilterDto struct { Employee_Id *uint `json:"employee_id"` Time *time.Time `json:"time"` Value *string `json:"value"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/ambulatory/dto.go b/internal/domain/main-entities/ambulatory/dto.go index 68147819..4236f6bd 100644 --- a/internal/domain/main-entities/ambulatory/dto.go +++ b/internal/domain/main-entities/ambulatory/dto.go @@ -13,17 +13,14 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { Encounter_Id *uint `json:"encounter_id"` Class_Code ere.AmbulatoryClassCode `json:"class_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/appointment/dto.go b/internal/domain/main-entities/appointment/dto.go index ff91ae92..356abf5a 100644 --- a/internal/domain/main-entities/appointment/dto.go +++ b/internal/domain/main-entities/appointment/dto.go @@ -25,10 +25,7 @@ type ReadListDto struct { Person_PhoneNumber string `json:"person_phoneNumber"` PaymentMethod_Code erc.PaymentMethodCode `json:"paymentMethod_code"` RefNumber string `json:"refNumber"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/consultation/dto.go b/internal/domain/main-entities/consultation/dto.go index 1969ce4f..a13231da 100644 --- a/internal/domain/main-entities/consultation/dto.go +++ b/internal/domain/main-entities/consultation/dto.go @@ -19,18 +19,15 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { Encounter_Id *uint `json:"encounter_id"` Unit_Id *uint `json:"unit_id"` Doctor_Id *uint `json:"doctor_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/counter/dto.go b/internal/domain/main-entities/counter/dto.go index 58e1a1d0..ae2a2e18 100644 --- a/internal/domain/main-entities/counter/dto.go +++ b/internal/domain/main-entities/counter/dto.go @@ -20,10 +20,7 @@ type ReadListDto struct { Parent_Id *uint16 `json:"parent_id"` Type_Code string `json:"type_code"` Queue_Code string `json:"queue_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/device-order-item/dto.go b/internal/domain/main-entities/device-order-item/dto.go index 3added12..90c6ea2b 100644 --- a/internal/domain/main-entities/device-order-item/dto.go +++ b/internal/domain/main-entities/device-order-item/dto.go @@ -14,18 +14,15 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { DeviceOrder_Id *uint `json:"deviceOrder_id"` Device_Id *uint `json:"device_id"` Count uint8 `json:"count"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { Id uint16 `json:"id"` diff --git a/internal/domain/main-entities/device-order/dto.go b/internal/domain/main-entities/device-order/dto.go index 6d61757e..a045a096 100644 --- a/internal/domain/main-entities/device-order/dto.go +++ b/internal/domain/main-entities/device-order/dto.go @@ -20,17 +20,15 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { Encounter_Id *uint `json:"encounter_id"` Status_Code erc.DataStatusCode `json:"status_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + 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 c7a386cd..b8046c75 100644 --- a/internal/domain/main-entities/device/dto.go +++ b/internal/domain/main-entities/device/dto.go @@ -17,9 +17,10 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Search string `json:"search"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Search string `json:"search"` + Pagination ecore.Pagination } type FilterDto struct { @@ -28,10 +29,6 @@ type FilterDto struct { Uom_Code string `json:"uom_code"` Infra_Id *uint16 `json:"infra_id"` Item_Id *uint `json:"item_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/diagnose-src/dto.go b/internal/domain/main-entities/diagnose-src/dto.go index 7b11f8b8..2f135368 100644 --- a/internal/domain/main-entities/diagnose-src/dto.go +++ b/internal/domain/main-entities/diagnose-src/dto.go @@ -11,13 +11,10 @@ type CreateDto struct { } type ReadListDto struct { - Code string `json:"code"` - Name string `json:"name"` - IndName string `json:"indName"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Code string `json:"code"` + Name string `json:"name"` + IndName string `json:"indName"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/district/dto.go b/internal/domain/main-entities/district/dto.go index 57f41892..869aa9c2 100644 --- a/internal/domain/main-entities/district/dto.go +++ b/internal/domain/main-entities/district/dto.go @@ -1,6 +1,9 @@ package district -import ev "simrs-vx/internal/domain/main-entities/village" +import ( + ecore "simrs-vx/internal/domain/base-entities/core" + ev "simrs-vx/internal/domain/main-entities/village" +) type CreateDto struct { Regency_Code string `json:"regency_code" validate:"numeric;maxLength=4"` @@ -12,10 +15,7 @@ type ReadListDto struct { Regency_Code string `json:"regency_code"` Code string `json:"code"` Name string `json:"name"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/division-position/dto.go b/internal/domain/main-entities/division-position/dto.go index 592985fe..20664a7e 100644 --- a/internal/domain/main-entities/division-position/dto.go +++ b/internal/domain/main-entities/division-position/dto.go @@ -13,18 +13,15 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { Division_Id *uint16 `json:"division_id"` Code string `json:"code"` Name string `json:"name"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/division/dto.go b/internal/domain/main-entities/division/dto.go index ea45ee1d..2babaf28 100644 --- a/internal/domain/main-entities/division/dto.go +++ b/internal/domain/main-entities/division/dto.go @@ -12,19 +12,17 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Search string `json:"search"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Search string `json:"search"` + Pagination ecore.Pagination + OnlyHaveChildren bool `json:"only-have-children"` } type FilterDto struct { Code string `json:"code"` Name string `json:"name"` Parent_Id *uint16 `json:"parent_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/doctor-fee/dto.go b/internal/domain/main-entities/doctor-fee/dto.go index 9e22d4d2..c11467dd 100644 --- a/internal/domain/main-entities/doctor-fee/dto.go +++ b/internal/domain/main-entities/doctor-fee/dto.go @@ -16,8 +16,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -25,10 +26,6 @@ type FilterDto struct { FeeType_Code *ero.DoctorFeeTypeCode `json:"feeType_code"` Price *float64 `json:"price"` Item_Id *uint `json:"item_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/doctor/dto.go b/internal/domain/main-entities/doctor/dto.go index 3d744a32..b6177607 100644 --- a/internal/domain/main-entities/doctor/dto.go +++ b/internal/domain/main-entities/doctor/dto.go @@ -19,8 +19,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -30,10 +31,6 @@ type FilterDto struct { Unit_Id *uint `json:"unit_id"` Specialist_Id *uint16 `json:"specialist_id"` Subspecialist_Id *uint16 `json:"subspecialist_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/emergency/dto.go b/internal/domain/main-entities/emergency/dto.go index b98096f2..ff9041a6 100644 --- a/internal/domain/main-entities/emergency/dto.go +++ b/internal/domain/main-entities/emergency/dto.go @@ -13,17 +13,14 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { Encounter_Id *uint `json:"encounter_id"` Class_Code ere.EmergencyClassCode `json:"class_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/employee/dto.go b/internal/domain/main-entities/employee/dto.go index 762e72a4..fa0a240c 100644 --- a/internal/domain/main-entities/employee/dto.go +++ b/internal/domain/main-entities/employee/dto.go @@ -5,6 +5,7 @@ import ( ed "simrs-vx/internal/domain/main-entities/division" ep "simrs-vx/internal/domain/main-entities/person" eu "simrs-vx/internal/domain/main-entities/user" + erc "simrs-vx/internal/domain/references/common" ) @@ -18,8 +19,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -28,10 +30,6 @@ type FilterDto struct { Division_Code *string `json:"division_code"` Number *string `json:"number"` Status_Code erc.ActiveStatusCode `json:"status_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/encounter/dto.go b/internal/domain/main-entities/encounter/dto.go index a431ad4e..b0415901 100644 --- a/internal/domain/main-entities/encounter/dto.go +++ b/internal/domain/main-entities/encounter/dto.go @@ -1,6 +1,8 @@ package encounter import ( + "time" + ecore "simrs-vx/internal/domain/base-entities/core" ea "simrs-vx/internal/domain/main-entities/appointment" ed "simrs-vx/internal/domain/main-entities/doctor" @@ -8,9 +10,9 @@ import ( es "simrs-vx/internal/domain/main-entities/specialist" ess "simrs-vx/internal/domain/main-entities/subspecialist" eu "simrs-vx/internal/domain/main-entities/unit" + erc "simrs-vx/internal/domain/references/common" ere "simrs-vx/internal/domain/references/encounter" - "time" ) type CreateDto struct { @@ -31,8 +33,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -53,10 +56,6 @@ type FilterDto struct { MedicalDischargeEducation *string `json:"medicalDischargeEducation"` AdmDischargeEducation *string `json:"admDischargeEducation"` DischargeReason *string `json:"dischargeReason"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/ethnic/dto.go b/internal/domain/main-entities/ethnic/dto.go index ff0d41a4..a25ced65 100644 --- a/internal/domain/main-entities/ethnic/dto.go +++ b/internal/domain/main-entities/ethnic/dto.go @@ -10,13 +10,10 @@ type CreateDto struct { } type ReadListDto struct { - Code string `json:"code"` - Name string `json:"name"` - Search string `json:"search"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Code string `json:"code"` + Name string `json:"name"` + Search string `json:"search"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/infra/dto.go b/internal/domain/main-entities/infra/dto.go index b51937ce..33b4fe62 100644 --- a/internal/domain/main-entities/infra/dto.go +++ b/internal/domain/main-entities/infra/dto.go @@ -21,9 +21,10 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Search string `json:"search"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Search string `json:"search"` + Pagination ecore.Pagination } type FilterDto struct { @@ -32,10 +33,6 @@ type FilterDto struct { InfraGroup_Code ero.InfraGroupCode `json:"infraGroup_code"` Parent_Id *uint16 `json:"parent_id"` Item_Id *uint `json:"item_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/inpatient/dto.go b/internal/domain/main-entities/inpatient/dto.go index acf1442a..6592db69 100644 --- a/internal/domain/main-entities/inpatient/dto.go +++ b/internal/domain/main-entities/inpatient/dto.go @@ -4,6 +4,7 @@ import ( ecore "simrs-vx/internal/domain/base-entities/core" ee "simrs-vx/internal/domain/main-entities/encounter" ei "simrs-vx/internal/domain/main-entities/infra" + ere "simrs-vx/internal/domain/references/encounter" ) @@ -15,18 +16,15 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { Encounter_Id *uint `json:"encounter_id"` Class_Code ere.InpatientClassCode `json:"class_code"` Infra_Id *uint16 `json:"infra_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/installation/dto.go b/internal/domain/main-entities/installation/dto.go index 15377317..ee307677 100644 --- a/internal/domain/main-entities/installation/dto.go +++ b/internal/domain/main-entities/installation/dto.go @@ -2,6 +2,7 @@ package installation import ( ecore "simrs-vx/internal/domain/base-entities/core" + ere "simrs-vx/internal/domain/references/encounter" ) @@ -15,10 +16,7 @@ type ReadListDto struct { Code string `json:"code"` Name string `json:"name"` EncounterClass_Code ere.EncounterClassCode `json:"encounterClass_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/insurance-company/dto.go b/internal/domain/main-entities/insurance-company/dto.go index 4ca58076..b99b546e 100644 --- a/internal/domain/main-entities/insurance-company/dto.go +++ b/internal/domain/main-entities/insurance-company/dto.go @@ -15,8 +15,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -25,10 +26,6 @@ type FilterDto struct { Regency_Code *string `json:"regency_code"` Address string `json:"address"` PhoneNumber string `json:"phoneNumber"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/item-price/dto.go b/internal/domain/main-entities/item-price/dto.go index b4740788..a8ec2f55 100644 --- a/internal/domain/main-entities/item-price/dto.go +++ b/internal/domain/main-entities/item-price/dto.go @@ -14,18 +14,15 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { Item_Id *uint `json:"item_id"` Price float64 `json:"price"` InsuranceCompany_Code *string `json:"insuranceCompany_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } 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 6c364828..32844b43 100644 --- a/internal/domain/main-entities/item/dto.go +++ b/internal/domain/main-entities/item/dto.go @@ -17,8 +17,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -28,10 +29,6 @@ type FilterDto struct { Uom_Code *string `json:"uom_code"` Infra_Id *uint16 `json:"infra_id"` Stock *int `json:"stock"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/laborant/dto.go b/internal/domain/main-entities/laborant/dto.go index 85c0176e..aff95200 100644 --- a/internal/domain/main-entities/laborant/dto.go +++ b/internal/domain/main-entities/laborant/dto.go @@ -12,17 +12,14 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { Employee_Id *uint `json:"employee_id"` IHS_Number *string `json:"ihs_number"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/language/dto.go b/internal/domain/main-entities/language/dto.go index 7d2e7239..79ae648c 100644 --- a/internal/domain/main-entities/language/dto.go +++ b/internal/domain/main-entities/language/dto.go @@ -10,13 +10,10 @@ type CreateDto struct { } type ReadListDto struct { - Code string `json:"code"` - Name string `json:"name"` - Search string `json:"search"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Code string `json:"code"` + Name string `json:"name"` + Search string `json:"search"` + Pagination ecore.Pagination } 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 81882e51..91e3c52d 100644 --- a/internal/domain/main-entities/material-order-item/dto.go +++ b/internal/domain/main-entities/material-order-item/dto.go @@ -14,18 +14,15 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { MaterialOrder_Id *uint `json:"materialOrder_id"` Material_Id *uint `json:"material_id"` Count *uint16 `json:"count"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { Id uint16 `json:"id"` diff --git a/internal/domain/main-entities/material-order/dto.go b/internal/domain/main-entities/material-order/dto.go index 1c58c379..553347eb 100644 --- a/internal/domain/main-entities/material-order/dto.go +++ b/internal/domain/main-entities/material-order/dto.go @@ -20,17 +20,14 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { Encounter_Id *uint `json:"encounter_id"` Status_Code erc.DataStatusCode `json:"status_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { Id uint16 `json:"id"` diff --git a/internal/domain/main-entities/material/dto.go b/internal/domain/main-entities/material/dto.go index 627d49c1..16f6b7c7 100644 --- a/internal/domain/main-entities/material/dto.go +++ b/internal/domain/main-entities/material/dto.go @@ -18,9 +18,10 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Search string `json:"search"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Search string `json:"search"` + Pagination ecore.Pagination } type FilterDto struct { @@ -30,10 +31,6 @@ type FilterDto struct { Infra_Id *uint16 `json:"infra_id"` Stock *int `json:"stock"` Item_Id *uint `json:"item_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } 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 24aba1b8..61590ffc 100644 --- a/internal/domain/main-entities/mcu-order-item/dto.go +++ b/internal/domain/main-entities/mcu-order-item/dto.go @@ -18,8 +18,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -27,10 +28,6 @@ type FilterDto struct { McuSrc_Id *uint `json:"mcuSrc_id"` Result *string `json:"result"` Status_Code erc.DataStatusCode `json:"status_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } 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 cb250200..bfd2312a 100644 --- a/internal/domain/main-entities/mcu-order-sub-item/dto.go +++ b/internal/domain/main-entities/mcu-order-sub-item/dto.go @@ -16,8 +16,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -25,10 +26,6 @@ type FilterDto struct { McuSrc_Id *uint `json:"mcuSrc_id"` Result *string `json:"result"` Status_Code erc.DataStatusCode `json:"status_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } 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 0f76b576..75f3647f 100644 --- a/internal/domain/main-entities/mcu-order/dto.go +++ b/internal/domain/main-entities/mcu-order/dto.go @@ -27,8 +27,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -40,10 +41,6 @@ type FilterDto struct { Number uint8 `json:"number"` Temperature float64 `json:"temperature"` McuUrgencyLevel_Code ercl.McuUrgencyLevelCode `json:"mcuUrgencyLevel_code""` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } 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 03e7cf79..06ab351c 100644 --- a/internal/domain/main-entities/mcu-src-category/dto.go +++ b/internal/domain/main-entities/mcu-src-category/dto.go @@ -2,6 +2,7 @@ package division import ( ecore "simrs-vx/internal/domain/base-entities/core" + ere "simrs-vx/internal/domain/references/encounter" ) @@ -15,10 +16,7 @@ type ReadListDto struct { Code string `json:"code"` Name string `json:"name"` Scope_Code *ere.CheckupScopeCode `json:"scope_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/mcu-src/dto.go b/internal/domain/main-entities/mcu-src/dto.go index e64c0d5d..447bb64f 100644 --- a/internal/domain/main-entities/mcu-src/dto.go +++ b/internal/domain/main-entities/mcu-src/dto.go @@ -14,19 +14,16 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Search string `json:"search"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Search string `json:"search"` + Pagination ecore.Pagination } type FilterDto struct { Code string `json:"code"` Name string `json:"name"` McuSrcCategory_Code *string `json:"mcuSrcCategory_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } 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 a112b3c4..eb3a2c5b 100644 --- a/internal/domain/main-entities/mcu-sub-src/dto.go +++ b/internal/domain/main-entities/mcu-sub-src/dto.go @@ -15,19 +15,16 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Search string `json:"search"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Search string `json:"search"` + Pagination ecore.Pagination } type FilterDto struct { Code string `json:"code"` Name string `json:"name"` CheckupCategory_Code *string `json:"checkupCategory_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } 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 75836c14..357d5f1b 100644 --- a/internal/domain/main-entities/medical-action-src-item/dto.go +++ b/internal/domain/main-entities/medical-action-src-item/dto.go @@ -15,18 +15,15 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { MedicalActionSrc_Id *uint `json:"medicalActionSrc_id"` ProcedureSrc_Id *uint `json:"procedureSrc_id"` Item_Id *uint `json:"item_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } 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 6480e732..a6178e71 100644 --- a/internal/domain/main-entities/medical-action-src/dto.go +++ b/internal/domain/main-entities/medical-action-src/dto.go @@ -13,19 +13,16 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Search string `json:"search"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Search string `json:"search"` + Pagination ecore.Pagination } type FilterDto struct { Code string `json:"code"` Name string `json:"name"` Item_Id *uint `json:"item_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } 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 8d5c43e1..ffafede0 100644 --- a/internal/domain/main-entities/medication-item-dist/dto.go +++ b/internal/domain/main-entities/medication-item-dist/dto.go @@ -18,8 +18,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -27,10 +28,6 @@ type FilterDto struct { DateTime *time.Time `json:"dateTime"` Remain float64 `json:"remain"` Nurse_Id *uint `json:"nurse_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } 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 a43473d2..bf9d9f28 100644 --- a/internal/domain/main-entities/medication-item/dto.go +++ b/internal/domain/main-entities/medication-item/dto.go @@ -5,6 +5,7 @@ import ( eme "simrs-vx/internal/domain/main-entities/medication" em "simrs-vx/internal/domain/main-entities/medicine" emm "simrs-vx/internal/domain/main-entities/medicine-mix" + erc "simrs-vx/internal/domain/references/common" ) @@ -26,8 +27,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -41,10 +43,6 @@ type FilterDto struct { IsRedeemed bool `json:"isRedeemed"` Quantity float64 `json:"quantity"` Note *string `json:"note" gorm:"size:1024"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { Id uint16 `json:"id"` diff --git a/internal/domain/main-entities/medication/dto.go b/internal/domain/main-entities/medication/dto.go index 86c77b2f..0db720f4 100644 --- a/internal/domain/main-entities/medication/dto.go +++ b/internal/domain/main-entities/medication/dto.go @@ -1,12 +1,13 @@ package medication import ( + "time" + ecore "simrs-vx/internal/domain/base-entities/core" ee "simrs-vx/internal/domain/main-entities/encounter" ep "simrs-vx/internal/domain/main-entities/pharmacist" - erc "simrs-vx/internal/domain/references/common" - "time" + erc "simrs-vx/internal/domain/references/common" pa "simrs-vx/pkg/auth-helper" ) @@ -20,8 +21,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -29,10 +31,6 @@ type FilterDto struct { IssuedAt *time.Time `json:"issuedAt"` Pharmacist_Id *uint `json:"pharmacist_id"` Status_Code erc.DataStatusCode `json:"status_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { Id uint `json:"id"` diff --git a/internal/domain/main-entities/medicine-group/dto.go b/internal/domain/main-entities/medicine-group/dto.go index 88de7c21..c392e46f 100644 --- a/internal/domain/main-entities/medicine-group/dto.go +++ b/internal/domain/main-entities/medicine-group/dto.go @@ -10,12 +10,9 @@ type CreateDto struct { } type ReadListDto struct { - Code string `json:"code"` - Name string `json:"name"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Code string `json:"code"` + Name string `json:"name"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/medicine-method/dto.go b/internal/domain/main-entities/medicine-method/dto.go index 5df40a7a..337eb6e6 100644 --- a/internal/domain/main-entities/medicine-method/dto.go +++ b/internal/domain/main-entities/medicine-method/dto.go @@ -10,12 +10,9 @@ type CreateDto struct { } type ReadListDto struct { - Code string `json:"code"` - Name string `json:"name"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Code string `json:"code"` + Name string `json:"name"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/medicine-mix-item/dto.go b/internal/domain/main-entities/medicine-mix-item/dto.go index b00114c5..5c372654 100644 --- a/internal/domain/main-entities/medicine-mix-item/dto.go +++ b/internal/domain/main-entities/medicine-mix-item/dto.go @@ -14,8 +14,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -23,10 +24,6 @@ type FilterDto struct { Medicine_Id *uint `json:"medicine_id"` Dose *uint8 `json:"dose"` Note *string `json:"note" gom:"size:1024"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/medicine-mix/dto.go b/internal/domain/main-entities/medicine-mix/dto.go index 6f7cd424..8c9b2c7f 100644 --- a/internal/domain/main-entities/medicine-mix/dto.go +++ b/internal/domain/main-entities/medicine-mix/dto.go @@ -12,12 +12,9 @@ type CreateDto struct { } type ReadListDto struct { - Name string `json:"name"` - Uom_Code *string `json:"uom_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Name string `json:"name"` + Uom_Code *string `json:"uom_code"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/medicine/dto.go b/internal/domain/main-entities/medicine/dto.go index df45de8f..08352c20 100644 --- a/internal/domain/main-entities/medicine/dto.go +++ b/internal/domain/main-entities/medicine/dto.go @@ -23,9 +23,10 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Search string `json:"search"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Search string `json:"search"` + Pagination ecore.Pagination } type FilterDto struct { @@ -38,10 +39,6 @@ type FilterDto struct { Infra_Id *uint16 `json:"infra_id"` Stock *int `json:"stock"` Item_Id *uint `json:"item_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/nurse/dto.go b/internal/domain/main-entities/nurse/dto.go index f59d2ee5..4aa37c25 100644 --- a/internal/domain/main-entities/nurse/dto.go +++ b/internal/domain/main-entities/nurse/dto.go @@ -16,8 +16,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -25,10 +26,6 @@ type FilterDto struct { IHS_Number *string `json:"ihs_number"` Unit_Id *uint16 `json:"unit_id"` Infra_Id *uint16 `json:"infra_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } 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 7f8c2229..b884e413 100644 --- a/internal/domain/main-entities/nutritionist/dto.go +++ b/internal/domain/main-entities/nutritionist/dto.go @@ -12,17 +12,14 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { Employee_Id *uint `json:"employee_id"` IHS_Number *string `json:"ihs_number"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/patient/dto.go b/internal/domain/main-entities/patient/dto.go index b8630a0f..1c084a54 100644 --- a/internal/domain/main-entities/patient/dto.go +++ b/internal/domain/main-entities/patient/dto.go @@ -9,6 +9,7 @@ import ( epa "simrs-vx/internal/domain/main-entities/person-address" epc "simrs-vx/internal/domain/main-entities/person-contact" epr "simrs-vx/internal/domain/main-entities/person-relative" + erc "simrs-vx/internal/domain/references/common" ere "simrs-vx/internal/domain/references/encounter" ) @@ -25,8 +26,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -34,10 +36,6 @@ type FilterDto struct { RegisteredAt *time.Time `json:"registeredAt"` Status_Code erc.ActiveStatusCode `json:"status_code"` Number *string `json:"number"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/person-address/dto.go b/internal/domain/main-entities/person-address/dto.go index 5f5dad52..0fcd52df 100644 --- a/internal/domain/main-entities/person-address/dto.go +++ b/internal/domain/main-entities/person-address/dto.go @@ -13,9 +13,7 @@ type CreateDto struct { } type ReadListDto struct { - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/person-contact/dto.go b/internal/domain/main-entities/person-contact/dto.go index c2b684e2..577d3776 100644 --- a/internal/domain/main-entities/person-contact/dto.go +++ b/internal/domain/main-entities/person-contact/dto.go @@ -12,9 +12,7 @@ type CreateDto struct { } type ReadListDto struct { - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/person-relative/dto.go b/internal/domain/main-entities/person-relative/dto.go index deb29886..76276f92 100644 --- a/internal/domain/main-entities/person-relative/dto.go +++ b/internal/domain/main-entities/person-relative/dto.go @@ -22,8 +22,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -39,10 +40,6 @@ type FilterDto struct { Occupation_Code *erp.OcupationCode `json:"occupation_code"` Occupation_Name *string `json:"occupation_name"` Responsible bool `json:"responsible"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/person/dto.go b/internal/domain/main-entities/person/dto.go index fd38822b..b946436b 100644 --- a/internal/domain/main-entities/person/dto.go +++ b/internal/domain/main-entities/person/dto.go @@ -1,13 +1,15 @@ package person import ( + "time" + ecore "simrs-vx/internal/domain/base-entities/core" ee "simrs-vx/internal/domain/main-entities/ethnic" epa "simrs-vx/internal/domain/main-entities/person-address" epc "simrs-vx/internal/domain/main-entities/person-contact" epr "simrs-vx/internal/domain/main-entities/person-relative" + erp "simrs-vx/internal/domain/references/person" - "time" ) type CreateDto struct { @@ -30,8 +32,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -50,10 +53,6 @@ type FilterDto struct { Ocupation_Name *string `json:"occupation_name"` Ethnic_Code *string `json:"ethnic_code"` Language_Code *string `json:"language_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/pharmacist/dto.go b/internal/domain/main-entities/pharmacist/dto.go index 39ba0d85..9a42f2ca 100644 --- a/internal/domain/main-entities/pharmacist/dto.go +++ b/internal/domain/main-entities/pharmacist/dto.go @@ -12,17 +12,14 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { Employee_Id *uint `json:"employee_id"` IHS_Number *string `json:"ihs_number"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/pharmacy-company/dto.go b/internal/domain/main-entities/pharmacy-company/dto.go index 138c58ad..d28de67e 100644 --- a/internal/domain/main-entities/pharmacy-company/dto.go +++ b/internal/domain/main-entities/pharmacy-company/dto.go @@ -14,10 +14,7 @@ type ReadListDto struct { Code string `json:"code"` Name string `json:"name"` Regency_Code string `json:"regency_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/practice-schedule/dto.go b/internal/domain/main-entities/practice-schedule/dto.go index 505d793e..5ec6fd2e 100644 --- a/internal/domain/main-entities/practice-schedule/dto.go +++ b/internal/domain/main-entities/practice-schedule/dto.go @@ -15,8 +15,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -25,10 +26,6 @@ type FilterDto struct { Day_Code *erc.DayCode `json:"day_code"` StartTime *string `json:"startTime"` EndTime *string `json:"endTime"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/prescription-item/dto.go b/internal/domain/main-entities/prescription-item/dto.go index 4c278b6f..3b70394f 100644 --- a/internal/domain/main-entities/prescription-item/dto.go +++ b/internal/domain/main-entities/prescription-item/dto.go @@ -5,6 +5,7 @@ import ( em "simrs-vx/internal/domain/main-entities/medicine" emm "simrs-vx/internal/domain/main-entities/medicine-mix" ep "simrs-vx/internal/domain/main-entities/prescription" + erc "simrs-vx/internal/domain/references/common" ) @@ -24,8 +25,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -37,10 +39,6 @@ type FilterDto struct { Interval uint8 `json:"interval"` IntervalUnit_Code erc.TimeUnitCode `json:"intervalUnit_code"` Quantity float64 `json:"quantity"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { Id uint16 `json:"id"` diff --git a/internal/domain/main-entities/prescription/dto.go b/internal/domain/main-entities/prescription/dto.go index 107509e1..bc538517 100644 --- a/internal/domain/main-entities/prescription/dto.go +++ b/internal/domain/main-entities/prescription/dto.go @@ -1,12 +1,12 @@ package prescription import ( + "time" + ecore "simrs-vx/internal/domain/base-entities/core" ed "simrs-vx/internal/domain/main-entities/doctor" ee "simrs-vx/internal/domain/main-entities/encounter" - "time" - erc "simrs-vx/internal/domain/references/common" ) @@ -19,8 +19,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -28,10 +29,6 @@ type FilterDto struct { Doctor_Id *uint `json:"doctor_id"` IssuedAt *time.Time `json:"issuedAt"` Status_Code *erc.DataStatusCode `json:"status_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { Id uint `json:"id"` diff --git a/internal/domain/main-entities/procedure-src/dto.go b/internal/domain/main-entities/procedure-src/dto.go index 687fbad6..f047fba1 100644 --- a/internal/domain/main-entities/procedure-src/dto.go +++ b/internal/domain/main-entities/procedure-src/dto.go @@ -11,14 +11,11 @@ type CreateDto struct { } type ReadListDto struct { - Code string `json:"code"` - Name string `json:"name"` - IndName string `json:"indName"` - Search string `json:"search"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Code string `json:"code"` + Name string `json:"name"` + IndName string `json:"indName"` + Search string `json:"search"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/province/dto.go b/internal/domain/main-entities/province/dto.go index 5bd519a8..d2cfc1ca 100644 --- a/internal/domain/main-entities/province/dto.go +++ b/internal/domain/main-entities/province/dto.go @@ -1,17 +1,18 @@ package province +import ( + ecore "simrs-vx/internal/domain/base-entities/core" +) + type CreateDto struct { Code string `json:"code" validate:"required;minLength=2;maxLength=2"` Name string `json:"name" validate:"required;maxLength=10"` } type ReadListDto struct { - Code string `json:"code"` - Name string `json:"name"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Code string `json:"code"` + Name string `json:"name"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/regency/dto.go b/internal/domain/main-entities/regency/dto.go index 7fb7546b..e4d76df2 100644 --- a/internal/domain/main-entities/regency/dto.go +++ b/internal/domain/main-entities/regency/dto.go @@ -1,6 +1,9 @@ package regency -import ed "simrs-vx/internal/domain/main-entities/district" +import ( + ecore "simrs-vx/internal/domain/base-entities/core" + ed "simrs-vx/internal/domain/main-entities/district" +) type CreateDto struct { Province_Code string `json:"province_code" validate:"numeric;maxLength=2"` @@ -12,10 +15,7 @@ type ReadListDto struct { Province_Code string `json:"province_code"` Code string `json:"code"` Name string `json:"name"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/room/dto.go b/internal/domain/main-entities/room/dto.go index eff76d0a..acee005e 100644 --- a/internal/domain/main-entities/room/dto.go +++ b/internal/domain/main-entities/room/dto.go @@ -17,8 +17,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -26,10 +27,6 @@ type FilterDto struct { Unit_Id *uint16 `json:"unit_id"` Specialist_Id *uint16 `json:"specialist_id"` Subspecialist_Id *uint16 `json:"subspecialist_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/sbar/dto.go b/internal/domain/main-entities/sbar/dto.go index edba338c..40f992e4 100644 --- a/internal/domain/main-entities/sbar/dto.go +++ b/internal/domain/main-entities/sbar/dto.go @@ -1,12 +1,13 @@ package sbar import ( + "time" + ecore "simrs-vx/internal/domain/base-entities/core" eem "simrs-vx/internal/domain/main-entities/employee" ee "simrs-vx/internal/domain/main-entities/encounter" pa "simrs-vx/pkg/auth-helper" - "time" ) type CreateDto struct { @@ -20,8 +21,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -29,10 +31,6 @@ type FilterDto struct { Employee_Id *uint `json:"employee_id"` Time *time.Time `json:"time"` Value *string `json:"value"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/soapi/dto.go b/internal/domain/main-entities/soapi/dto.go index 172b38b2..b2830d32 100644 --- a/internal/domain/main-entities/soapi/dto.go +++ b/internal/domain/main-entities/soapi/dto.go @@ -24,8 +24,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -34,10 +35,6 @@ type FilterDto struct { Time *time.Time `json:"time"` TypeCode erc.SoapiTypeCode `json:"typeCode"` Value *string `json:"value"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/specialist-intern/dto.go b/internal/domain/main-entities/specialist-intern/dto.go index 87044ba7..46563c8d 100644 --- a/internal/domain/main-entities/specialist-intern/dto.go +++ b/internal/domain/main-entities/specialist-intern/dto.go @@ -17,8 +17,9 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Pagination ecore.Pagination } type FilterDto struct { @@ -26,10 +27,6 @@ type FilterDto struct { Specialist_Id *uint16 `json:"specialist_id"` Subspecialist_Id *uint16 `json:"subspecialist_id"` User_Id *uint `json:"user_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/specialist/dto.go b/internal/domain/main-entities/specialist/dto.go index 01b004e0..2ab153bb 100644 --- a/internal/domain/main-entities/specialist/dto.go +++ b/internal/domain/main-entities/specialist/dto.go @@ -12,19 +12,16 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Search string `json:"search"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Search string `json:"search"` + Pagination ecore.Pagination } type FilterDto struct { Code string `json:"code"` Name string `json:"name"` Unit_Id *uint16 `json:"unit_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/subspecialist/dto.go b/internal/domain/main-entities/subspecialist/dto.go index ef3178d8..41073313 100644 --- a/internal/domain/main-entities/subspecialist/dto.go +++ b/internal/domain/main-entities/subspecialist/dto.go @@ -12,19 +12,16 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Search string `json:"search"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Search string `json:"search"` + Pagination ecore.Pagination } type FilterDto struct { Code *string `json:"code"` Name *string `json:"name"` Specialist_Id *uint16 `json:"specialist_id"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/unit/dto.go b/internal/domain/main-entities/unit/dto.go index ff082dc7..bf589aa5 100644 --- a/internal/domain/main-entities/unit/dto.go +++ b/internal/domain/main-entities/unit/dto.go @@ -13,19 +13,16 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Search string `json:"search"` + Includes string `json:"includes"` + Preloads []string `json:"-"` + Search string `json:"search"` + Pagination ecore.Pagination } type FilterDto struct { Installation_Id *uint16 `json:"installation_id"` Code string `json:"code"` Name string `json:"name"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/uom/dto.go b/internal/domain/main-entities/uom/dto.go index 58ea2554..ef50ea4b 100644 --- a/internal/domain/main-entities/uom/dto.go +++ b/internal/domain/main-entities/uom/dto.go @@ -10,13 +10,10 @@ type CreateDto struct { } type ReadListDto struct { - Code string `json:"code"` - Name string `json:"name"` - Search string `json:"search"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Code string `json:"code"` + Name string `json:"name"` + Search string `json:"search"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/user/dto.go b/internal/domain/main-entities/user/dto.go index 47b50dca..62a0c587 100644 --- a/internal/domain/main-entities/user/dto.go +++ b/internal/domain/main-entities/user/dto.go @@ -1,13 +1,15 @@ package user import ( + "time" + ecore "simrs-vx/internal/domain/base-entities/core" ep "simrs-vx/internal/domain/main-entities/person" epa "simrs-vx/internal/domain/main-entities/person-address" epc "simrs-vx/internal/domain/main-entities/person-contact" + erc "simrs-vx/internal/domain/references/common" ero "simrs-vx/internal/domain/references/organization" - "time" ) type CreateDto struct { @@ -31,10 +33,7 @@ type CreateDto struct { type ReadListDto struct { Name string `json:"name"` Status_Code erc.UserStatusCode `json:"status_code"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/user/entity.go b/internal/domain/main-entities/user/entity.go index 43669663..4f7d8792 100644 --- a/internal/domain/main-entities/user/entity.go +++ b/internal/domain/main-entities/user/entity.go @@ -1,10 +1,11 @@ package user import ( + "time" + ecore "simrs-vx/internal/domain/base-entities/core" erc "simrs-vx/internal/domain/references/common" ero "simrs-vx/internal/domain/references/organization" - "time" ) type User struct { diff --git a/internal/domain/main-entities/village/dto.go b/internal/domain/main-entities/village/dto.go index 968784ee..ca42f073 100644 --- a/internal/domain/main-entities/village/dto.go +++ b/internal/domain/main-entities/village/dto.go @@ -1,5 +1,9 @@ package village +import ( + ecore "simrs-vx/internal/domain/base-entities/core" +) + type CreateDto struct { District_Code string `json:"district_code" validate:"numeric;maxLength=6"` Code string `json:"code" validate:"numeric;maxLength=10"` @@ -10,10 +14,7 @@ type ReadListDto struct { District_Code string `json:"district_code"` Code string `json:"code"` Name string `json:"name"` - - Page int `json:"page"` - PageSize int `json:"page_size"` - NoPagination int `json:"no_pagination"` + Pagination ecore.Pagination } type ReadDetailDto struct { diff --git a/internal/use-case/main-use-case/adime/case.go b/internal/use-case/main-use-case/adime/case.go index 3a4c4496..5d07ab13 100644 --- a/internal/use-case/main-use-case/adime/case.go +++ b/internal/use-case/main-use-case/adime/case.go @@ -129,12 +129,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/ambulatory/case.go b/internal/use-case/main-use-case/ambulatory/case.go index 14f6b2e5..312a9376 100644 --- a/internal/use-case/main-use-case/ambulatory/case.go +++ b/internal/use-case/main-use-case/ambulatory/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/consultation/case.go b/internal/use-case/main-use-case/consultation/case.go index 2de98916..683ece20 100644 --- a/internal/use-case/main-use-case/consultation/case.go +++ b/internal/use-case/main-use-case/consultation/case.go @@ -119,12 +119,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/counter/case.go b/internal/use-case/main-use-case/counter/case.go index bfc24194..dcf70781 100644 --- a/internal/use-case/main-use-case/counter/case.go +++ b/internal/use-case/main-use-case/counter/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/device-order-item/case.go b/internal/use-case/main-use-case/device-order-item/case.go index d4920979..11cd88ab 100644 --- a/internal/use-case/main-use-case/device-order-item/case.go +++ b/internal/use-case/main-use-case/device-order-item/case.go @@ -110,12 +110,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/device-order/case.go b/internal/use-case/main-use-case/device-order/case.go index 422c4f1a..d8f52238 100644 --- a/internal/use-case/main-use-case/device-order/case.go +++ b/internal/use-case/main-use-case/device-order/case.go @@ -141,12 +141,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/device/case.go b/internal/use-case/main-use-case/device/case.go index 5c5c9b73..3e97fe6c 100644 --- a/internal/use-case/main-use-case/device/case.go +++ b/internal/use-case/main-use-case/device/case.go @@ -112,12 +112,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/diagnose-src/case.go b/internal/use-case/main-use-case/diagnose-src/case.go index 6fc921e4..184e68a8 100644 --- a/internal/use-case/main-use-case/diagnose-src/case.go +++ b/internal/use-case/main-use-case/diagnose-src/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/district/case.go b/internal/use-case/main-use-case/district/case.go index 1770e6f2..b7a4b1a0 100644 --- a/internal/use-case/main-use-case/district/case.go +++ b/internal/use-case/main-use-case/district/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/division-position/case.go b/internal/use-case/main-use-case/division-position/case.go index 2fbb0c3b..2ab963e5 100644 --- a/internal/use-case/main-use-case/division-position/case.go +++ b/internal/use-case/main-use-case/division-position/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/division/case.go b/internal/use-case/main-use-case/division/case.go index cf37c36c..885d5724 100644 --- a/internal/use-case/main-use-case/division/case.go +++ b/internal/use-case/main-use-case/division/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/division/lib.go b/internal/use-case/main-use-case/division/lib.go index 25ccd22f..e8713508 100644 --- a/internal/use-case/main-use-case/division/lib.go +++ b/internal/use-case/main-use-case/division/lib.go @@ -55,6 +55,16 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di plh.SearchCodeOrName(input.Search, tx) + if input.OnlyHaveChildren { + tx = tx.Where(` + EXISTS ( + SELECT 1 + FROM "Division" c + WHERE c."Parent_Id" = "Division"."Id" + ) + `) + } + tx = tx. Model(&e.Division{}). Scopes(gh.Filter(input.FilterDto)). diff --git a/internal/use-case/main-use-case/doctor-fee/case.go b/internal/use-case/main-use-case/doctor-fee/case.go index cce2ae5f..6a93b57d 100644 --- a/internal/use-case/main-use-case/doctor-fee/case.go +++ b/internal/use-case/main-use-case/doctor-fee/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/doctor/case.go b/internal/use-case/main-use-case/doctor/case.go index 19088c61..e09376b7 100644 --- a/internal/use-case/main-use-case/doctor/case.go +++ b/internal/use-case/main-use-case/doctor/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/emergency/case.go b/internal/use-case/main-use-case/emergency/case.go index a21cc02c..0a9e48e7 100644 --- a/internal/use-case/main-use-case/emergency/case.go +++ b/internal/use-case/main-use-case/emergency/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/employee/case.go b/internal/use-case/main-use-case/employee/case.go index 030374f0..c68fd7cf 100644 --- a/internal/use-case/main-use-case/employee/case.go +++ b/internal/use-case/main-use-case/employee/case.go @@ -104,12 +104,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/encounter/case.go b/internal/use-case/main-use-case/encounter/case.go index 3a95e1d0..50761e11 100644 --- a/internal/use-case/main-use-case/encounter/case.go +++ b/internal/use-case/main-use-case/encounter/case.go @@ -165,12 +165,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/ethnic/case.go b/internal/use-case/main-use-case/ethnic/case.go index adf50f44..c8ca95a1 100644 --- a/internal/use-case/main-use-case/ethnic/case.go +++ b/internal/use-case/main-use-case/ethnic/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/infra/case.go b/internal/use-case/main-use-case/infra/case.go index 26f9d319..52e594a5 100644 --- a/internal/use-case/main-use-case/infra/case.go +++ b/internal/use-case/main-use-case/infra/case.go @@ -134,12 +134,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/inpatient/case.go b/internal/use-case/main-use-case/inpatient/case.go index 9c6aa963..3548a908 100644 --- a/internal/use-case/main-use-case/inpatient/case.go +++ b/internal/use-case/main-use-case/inpatient/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/installation/case.go b/internal/use-case/main-use-case/installation/case.go index 6de77882..5e1339da 100644 --- a/internal/use-case/main-use-case/installation/case.go +++ b/internal/use-case/main-use-case/installation/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/insurance-company/case.go b/internal/use-case/main-use-case/insurance-company/case.go index a981339d..3d55fa1f 100644 --- a/internal/use-case/main-use-case/insurance-company/case.go +++ b/internal/use-case/main-use-case/insurance-company/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/item-price/case.go b/internal/use-case/main-use-case/item-price/case.go index a40f9142..9c916875 100644 --- a/internal/use-case/main-use-case/item-price/case.go +++ b/internal/use-case/main-use-case/item-price/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/item/case.go b/internal/use-case/main-use-case/item/case.go index 67027fa8..be9f6b16 100644 --- a/internal/use-case/main-use-case/item/case.go +++ b/internal/use-case/main-use-case/item/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/laborant/case.go b/internal/use-case/main-use-case/laborant/case.go index 4049ff53..79a9ba32 100644 --- a/internal/use-case/main-use-case/laborant/case.go +++ b/internal/use-case/main-use-case/laborant/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/language/case.go b/internal/use-case/main-use-case/language/case.go index 142e14af..885bcfeb 100644 --- a/internal/use-case/main-use-case/language/case.go +++ b/internal/use-case/main-use-case/language/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/material-order-item/case.go b/internal/use-case/main-use-case/material-order-item/case.go index 32d7875d..b1a6f61d 100644 --- a/internal/use-case/main-use-case/material-order-item/case.go +++ b/internal/use-case/main-use-case/material-order-item/case.go @@ -118,12 +118,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/material-order/case.go b/internal/use-case/main-use-case/material-order/case.go index af93924c..558c55f6 100644 --- a/internal/use-case/main-use-case/material-order/case.go +++ b/internal/use-case/main-use-case/material-order/case.go @@ -137,12 +137,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/material/case.go b/internal/use-case/main-use-case/material/case.go index 87b8be9c..3462971c 100644 --- a/internal/use-case/main-use-case/material/case.go +++ b/internal/use-case/main-use-case/material/case.go @@ -112,12 +112,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/mcu-order-item/case.go b/internal/use-case/main-use-case/mcu-order-item/case.go index 2b1cacd1..a2149006 100644 --- a/internal/use-case/main-use-case/mcu-order-item/case.go +++ b/internal/use-case/main-use-case/mcu-order-item/case.go @@ -120,12 +120,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/mcu-order-sub-item/case.go b/internal/use-case/main-use-case/mcu-order-sub-item/case.go index 88684bff..d7fd5af5 100644 --- a/internal/use-case/main-use-case/mcu-order-sub-item/case.go +++ b/internal/use-case/main-use-case/mcu-order-sub-item/case.go @@ -120,12 +120,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/mcu-order/case.go b/internal/use-case/main-use-case/mcu-order/case.go index 77176cd9..1d3d43dc 100644 --- a/internal/use-case/main-use-case/mcu-order/case.go +++ b/internal/use-case/main-use-case/mcu-order/case.go @@ -137,12 +137,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/mcu-src-category/case.go b/internal/use-case/main-use-case/mcu-src-category/case.go index 004d97f2..c105603c 100644 --- a/internal/use-case/main-use-case/mcu-src-category/case.go +++ b/internal/use-case/main-use-case/mcu-src-category/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/mcu-src/case.go b/internal/use-case/main-use-case/mcu-src/case.go index f0e7589a..9509b219 100644 --- a/internal/use-case/main-use-case/mcu-src/case.go +++ b/internal/use-case/main-use-case/mcu-src/case.go @@ -113,12 +113,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/mcu-sub-src/case.go b/internal/use-case/main-use-case/mcu-sub-src/case.go index e977931f..1463facd 100644 --- a/internal/use-case/main-use-case/mcu-sub-src/case.go +++ b/internal/use-case/main-use-case/mcu-sub-src/case.go @@ -113,12 +113,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/medical-action-src-item/case.go b/internal/use-case/main-use-case/medical-action-src-item/case.go index 2efdca2c..74af5873 100644 --- a/internal/use-case/main-use-case/medical-action-src-item/case.go +++ b/internal/use-case/main-use-case/medical-action-src-item/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/medical-action-src/case.go b/internal/use-case/main-use-case/medical-action-src/case.go index 1c0fe565..059c15be 100644 --- a/internal/use-case/main-use-case/medical-action-src/case.go +++ b/internal/use-case/main-use-case/medical-action-src/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/medication-item-dist/case.go b/internal/use-case/main-use-case/medication-item-dist/case.go index 3c79b6a7..550cc67c 100644 --- a/internal/use-case/main-use-case/medication-item-dist/case.go +++ b/internal/use-case/main-use-case/medication-item-dist/case.go @@ -113,12 +113,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/medication-item/case.go b/internal/use-case/main-use-case/medication-item/case.go index b5c3a015..498df263 100644 --- a/internal/use-case/main-use-case/medication-item/case.go +++ b/internal/use-case/main-use-case/medication-item/case.go @@ -111,12 +111,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/medication/case.go b/internal/use-case/main-use-case/medication/case.go index c4a97373..4662f4c3 100644 --- a/internal/use-case/main-use-case/medication/case.go +++ b/internal/use-case/main-use-case/medication/case.go @@ -115,12 +115,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/medicine-group/case.go b/internal/use-case/main-use-case/medicine-group/case.go index 66fe35b8..180c6e00 100644 --- a/internal/use-case/main-use-case/medicine-group/case.go +++ b/internal/use-case/main-use-case/medicine-group/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/medicine-method/case.go b/internal/use-case/main-use-case/medicine-method/case.go index 2a672f80..012b77b0 100644 --- a/internal/use-case/main-use-case/medicine-method/case.go +++ b/internal/use-case/main-use-case/medicine-method/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/medicine-mix-item/case.go b/internal/use-case/main-use-case/medicine-mix-item/case.go index 42145947..30932664 100644 --- a/internal/use-case/main-use-case/medicine-mix-item/case.go +++ b/internal/use-case/main-use-case/medicine-mix-item/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/medicine-mix/case.go b/internal/use-case/main-use-case/medicine-mix/case.go index 13602162..c48a1e17 100644 --- a/internal/use-case/main-use-case/medicine-mix/case.go +++ b/internal/use-case/main-use-case/medicine-mix/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/medicine/case.go b/internal/use-case/main-use-case/medicine/case.go index aa970478..22e052ab 100644 --- a/internal/use-case/main-use-case/medicine/case.go +++ b/internal/use-case/main-use-case/medicine/case.go @@ -112,12 +112,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/nurse/case.go b/internal/use-case/main-use-case/nurse/case.go index 509be4dd..a683bfda 100644 --- a/internal/use-case/main-use-case/nurse/case.go +++ b/internal/use-case/main-use-case/nurse/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/nutritionist/case.go b/internal/use-case/main-use-case/nutritionist/case.go index f584f005..cc5b2163 100644 --- a/internal/use-case/main-use-case/nutritionist/case.go +++ b/internal/use-case/main-use-case/nutritionist/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/patient/case.go b/internal/use-case/main-use-case/patient/case.go index 2d874b8b..590183e4 100644 --- a/internal/use-case/main-use-case/patient/case.go +++ b/internal/use-case/main-use-case/patient/case.go @@ -143,12 +143,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/person-address/case.go b/internal/use-case/main-use-case/person-address/case.go index 1f354661..38353ae9 100644 --- a/internal/use-case/main-use-case/person-address/case.go +++ b/internal/use-case/main-use-case/person-address/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/person-contact/case.go b/internal/use-case/main-use-case/person-contact/case.go index 10bf8408..5f37388b 100644 --- a/internal/use-case/main-use-case/person-contact/case.go +++ b/internal/use-case/main-use-case/person-contact/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/person-relative/case.go b/internal/use-case/main-use-case/person-relative/case.go index ab68bbef..929d0817 100644 --- a/internal/use-case/main-use-case/person-relative/case.go +++ b/internal/use-case/main-use-case/person-relative/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/person/case.go b/internal/use-case/main-use-case/person/case.go index e0395bd9..bb8ee7fb 100644 --- a/internal/use-case/main-use-case/person/case.go +++ b/internal/use-case/main-use-case/person/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/pharmacist/case.go b/internal/use-case/main-use-case/pharmacist/case.go index cdc8503f..b8a9d063 100644 --- a/internal/use-case/main-use-case/pharmacist/case.go +++ b/internal/use-case/main-use-case/pharmacist/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/pharmacy-company/case.go b/internal/use-case/main-use-case/pharmacy-company/case.go index bf22d56d..cce54750 100644 --- a/internal/use-case/main-use-case/pharmacy-company/case.go +++ b/internal/use-case/main-use-case/pharmacy-company/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/practice-schedule/case.go b/internal/use-case/main-use-case/practice-schedule/case.go index 223d97ec..bb2be8d0 100644 --- a/internal/use-case/main-use-case/practice-schedule/case.go +++ b/internal/use-case/main-use-case/practice-schedule/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/prescription-item/case.go b/internal/use-case/main-use-case/prescription-item/case.go index c068344d..ae4c15f6 100644 --- a/internal/use-case/main-use-case/prescription-item/case.go +++ b/internal/use-case/main-use-case/prescription-item/case.go @@ -112,12 +112,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/prescription/case.go b/internal/use-case/main-use-case/prescription/case.go index ce9bc9ba..e7666dd2 100644 --- a/internal/use-case/main-use-case/prescription/case.go +++ b/internal/use-case/main-use-case/prescription/case.go @@ -113,12 +113,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/procedure-src/case.go b/internal/use-case/main-use-case/procedure-src/case.go index d7b116c0..1b91f6bb 100644 --- a/internal/use-case/main-use-case/procedure-src/case.go +++ b/internal/use-case/main-use-case/procedure-src/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/province/case.go b/internal/use-case/main-use-case/province/case.go index c8705614..50d5e7ab 100644 --- a/internal/use-case/main-use-case/province/case.go +++ b/internal/use-case/main-use-case/province/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/regency/case.go b/internal/use-case/main-use-case/regency/case.go index a0836549..c6ed4b4f 100644 --- a/internal/use-case/main-use-case/regency/case.go +++ b/internal/use-case/main-use-case/regency/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/room/case.go b/internal/use-case/main-use-case/room/case.go index c14fbbe9..36bf3aa5 100644 --- a/internal/use-case/main-use-case/room/case.go +++ b/internal/use-case/main-use-case/room/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/sbar/case.go b/internal/use-case/main-use-case/sbar/case.go index 3606bae4..e7571e75 100644 --- a/internal/use-case/main-use-case/sbar/case.go +++ b/internal/use-case/main-use-case/sbar/case.go @@ -129,12 +129,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/soapi/case.go b/internal/use-case/main-use-case/soapi/case.go index 46e64e71..b589e946 100644 --- a/internal/use-case/main-use-case/soapi/case.go +++ b/internal/use-case/main-use-case/soapi/case.go @@ -129,12 +129,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/specialist-intern/case.go b/internal/use-case/main-use-case/specialist-intern/case.go index ad71627b..0a189e3d 100644 --- a/internal/use-case/main-use-case/specialist-intern/case.go +++ b/internal/use-case/main-use-case/specialist-intern/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/specialist/case.go b/internal/use-case/main-use-case/specialist/case.go index 1ede6556..91e06eb3 100644 --- a/internal/use-case/main-use-case/specialist/case.go +++ b/internal/use-case/main-use-case/specialist/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/subspecialist/case.go b/internal/use-case/main-use-case/subspecialist/case.go index 66df538b..5e633047 100644 --- a/internal/use-case/main-use-case/subspecialist/case.go +++ b/internal/use-case/main-use-case/subspecialist/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/unit/case.go b/internal/use-case/main-use-case/unit/case.go index beb91f7b..2c07bed7 100644 --- a/internal/use-case/main-use-case/unit/case.go +++ b/internal/use-case/main-use-case/unit/case.go @@ -109,12 +109,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/uom/case.go b/internal/use-case/main-use-case/uom/case.go index 786d4b7e..29c4516b 100644 --- a/internal/use-case/main-use-case/uom/case.go +++ b/internal/use-case/main-use-case/uom/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/user/case.go b/internal/use-case/main-use-case/user/case.go index ae1e8464..f33286bb 100644 --- a/internal/use-case/main-use-case/user/case.go +++ b/internal/use-case/main-use-case/user/case.go @@ -220,12 +220,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil diff --git a/internal/use-case/main-use-case/village/case.go b/internal/use-case/main-use-case/village/case.go index dbdeb33d..787fdb12 100644 --- a/internal/use-case/main-use-case/village/case.go +++ b/internal/use-case/main-use-case/village/case.go @@ -106,12 +106,13 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return &d.Data{ Meta: d.IS{ - "source": source, - "structure": "list-data", - "status": "fetched", - "page_number": strconv.Itoa(metaList.PageNumber), - "page_size": strconv.Itoa(metaList.PageSize), - "record_totalCount": strconv.Itoa(metaList.Count), + "source": source, + "structure": "list-data", + "status": "fetched", + "page_number": strconv.Itoa(metaList.PageNumber), + "page_size": strconv.Itoa(metaList.PageSize), + "record_totalCount": strconv.Itoa(metaList.Count), + "record_currentCount": strconv.Itoa(len(dataList)), }, Data: e.ToResponseList(dataList), }, nil