Add time rezerv

This commit is contained in:
2026-05-25 19:12:32 +03:30
parent 26c3e02d6f
commit 8263198d1e
12 changed files with 540 additions and 3 deletions
@@ -6,6 +6,7 @@ import {
Param,
Patch,
Post,
Put,
Query,
UploadedFiles,
UseGuards,
@@ -25,6 +26,7 @@ import { BusinessImagesService } from './business-images.service';
import { BusinessesService } from './businesses.service';
import { AssignBusinessOwnerDto } from './dto/assign-business-owner.dto';
import { CreateBusinessDto } from './dto/create-business.dto';
import { SetAvailabilityDto } from './dto/set-availability.dto';
import { UpdateBusinessDto } from './dto/update-business.dto';
@Controller('businesses')
@@ -55,6 +57,22 @@ export class BusinessesController {
return this.service.findMine(user.id);
}
@Get(':id/availability')
getAvailability(@Param('id') id: string) {
return this.service.getAvailability(id);
}
@Put(':id/availability')
@UseGuards(JwtAuthGuard, RolesGuard)
@Roles(UserRole.ADMIN, UserRole.BUSINESS_OWNER)
setAvailability(
@Param('id') id: string,
@Body() payload: SetAvailabilityDto,
@CurrentUser() user: AuthUser,
) {
return this.service.setAvailability(id, payload, user);
}
@Get(':id')
findOne(@Param('id') id: string): Promise<BusinessEntity> {
return this.service.findOne(id);
@@ -2,6 +2,7 @@ import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { BusinessCategoryEntity } from '../../entities/business-category.entity';
import { BusinessImageEntity } from '../../entities/business-image.entity';
import { BusinessAvailabilitySlotEntity } from '../../entities/business-availability-slot.entity';
import { BusinessEntity } from '../../entities/business.entity';
import { UserEntity } from '../../entities/user.entity';
import { AuthModule } from '../auth/auth.module';
@@ -16,6 +17,7 @@ import { BusinessesService } from './businesses.service';
BusinessCategoryEntity,
UserEntity,
BusinessImageEntity,
BusinessAvailabilitySlotEntity,
]),
AuthModule,
],
@@ -11,11 +11,14 @@ import { deleteBusinessCascade } from '../../common/utils/business-cascade.util'
import { resolveUniqueSlug, normalizeSlugInput } from '../../common/utils/slug.util';
import { BusinessImagesService } from './business-images.service';
import { BusinessCategoryEntity } from '../../entities/business-category.entity';
import { parseHmToMinute } from '../../common/utils/booking-schedule.util';
import { BusinessAvailabilitySlotEntity } from '../../entities/business-availability-slot.entity';
import { BusinessEntity } from '../../entities/business.entity';
import { UserEntity, UserRole } from '../../entities/user.entity';
import { AuthUser } from '../auth/auth.types';
import { AssignBusinessOwnerDto } from './dto/assign-business-owner.dto';
import { CreateBusinessDto } from './dto/create-business.dto';
import { SetAvailabilityDto } from './dto/set-availability.dto';
import { UpdateBusinessDto } from './dto/update-business.dto';
type FindAllFilters = {
@@ -28,6 +31,8 @@ export class BusinessesService {
constructor(
@InjectRepository(BusinessEntity)
private readonly repo: Repository<BusinessEntity>,
@InjectRepository(BusinessAvailabilitySlotEntity)
private readonly availabilityRepo: Repository<BusinessAvailabilitySlotEntity>,
@InjectRepository(BusinessCategoryEntity)
private readonly categoryRepo: Repository<BusinessCategoryEntity>,
@InjectRepository(UserEntity)
@@ -147,6 +152,52 @@ export class BusinessesService {
});
}
async getAvailability(businessId: string) {
await this.findOne(businessId);
const rows = await this.availabilityRepo.find({
where: { businessId },
order: { dayOfWeek: 'ASC', startMinute: 'ASC' },
});
return rows.map((row) => ({
id: row.id,
dayOfWeek: row.dayOfWeek,
startTime: this.minuteToHm(row.startMinute),
endTime: this.minuteToHm(row.endMinute),
}));
}
async setAvailability(
businessId: string,
dto: SetAvailabilityDto,
actor?: AuthUser,
) {
const business = await this.findOne(businessId);
this.assertCanManageAvailability(business, actor);
const entities: BusinessAvailabilitySlotEntity[] = [];
for (const slot of dto.slots) {
const startMinute = parseHmToMinute(slot.startTime);
const endMinute = parseHmToMinute(slot.endTime);
if (endMinute <= startMinute) {
throw new BadRequestException('endTime must be after startTime');
}
entities.push(
this.availabilityRepo.create({
businessId,
dayOfWeek: slot.dayOfWeek,
startMinute,
endMinute,
}),
);
}
await this.availabilityRepo.delete({ businessId });
if (entities.length) {
await this.availabilityRepo.save(entities);
}
return this.getAvailability(businessId);
}
async assignOwner(
id: string,
dto: AssignBusinessOwnerDto,
@@ -192,6 +243,27 @@ export class BusinessesService {
return normalized;
}
private minuteToHm(minute: number): string {
const h = Math.floor(minute / 60);
const m = minute % 60;
return `${String(h).padStart(2, '0')}:${String(m).padStart(2, '0')}`;
}
private assertCanManageAvailability(
business: BusinessEntity,
actor?: AuthUser,
): void {
if (!actor || actor.role === UserRole.ADMIN) {
return;
}
if (
actor.role !== UserRole.BUSINESS_OWNER ||
business.ownerId !== actor.id
) {
throw new ForbiddenException('You can only manage your own business');
}
}
private assertCanUpdateBusiness(
business: BusinessEntity,
payload: UpdateBusinessDto,
@@ -0,0 +1,39 @@
import { ApiProperty } from '@nestjs/swagger';
import { Type } from 'class-transformer';
import {
ArrayMaxSize,
IsArray,
IsInt,
IsString,
Matches,
Max,
Min,
ValidateNested,
} from 'class-validator';
export class AvailabilitySlotDto {
@ApiProperty({ description: '0=شنبه … 6=جمعه', minimum: 0, maximum: 6 })
@IsInt()
@Min(0)
@Max(6)
dayOfWeek!: number;
@ApiProperty({ example: '09:00' })
@IsString()
@Matches(/^([01]\d|2[0-3]):[0-5]\d]$/)
startTime!: string;
@ApiProperty({ example: '17:00' })
@IsString()
@Matches(/^([01]\d|2[0-3]):[0-5]\d]$/)
endTime!: string;
}
export class SetAvailabilityDto {
@ApiProperty({ type: [AvailabilitySlotDto] })
@IsArray()
@ArrayMaxSize(70)
@ValidateNested({ each: true })
@Type(() => AvailabilitySlotDto)
slots!: AvailabilitySlotDto[];
}