From e468957f3d9173325f0d2b413e349e660964560d Mon Sep 17 00:00:00 2001
From: morteza-mortezai <mrtz.mrtzi.1989@gmail.com>
Date: Sat, 20 Dec 2025 16:26:15 +0330
Subject: [PATCH] update delivery entity and add min cost for distance based

---
 src/modules/delivery/dto/create-delivery.dto.ts    | 6 +++---
 src/modules/delivery/entities/delivery.entity.ts   | 5 ++---
 src/modules/delivery/providers/delivery.service.ts | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/modules/delivery/dto/create-delivery.dto.ts b/src/modules/delivery/dto/create-delivery.dto.ts
index 4821ff2..cabdb1b 100644
--- a/src/modules/delivery/dto/create-delivery.dto.ts
+++ b/src/modules/delivery/dto/create-delivery.dto.ts
@@ -41,13 +41,13 @@ export class CreateDeliveryDto {
   @IsOptional()
   @IsNumber()
   @Type(() => Number)
-  kilometerNumber?: number;
+  distanceBasedMinCost?: number;
 
-  @ApiPropertyOptional({ example: 0, description: 'Delivery fee for kilometer' })
+  @ApiPropertyOptional({ example: 0, description: 'Delivery fee per kilometer' })
   @IsOptional()
   @IsNumber()
   @Type(() => Number)
-  deliveryFeeForKilometer?: number;
+  perKilometerFee?: number;
 
   @ApiPropertyOptional({
     example: DeliveryFeeTypeEnum.FIXED,
diff --git a/src/modules/delivery/entities/delivery.entity.ts b/src/modules/delivery/entities/delivery.entity.ts
index 76cc8fe..b1ae9da 100644
--- a/src/modules/delivery/entities/delivery.entity.ts
+++ b/src/modules/delivery/entities/delivery.entity.ts
@@ -5,7 +5,6 @@ import { DeliveryFeeTypeEnum, DeliveryMethodEnum } from '../interface/delivery';
 
 @Entity({ tableName: 'deliveries' })
 export class Delivery extends BaseEntity {
-
   @Enum(() => DeliveryMethodEnum)
   method!: DeliveryMethodEnum;
 
@@ -19,10 +18,10 @@ export class Delivery extends BaseEntity {
   deliveryFeeType: DeliveryFeeTypeEnum = DeliveryFeeTypeEnum.FIXED;
 
   @Property({ type: 'decimal', precision: 10, scale: 0, default: 0 })
-  kilometerNumber: number | null = null;
+  perKilometerFee: number | null = null;
 
   @Property({ type: 'decimal', precision: 10, scale: 0, default: 0 })
-  deliveryFeeForKilometer: number | null = null;
+  distanceBasedMinCost: number | null = null;
 
   @Property({ type: 'decimal', precision: 10, scale: 0, default: 0 })
   minOrderPrice: number = 0;
diff --git a/src/modules/delivery/providers/delivery.service.ts b/src/modules/delivery/providers/delivery.service.ts
index f6f3623..001cee0 100644
--- a/src/modules/delivery/providers/delivery.service.ts
+++ b/src/modules/delivery/providers/delivery.service.ts
@@ -13,7 +13,7 @@ export class DeliveryService {
     private readonly deliveryRepository: DeliveryRepository,
     private readonly restRepository: RestRepository,
     private readonly em: EntityManager,
-  ) { }
+  ) {}
 
   async create(restId: string, createDto: CreateDeliveryDto): Promise<Delivery> {
     const restaurant = await this.restRepository.findOne({ id: restId });
@@ -40,8 +40,8 @@ export class DeliveryService {
       enabled: createDto.enabled ?? true,
       order: createDto.order ?? 0,
       deliveryFeeType: createDto.deliveryFeeType,
-      kilometerNumber: createDto.kilometerNumber,
-      deliveryFeeForKilometer: createDto.deliveryFeeForKilometer ?? 0,
+      perKilometerFee: createDto.perKilometerFee ?? null,
+      distanceBasedMinCost: createDto.distanceBasedMinCost ?? null,
     };
 
     const delivery = this.deliveryRepository.create(data);