diff --git a/src/order/dto/order-delivery.dto.ts b/src/order/dto/order-delivery.dto.ts index d56b979..dd4df81 100644 --- a/src/order/dto/order-delivery.dto.ts +++ b/src/order/dto/order-delivery.dto.ts @@ -78,18 +78,18 @@ export class OrderDeliveryDTO { obj, }: { obj: { - adress?: { - adress?: string; + address?: { + address?: string; zipCode?: string; additionalInformation?: string; referencePoint?: string; }; }; }) => ({ - adress: obj.adress?.adress, - zipCode: obj.adress?.zipCode, - additionalInformation: obj.adress?.additionalInformation, - referencePoint: obj.adress?.referencePoint, + adress: obj.address?.address, + zipCode: obj.address?.zipCode, + additionalInformation: obj.address?.additionalInformation, + referencePoint: obj.address?.referencePoint, }), { toClassOnly: true }, ) diff --git a/src/order/order.service.ts b/src/order/order.service.ts index da2f6e4..76b18b8 100644 --- a/src/order/order.service.ts +++ b/src/order/order.service.ts @@ -182,12 +182,12 @@ export class OrderService { .createQueryBuilder('delivery') .leftJoinAndSelect('delivery.order', 'order') .leftJoinAndSelect('order.user', 'orderUser') - .leftJoinAndSelect('delivery.adress', 'adress') - .leftJoinAndSelect('delivery.branch', 'branch') - .leftJoinAndSelect('delivery.employee', 'employee') - .leftJoinAndSelect('adress.city', 'city') + .leftJoinAndSelect('delivery.address', 'address') + .leftJoinAndSelect('address.city', 'city') .leftJoinAndSelect('city.state', 'state') .leftJoinAndSelect('state.country', 'country') + .leftJoinAndSelect('delivery.branch', 'branch') + .leftJoinAndSelect('delivery.employee', 'employee') .where('delivery.deletedAt IS NULL'); if (user.role !== UserRole.ADMIN) {