TRX-develop add conflict check for room name during update

Author: PKFO

src/modules/devices/devices.repository.ts

@@ -22,7 +22,7 @@ import {
   deviceTemplates,
   ServerVendor,
 } from '../drizzle/schema';
-import { eq, sql, and } from 'drizzle-orm';
+import { eq, sql, and, inArray } from 'drizzle-orm';
 import { unionAll } from 'drizzle-orm/pg-core';
 import { inferLinksForNewDevices } from '@/shared/utils/topology';
 import { interfaceLinks } from '../drizzle/schema';
@@ -36,8 +36,6 @@ export class DevicesRepository {
   private findByIdsAndProjectIdStmt;
   private deleteByIdStmt;
   private findByIdStmt;
-  private findPhysicalDevicesByProjectIdStmt;
-  private findPhysicalDevicesByIdsAndProjectIdStmt;
 
   constructor(@Inject(DRIZZLE_CONNECTION) private readonly db: AppDatabase) {
     this.findByIdsStmt = this.db.query.devices
@@ -115,17 +113,61 @@ export class DevicesRepository {
       })
       .prepare('find_device_by_id');
 
-    const inRackSql = sql`
-      (${sql.placeholder('inRack')}::boolean IS NULL)
-      OR (${devices.rackId} IS NOT NULL) = ${sql.placeholder('inRack')}::boolean
-    `;
+  }
 
