Merge pull request #478 from SyncrowIOT/hotfix/booking-filter

Hotfix/booking filter
This commit is contained in:
raf-dev1
2025-07-21 09:38:32 +03:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

View File

@ -3,11 +3,11 @@ import { IsNotEmpty, IsOptional, IsUUID, Matches } from 'class-validator';
export class BookingRequestDto {
@ApiProperty({
description: 'Month in MM/YYYY format',
example: '07/2025',
description: 'Month in MM-YYYY format',
example: '07-2025',
})
@IsNotEmpty()
@Matches(/^(0[1-9]|1[0-2])\/\d{4}$/, {
@Matches(/^(0[1-9]|1[0-2])\-\d{4}$/, {
message: 'Date must be in MM/YYYY format',
})
month: string;

View File

@ -51,7 +51,7 @@ export class BookingService {
}
async findAll({ month, space }: BookingRequestDto, project: string) {
const [monthNumber, year] = month.split('/').map(Number);
const [monthNumber, year] = month.split('-').map(Number);
const fromDate = new Date(year, monthNumber - 1, 1);
const toDate = new Date(year, monthNumber, 0, 23, 59, 59);
return this.bookingEntityRepository.find({