Refactor middleware to guards for type checking

This commit is contained in:
faris Aljohari
2024-04-14 13:13:56 +03:00
parent d92ae03eac
commit 99aca8cf01
17 changed files with 289 additions and 361 deletions
+2 -15
View File
@@ -1,9 +1,4 @@
import {
MiddlewareConsumer,
Module,
NestModule,
RequestMethod,
} from '@nestjs/common';
import { Module } from '@nestjs/common';
import { BuildingService } from './services/building.service';
import { BuildingController } from './controllers/building.controller';
import { ConfigModule } from '@nestjs/config';
@@ -11,7 +6,6 @@ import { SpaceRepositoryModule } from '@app/common/modules/space/space.repositor
import { SpaceRepository } from '@app/common/modules/space/repositories';
import { SpaceTypeRepositoryModule } from '@app/common/modules/space-type/space.type.repository.module';
import { SpaceTypeRepository } from '@app/common/modules/space-type/repositories';
import { CheckCommunityTypeMiddleware } from 'src/middleware/CheckCommunityTypeMiddleware';
@Module({
imports: [ConfigModule, SpaceRepositoryModule, SpaceTypeRepositoryModule],
@@ -19,11 +13,4 @@ import { CheckCommunityTypeMiddleware } from 'src/middleware/CheckCommunityTypeM
providers: [BuildingService, SpaceRepository, SpaceTypeRepository],
exports: [BuildingService],
})
export class BuildingModule implements NestModule {
configure(consumer: MiddlewareConsumer) {
consumer.apply(CheckCommunityTypeMiddleware).forRoutes({
path: '/building',
method: RequestMethod.POST,
});
}
}
export class BuildingModule {}
@@ -16,6 +16,7 @@ import { JwtAuthGuard } from '../../../libs/common/src/guards/jwt.auth.guard';
import { AddBuildingDto } from '../dtos/add.building.dto';
import { GetBuildingChildDto } from '../dtos/get.building.dto';
import { UpdateBuildingNameDto } from '../dtos/update.building.dto';
import { CheckCommunityTypeGuard } from 'src/guards/community.type.guard';
@ApiTags('Building Module')
@Controller({
@@ -26,7 +27,7 @@ export class BuildingController {
constructor(private readonly buildingService: BuildingService) {}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@UseGuards(JwtAuthGuard, CheckCommunityTypeGuard)
@Post()
async addBuilding(@Body() addBuildingDto: AddBuildingDto) {
try {
+8 -1
View File
@@ -32,13 +32,20 @@ export class BuildingService {
},
});
if (!spaceType) {
throw new BadRequestException('Invalid building UUID');
}
await this.spaceRepository.save({
spaceName: addBuildingDto.buildingName,
parent: { uuid: addBuildingDto.communityUuid },
spaceType: { uuid: spaceType.uuid },
});
} catch (err) {
throw new HttpException(err.message, HttpStatus.INTERNAL_SERVER_ERROR);
if (err instanceof BadRequestException) {
throw err; // Re-throw BadRequestException
} else {
throw new HttpException('Building not found', HttpStatus.NOT_FOUND);
}
}
}