-    const inRackServerSql = sql`
-      (${sql.placeholder('inRack')}::boolean IS NULL)
-      OR (${servers.rackId} IS NOT NULL) = ${sql.placeholder('inRack')}::boolean
-    `;
+  async createDeviceStack(newStack: NewDeviceStack): Promise<DeviceStack> {
+    const [createdDeviceStack] = await this.insertDeviceStackStmt.execute({
+      name: newStack.name,
+      projectId: newStack.projectId,
+    });
+
+    return createdDeviceStack;
+  }
+
+  async findDevicesByProjectId(projectId: string) {
+    return this.findManyByProjectIdStmt.execute({ projectId });
+  }
+
+  async findPhysicalDevicesByProjectId(projectId: string, inRack?: boolean) {
+    const inRackCondition =
+      inRack === undefined
+        ? undefined
+        : sql`(${devices.rackId} IS NOT NULL) = ${inRack}`;
+    const inRackServerCondition =
+      inRack === undefined
+        ? undefined
+        : sql`(${servers.rackId} IS NOT NULL) = ${inRack}`;
+
+    const devicesQuery = this.buildBaseDevicesQuery().where(
+      and(eq(devices.projectId, projectId), inRackCondition),
+    );
+    const serversQuery = this.buildBaseServersQuery().where(
+      and(eq(servers.projectId, projectId), inRackServerCondition),
+    );
 
-    const baseDevicesQuery = this.db
+    return this.db
+      .select()
+      .from(unionAll(devicesQuery, serversQuery).as('combined_devices'));
+  }
+
+  async findPhysicalDevicesByIdsAndProjectId(
+    ids: string[],
+    projectId: string,
+  ): Promise<DeviceWithRelations[]> {
+    const devicesQuery = this.buildBaseDevicesQuery().where(
+      and(eq(devices.projectId, projectId), inArray(devices.id, ids)),
+    );
+    const serversQuery = this.buildBaseServersQuery().where(
+      and(eq(servers.projectId, projectId), inArray(servers.id, ids)),
+    );
+
+    return this.db
+      .select()
+      .from(unionAll(devicesQuery, serversQuery).as('combined_devices_by_ids')) as unknown as Promise<DeviceWithRelations[]>;
+  }
+
+  private buildBaseDevicesQuery() {
+    return this.db
       .select({
         id: devices.id,
         name: devices.name,
@@ -152,8 +194,10 @@ export class DevicesRepository {
       })
       .from(devices)
       .leftJoin(deviceTemplates, eq(devices.deviceTemplateId, deviceTemplates.id));
+  }
 
-    const baseServersQuery = this.db
+  private buildBaseServersQuery() {
+    return this.db
       .select({
         id: servers.id,
         name: servers.name,
@@ -180,68 +224,6 @@ export class DevicesRepository {
       })
       .from(servers)
       .leftJoin(deviceTemplates, eq(servers.deviceTemplateId, deviceTemplates.id));
-
-    const devicesQuery = baseDevicesQuery.where(
-      and(eq(devices.projectId, sql.placeholder('projectId')), inRackSql),
-    );
-
-    const serversQuery = baseServersQuery.where(
-      and(eq(servers.projectId, sql.placeholder('projectId')), inRackServerSql),
-    );
-
-    this.findPhysicalDevicesByProjectIdStmt = this.db
-      .select()
-      .from(unionAll(devicesQuery, serversQuery).as('combined_devices'))
-      .prepare('find_physical_devices');
-
-    const devicesQueryByIds = baseDevicesQuery.where(
-      and(
-        eq(devices.projectId, sql.placeholder('projectId')),
-        sql`${devices.id} = ANY(${sql.placeholder('ids')}::uuid[])`,
-      ),
-    );
-
-    const serversQueryByIds = baseServersQuery.where(
-      and(
-        eq(servers.projectId, sql.placeholder('projectId')),
-        sql`${servers.id} = ANY(${sql.placeholder('ids')}::uuid[])`,
-      ),
-    );
-
-    this.findPhysicalDevicesByIdsAndProjectIdStmt = this.db
-      .select()
-      .from(unionAll(devicesQueryByIds, serversQueryByIds).as('combined_devices_by_ids'))
-      .prepare('find_physical_devices_by_ids_and_project_id');
-  }
-
-  async createDeviceStack(newStack: NewDeviceStack): Promise<DeviceStack> {
-    const [createdDeviceStack] = await this.insertDeviceStackStmt.execute({
-      name: newStack.name,
-      projectId: newStack.projectId,
-    });
-
-    return createdDeviceStack;
-  }
-
-  async findDevicesByProjectId(projectId: string) {
-    return this.findManyByProjectIdStmt.execute({ projectId });
-  }
-
-  async findPhysicalDevicesByProjectId(projectId: string, inRack?: boolean) {
-    return this.findPhysicalDevicesByProjectIdStmt.execute({
-      projectId,
-      inRack: inRack ?? null,
-    });
-  }
-
-  async findPhysicalDevicesByIdsAndProjectId(
-    ids: string[],
-    projectId: string,
-  ): Promise<DeviceWithRelations[]> {
-    return this.findPhysicalDevicesByIdsAndProjectIdStmt.execute({
-      ids,
-      projectId,
-    });
   }
 
   async createDevicesTransaction(

src/modules/rooms/rooms.service.ts

@@ -17,7 +17,7 @@ export class RoomsService {
   constructor(
     private readonly roomsRepository: RoomsRepository,
     private readonly racksService: RacksService,
-  ) {}
+  ) { }
 
   async createRoom(floorId: string, buildingId: string, createRoomDto: CreateRoomDto) {
     const existingRoom = await this.roomsRepository.findByNameAndBuildingId(
@@ -59,6 +59,17 @@ export class RoomsService {
   async updateRoom(roomId: string, userId: string, updateRoomDto: UpdateRoomDto) {
     const existingRoom = await this.getRoomByIdOrThrow(roomId, userId);
 
+    if (updateRoomDto.name) {
+      const room = await this.roomsRepository.findByNameAndBuildingId(
+        updateRoomDto.name,
+        existingRoom.floor.buildingId,
+      );
+
+      if (room && room.id !== existingRoom.id) {
+        throw new ConflictException('Room with the same name already exists in this building');
+      }
+    }
+    
     return await this.roomsRepository.update(existingRoom.id, {
       ...existingRoom,
       ...updateRoomDto,