ammar/backend
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/backend.git synced 2025-11-26 08:34:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor error handling in controllers and services

Browse Source
This commit is contained in:
faris Aljohari
2024-04-14 11:28:52 +03:00
parent 53628236a6
commit d92ae03eac
10 changed files with 287 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/building/controllers/building.controller.ts
View File

@ -35,7 +35,7 @@ export class BuildingController {
} catch (error) {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
@ -49,16 +49,12 @@ export class BuildingController {
await this.buildingService.getBuildingByUuid(buildingUuid);
return building;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Building not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@ -74,16 +70,12 @@ export class BuildingController {
);
return building;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Building not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@Get('parent/:buildingUuid')
@ -93,16 +85,12 @@ export class BuildingController {
await this.buildingService.getBuildingParentByUuid(buildingUuid);
return building;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Building not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@Put('rename/:buildingUuid')
@ -117,9 +105,6 @@ export class BuildingController {
);
return building;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Building not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
@ -127,4 +112,3 @@ export class BuildingController {
}
}
}
}

48
src/building/services/building.service.ts
View File

@ -55,8 +55,12 @@ export class BuildingService {
},
relations: ['spaceType'],
});
if (!building) {
throw new HttpException('Building not found', HttpStatus.NOT_FOUND);
if (
!building ||
!building.spaceType ||
building.spaceType.type !== 'building'
) {
throw new BadRequestException('Invalid building UUID');
}
return {
uuid: building.uuid,
@ -66,25 +70,26 @@ export class BuildingService {
type: building.spaceType.type,
};
} catch (err) {
throw new HttpException(
err.message,
err.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
if (err instanceof BadRequestException) {
throw err; // Re-throw BadRequestException
} else {
throw new HttpException('Building not found', HttpStatus.NOT_FOUND);
}
}
}
async getBuildingChildByUuid(
buildingUuid: string,
getBuildingChildDto: GetBuildingChildDto,
): Promise<BuildingChildInterface> {
try {
const { includeSubSpaces, page, pageSize } = getBuildingChildDto;
const space = await this.spaceRepository.findOneOrFail({
where: { uuid: buildingUuid },
relations: ['children', 'spaceType'],
});
if (space.spaceType.type !== 'building') {
throw new HttpException('Building not found', HttpStatus.NOT_FOUND);
if (!space || !space.spaceType || space.spaceType.type !== 'building') {
throw new BadRequestException('Invalid building UUID');
}
const totalCount = await this.spaceRepository.count({
@ -105,6 +110,13 @@ export class BuildingService {
totalCount,
children,
};
} catch (err) {
if (err instanceof BadRequestException) {
throw err; // Re-throw BadRequestException
} else {
throw new HttpException('Building not found', HttpStatus.NOT_FOUND);
}
}
}
private async buildHierarchy(
@ -165,10 +177,13 @@ export class BuildingService {
},
relations: ['spaceType', 'parent', 'parent.spaceType'],
});
if (!building) {
throw new HttpException('Building not found', HttpStatus.NOT_FOUND);
if (
!building ||
!building.spaceType ||
building.spaceType.type !== 'building'
) {
throw new BadRequestException('Invalid building UUID');
}
return {
uuid: building.uuid,
name: building.spaceName,
@ -180,10 +195,11 @@ export class BuildingService {
},
};
} catch (err) {
throw new HttpException(
err.message,
err.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
if (err instanceof BadRequestException) {
throw err; // Re-throw BadRequestException
} else {
throw new HttpException('Building not found', HttpStatus.NOT_FOUND);
}
}
}

18
src/community/controllers/community.controller.ts
View File

@ -35,7 +35,7 @@ export class CommunityController {
} catch (error) {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
@ -49,16 +49,12 @@ export class CommunityController {
await this.communityService.getCommunityByUuid(communityUuid);
return community;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Community not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@ -74,16 +70,12 @@ export class CommunityController {
);
return community;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Community not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@ -99,9 +91,6 @@ export class CommunityController {
);
return community;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Community not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
@ -109,4 +98,3 @@ export class CommunityController {
}
}
}
}

29
src/community/services/community.service.ts
View File

@ -53,8 +53,12 @@ export class CommunityService {
},
relations: ['spaceType'],
});
if (!community) {
throw new HttpException('Community not found', HttpStatus.NOT_FOUND);
if (
!community ||
!community.spaceType ||
community.spaceType.type !== 'community'
) {
throw new BadRequestException('Invalid community UUID');
}
return {
uuid: community.uuid,
@ -64,16 +68,18 @@ export class CommunityService {
type: community.spaceType.type,
};
} catch (err) {
throw new HttpException(
err.message,
err.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
if (err instanceof BadRequestException) {
throw err; // Re-throw BadRequestException
} else {
throw new HttpException('Community not found', HttpStatus.NOT_FOUND);
}
}
}
async getCommunityChildByUuid(
communityUuid: string,
getCommunityChildDto: GetCommunityChildDto,
): Promise<CommunityChildInterface> {
try {
const { includeSubSpaces, page, pageSize } = getCommunityChildDto;
const space = await this.spaceRepository.findOneOrFail({
@ -81,8 +87,8 @@ export class CommunityService {
relations: ['children', 'spaceType'],
});
if (space.spaceType.type !== 'community') {
throw new HttpException('Community not found', HttpStatus.NOT_FOUND);
if (!space || !space.spaceType || space.spaceType.type !== 'community') {
throw new BadRequestException('Invalid community UUID');
}
const totalCount = await this.spaceRepository.count({
where: { parent: { uuid: space.uuid } },
@ -100,6 +106,13 @@ export class CommunityService {
totalCount,
children,
};
} catch (err) {
if (err instanceof BadRequestException) {
throw err; // Re-throw BadRequestException
} else {
throw new HttpException('Community not found', HttpStatus.NOT_FOUND);
}
}
}
private async buildHierarchy(

28
src/floor/controllers/floor.controller.ts
View File

@ -25,8 +25,8 @@ import { UpdateFloorNameDto } from '../dtos/update.floor.dto';
export class FloorController {
constructor(private readonly floorService: FloorService) {}
// @ApiBearerAuth()
// @UseGuards(JwtAuthGuard)
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@Post()
async addFloor(@Body() addFloorDto: AddFloorDto) {
try {
@ -35,7 +35,7 @@ export class FloorController {
} catch (error) {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
@ -48,16 +48,12 @@ export class FloorController {
const floor = await this.floorService.getFloorByUuid(floorUuid);
return floor;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Floor not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@ -73,16 +69,12 @@ export class FloorController {
);
return floor;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Floor not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@Get('parent/:floorUuid')
@ -91,16 +83,12 @@ export class FloorController {
const floor = await this.floorService.getFloorParentByUuid(floorUuid);
return floor;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Floor not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@ -116,9 +104,6 @@ export class FloorController {
);
return floor;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Floor not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
@ -126,4 +111,3 @@ export class FloorController {
}
}
}
}

40
src/floor/services/floor.service.ts
View File

@ -53,9 +53,10 @@ export class FloorService {
},
relations: ['spaceType'],
});
if (!floor) {
throw new HttpException('Floor not found', HttpStatus.NOT_FOUND);
if (!floor || !floor.spaceType || floor.spaceType.type !== 'floor') {
throw new BadRequestException('Invalid floor UUID');
}
return {
uuid: floor.uuid,
createdAt: floor.createdAt,
@ -64,16 +65,18 @@ export class FloorService {
type: floor.spaceType.type,
};
} catch (err) {
throw new HttpException(
err.message,
err.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
if (err instanceof BadRequestException) {
throw err; // Re-throw BadRequestException
} else {
throw new HttpException('Floor not found', HttpStatus.NOT_FOUND);
}
}
}
async getFloorChildByUuid(
floorUuid: string,
getFloorChildDto: GetFloorChildDto,
): Promise<FloorChildInterface> {
try {
const { includeSubSpaces, page, pageSize } = getFloorChildDto;
const space = await this.spaceRepository.findOneOrFail({
@ -81,10 +84,9 @@ export class FloorService {
relations: ['children', 'spaceType'],
});
if (space.spaceType.type !== 'floor') {
throw new HttpException('Floor not found', HttpStatus.NOT_FOUND);
if (!space || !space.spaceType || space.spaceType.type !== 'floor') {
throw new BadRequestException('Invalid floor UUID');
}
const totalCount = await this.spaceRepository.count({
where: { parent: { uuid: space.uuid } },
});
@ -103,6 +105,13 @@ export class FloorService {
totalCount,
children,
};
} catch (err) {
if (err instanceof BadRequestException) {
throw err; // Re-throw BadRequestException
} else {
throw new HttpException('Floor not found', HttpStatus.NOT_FOUND);
}
}
}
private async buildHierarchy(
@ -163,8 +172,8 @@ export class FloorService {
},
relations: ['spaceType', 'parent', 'parent.spaceType'],
});
if (!floor) {
throw new HttpException('Floor not found', HttpStatus.NOT_FOUND);
if (!floor || !floor.spaceType || floor.spaceType.type !== 'floor') {
throw new BadRequestException('Invalid floor UUID');
}
return {
@ -178,10 +187,11 @@ export class FloorService {
},
};
} catch (err) {
throw new HttpException(
err.message,
err.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
if (err instanceof BadRequestException) {
throw err; // Re-throw BadRequestException
} else {
throw new HttpException('Floor not found', HttpStatus.NOT_FOUND);
}
}
}

18
src/room/controllers/room.controller.ts
View File

@ -33,7 +33,7 @@ export class RoomController {
} catch (error) {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
@ -46,16 +46,12 @@ export class RoomController {
const room = await this.roomService.getRoomByUuid(roomUuid);
return room;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Room not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@ -65,16 +61,12 @@ export class RoomController {
const room = await this.roomService.getRoomParentByUuid(roomUuid);
return room;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Room not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@ -90,9 +82,6 @@ export class RoomController {
);
return room;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Room not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
@ -100,4 +89,3 @@ export class RoomController {
}
}
}
}

27
src/room/services/room.service.ts
View File

@ -50,9 +50,10 @@ export class RoomService {
},
relations: ['spaceType'],
});
if (!room) {
throw new HttpException('Room not found', HttpStatus.NOT_FOUND);
if (!room || !room.spaceType || room.spaceType.type !== 'room') {
throw new BadRequestException('Invalid room UUID');
}
return {
uuid: room.uuid,
createdAt: room.createdAt,
@ -61,10 +62,11 @@ export class RoomService {
type: room.spaceType.type,
};
} catch (err) {
throw new HttpException(
err.message,
err.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
if (err instanceof BadRequestException) {
throw err; // Re-throw BadRequestException
} else {
throw new HttpException('Room not found', HttpStatus.NOT_FOUND);
}
}
}
@ -79,8 +81,8 @@ export class RoomService {
},
relations: ['spaceType', 'parent', 'parent.spaceType'],
});
if (!room) {
throw new HttpException('Room not found', HttpStatus.NOT_FOUND);
if (!room || !room.spaceType || room.spaceType.type !== 'room') {
throw new BadRequestException('Invalid room UUID');
}
return {
@ -94,10 +96,11 @@ export class RoomService {
},
};
} catch (err) {
throw new HttpException(
err.message,
err.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
if (err instanceof BadRequestException) {
throw err; // Re-throw BadRequestException
} else {
throw new HttpException('Room not found', HttpStatus.NOT_FOUND);
}
}
}
async renameRoomByUuid(

24
src/unit/controllers/unit.controller.ts
View File

@ -35,7 +35,7 @@ export class UnitController {
} catch (error) {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
@ -48,16 +48,12 @@ export class UnitController {
const unit = await this.unitService.getUnitByUuid(unitUuid);
return unit;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Unit not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@ -70,16 +66,12 @@ export class UnitController {
const unit = await this.unitService.getUnitChildByUuid(unitUuid, query);
return unit;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Unit not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@Get('parent/:unitUuid')
@ -88,16 +80,12 @@ export class UnitController {
const unit = await this.unitService.getUnitParentByUuid(unitUuid);
return unit;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Unit not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
HttpStatus.INTERNAL_SERVER_ERROR,
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
}
}
}
@ApiBearerAuth()
@UseGuards(JwtAuthGuard)
@ -113,9 +101,6 @@ export class UnitController {
);
return unit;
} catch (error) {
if (error.status === 404) {
throw new HttpException('Unit not found', HttpStatus.NOT_FOUND);
} else {
throw new HttpException(
error.message || 'Internal server error',
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
@ -123,4 +108,3 @@ export class UnitController {
}
}
}
}

39
src/unit/services/unit.service.ts
View File

@ -53,8 +53,8 @@ export class UnitService {
},
relations: ['spaceType'],
});
if (!unit) {
throw new HttpException('Unit not found', HttpStatus.NOT_FOUND);
if (!unit || !unit.spaceType || unit.spaceType.type !== 'unit') {
throw new BadRequestException('Invalid unit UUID');
}
return {
uuid: unit.uuid,
@ -64,16 +64,18 @@ export class UnitService {
type: unit.spaceType.type,
};
} catch (err) {
throw new HttpException(
err.message,
err.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
if (err instanceof BadRequestException) {
throw err; // Re-throw BadRequestException
} else {
throw new HttpException('Unit not found', HttpStatus.NOT_FOUND);
}
}
}
async getUnitChildByUuid(
unitUuid: string,
getUnitChildDto: GetUnitChildDto,
): Promise<UnitChildInterface> {
try {
const { includeSubSpaces, page, pageSize } = getUnitChildDto;
const space = await this.spaceRepository.findOneOrFail({
@ -81,8 +83,8 @@ export class UnitService {
relations: ['children', 'spaceType'],
});
if (space.spaceType.type !== 'unit') {
throw new HttpException('Unit not found', HttpStatus.NOT_FOUND);
if (!space || !space.spaceType || space.spaceType.type !== 'unit') {
throw new BadRequestException('Invalid unit UUID');
}
const totalCount = await this.spaceRepository.count({
@ -103,6 +105,13 @@ export class UnitService {
totalCount,
children,
};
} catch (err) {
if (err instanceof BadRequestException) {
throw err; // Re-throw BadRequestException
} else {
throw new HttpException('Unit not found', HttpStatus.NOT_FOUND);
}
}
}
private async buildHierarchy(
@ -165,10 +174,9 @@ export class UnitService {
},
relations: ['spaceType', 'parent', 'parent.spaceType'],
});
if (!unit) {
throw new HttpException('Unit not found', HttpStatus.NOT_FOUND);
if (!unit || !unit.spaceType || unit.spaceType.type !== 'unit') {
throw new BadRequestException('Invalid unit UUID');
}
return {
uuid: unit.uuid,
name: unit.spaceName,
@ -180,10 +188,11 @@ export class UnitService {
},
};
} catch (err) {
throw new HttpException(
err.message,
err.status || HttpStatus.INTERNAL_SERVER_ERROR,
);
if (err instanceof BadRequestException) {
throw err; // Re-throw BadRequestException
} else {
throw new HttpException('Unit not found', HttpStatus.NOT_FOUND);
}
}
}