diff --git a/src/controllers/03-customer-controller.ts b/src/controllers/03-customer-controller.ts index 95e2df6..bd3bc4d 100644 --- a/src/controllers/03-customer-controller.ts +++ b/src/controllers/03-customer-controller.ts @@ -170,10 +170,10 @@ export class CustomerController extends Controller { @Query() activeBranchOnly?: boolean, @Query() startDate?: Date, @Query() endDate?: Date, - @Query() businessType?: string, - @Query() province?: string, - @Query() district?: string, - @Query() subDistrict?: string, + @Query() businessTypeId?: string, + @Query() provinceId?: string, + @Query() districtId?: string, + @Query() subDistrictId?: string, ) { const where = { OR: queryOrNot(query, [ @@ -199,27 +199,27 @@ export class CustomerController extends Controller { branch: { some: { AND: [ - businessType + businessTypeId ? { - OR: [{ businessType: { id: businessType } }], + OR: [{ businessType: { id: businessTypeId } }], } : {}, - province + provinceId ? { - OR: [{ province: { id: province } }], + OR: [{ province: { id: provinceId } }], } : {}, - district + districtId ? { - OR: [{ district: { id: district } }], + OR: [{ district: { id: districtId } }], } : {}, - subDistrict + subDistrictId ? { - OR: [{ subDistrict: { id: subDistrict } }], + OR: [{ subDistrict: { id: subDistrictId } }], } : {}, ], @@ -630,10 +630,10 @@ export class CustomerExportController extends CustomerController { @Query() activeBranchOnly?: boolean, @Query() startDate?: Date, @Query() endDate?: Date, - @Query() businessType?: string, - @Query() province?: string, - @Query() district?: string, - @Query() subDistrict?: string, + @Query() businessTypeId?: string, + @Query() provinceId?: string, + @Query() districtId?: string, + @Query() subDistrictId?: string, ) { const ret = await this.list( req, @@ -647,10 +647,10 @@ export class CustomerExportController extends CustomerController { activeBranchOnly, startDate, endDate, - businessType, - province, - district, - subDistrict, + businessTypeId, + provinceId, + districtId, + subDistrictId, ); this.setHeader("Content-Type", "text/csv");