delivery
This commit is contained in:
@@ -8,9 +8,9 @@ export class CreateDeliveryDto {
|
||||
@IsEnum(DeliveryMethodEnum)
|
||||
method!: DeliveryMethodEnum;
|
||||
|
||||
@ApiProperty({ example: 'سرو در رستوران', description: 'Delivery method title' })
|
||||
@ApiProperty({ example: 'سرو در رستوران', description: 'Delivery method display name' })
|
||||
@IsString()
|
||||
title!: string;
|
||||
name!: string;
|
||||
|
||||
@ApiProperty({ example: 5000, description: 'Delivery fee' })
|
||||
@IsNumber()
|
||||
|
||||
@@ -5,8 +5,8 @@ import { DeliveryFeeTypeEnum, DeliveryMethodEnum } from '../interface/delivery';
|
||||
|
||||
@Entity({ tableName: 'deliveries' })
|
||||
export class Delivery extends BaseEntity {
|
||||
@Property()
|
||||
title!: string;
|
||||
@Property({ fieldName: 'title' })
|
||||
name!: string;
|
||||
|
||||
@Enum(() => DeliveryMethodEnum)
|
||||
method!: DeliveryMethodEnum;
|
||||
|
||||
@@ -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 });
|
||||
@@ -34,7 +34,7 @@ export class DeliveryService {
|
||||
const data: RequiredEntityData<Delivery> = {
|
||||
restaurant,
|
||||
method: createDto.method,
|
||||
title: createDto.title,
|
||||
name: createDto.name,
|
||||
deliveryFee: createDto.deliveryFee,
|
||||
minOrderPrice: createDto.minOrderPrice,
|
||||
description: createDto.description,
|
||||
@@ -77,7 +77,7 @@ export class DeliveryService {
|
||||
throw new NotFoundException(`روش ارسال با شناسه ${deliveryId} برای رستوران با شناسه ${restId} یافت نشد.`);
|
||||
}
|
||||
|
||||
// If name is being updated, check for conflicts
|
||||
// If method is being updated, check for conflicts
|
||||
if (updateDto.method !== undefined && updateDto.method !== delivery.method) {
|
||||
const existing = await this.deliveryRepository.findOne({
|
||||
restaurant: { id: restId },
|
||||
|
||||
Reference in New Issue
Block a user