This commit is contained in:
2025-12-02 23:32:26 +03:30
parent 327eb9c6a9
commit be823550ad
8 changed files with 27 additions and 33 deletions
@@ -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);
}
}