seeder
This commit is contained in:
@@ -34,15 +34,6 @@ export class DeliveryController {
|
||||
return this.deliveryService.findAllForRestaurantId(restId);
|
||||
}
|
||||
|
||||
@Get('admin/delivery-methods')
|
||||
@ApiOperation({ summary: 'Get all delivery method names' })
|
||||
@ApiOkResponse({
|
||||
description: 'List of delivery method names',
|
||||
})
|
||||
findAll() {
|
||||
return this.deliveryService.findAll();
|
||||
}
|
||||
|
||||
@UseGuards(AdminAuthGuard)
|
||||
@ApiBearerAuth()
|
||||
@Post('admin/delivery-methods/restaurant')
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { IsNumber, IsBoolean, IsOptional, IsString, Min, IsEnum } from 'class-validator';
|
||||
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
||||
import { Type } from 'class-transformer';
|
||||
import { DeliveryName } from '../interface/delivery';
|
||||
import { DeliveryMethodEnum } from '../interface/delivery';
|
||||
|
||||
export class CreateDeliveryDto {
|
||||
@ApiProperty({ example: 'dineIn', description: 'Delivery method name', enum: DeliveryName })
|
||||
@IsEnum(DeliveryName)
|
||||
name!: DeliveryName;
|
||||
@ApiProperty({ example: 'dineIn', description: 'Delivery method name', enum: DeliveryMethodEnum })
|
||||
@IsEnum(DeliveryMethodEnum)
|
||||
method!: DeliveryMethodEnum;
|
||||
|
||||
@ApiProperty({ example: 'سرو در رستوران', description: 'Delivery method title' })
|
||||
@IsString()
|
||||
@@ -41,4 +41,3 @@ export class CreateDeliveryDto {
|
||||
@Type(() => Number)
|
||||
order?: number;
|
||||
}
|
||||
|
||||
|
||||
@@ -2,4 +2,3 @@ import { PartialType } from '@nestjs/swagger';
|
||||
import { CreateDeliveryDto } from './create-delivery.dto';
|
||||
|
||||
export class UpdateDeliveryDto extends PartialType(CreateDeliveryDto) {}
|
||||
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
import { Entity, Property, Enum, ManyToOne } from '@mikro-orm/core';
|
||||
import { BaseEntity } from '../../../common/entities/base.entity';
|
||||
import { Restaurant } from '../../restaurants/entities/restaurant.entity';
|
||||
import { DeliveryName } from '../interface/delivery';
|
||||
import { DeliveryMethodEnum } from '../interface/delivery';
|
||||
|
||||
@Entity({ tableName: 'deliveries' })
|
||||
export class Delivery extends BaseEntity {
|
||||
@Property()
|
||||
title!: string;
|
||||
|
||||
@Enum(() => DeliveryName)
|
||||
name!: DeliveryName;
|
||||
@Enum(() => DeliveryMethodEnum)
|
||||
method!: DeliveryMethodEnum;
|
||||
|
||||
@ManyToOne(() => Restaurant)
|
||||
restaurant!: Restaurant;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
export enum DeliveryName {
|
||||
export enum DeliveryMethodEnum {
|
||||
DineIn = 'dineIn',
|
||||
Pickup = 'pickup',
|
||||
DeliveryCar = 'deliveryCar',
|
||||
|
||||
@@ -5,7 +5,7 @@ import { DeliveryRepository } from '../repositories/delivery.repository';
|
||||
import { CreateDeliveryDto } from '../dto/create-delivery.dto';
|
||||
import { UpdateDeliveryDto } from '../dto/update-delivery.dto';
|
||||
import { RestRepository } from '../../restaurants/repositories/rest.repository';
|
||||
import { DeliveryName } from '../interface/delivery';
|
||||
import { DeliveryMethodEnum } from '../interface/delivery';
|
||||
|
||||
@Injectable()
|
||||
export class DeliveryService {
|
||||
@@ -24,7 +24,7 @@ export class DeliveryService {
|
||||
// Check if the delivery method with the same name already exists for this restaurant
|
||||
const existing = await this.deliveryRepository.findOne({
|
||||
restaurant: { id: restId },
|
||||
name: createDto.name,
|
||||
method: createDto.method,
|
||||
});
|
||||
|
||||
if (existing) {
|
||||
@@ -33,7 +33,7 @@ export class DeliveryService {
|
||||
|
||||
const data: RequiredEntityData<Delivery> = {
|
||||
restaurant,
|
||||
name: createDto.name,
|
||||
method: createDto.method,
|
||||
title: createDto.title,
|
||||
deliveryFee: createDto.deliveryFee,
|
||||
minOrderPrice: createDto.minOrderPrice,
|
||||
@@ -75,10 +75,10 @@ export class DeliveryService {
|
||||
}
|
||||
|
||||
// If name is being updated, check for conflicts
|
||||
if (updateDto.name !== undefined && updateDto.name !== delivery.name) {
|
||||
if (updateDto.method !== undefined && updateDto.method !== delivery.method) {
|
||||
const existing = await this.deliveryRepository.findOne({
|
||||
restaurant: { id: restId },
|
||||
name: updateDto.name,
|
||||
method: updateDto.method,
|
||||
id: { $ne: deliveryId },
|
||||
});
|
||||
|
||||
@@ -106,7 +106,7 @@ export class DeliveryService {
|
||||
await this.em.removeAndFlush(delivery);
|
||||
}
|
||||
|
||||
findAll(): DeliveryName[] {
|
||||
return Object.values(DeliveryName);
|
||||
findAll(): DeliveryMethodEnum[] {
|
||||
return Object.values(DeliveryMethodEnum);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user