SP-1830: add company name to invite user entity (#468)

* chore: remove unused imports and dead code for space link

* chore: remove unused imports and dead code

* chore: remove unused imports and dead code of tag service

.eslintrc.js

@@ -21,6 +21,7 @@ module.exports = {
     '@typescript-eslint/explicit-function-return-type': 'off',
     '@typescript-eslint/explicit-module-boundary-types': 'off',
     '@typescript-eslint/no-explicit-any': 'off',
+    "@typescript-eslint/no-unused-vars": 'warn',
   },
   settings: {
     'import/resolver': {

.github/pull_request_template.md

@@ -0,0 +1,17 @@
+<!--
+  Thanks for contributing!
+
+  Provide a description of your changes below and a general summary in the title.
+-->
+
+## Jira Ticket
+
+[SP-0000](https://syncrow.atlassian.net/browse/SP-0000)
+
+## Description
+
+<!--- Describe your changes in detail -->
+
+## How to Test
+
+<!--- Describe the created APIs / Logic -->

.gitignore

@@ -4,7 +4,7 @@
 /build
 
 #github 
-/.github
+/.github/workflows
 
 # Logs
 logs

libs/common/src/auth/services/auth.service.ts

@@ -1,5 +1,6 @@
 import { PlatformType } from '@app/common/constants/platform-type.enum';
 import { RoleType } from '@app/common/constants/role.type.enum';
+import { UserEntity } from '@app/common/modules/user/entities';
 import {
   BadRequestException,
   Injectable,
@@ -32,7 +33,7 @@ export class AuthService {
     pass: string,
     regionUuid?: string,
     platform?: PlatformType,
-  ): Promise<any> {
+  ): Promise<Omit<UserEntity, 'password'>> {
     const user = await this.userRepository.findOne({
       where: {
         email,
@@ -70,8 +71,9 @@ export class AuthService {
     }
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { password, ...result } = user;
+    // const { password, ...result } = user;
-    return result;
+    delete user.password;
+    return user;
   }
 
   async createSession(data): Promise<UserSessionEntity> {
@@ -114,6 +116,7 @@ export class AuthService {
       hasAcceptedWebAgreement: user.hasAcceptedWebAgreement,
       hasAcceptedAppAgreement: user.hasAcceptedAppAgreement,
       project: user?.project,
+      bookingPoints: user?.bookingPoints,
     };
     if (payload.googleCode) {
       const profile = await this.getProfile(payload.googleCode);

libs/common/src/constants/controller-route.ts

@@ -69,7 +69,28 @@ export class ControllerRoute {
         'Retrieve the list of all regions registered in Syncrow.';
     };
   };
+  static BOOKABLE_SPACES = class {
+    public static readonly ROUTE = 'bookable-spaces';
+    static ACTIONS = class {
+      public static readonly ADD_BOOKABLE_SPACES_SUMMARY =
+        'Add new bookable spaces';
 
+      public static readonly ADD_BOOKABLE_SPACES_DESCRIPTION =
+        'This endpoint allows you to add new bookable spaces by providing the required details.';
+
+      public static readonly GET_ALL_BOOKABLE_SPACES_SUMMARY =
+        'Get all bookable spaces';
+
+      public static readonly GET_ALL_BOOKABLE_SPACES_DESCRIPTION =
+        'This endpoint retrieves all bookable spaces.';
+
+      public static readonly UPDATE_BOOKABLE_SPACES_SUMMARY =
+        'Update existing bookable spaces';
+
+      public static readonly UPDATE_BOOKABLE_SPACES_DESCRIPTION =
+        'This endpoint allows you to update existing bookable spaces by providing the required details.';
+    };
+  };
   static COMMUNITY = class {
     public static readonly ROUTE = '/projects/:projectUuid/communities';
     static ACTIONS = class {
@@ -199,6 +220,11 @@ export class ControllerRoute {
       public static readonly UPDATE_SPACE_DESCRIPTION =
         'Updates a space by its UUID and community ID. You can update the name, parent space, and other properties. If a parent space is provided and not already a parent, its `isParent` flag will be set to true.';
 
+      public static readonly UPDATE_CHILDREN_SPACES_ORDER_OF_A_SPACE_SUMMARY =
+        'Update the order of child spaces under a specific parent space';
+      public static readonly UPDATE_CHILDREN_SPACES_ORDER_OF_A_SPACE_DESCRIPTION =
+        'Updates the order of child spaces under a specific parent space. You can provide a new order for the child spaces.';
+
       public static readonly GET_HEIRARCHY_SUMMARY = 'Get space hierarchy';
       public static readonly GET_HEIRARCHY_DESCRIPTION =
         'This endpoint retrieves the hierarchical structure of spaces under a given space ID. It returns all the child spaces nested within the specified space, organized by their parent-child relationships. ';
@@ -632,6 +658,11 @@ export class ControllerRoute {
         'Delete scenes by device uuid and switch name';
       public static readonly DELETE_SCENES_BY_SWITCH_NAME_DESCRIPTION =
         'This endpoint deletes all scenes associated with a specific switch device.';
+
+      public static readonly POPULATE_TUYA_CONST_UUID_SUMMARY =
+        'Populate Tuya const UUID';
+      public static readonly POPULATE_TUYA_CONST_UUID_DESCRIPTION =
+        'This endpoint populates the Tuya const UUID for all devices.';
     };
   };
   static DEVICE_COMMISSION = class {

libs/common/src/database/database.module.ts

@@ -25,6 +25,7 @@ import {
   InviteUserEntity,
   InviteUserSpaceEntity,
 } from '../modules/Invite-user/entities';
+import { SpaceDailyOccupancyDurationEntity } from '../modules/occupancy/entities';
 import {
   PowerClampDailyEntity,
   PowerClampHourlyEntity,
@@ -46,7 +47,6 @@ import {
   SubspaceModelProductAllocationEntity,
 } from '../modules/space-model/entities';
 import { InviteSpaceEntity } from '../modules/space/entities/invite-space.entity';
-import { SpaceLinkEntity } from '../modules/space/entities/space-link.entity';
 import { SpaceProductAllocationEntity } from '../modules/space/entities/space-product-allocation.entity';
 import { SpaceEntity } from '../modules/space/entities/space.entity';
 import { SubspaceProductAllocationEntity } from '../modules/space/entities/subspace/subspace-product-allocation.entity';
@@ -58,7 +58,7 @@ import {
   UserSpaceEntity,
 } from '../modules/user/entities';
 import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
-import { SpaceDailyOccupancyDurationEntity } from '../modules/occupancy/entities';
+import { BookableSpaceEntity } from '../modules/booking/entities';
 @Module({
   imports: [
     TypeOrmModule.forRootAsync({
@@ -87,7 +87,6 @@ import { SpaceDailyOccupancyDurationEntity } from '../modules/occupancy/entities
             PermissionTypeEntity,
             CommunityEntity,
             SpaceEntity,
-            SpaceLinkEntity,
             SubspaceEntity,
             UserSpaceEntity,
             DeviceUserPermissionEntity,
@@ -119,6 +118,7 @@ import { SpaceDailyOccupancyDurationEntity } from '../modules/occupancy/entities
             PresenceSensorDailySpaceEntity,
             AqiSpaceDailyPollutantStatsEntity,
             SpaceDailyOccupancyDurationEntity,
+            BookableSpaceEntity,
           ],
           namingStrategy: new SnakeNamingStrategy(),
           synchronize: Boolean(JSON.parse(configService.get('DB_SYNC'))),
@@ -127,8 +127,8 @@ import { SpaceDailyOccupancyDurationEntity } from '../modules/occupancy/entities
           logger: typeOrmLogger,
           extra: {
             charset: 'utf8mb4',
-            max: 20, // set pool max size
+            max: 100, // set pool max size
-            idleTimeoutMillis: 5000, // close idle clients after 5 second
+            idleTimeoutMillis: 3000, // close idle clients after 5 second
             connectionTimeoutMillis: 12_000, // return an error after 11 second if connection could not be established
             maxUses: 7500, // close (and replace) a connection after it has been used 7500 times (see below for discussion)
           },

libs/common/src/dto/pagination.request.dto.ts

@@ -1,10 +1,9 @@
-import { IsBoolean, IsDate, IsOptional } from 'class-validator';
-import { IsPageRequestParam } from '../validators/is-page-request-param.validator';
 import { ApiProperty } from '@nestjs/swagger';
-import { IsSizeRequestParam } from '../validators/is-size-request-param.validator';
 import { Transform } from 'class-transformer';
-import { parseToDate } from '../util/parseToDate';
+import { IsBoolean, IsOptional } from 'class-validator';
 import { BooleanValues } from '../constants/boolean-values.enum';
+import { IsPageRequestParam } from '../validators/is-page-request-param.validator';
+import { IsSizeRequestParam } from '../validators/is-size-request-param.validator';
 
 export class PaginationRequestGetListDto {
   @ApiProperty({
@@ -19,6 +18,7 @@ export class PaginationRequestGetListDto {
     return value.obj.includeSpaces === BooleanValues.TRUE;
   })
   public includeSpaces?: boolean = false;
+
   @IsOptional()
   @IsPageRequestParam({
     message: 'Page must be bigger than 0',
@@ -40,40 +40,4 @@ export class PaginationRequestGetListDto {
     description: 'Size request',
   })
   size?: number;
-
-  @IsOptional()
-  @ApiProperty({
-    name: 'name',
-    required: false,
-    description: 'Name to be filtered',
-  })
-  name?: string;
-
-  @ApiProperty({
-    name: 'from',
-    required: false,
-    type: Number,
-    description: `Start time in UNIX timestamp format to filter`,
-    example: 1674172800000,
-  })
-  @IsOptional()
-  @Transform(({ value }) => parseToDate(value))
-  @IsDate({
-    message: `From must be in UNIX timestamp format in order to parse to Date instance`,
-  })
-  from?: Date;
-
-  @ApiProperty({
-    name: 'to',
-    required: false,
-    type: Number,
-    description: `End time in UNIX timestamp format to filter`,
-    example: 1674259200000,
-  })
-  @IsOptional()
-  @Transform(({ value }) => parseToDate(value))
-  @IsDate({
-    message: `To must be in UNIX timestamp format in order to parse to Date instance`,
-  })
-  to?: Date;
 }

libs/common/src/firebase/devices-status/devices-status.module.ts

@@ -3,28 +3,12 @@ import { DeviceStatusFirebaseController } from './controllers/devices-status.con
 import { DeviceStatusFirebaseService } from './services/devices-status.service';
 import { DeviceRepository } from '@app/common/modules/device/repositories';
 import { DeviceStatusLogRepository } from '@app/common/modules/device-status-log/repositories/device-status.repository';
-import { PowerClampService } from '@app/common/helper/services/power.clamp.service';
-import {
-  PowerClampHourlyRepository,
-  PowerClampDailyRepository,
-  PowerClampMonthlyRepository,
-} from '@app/common/modules/power-clamp/repositories';
-import { SqlLoaderService } from '@app/common/helper/services/sql-loader.service';
-import { OccupancyService } from '@app/common/helper/services/occupancy.service';
-import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
 
 @Module({
   providers: [
     DeviceStatusFirebaseService,
     DeviceRepository,
     DeviceStatusLogRepository,
-    PowerClampService,
-    PowerClampHourlyRepository,
-    PowerClampDailyRepository,
-    PowerClampMonthlyRepository,
-    SqlLoaderService,
-    OccupancyService,
-    AqiDataService,
   ],
   controllers: [DeviceStatusFirebaseController],
   exports: [DeviceStatusFirebaseService, DeviceStatusLogRepository],

libs/common/src/firebase/devices-status/services/devices-status.service.ts

@@ -18,12 +18,6 @@ import {
   runTransaction,
 } from 'firebase/database';
 import { DeviceStatusLogRepository } from '@app/common/modules/device-status-log/repositories';
-import { ProductType } from '@app/common/constants/product-type.enum';
-import { PowerClampService } from '@app/common/helper/services/power.clamp.service';
-import { PowerClampEnergyEnum } from '@app/common/constants/power.clamp.enargy.enum';
-import { PresenceSensorEnum } from '@app/common/constants/presence.sensor.enum';
-import { OccupancyService } from '@app/common/helper/services/occupancy.service';
-import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
 @Injectable()
 export class DeviceStatusFirebaseService {
   private tuya: TuyaContext;
@@ -33,9 +27,6 @@ export class DeviceStatusFirebaseService {
   constructor(
     private readonly configService: ConfigService,
     private readonly deviceRepository: DeviceRepository,
-    private readonly powerClampService: PowerClampService,
-    private readonly occupancyService: OccupancyService,
-    private readonly aqiDataService: AqiDataService,
     private deviceStatusLogRepository: DeviceStatusLogRepository,
   ) {
     const accessKey = this.configService.get<string>('auth-config.ACCESS_KEY');
@@ -80,25 +71,94 @@ export class DeviceStatusFirebaseService {
       );
     }
   }
+  async addBatchDeviceStatusToOurDb(
+    batch: {
+      deviceTuyaUuid: string;
+      status: any;
+      log: any;
+      device: any;
+    }[],
+  ): Promise<void> {
+    const allLogs = [];
+
+    console.log(`🔁 Preparing logs from batch of ${batch.length} items...`);
+
+    for (const item of batch) {
+      const device = item.device;
+      if (!device?.uuid) {
+        console.log(`⛔ Skipped unknown device: ${item.deviceTuyaUuid}`);
+        continue;
+      }
+
+      const logs = item.log.properties.map((property) =>
+        this.deviceStatusLogRepository.create({
+          deviceId: device.uuid,
+          deviceTuyaId: item.deviceTuyaUuid,
+          productId: item.log.productId,
+          log: item.log,
+          code: property.code,
+          value: property.value,
+          eventId: item.log.dataId,
+          eventTime: new Date(property.time).toISOString(),
+        }),
+      );
+      allLogs.push(...logs);
+    }
+
+    console.log(`📝 Total logs to insert: ${allLogs.length}`);
+
+    const insertLogsPromise = (async () => {
+      const chunkSize = 300;
+      let insertedCount = 0;
+
+      for (let i = 0; i < allLogs.length; i += chunkSize) {
+        const chunk = allLogs.slice(i, i + chunkSize);
+        try {
+          const result = await this.deviceStatusLogRepository
+            .createQueryBuilder()
+            .insert()
+            .into('device-status-log') // or use DeviceStatusLogEntity
+            .values(chunk)
+            .orIgnore() // skip duplicates
+            .execute();
+
+          insertedCount += result.identifiers.length;
+          console.log(
+            `✅ Inserted ${result.identifiers.length} / ${chunk.length} logs (chunk)`,
+          );
+        } catch (error) {
+          console.error('❌ Insert error (skipped chunk):', error.message);
+        }
+      }
+
+      console.log(
+        `✅ Total logs inserted: ${insertedCount} / ${allLogs.length}`,
+      );
+    })();
+
+    await insertLogsPromise;
+  }
+
   async addDeviceStatusToFirebase(
-    addDeviceStatusDto: AddDeviceStatusDto,
+    addDeviceStatusDto: AddDeviceStatusDto & { device?: any },
   ): Promise<AddDeviceStatusDto | null> {
     try {
-      const device = await this.getDeviceByDeviceTuyaUuid(
+      let device = addDeviceStatusDto.device;
+      if (!device) {
+        device = await this.getDeviceByDeviceTuyaUuid(
           addDeviceStatusDto.deviceTuyaUuid,
         );
-
+      }
       if (device?.uuid) {
         return await this.createDeviceStatusFirebase({
           deviceUuid: device.uuid,
           ...addDeviceStatusDto,
-          productType: device.productDevice.prodType,
+          productType: device.productDevice?.prodType,
         });
       }
       // Return null if device not found or no UUID
       return null;
     } catch (error) {
-      // Handle the error silently, perhaps log it internally or ignore it
       return null;
     }
   }
@@ -112,6 +172,15 @@ export class DeviceStatusFirebaseService {
       relations: ['productDevice'],
     });
   }
+  async getAllDevices() {
+    return await this.deviceRepository.find({
+      where: {
+        isActive: true,
+      },
+      relations: ['productDevice'],
+    });
+  }
+
   async getDevicesInstructionStatus(deviceUuid: string) {
     try {
       const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
@@ -215,126 +284,6 @@ export class DeviceStatusFirebaseService {
       return existingData;
     });
 
-    if (this.isDevEnv) {
-      // Save logs to your repository
-      const newLogs = addDeviceStatusDto.log.properties.map((property) => {
-        return this.deviceStatusLogRepository.create({
-          deviceId: addDeviceStatusDto.deviceUuid,
-          deviceTuyaId: addDeviceStatusDto.deviceTuyaUuid,
-          productId: addDeviceStatusDto.log.productId,
-          log: addDeviceStatusDto.log,
-          code: property.code,
-          value: property.value,
-          eventId: addDeviceStatusDto.log.dataId,
-          eventTime: new Date(property.time).toISOString(),
-        });
-      });
-      await this.deviceStatusLogRepository.save(newLogs);
-
-      if (addDeviceStatusDto.productType === ProductType.PC) {
-        const energyCodes = new Set([
-          PowerClampEnergyEnum.ENERGY_CONSUMED,
-          PowerClampEnergyEnum.ENERGY_CONSUMED_A,
-          PowerClampEnergyEnum.ENERGY_CONSUMED_B,
-          PowerClampEnergyEnum.ENERGY_CONSUMED_C,
-        ]);
-
-        const energyStatus = addDeviceStatusDto?.log?.properties?.find(
-          (status) => energyCodes.has(status.code),
-        );
-
-        if (energyStatus) {
-          await this.powerClampService.updateEnergyConsumedHistoricalData(
-            addDeviceStatusDto.deviceUuid,
-          );
-        }
-      }
-
-      if (
-        addDeviceStatusDto.productType === ProductType.CPS ||
-        addDeviceStatusDto.productType === ProductType.WPS
-      ) {
-        const occupancyCodes = new Set([PresenceSensorEnum.PRESENCE_STATE]);
-
-        const occupancyStatus = addDeviceStatusDto?.log?.properties?.find(
-          (status) => occupancyCodes.has(status.code),
-        );
-
-        if (occupancyStatus) {
-          await this.occupancyService.updateOccupancySensorHistoricalData(
-            addDeviceStatusDto.deviceUuid,
-          );
-          await this.occupancyService.updateOccupancySensorHistoricalDurationData(
-            addDeviceStatusDto.deviceUuid,
-          );
-        }
-      }
-      if (addDeviceStatusDto.productType === ProductType.AQI) {
-        await this.aqiDataService.updateAQISensorHistoricalData(
-          addDeviceStatusDto.deviceUuid,
-        );
-      }
-    } else {
-      // Save logs to your repository
-      const newLogs = addDeviceStatusDto?.status.map((property) => {
-        return this.deviceStatusLogRepository.create({
-          deviceId: addDeviceStatusDto.deviceUuid,
-          deviceTuyaId: addDeviceStatusDto.deviceTuyaUuid,
-          productId: addDeviceStatusDto.log.productKey,
-          log: addDeviceStatusDto.log,
-          code: property.code,
-          value: property.value,
-          eventId: addDeviceStatusDto.log.dataId,
-          eventTime: new Date(property.t).toISOString(),
-        });
-      });
-      await this.deviceStatusLogRepository.save(newLogs);
-
-      if (addDeviceStatusDto.productType === ProductType.PC) {
-        const energyCodes = new Set([
-          PowerClampEnergyEnum.ENERGY_CONSUMED,
-          PowerClampEnergyEnum.ENERGY_CONSUMED_A,
-          PowerClampEnergyEnum.ENERGY_CONSUMED_B,
-          PowerClampEnergyEnum.ENERGY_CONSUMED_C,
-        ]);
-
-        const energyStatus = addDeviceStatusDto?.status?.find((status) => {
-          return energyCodes.has(status.code as PowerClampEnergyEnum);
-        });
-
-        if (energyStatus) {
-          await this.powerClampService.updateEnergyConsumedHistoricalData(
-            addDeviceStatusDto.deviceUuid,
-          );
-        }
-      }
-
-      if (
-        addDeviceStatusDto.productType === ProductType.CPS ||
-        addDeviceStatusDto.productType === ProductType.WPS
-      ) {
-        const occupancyCodes = new Set([PresenceSensorEnum.PRESENCE_STATE]);
-
-        const occupancyStatus = addDeviceStatusDto?.status?.find((status) => {
-          return occupancyCodes.has(status.code as PresenceSensorEnum);
-        });
-
-        if (occupancyStatus) {
-          await this.occupancyService.updateOccupancySensorHistoricalData(
-            addDeviceStatusDto.deviceUuid,
-          );
-          await this.occupancyService.updateOccupancySensorHistoricalDurationData(
-            addDeviceStatusDto.deviceUuid,
-          );
-        }
-      }
-
-      if (addDeviceStatusDto.productType === ProductType.AQI) {
-        await this.aqiDataService.updateAQISensorHistoricalData(
-          addDeviceStatusDto.deviceUuid,
-        );
-      }
-    }
     // Return the updated data
     const snapshot: DataSnapshot = await get(dataRef);
     return snapshot.val();

libs/common/src/helper/helper.module.ts

@@ -8,7 +8,10 @@ import { TuyaWebSocketService } from './services/tuya.web.socket.service';
 import { OneSignalService } from './services/onesignal.service';
 import { DeviceMessagesService } from './services/device.messages.service';
 import { DeviceRepositoryModule } from '../modules/device/device.repository.module';
-import { DeviceNotificationRepository } from '../modules/device/repositories';
+import {
+  DeviceNotificationRepository,
+  DeviceRepository,
+} from '../modules/device/repositories';
 import { DeviceStatusFirebaseModule } from '../firebase/devices-status/devices-status.module';
 import { CommunityPermissionService } from './services/community.permission.service';
 import { CommunityRepository } from '../modules/community/repositories';
@@ -27,6 +30,7 @@ import { SosHandlerService } from './services/sos.handler.service';
     DeviceNotificationRepository,
     CommunityRepository,
     SosHandlerService,
+    DeviceRepository,
   ],
   exports: [
     HelperHashService,

libs/common/src/helper/services/aqi.data.service.ts

@@ -1,44 +1,63 @@
-import { DeviceRepository } from '@app/common/modules/device/repositories';
 import { Injectable } from '@nestjs/common';
-import { SqlLoaderService } from './sql-loader.service';
 import { DataSource } from 'typeorm';
 import { SQL_PROCEDURES_PATH } from '@app/common/constants/sql-query-path';
+import { SqlLoaderService } from './sql-loader.service';
 
 @Injectable()
 export class AqiDataService {
   constructor(
     private readonly sqlLoader: SqlLoaderService,
     private readonly dataSource: DataSource,
-    private readonly deviceRepository: DeviceRepository,
   ) {}
-  async updateAQISensorHistoricalData(deviceUuid: string): Promise<void> {
-    try {
-      const now = new Date();
-      const dateStr = now.toLocaleDateString('en-CA'); // YYYY-MM-DD
-      const device = await this.deviceRepository.findOne({
-        where: { uuid: deviceUuid },
-        relations: ['spaceDevice'],
-      });
 
-      await this.executeProcedure(
+  async updateAQISensorHistoricalData(): Promise<void> {
-        'fact_daily_space_aqi',
+    try {
+      const { dateStr } = this.getFormattedDates();
+
+      // Execute all procedures in parallel
+      await Promise.all([
+        this.executeProcedureWithRetry(
           'proceduce_update_daily_space_aqi',
-        [dateStr, device.spaceDevice?.uuid],
+          [dateStr],
-      );
+          'fact_daily_space_aqi',
+        ),
+      ]);
     } catch (err) {
-      console.error('Failed to insert or update aqi data:', err);
+      console.error('Failed to update AQI sensor historical data:', err);
       throw err;
     }
   }
-
+  private getFormattedDates(): { dateStr: string } {
-  private async executeProcedure(
+    const now = new Date();
-    procedureFolderName: string,
+    return {
+      dateStr: now.toLocaleDateString('en-CA'), // YYYY-MM-DD
+    };
+  }
+  private async executeProcedureWithRetry(
     procedureFileName: string,
     params: (string | number | null)[],
+    folderName: string,
+    retries = 3,
   ): Promise<void> {
-    const query = this.loadQuery(procedureFolderName, procedureFileName);
+    try {
+      const query = this.loadQuery(folderName, procedureFileName);
       await this.dataSource.query(query, params);
       console.log(`Procedure ${procedureFileName} executed successfully.`);
+    } catch (err) {
+      if (retries > 0) {
+        const delayMs = 1000 * (4 - retries); // Exponential backoff
+        console.warn(`Retrying ${procedureFileName} (${retries} retries left)`);
+        await new Promise((resolve) => setTimeout(resolve, delayMs));
+        return this.executeProcedureWithRetry(
+          procedureFileName,
+          params,
+          folderName,
+          retries - 1,
+        );
+      }
+      console.error(`Failed to execute ${procedureFileName}:`, err);
+      throw err;
+    }
   }
 
   private loadQuery(folderName: string, fileName: string): string {

libs/common/src/helper/services/occupancy.service.ts

@@ -1,65 +1,68 @@
-import { DeviceRepository } from '@app/common/modules/device/repositories';
 import { Injectable } from '@nestjs/common';
-import { SqlLoaderService } from './sql-loader.service';
 import { DataSource } from 'typeorm';
 import { SQL_PROCEDURES_PATH } from '@app/common/constants/sql-query-path';
+import { SqlLoaderService } from './sql-loader.service';
 
 @Injectable()
 export class OccupancyService {
   constructor(
     private readonly sqlLoader: SqlLoaderService,
     private readonly dataSource: DataSource,
-    private readonly deviceRepository: DeviceRepository,
   ) {}
-  async updateOccupancySensorHistoricalDurationData(
-    deviceUuid: string,
-  ): Promise<void> {
-    try {
-      const now = new Date();
-      const dateStr = now.toLocaleDateString('en-CA'); // YYYY-MM-DD
-      const device = await this.deviceRepository.findOne({
-        where: { uuid: deviceUuid },
-        relations: ['spaceDevice'],
-      });
 
-      await this.executeProcedure(
+  async updateOccupancyDataProcedures(): Promise<void> {
-        'fact_daily_space_occupancy_duration',
-        'procedure_update_daily_space_occupancy_duration',
-        [dateStr, device.spaceDevice?.uuid],
-      );
-    } catch (err) {
-      console.error('Failed to insert or update occupancy duration data:', err);
-      throw err;
-    }
-  }
-  async updateOccupancySensorHistoricalData(deviceUuid: string): Promise<void> {
     try {
-      const now = new Date();
+      const { dateStr } = this.getFormattedDates();
-      const dateStr = now.toLocaleDateString('en-CA'); // YYYY-MM-DD
-      const device = await this.deviceRepository.findOne({
-        where: { uuid: deviceUuid },
-        relations: ['spaceDevice'],
-      });
 
-      await this.executeProcedure(
+      // Execute all procedures in parallel
-        'fact_space_occupancy_count',
+      await Promise.all([
+        this.executeProcedureWithRetry(
           'procedure_update_fact_space_occupancy',
-        [dateStr, device.spaceDevice?.uuid],
+          [dateStr],
-      );
+          'fact_space_occupancy_count',
+        ),
+        this.executeProcedureWithRetry(
+          'procedure_update_daily_space_occupancy_duration',
+          [dateStr],
+          'fact_daily_space_occupancy_duration',
+        ),
+      ]);
     } catch (err) {
-      console.error('Failed to insert or update occupancy data:', err);
+      console.error('Failed to update occupancy data:', err);
       throw err;
     }
   }
-
+  private getFormattedDates(): { dateStr: string } {
-  private async executeProcedure(
+    const now = new Date();
-    procedureFolderName: string,
+    return {
+      dateStr: now.toLocaleDateString('en-CA'), // YYYY-MM-DD
+    };
+  }
+  private async executeProcedureWithRetry(
     procedureFileName: string,
     params: (string | number | null)[],
+    folderName: string,
+    retries = 3,
   ): Promise<void> {
-    const query = this.loadQuery(procedureFolderName, procedureFileName);
+    try {
+      const query = this.loadQuery(folderName, procedureFileName);
       await this.dataSource.query(query, params);
       console.log(`Procedure ${procedureFileName} executed successfully.`);
+    } catch (err) {
+      if (retries > 0) {
+        const delayMs = 1000 * (4 - retries); // Exponential backoff
+        console.warn(`Retrying ${procedureFileName} (${retries} retries left)`);
+        await new Promise((resolve) => setTimeout(resolve, delayMs));
+        return this.executeProcedureWithRetry(
+          procedureFileName,
+          params,
+          folderName,
+          retries - 1,
+        );
+      }
+      console.error(`Failed to execute ${procedureFileName}:`, err);
+      throw err;
+    }
   }
 
   private loadQuery(folderName: string, fileName: string): string {

libs/common/src/helper/services/power.clamp.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
-import { SqlLoaderService } from './sql-loader.service';
 import { DataSource } from 'typeorm';
 import { SQL_PROCEDURES_PATH } from '@app/common/constants/sql-query-path';
+import { SqlLoaderService } from './sql-loader.service';
 
 @Injectable()
 export class PowerClampService {
@@ -10,48 +10,72 @@ export class PowerClampService {
     private readonly dataSource: DataSource,
   ) {}
 
-  async updateEnergyConsumedHistoricalData(deviceUuid: string): Promise<void> {
+  async updateEnergyConsumedHistoricalData(): Promise<void> {
     try {
-      const now = new Date();
+      const { dateStr, monthYear } = this.getFormattedDates();
-      const dateStr = now.toLocaleDateString('en-CA'); // YYYY-MM-DD
-      const hour = now.getHours();
-      const monthYear = now
-        .toLocaleDateString('en-US', {
-          month: '2-digit',
-          year: 'numeric',
-        })
-        .replace('/', '-'); // MM-YYYY
 
-      await this.executeProcedure(
+      // Execute all procedures in parallel
+      await Promise.all([
+        this.executeProcedureWithRetry(
           'fact_hourly_device_energy_consumed_procedure',
-        [deviceUuid, dateStr, hour],
+          [dateStr],
-      );
+          'fact_device_energy_consumed',
-
+        ),
-      await this.executeProcedure(
+        this.executeProcedureWithRetry(
           'fact_daily_device_energy_consumed_procedure',
-        [deviceUuid, dateStr],
+          [dateStr],
-      );
+          'fact_device_energy_consumed',
-
+        ),
-      await this.executeProcedure(
+        this.executeProcedureWithRetry(
           'fact_monthly_device_energy_consumed_procedure',
-        [deviceUuid, monthYear],
+          [monthYear],
-      );
+          'fact_device_energy_consumed',
+        ),
+      ]);
     } catch (err) {
-      console.error('Failed to insert or update energy data:', err);
+      console.error('Failed to update energy consumption data:', err);
       throw err;
     }
   }
 
-  private async executeProcedure(
+  private getFormattedDates(): { dateStr: string; monthYear: string } {
+    const now = new Date();
+    return {
+      dateStr: now.toLocaleDateString('en-CA'), // YYYY-MM-DD
+      monthYear: now
+        .toLocaleDateString('en-US', {
+          month: '2-digit',
+          year: 'numeric',
+        })
+        .replace('/', '-'), // MM-YYYY
+    };
+  }
+
+  private async executeProcedureWithRetry(
     procedureFileName: string,
     params: (string | number | null)[],
+    folderName: string,
+    retries = 3,
   ): Promise<void> {
-    const query = this.loadQuery(
+    try {
-      'fact_device_energy_consumed',
+      const query = this.loadQuery(folderName, procedureFileName);
-      procedureFileName,
-    );
       await this.dataSource.query(query, params);
       console.log(`Procedure ${procedureFileName} executed successfully.`);
+    } catch (err) {
+      if (retries > 0) {
+        const delayMs = 1000 * (4 - retries); // Exponential backoff
+        console.warn(`Retrying ${procedureFileName} (${retries} retries left)`);
+        await new Promise((resolve) => setTimeout(resolve, delayMs));
+        return this.executeProcedureWithRetry(
+          procedureFileName,
+          params,
+          folderName,
+          retries - 1,
+        );
+      }
+      console.error(`Failed to execute ${procedureFileName}:`, err);
+      throw err;
+    }
   }
 
   private loadQuery(folderName: string, fileName: string): string {

libs/common/src/helper/services/sos.handler.service.ts

@@ -16,21 +16,46 @@ export class SosHandlerService {
     );
   }
 
-  async handleSosEvent(devId: string, logData: any): Promise<void> {
+  async handleSosEventFirebase(device: any, logData: any): Promise<void> {
+    const sosTrueStatus = [{ code: 'sos', value: true }];
+    const sosFalseStatus = [{ code: 'sos', value: false }];
+
     try {
+      // ✅ Send true status
       await this.deviceStatusFirebaseService.addDeviceStatusToFirebase({
-        deviceTuyaUuid: devId,
+        deviceTuyaUuid: device.deviceTuyaUuid,
-        status: [{ code: 'sos', value: true }],
+        status: sosTrueStatus,
         log: logData,
+        device,
       });
 
+      await this.deviceStatusFirebaseService.addBatchDeviceStatusToOurDb([
+        {
+          deviceTuyaUuid: device.deviceTuyaUuid,
+          status: sosTrueStatus,
+          log: logData,
+          device,
+        },
+      ]);
+
+      // ✅ Schedule false status
       setTimeout(async () => {
         try {
           await this.deviceStatusFirebaseService.addDeviceStatusToFirebase({
-            deviceTuyaUuid: devId,
+            deviceTuyaUuid: device.deviceTuyaUuid,
-            status: [{ code: 'sos', value: false }],
+            status: sosFalseStatus,
             log: logData,
+            device,
           });
+
+          await this.deviceStatusFirebaseService.addBatchDeviceStatusToOurDb([
+            {
+              deviceTuyaUuid: device.deviceTuyaUuid,
+              status: sosFalseStatus,
+              log: logData,
+              device,
+            },
+          ]);
         } catch (err) {
           this.logger.error('Failed to send SOS false value', err);
         }

libs/common/src/helper/services/tuya.web.socket.service.ts

@@ -1,13 +1,24 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, OnModuleInit } from '@nestjs/common';
 import TuyaWebsocket from '../../config/tuya-web-socket-config';
 import { ConfigService } from '@nestjs/config';
 import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
 import { SosHandlerService } from './sos.handler.service';
+import * as NodeCache from 'node-cache';
 
 @Injectable()
-export class TuyaWebSocketService {
+export class TuyaWebSocketService implements OnModuleInit {
   private client: any;
   private readonly isDevEnv: boolean;
+  private readonly deviceCache = new NodeCache({ stdTTL: 7200 }); // TTL = 2 hour
+
+  private messageQueue: {
+    devId: string;
+    status: any;
+    logData: any;
+    device: any;
+  }[] = [];
+
+  private isProcessing = false;
 
   constructor(
     private readonly configService: ConfigService,
@@ -26,16 +37,36 @@ export class TuyaWebSocketService {
     });
 
     if (this.configService.get<string>('tuya-config.TRUN_ON_TUYA_SOCKET')) {
-      // Set up event handlers
       this.setupEventHandlers();
-
-      // Start receiving messages
       this.client.start();
     }
+
+    // Run the queue processor every 15 seconds
+    setInterval(() => this.processQueue(), 15000);
+
+    // Refresh the cache every 1 hour
+    setInterval(() => this.initializeDeviceCache(), 30 * 60 * 1000); // 30 minutes
+  }
+
+  async onModuleInit() {
+    await this.initializeDeviceCache();
+  }
+
+  private async initializeDeviceCache() {
+    try {
+      const allDevices = await this.deviceStatusFirebaseService.getAllDevices();
+      allDevices.forEach((device) => {
+        if (device.deviceTuyaUuid) {
+          this.deviceCache.set(device.deviceTuyaUuid, device);
+        }
+      });
+      console.log(`✅ Refreshed cache with ${allDevices.length} devices.`);
+    } catch (error) {
+      console.error('❌ Failed to initialize device cache:', error);
+    }
   }
 
   private setupEventHandlers() {
-    // Event handlers
     this.client.open(() => {
       console.log('open');
     });
@@ -43,23 +74,38 @@ export class TuyaWebSocketService {
     this.client.message(async (ws: WebSocket, message: any) => {
       try {
         const { devId, status, logData } = this.extractMessageData(message);
+        if (!Array.isArray(logData?.properties)) {
+          this.client.ackMessage(message.messageId);
+          return;
+        }
+
+        const device = this.deviceCache.get(devId);
+        if (!device) {
+          // console.log(⛔ Unknown device: ${devId}, message ignored.);
+          this.client.ackMessage(message.messageId);
+          return;
+        }
 
         if (this.sosHandlerService.isSosTriggered(status)) {
-          await this.sosHandlerService.handleSosEvent(devId, logData);
+          await this.sosHandlerService.handleSosEventFirebase(devId, logData);
         } else {
           await this.deviceStatusFirebaseService.addDeviceStatusToFirebase({
             deviceTuyaUuid: devId,
-            status: status,
+            status,
             log: logData,
+            device,
           });
         }
 
+        // Push to internal queue
+        this.messageQueue.push({ devId, status, logData, device });
+
+        // Acknowledge the message
         this.client.ackMessage(message.messageId);
       } catch (error) {
-        console.error('Error processing message:', error);
+        console.error('❌ Error receiving message:', error);
       }
     });
-
     this.client.reconnect(() => {
       console.log('reconnect');
     });
@@ -80,6 +126,37 @@ export class TuyaWebSocketService {
       console.error('WebSocket error:', error);
     });
   }
+  private async processQueue() {
+    if (this.isProcessing) {
+      console.log('⏳ Skipping: still processing previous batch');
+      return;
+    }
+
+    if (this.messageQueue.length === 0) return;
+
+    this.isProcessing = true;
+    const batch = [...this.messageQueue];
+    this.messageQueue = [];
+
+    console.log(`🔁 Processing batch of size: ${batch.length}`);
+
+    try {
+      await this.deviceStatusFirebaseService.addBatchDeviceStatusToOurDb(
+        batch.map((item) => ({
+          deviceTuyaUuid: item.devId,
+          status: item.status,
+          log: item.logData,
+          device: item.device,
+        })),
+      );
+    } catch (error) {
+      console.error('❌ Error processing batch:', error);
+      this.messageQueue.unshift(...batch); // retry
+    } finally {
+      this.isProcessing = false;
+    }
+  }
+
   private extractMessageData(message: any): {
     devId: string;
     status: any;

libs/common/src/helper/timeToMinutes.ts

@@ -0,0 +1,5 @@
+// Convert time string (HH:mm) to minutes
+export function timeToMinutes(time: string): number {
+  const [hours, minutes] = time.split(':').map(Number);
+  return hours * 60 + minutes;
+}

libs/common/src/integrations/tuya/services/tuya.service.ts

@@ -49,12 +49,12 @@ export class TuyaService {
       path,
     });
 
-    if (!response.success) {
+    // if (!response.success) {
-      throw new HttpException(
+    //   throw new HttpException(
-        `Error fetching device details: ${response.msg}`,
+    //     `Error fetching device details: ${response.msg}`,
-        HttpStatus.BAD_REQUEST,
+    //     HttpStatus.BAD_REQUEST,
-      );
+    //   );
-    }
+    // }
 
     return response.result;
   }

libs/common/src/modules/Invite-user/dtos/Invite-user.dto.ts

@@ -1,6 +1,6 @@
 import { RoleType } from '@app/common/constants/role.type.enum';
 import { UserStatusEnum } from '@app/common/constants/user-status.enum';
-import { IsEnum, IsNotEmpty, IsString } from 'class-validator';
+import { IsEnum, IsNotEmpty, IsOptional, IsString } from 'class-validator';
 
 export class InviteUserDto {
   @IsString()
@@ -12,8 +12,12 @@ export class InviteUserDto {
   public email: string;
 
   @IsString()
-  @IsNotEmpty()
+  @IsOptional()
-  public jobTitle: string;
+  public jobTitle?: string;
+
+  @IsString()
+  @IsOptional()
+  public companyName?: string;
 
   @IsEnum(UserStatusEnum)
   @IsNotEmpty()

libs/common/src/modules/Invite-user/entities/Invite-user.entity.ts

@@ -37,6 +37,11 @@ export class InviteUserEntity extends AbstractEntity<InviteUserDto> {
   })
   jobTitle: string;
 
+  @Column({
+    nullable: true,
+  })
+  companyName: string;
+
   @Column({
     nullable: false,
     enum: Object.values(UserStatusEnum),

libs/common/src/modules/booking/booking.repository.module.ts

@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { BookableSpaceEntity } from './entities/bookable-space.entity';
+
+@Module({
+  providers: [],
+  exports: [],
+  controllers: [],
+  imports: [TypeOrmModule.forFeature([BookableSpaceEntity])],
+})
+export class BookableRepositoryModule {}

libs/common/src/modules/booking/entities/bookable-space.entity.ts

@@ -0,0 +1,51 @@
+import { DaysEnum } from '@app/common/constants/days.enum';
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  JoinColumn,
+  OneToOne,
+  UpdateDateColumn,
+} from 'typeorm';
+import { AbstractEntity } from '../../abstract/entities/abstract.entity';
+import { SpaceEntity } from '../../space/entities/space.entity';
+
+@Entity('bookable-space')
+export class BookableSpaceEntity extends AbstractEntity {
+  @Column({
+    type: 'uuid',
+    default: () => 'gen_random_uuid()',
+    nullable: false,
+  })
+  public uuid: string;
+
+  @OneToOne(() => SpaceEntity, (space) => space.bookableConfig)
+  @JoinColumn({ name: 'space_uuid' })
+  space: SpaceEntity;
+
+  @Column({
+    type: 'enum',
+    enum: DaysEnum,
+    array: true,
+    nullable: false,
+  })
+  daysAvailable: DaysEnum[];
+
+  @Column({ type: 'time' })
+  startTime: string;
+
+  @Column({ type: 'time' })
+  endTime: string;
+
+  @Column({ type: Boolean, default: true })
+  active: boolean;
+
+  @Column({ type: 'int', default: null })
+  points?: number;
+
+  @CreateDateColumn()
+  createdAt: Date;
+
+  @UpdateDateColumn()
+  updatedAt: Date;
+}

libs/common/src/modules/booking/entities/index.ts

@@ -0,0 +1 @@
+export * from './bookable-space.entity';

libs/common/src/modules/booking/repositories/booking.repository.ts

@@ -0,0 +1,10 @@
+import { DataSource, Repository } from 'typeorm';
+import { Injectable } from '@nestjs/common';
+import { BookableSpaceEntity } from '../entities/bookable-space.entity';
+
+@Injectable()
+export class BookableSpaceEntityRepository extends Repository<BookableSpaceEntity> {
+  constructor(private dataSource: DataSource) {
+    super(BookableSpaceEntity, dataSource.createEntityManager());
+  }
+}

libs/common/src/modules/booking/repositories/index.ts

@@ -0,0 +1 @@
+export * from './booking.repository';

libs/common/src/modules/device/entities/device.entity.ts

@@ -28,6 +28,11 @@ export class DeviceEntity extends AbstractEntity<DeviceDto> {
   })
   deviceTuyaUuid: string;
 
+  @Column({
+    nullable: true,
+  })
+  deviceTuyaConstUuid: string;
+
   @Column({
     nullable: true,
     default: true,

libs/common/src/modules/space/entities/space-link.entity.ts

@@ -1,32 +0,0 @@
-import { Column, Entity, JoinColumn, ManyToOne } from 'typeorm';
-import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { SpaceEntity } from './space.entity';
-import { Direction } from '@app/common/constants/direction.enum';
-
-@Entity({ name: 'space-link' })
-export class SpaceLinkEntity extends AbstractEntity {
-  @ManyToOne(() => SpaceEntity, { nullable: false, onDelete: 'CASCADE' })
-  @JoinColumn({ name: 'start_space_id' })
-  public startSpace: SpaceEntity;
-
-  @ManyToOne(() => SpaceEntity, { nullable: false, onDelete: 'CASCADE' })
-  @JoinColumn({ name: 'end_space_id' })
-  public endSpace: SpaceEntity;
-
-  @Column({
-    nullable: false,
-    default: false,
-  })
-  public disabled: boolean;
-
-  @Column({
-    nullable: false,
-    enum: Object.values(Direction),
-  })
-  direction: string;
-
-  constructor(partial: Partial<SpaceLinkEntity>) {
-    super();
-    Object.assign(this, partial);
-  }
-}

libs/common/src/modules/space/entities/space.entity.ts

@@ -1,18 +1,25 @@
-import { Column, Entity, JoinColumn, ManyToOne, OneToMany } from 'typeorm';
+import {
-import { SpaceDto } from '../dtos';
+  Column,
+  Entity,
+  JoinColumn,
+  ManyToOne,
+  OneToMany,
+  OneToOne,
+} from 'typeorm';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { UserSpaceEntity } from '../../user/entities';
+import { AqiSpaceDailyPollutantStatsEntity } from '../../aqi/entities';
-import { DeviceEntity } from '../../device/entities';
+import { BookableSpaceEntity } from '../../booking/entities';
 import { CommunityEntity } from '../../community/entities';
-import { SpaceLinkEntity } from './space-link.entity';
+import { DeviceEntity } from '../../device/entities';
+import { InviteUserSpaceEntity } from '../../Invite-user/entities';
+import { SpaceDailyOccupancyDurationEntity } from '../../occupancy/entities';
+import { PresenceSensorDailySpaceEntity } from '../../presence-sensor/entities';
 import { SceneEntity } from '../../scene/entities';
 import { SpaceModelEntity } from '../../space-model';
-import { InviteUserSpaceEntity } from '../../Invite-user/entities';
+import { UserSpaceEntity } from '../../user/entities';
+import { SpaceDto } from '../dtos';
 import { SpaceProductAllocationEntity } from './space-product-allocation.entity';
 import { SubspaceEntity } from './subspace/subspace.entity';
-import { PresenceSensorDailySpaceEntity } from '../../presence-sensor/entities';
-import { AqiSpaceDailyPollutantStatsEntity } from '../../aqi/entities';
-import { SpaceDailyOccupancyDurationEntity } from '../../occupancy/entities';
 
 @Entity({ name: 'space' })
 export class SpaceEntity extends AbstractEntity<SpaceDto> {
@@ -57,6 +64,12 @@ export class SpaceEntity extends AbstractEntity<SpaceDto> {
   })
   public disabled: boolean;
 
+  @Column({
+    nullable: true,
+    type: Number,
+  })
+  public order?: number;
+
   @OneToMany(() => SubspaceEntity, (subspace) => subspace.space, {
     nullable: true,
   })
@@ -75,16 +88,6 @@ export class SpaceEntity extends AbstractEntity<SpaceDto> {
   )
   devices: DeviceEntity[];
 
-  @OneToMany(() => SpaceLinkEntity, (connection) => connection.startSpace, {
-    nullable: true,
-  })
-  public outgoingConnections: SpaceLinkEntity[];
-
-  @OneToMany(() => SpaceLinkEntity, (connection) => connection.endSpace, {
-    nullable: true,
-  })
-  public incomingConnections: SpaceLinkEntity[];
-
   @Column({
     nullable: true,
     type: 'text',
@@ -126,6 +129,9 @@ export class SpaceEntity extends AbstractEntity<SpaceDto> {
   )
   occupancyDaily: SpaceDailyOccupancyDurationEntity[];
 
+  @OneToOne(() => BookableSpaceEntity, (bookable) => bookable.space)
+  bookableConfig: BookableSpaceEntity;
+
   constructor(partial: Partial<SpaceEntity>) {
     super();
     Object.assign(this, partial);

libs/common/src/modules/space/repositories/space.repository.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { DataSource, Repository } from 'typeorm';
 import { InviteSpaceEntity } from '../entities/invite-space.entity';
-import { SpaceLinkEntity } from '../entities/space-link.entity';
 import { SpaceProductAllocationEntity } from '../entities/space-product-allocation.entity';
 import { SpaceEntity } from '../entities/space.entity';
 
@@ -12,13 +11,6 @@ export class SpaceRepository extends Repository<SpaceEntity> {
   }
 }
 
-@Injectable()
-export class SpaceLinkRepository extends Repository<SpaceLinkEntity> {
-  constructor(private dataSource: DataSource) {
-    super(SpaceLinkEntity, dataSource.createEntityManager());
-  }
-}
-
 @Injectable()
 export class InviteSpaceRepository extends Repository<InviteSpaceEntity> {
   constructor(private dataSource: DataSource) {

libs/common/src/modules/user/entities/user.entity.ts

@@ -82,6 +82,12 @@ export class UserEntity extends AbstractEntity<UserDto> {
   })
   public isActive: boolean;
 
+  @Column({
+    nullable: true,
+    type: Number,
+  })
+  public bookingPoints?: number;
+
   @Column({ default: false })
   hasAcceptedWebAgreement: boolean;
 

libs/common/src/sql/procedures/fact_daily_space_aqi/proceduce_update_daily_space_aqi.sql

@@ -1,7 +1,6 @@
 WITH params AS (
 	SELECT 
-      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date,
+      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date
-      $2::uuid AS space_id
 ),
 
 -- Query Pipeline Starts Here
@@ -277,7 +276,10 @@ SELECT
   a.daily_avg_ch2o,a.daily_max_ch2o, a.daily_min_ch2o
 FROM daily_percentages p
 LEFT JOIN daily_averages a 
-  ON p.space_id = a.space_id AND p.event_date = a.event_date
+  ON p.space_id = a.space_id 
+  AND p.event_date = a.event_date
+JOIN params  
+    ON params.event_date = a.event_date
 ORDER BY p.space_id, p.event_date)
 
 

libs/common/src/sql/procedures/fact_daily_space_occupancy_duration/procedure_update_daily_space_occupancy_duration.sql

@@ -1,7 +1,6 @@
 WITH params AS (
 	SELECT 
-      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date,
+      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date
-      $2::uuid AS space_id
 ),
 
 presence_logs AS (
@@ -86,8 +85,7 @@ final_data AS (
     ROUND(LEAST(raw_occupied_seconds, 86400) / 86400.0 * 100, 2) AS occupancy_percentage
   FROM summed_intervals s
   JOIN params p 
-    ON p.space_id = s.space_id 
+    ON p.event_date = s.event_date
-   AND p.event_date = s.event_date
 )
 
 INSERT INTO public."space-daily-occupancy-duration" (

libs/common/src/sql/procedures/fact_device_energy_consumed/fact_daily_device_energy_consumed_procedure.sql

@@ -1,7 +1,6 @@
 WITH params AS (
     SELECT 
-        $1::uuid AS device_id,
+        $1::date AS target_date
-        $2::date AS target_date
 ),
 total_energy AS (
     SELECT 
@@ -14,7 +13,6 @@ total_energy AS (
         MAX(log.value)::integer AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumed'
-      AND log.device_id = params.device_id
     AND log.event_time::date = params.target_date
     GROUP BY 1,2,3,4,5
 ),
@@ -29,7 +27,6 @@ energy_phase_A AS (
         MAX(log.value)::integer AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedA'
-      AND log.device_id = params.device_id
     AND log.event_time::date = params.target_date
     GROUP BY 1,2,3,4,5
 ),
@@ -44,7 +41,6 @@ energy_phase_B AS (
         MAX(log.value)::integer AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedB'
-      AND log.device_id = params.device_id
     AND log.event_time::date = params.target_date
     GROUP BY 1,2,3,4,5
 ),
@@ -59,7 +55,6 @@ energy_phase_C AS (
         MAX(log.value)::integer AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedC'
-      AND log.device_id = params.device_id
     AND log.event_time::date = params.target_date
     GROUP BY 1,2,3,4,5
 ),

libs/common/src/sql/procedures/fact_device_energy_consumed/fact_hourly_device_energy_consumed_procedure.sql

@@ -1,8 +1,6 @@
 WITH params AS (
     SELECT 
-        $1::uuid AS device_id,
+        $1::date AS target_date
-        $2::date AS target_date,
-        $3::text AS target_hour
 ),
 total_energy AS (
     SELECT 
@@ -15,9 +13,7 @@ total_energy AS (
         MAX(log.value)::integer AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumed'
-      AND log.device_id = params.device_id
       AND log.event_time::date = params.target_date
-      AND EXTRACT(HOUR FROM log.event_time)::text = params.target_hour
     GROUP BY 1,2,3,4,5
 ),
 energy_phase_A AS (
@@ -31,9 +27,7 @@ energy_phase_A AS (
         MAX(log.value)::integer AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedA'
-      AND log.device_id = params.device_id
       AND log.event_time::date = params.target_date
-      AND EXTRACT(HOUR FROM log.event_time)::text = params.target_hour
     GROUP BY 1,2,3,4,5
 ),
 energy_phase_B AS (
@@ -47,9 +41,7 @@ energy_phase_B AS (
         MAX(log.value)::integer AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedB'
-      AND log.device_id = params.device_id
       AND log.event_time::date = params.target_date
-      AND EXTRACT(HOUR FROM log.event_time)::text = params.target_hour
     GROUP BY 1,2,3,4,5
 ),
 energy_phase_C AS (
@@ -63,9 +55,7 @@ energy_phase_C AS (
         MAX(log.value)::integer AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedC'
-      AND log.device_id = params.device_id
       AND log.event_time::date = params.target_date
-      AND EXTRACT(HOUR FROM log.event_time)::text = params.target_hour
     GROUP BY 1,2,3,4,5
 ),
 final_data AS (

libs/common/src/sql/procedures/fact_device_energy_consumed/fact_monthly_device_energy_consumed_procedure.sql

@@ -1,7 +1,6 @@
 WITH params AS (
     SELECT 
-        $1::uuid AS device_id,
+        $1::text AS target_month  -- Format should match 'MM-YYYY'
-        $2::text AS target_month  -- Format should match 'MM-YYYY'
 ),
 total_energy AS (
     SELECT 
@@ -14,7 +13,6 @@ total_energy AS (
         MAX(log.value)::integer AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumed'
-      AND log.device_id = params.device_id
       AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month
     GROUP BY 1,2,3,4,5
 ),
@@ -29,7 +27,6 @@ energy_phase_A AS (
         MAX(log.value)::integer AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedA'
-      AND log.device_id = params.device_id
       AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month
     GROUP BY 1,2,3,4,5
 ),
@@ -44,7 +41,6 @@ energy_phase_B AS (
         MAX(log.value)::integer AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedB'
-      AND log.device_id = params.device_id
       AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month
     GROUP BY 1,2,3,4,5
 ),
@@ -59,7 +55,6 @@ energy_phase_C AS (
         MAX(log.value)::integer AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedC'
-      AND log.device_id = params.device_id
       AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month
     GROUP BY 1,2,3,4,5
 ),

libs/common/src/sql/procedures/fact_space_occupancy_count/procedure_update_fact_space_occupancy.sql

@@ -1,7 +1,6 @@
 WITH params AS (
 	SELECT 
-      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date,
+      TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date
-      $2::uuid AS space_id
 ),
 
 device_logs AS (
@@ -87,8 +86,7 @@ SELECT summary.space_id,
        count_total_presence_detected
 FROM summary
 JOIN params P ON true
-where summary.space_id = P.space_id
+where (P.event_date IS NULL or summary.event_date::date = P.event_date)
-and (P.event_date IS NULL or summary.event_date::date = P.event_date)
 ORDER BY space_id, event_date)
 
 

package.json

@@ -30,6 +30,7 @@
     "@nestjs/jwt": "^10.2.0",
     "@nestjs/passport": "^10.0.3",
     "@nestjs/platform-express": "^10.0.0",
+    "@nestjs/schedule": "^6.0.0",
     "@nestjs/swagger": "^7.3.0",
     "@nestjs/terminus": "^11.0.0",
     "@nestjs/throttler": "^6.4.0",
@@ -50,11 +51,12 @@
     "ioredis": "^5.3.2",
     "morgan": "^1.10.0",
     "nest-winston": "^1.10.2",
+    "node-cache": "^5.1.2",
     "nodemailer": "^6.9.10",
     "onesignal-node": "^3.4.0",
     "passport-jwt": "^4.0.1",
     "pg": "^8.11.3",
-    "reflect-metadata": "^0.2.0",
+    "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
     "typeorm": "^0.3.20",
     "winston": "^3.17.0",

src/app.module.ts

@@ -1,7 +1,7 @@
 import { SeederModule } from '@app/common/seed/seeder.module';
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
-import { APP_INTERCEPTOR } from '@nestjs/core';
+import { APP_GUARD, APP_INTERCEPTOR } from '@nestjs/core';
 import { WinstonModule } from 'nest-winston';
 import { AuthenticationModule } from './auth/auth.module';
 import { AutomationModule } from './automation/automation.module';
@@ -35,18 +35,33 @@ import { UserNotificationModule } from './user-notification/user-notification.mo
 import { UserModule } from './users/user.module';
 import { VisitorPasswordModule } from './vistor-password/visitor-password.module';
 
+import { ThrottlerGuard } from '@nestjs/throttler';
+import { ThrottlerModule } from '@nestjs/throttler/dist/throttler.module';
+import { isArray } from 'class-validator';
 import { winstonLoggerOptions } from '../libs/common/src/logger/services/winston.logger';
 import { AqiModule } from './aqi/aqi.module';
 import { OccupancyModule } from './occupancy/occupancy.module';
 import { WeatherModule } from './weather/weather.module';
+import { ScheduleModule as NestScheduleModule } from '@nestjs/schedule';
+import { SchedulerModule } from './scheduler/scheduler.module';
+import { BookingModule } from './booking';
 @Module({
   imports: [
     ConfigModule.forRoot({
       load: config,
     }),
-    /*   ThrottlerModule.forRoot({
+    ThrottlerModule.forRoot({
-      throttlers: [{ ttl: 100000, limit: 30 }],
+      throttlers: [{ ttl: 60000, limit: 100 }],
-    }), */
+      generateKey: (context) => {
+        const req = context.switchToHttp().getRequest();
+        console.log('Real IP:', req.headers['x-forwarded-for']);
+        return req.headers['x-forwarded-for']
+          ? isArray(req.headers['x-forwarded-for'])
+            ? req.headers['x-forwarded-for'][0].split(':')[0]
+            : req.headers['x-forwarded-for'].split(':')[0]
+          : req.ip;
+      },
+    }),
     WinstonModule.forRoot(winstonLoggerOptions),
     ClientModule,
     AuthenticationModule,
@@ -82,16 +97,19 @@ import { WeatherModule } from './weather/weather.module';
     OccupancyModule,
     WeatherModule,
     AqiModule,
+    SchedulerModule,
+    NestScheduleModule.forRoot(),
+    BookingModule,
   ],
   providers: [
     {
       provide: APP_INTERCEPTOR,
       useClass: LoggingInterceptor,
     },
-    /*  {
+    {
       provide: APP_GUARD,
       useClass: ThrottlerGuard,
-    }, */
+    },
   ],
 })
 export class AppModule {}

src/auth/services/user-auth.service.ts

@@ -1,25 +1,25 @@
-import { UserRepository } from '../../../libs/common/src/modules/user/repositories';
+import { RoleType } from '@app/common/constants/role.type.enum';
+import { differenceInSeconds } from '@app/common/helper/differenceInSeconds';
 import {
   BadRequestException,
   ForbiddenException,
   Injectable,
 } from '@nestjs/common';
-import { UserSignUpDto } from '../dtos/user-auth.dto';
-import { HelperHashService } from '../../../libs/common/src/helper/services';
-import { UserLoginDto } from '../dtos/user-login.dto';
-import { AuthService } from '../../../libs/common/src/auth/services/auth.service';
-import { UserSessionRepository } from '../../../libs/common/src/modules/session/repositories/session.repository';
-import { UserOtpRepository } from '../../../libs/common/src/modules/user/repositories/user.repository';
-import { ForgetPasswordDto, UserOtpDto, VerifyOtpDto } from '../dtos';
-import { EmailService } from '../../../libs/common/src/util/email.service';
-import { OtpType } from '../../../libs/common/src/constants/otp-type.enum';
-import { UserEntity } from '../../../libs/common/src/modules/user/entities/user.entity';
-import * as argon2 from 'argon2';
-import { differenceInSeconds } from '@app/common/helper/differenceInSeconds';
-import { LessThan, MoreThan } from 'typeorm';
 import { ConfigService } from '@nestjs/config';
+import * as argon2 from 'argon2';
 import { RoleService } from 'src/role/services';
-import { RoleType } from '@app/common/constants/role.type.enum';
+import { LessThan, MoreThan } from 'typeorm';
+import { AuthService } from '../../../libs/common/src/auth/services/auth.service';
+import { OtpType } from '../../../libs/common/src/constants/otp-type.enum';
+import { HelperHashService } from '../../../libs/common/src/helper/services';
+import { UserSessionRepository } from '../../../libs/common/src/modules/session/repositories/session.repository';
+import { UserEntity } from '../../../libs/common/src/modules/user/entities/user.entity';
+import { UserRepository } from '../../../libs/common/src/modules/user/repositories';
+import { UserOtpRepository } from '../../../libs/common/src/modules/user/repositories/user.repository';
+import { EmailService } from '../../../libs/common/src/util/email.service';
+import { ForgetPasswordDto, UserOtpDto, VerifyOtpDto } from '../dtos';
+import { UserSignUpDto } from '../dtos/user-auth.dto';
+import { UserLoginDto } from '../dtos/user-login.dto';
 
 @Injectable()
 export class UserAuthService {
@@ -108,7 +108,7 @@ export class UserAuthService {
 
   async userLogin(data: UserLoginDto) {
     try {
-      let user;
+      let user: Omit<UserEntity, 'password'>;
       if (data.googleCode) {
         const googleUserData = await this.authService.login({
           googleCode: data.googleCode,
@@ -145,7 +145,7 @@ export class UserAuthService {
       }
       const session = await Promise.all([
         await this.sessionRepository.update(
-          { userId: user.id },
+          { userId: user?.['id'] },
           {
             isLoggedOut: true,
           },
@@ -166,6 +166,7 @@ export class UserAuthService {
         hasAcceptedAppAgreement: user.hasAcceptedAppAgreement,
         project: user.project,
         sessionId: session[1].uuid,
+        bookingPoints: user.bookingPoints,
       });
       return res;
     } catch (error) {
@@ -347,6 +348,7 @@ export class UserAuthService {
       userId: user.uuid,
       uuid: user.uuid,
       type,
+      bookingPoints: user.bookingPoints,
       sessionId,
     });
     await this.authService.updateRefreshToken(user.uuid, tokens.refreshToken);

src/booking/booking.module.ts

@@ -0,0 +1,17 @@
+import { Global, Module } from '@nestjs/common';
+import { BookableSpaceController } from './controllers';
+import { BookableSpaceService } from './services';
+import { BookableSpaceEntityRepository } from '@app/common/modules/booking/repositories';
+import { SpaceRepository } from '@app/common/modules/space';
+
+@Global()
+@Module({
+  controllers: [BookableSpaceController],
+  providers: [
+    BookableSpaceService,
+    BookableSpaceEntityRepository,
+    SpaceRepository,
+  ],
+  exports: [BookableSpaceService],
+})
+export class BookingModule {}

src/booking/controllers/bookable-space.controller.ts

@@ -0,0 +1,107 @@
+import { ControllerRoute } from '@app/common/constants/controller-route';
+import { EnableDisableStatusEnum } from '@app/common/constants/days.enum';
+import { BaseResponseDto } from '@app/common/dto/base.response.dto';
+import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard';
+import {
+  Body,
+  Controller,
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Post,
+  Put,
+  Query,
+  Req,
+  UseGuards,
+} from '@nestjs/common';
+import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
+
+import { PageResponse } from '@app/common/dto/pagination.response.dto';
+import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
+import { plainToInstance } from 'class-transformer';
+import { CreateBookableSpaceDto } from '../dtos';
+import { BookableSpaceRequestDto } from '../dtos/bookable-space-request.dto';
+import { BookableSpaceResponseDto } from '../dtos/bookable-space-response.dto';
+import { UpdateBookableSpaceDto } from '../dtos/update-bookable-space.dto';
+import { BookableSpaceService } from '../services';
+
+@ApiTags('Booking Module')
+@Controller({
+  version: EnableDisableStatusEnum.ENABLED,
+  path: ControllerRoute.BOOKABLE_SPACES.ROUTE,
+})
+export class BookableSpaceController {
+  constructor(private readonly bookableSpaceService: BookableSpaceService) {}
+  @ApiBearerAuth()
+  @UseGuards(JwtAuthGuard)
+  @Post()
+  @ApiOperation({
+    summary:
+      ControllerRoute.BOOKABLE_SPACES.ACTIONS.ADD_BOOKABLE_SPACES_SUMMARY,
+    description:
+      ControllerRoute.BOOKABLE_SPACES.ACTIONS.ADD_BOOKABLE_SPACES_DESCRIPTION,
+  })
+  async create(@Body() dto: CreateBookableSpaceDto): Promise<BaseResponseDto> {
+    const result = await this.bookableSpaceService.create(dto);
+    return new SuccessResponseDto({
+      data: result,
+      message: 'Successfully created bookable spaces',
+    });
+  }
+
+  @ApiBearerAuth()
+  @UseGuards(JwtAuthGuard)
+  @Get()
+  @ApiOperation({
+    summary:
+      ControllerRoute.BOOKABLE_SPACES.ACTIONS.GET_ALL_BOOKABLE_SPACES_SUMMARY,
+    description:
+      ControllerRoute.BOOKABLE_SPACES.ACTIONS
+        .GET_ALL_BOOKABLE_SPACES_DESCRIPTION,
+  })
+  async findAll(
+    @Query() query: BookableSpaceRequestDto,
+    @Req() req: Request,
+  ): Promise<PageResponse<BookableSpaceResponseDto>> {
+    const project = req['user']?.project?.uuid;
+    if (!project) {
+      throw new Error('Project UUID is required in the request');
+    }
+    const { data, pagination } = await this.bookableSpaceService.findAll(
+      query,
+      project,
+    );
+    return new PageResponse<BookableSpaceResponseDto>(
+      {
+        data: data.map((space) =>
+          plainToInstance(BookableSpaceResponseDto, space, {
+            excludeExtraneousValues: true,
+          }),
+        ),
+        message: 'Successfully fetched all bookable spaces',
+      },
+      pagination,
+    );
+  }
+
+  @ApiBearerAuth()
+  @UseGuards(JwtAuthGuard)
+  @Put(':spaceUuid')
+  @ApiOperation({
+    summary:
+      ControllerRoute.BOOKABLE_SPACES.ACTIONS.UPDATE_BOOKABLE_SPACES_SUMMARY,
+    description:
+      ControllerRoute.BOOKABLE_SPACES.ACTIONS
+        .UPDATE_BOOKABLE_SPACES_DESCRIPTION,
+  })
+  async update(
+    @Param('spaceUuid', ParseUUIDPipe) spaceUuid: string,
+    @Body() dto: UpdateBookableSpaceDto,
+  ): Promise<BaseResponseDto> {
+    const result = await this.bookableSpaceService.update(spaceUuid, dto);
+    return new SuccessResponseDto({
+      data: result,
+      message: 'Successfully updated bookable spaces',
+    });
+  }
+}

src/booking/controllers/index.ts

@@ -0,0 +1 @@
+export * from './bookable-space.controller';

src/booking/dtos/bookable-space-request.dto.ts

@@ -0,0 +1,31 @@
+import { BooleanValues } from '@app/common/constants/boolean-values.enum';
+import { PaginationRequestWithSearchGetListDto } from '@app/common/dto/pagination-with-search.request.dto';
+import { ApiProperty, OmitType } from '@nestjs/swagger';
+import { Transform } from 'class-transformer';
+import { IsBoolean, IsNotEmpty, IsOptional } from 'class-validator';
+
+export class BookableSpaceRequestDto extends OmitType(
+  PaginationRequestWithSearchGetListDto,
+  ['includeSpaces'],
+) {
+  @ApiProperty({
+    type: Boolean,
+    required: false,
+  })
+  @IsBoolean()
+  @IsOptional()
+  @Transform(({ obj }) => {
+    return obj.active === BooleanValues.TRUE;
+  })
+  active?: boolean;
+
+  @ApiProperty({
+    type: Boolean,
+  })
+  @IsBoolean()
+  @IsNotEmpty()
+  @Transform(({ obj }) => {
+    return obj.configured === BooleanValues.TRUE;
+  })
+  configured: boolean;
+}

src/booking/dtos/bookable-space-response.dto.ts

@@ -0,0 +1,59 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { Expose, Type } from 'class-transformer';
+export class BookableSpaceConfigResponseDto {
+  @ApiProperty()
+  @Expose()
+  uuid: string;
+
+  @ApiProperty({
+    type: [String],
+  })
+  @Expose()
+  daysAvailable: string[];
+
+  @ApiProperty()
+  @Expose()
+  startTime: string;
+
+  @ApiProperty()
+  @Expose()
+  endTime: string;
+
+  @ApiProperty({
+    type: Boolean,
+  })
+  @Expose()
+  active: boolean;
+
+  @ApiProperty({
+    type: Number,
+    nullable: true,
+  })
+  @Expose()
+  points?: number;
+}
+
+export class BookableSpaceResponseDto {
+  @ApiProperty()
+  @Expose()
+  uuid: string;
+
+  @ApiProperty()
+  @Expose()
+  spaceUuid: string;
+
+  @ApiProperty()
+  @Expose()
+  spaceName: string;
+
+  @ApiProperty()
+  @Expose()
+  virtualLocation: string;
+
+  @ApiProperty({
+    type: BookableSpaceConfigResponseDto,
+  })
+  @Expose()
+  @Type(() => BookableSpaceConfigResponseDto)
+  bookableConfig: BookableSpaceConfigResponseDto;
+}

src/booking/dtos/create-bookable-space.dto.ts

@@ -0,0 +1,63 @@
+import { DaysEnum } from '@app/common/constants/days.enum';
+import { ApiProperty } from '@nestjs/swagger';
+import {
+  ArrayMinSize,
+  IsArray,
+  IsEnum,
+  IsInt,
+  IsNotEmpty,
+  IsOptional,
+  IsString,
+  IsUUID,
+  Matches,
+  Max,
+  Min,
+} from 'class-validator';
+
+export class CreateBookableSpaceDto {
+  @ApiProperty({
+    type: 'string',
+    isArray: true,
+    example: [
+      '3fa85f64-5717-4562-b3fc-2c963f66afa6',
+      '4fa85f64-5717-4562-b3fc-2c963f66afa7',
+    ],
+  })
+  @IsArray()
+  @ArrayMinSize(1, { message: 'At least one space must be selected' })
+  @IsUUID('all', { each: true, message: 'Invalid space UUID provided' })
+  spaceUuids: string[];
+
+  @ApiProperty({
+    enum: DaysEnum,
+    isArray: true,
+    example: [DaysEnum.MON, DaysEnum.WED, DaysEnum.FRI],
+  })
+  @IsArray()
+  @ArrayMinSize(1, { message: 'At least one day must be selected' })
+  @IsEnum(DaysEnum, { each: true, message: 'Invalid day provided' })
+  daysAvailable: DaysEnum[];
+
+  @ApiProperty({ example: '09:00' })
+  @IsString()
+  @IsNotEmpty({ message: 'Start time cannot be empty' })
+  @Matches(/^([01]?[0-9]|2[0-3]):[0-5][0-9]$/, {
+    message: 'Start time must be in HH:mm format (24-hour)',
+  })
+  startTime: string;
+
+  @ApiProperty({ example: '17:00' })
+  @IsString()
+  @IsNotEmpty({ message: 'End time cannot be empty' })
+  @Matches(/^([01]?[0-9]|2[0-3]):[0-5][0-9]$/, {
+    message: 'End time must be in HH:mm format (24-hour)',
+  })
+  endTime: string;
+
+  @ApiProperty({ example: 10, required: false })
+  @IsOptional()
+  @IsInt()
+  @Min(0, { message: 'Points cannot be negative' })
+  @Max(1000, { message: 'Points cannot exceed 1000' })
+  points?: number;
+}

src/booking/dtos/index.ts

@@ -0,0 +1 @@
+export * from './create-bookable-space.dto';

src/booking/dtos/update-bookable-space.dto.ts

@@ -0,0 +1,12 @@
+import { ApiProperty, OmitType, PartialType } from '@nestjs/swagger';
+import { IsBoolean, IsOptional } from 'class-validator';
+import { CreateBookableSpaceDto } from './create-bookable-space.dto';
+
+export class UpdateBookableSpaceDto extends PartialType(
+  OmitType(CreateBookableSpaceDto, ['spaceUuids']),
+) {
+  @ApiProperty({ type: Boolean })
+  @IsOptional()
+  @IsBoolean()
+  active?: boolean;
+}

src/booking/index.ts

@@ -0,0 +1 @@
+export * from './booking.module';

src/booking/services/bookable-space.service.ts

@@ -0,0 +1,197 @@
+import { BaseResponseDto } from '@app/common/dto/base.response.dto';
+import { PageResponseDto } from '@app/common/dto/pagination.response.dto';
+import { timeToMinutes } from '@app/common/helper/timeToMinutes';
+import { TypeORMCustomModel } from '@app/common/models/typeOrmCustom.model';
+import { BookableSpaceEntityRepository } from '@app/common/modules/booking/repositories';
+import { SpaceEntity } from '@app/common/modules/space/entities/space.entity';
+import { SpaceRepository } from '@app/common/modules/space/repositories/space.repository';
+import {
+  BadRequestException,
+  ConflictException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { In } from 'typeorm';
+import { CreateBookableSpaceDto } from '../dtos';
+import { BookableSpaceRequestDto } from '../dtos/bookable-space-request.dto';
+import { UpdateBookableSpaceDto } from '../dtos/update-bookable-space.dto';
+
+@Injectable()
+export class BookableSpaceService {
+  constructor(
+    private readonly bookableSpaceEntityRepository: BookableSpaceEntityRepository,
+    private readonly spaceRepository: SpaceRepository,
+  ) {}
+
+  async create(dto: CreateBookableSpaceDto) {
+    // Validate time slots first
+    this.validateTimeSlot(dto.startTime, dto.endTime);
+
+    // fetch spaces exist
+    const spaces = await this.getSpacesOrFindMissing(dto.spaceUuids);
+
+    // Validate no duplicate bookable configurations
+    await this.validateNoDuplicateBookableConfigs(dto.spaceUuids);
+
+    // Create and save bookable spaces
+    return this.createBookableSpaces(spaces, dto);
+  }
+
+  async findAll(
+    { active, page, size, configured, search }: BookableSpaceRequestDto,
+    project: string,
+  ): Promise<{
+    data: BaseResponseDto['data'];
+    pagination: PageResponseDto;
+  }> {
+    let qb = this.spaceRepository
+      .createQueryBuilder('space')
+      .leftJoinAndSelect('space.parent', 'parentSpace')
+      .leftJoinAndSelect('space.community', 'community')
+      .where('community.project = :project', { project });
+
+    if (search) {
+      qb = qb.andWhere(
+        '(space.spaceName ILIKE :search OR community.name ILIKE :search OR parentSpace.spaceName ILIKE :search)',
+        { search: `%${search}%` },
+      );
+    }
+    if (configured) {
+      qb = qb
+        .leftJoinAndSelect('space.bookableConfig', 'bookableConfig')
+        .andWhere('bookableConfig.uuid IS NOT NULL');
+      if (active !== undefined) {
+        qb = qb.andWhere('bookableConfig.active = :active', { active });
+      }
+    } else {
+      qb = qb
+        .leftJoinAndSelect('space.bookableConfig', 'bookableConfig')
+        .andWhere('bookableConfig.uuid IS NULL');
+    }
+    const customModel = TypeORMCustomModel(this.spaceRepository);
+
+    const { baseResponseDto, paginationResponseDto } =
+      await customModel.findAll({ page, size, modelName: 'space' }, qb);
+    return {
+      data: baseResponseDto.data.map((space) => {
+        return {
+          ...space,
+          virtualLocation: `${space.community?.name} - ${space.parent ? space.parent?.spaceName + ' - ' : ''}${space.spaceName}`,
+        };
+      }),
+      pagination: paginationResponseDto,
+    };
+  }
+
+  /**
+   * todo: if updating availability, send to the ones who have access to this space
+   * todo: if updating other fields, just send emails to all users who's bookings might be affected
+   */
+  async update(spaceUuid: string, dto: UpdateBookableSpaceDto) {
+    // fetch spaces exist
+    const space = (await this.getSpacesOrFindMissing([spaceUuid]))[0];
+
+    if (!space.bookableConfig) {
+      throw new NotFoundException(
+        `Bookable configuration not found for space: ${spaceUuid}`,
+      );
+    }
+    if (dto.startTime || dto.endTime) {
+      // Validate time slots first
+      this.validateTimeSlot(
+        dto.startTime || space.bookableConfig.startTime,
+        dto.endTime || space.bookableConfig.endTime,
+      );
+    }
+    Object.assign(space.bookableConfig, dto);
+    return this.bookableSpaceEntityRepository.save(space.bookableConfig);
+  }
+
+  /**
+   * Fetch spaces by UUIDs and throw an error if any are missing
+   */
+  private async getSpacesOrFindMissing(
+    spaceUuids: string[],
+  ): Promise<SpaceEntity[]> {
+    const spaces = await this.spaceRepository.find({
+      where: { uuid: In(spaceUuids) },
+      relations: ['bookableConfig'],
+    });
+
+    if (spaces.length !== spaceUuids.length) {
+      const foundUuids = spaces.map((s) => s.uuid);
+      const missingUuids = spaceUuids.filter(
+        (uuid) => !foundUuids.includes(uuid),
+      );
+      throw new NotFoundException(
+        `Spaces not found: ${missingUuids.join(', ')}`,
+      );
+    }
+
+    return spaces;
+  }
+
+  /**
+   * Validate there are no existing bookable configurations for these spaces
+   */
+  private async validateNoDuplicateBookableConfigs(
+    spaceUuids: string[],
+  ): Promise<void> {
+    const existingBookables = await this.bookableSpaceEntityRepository.find({
+      where: { space: { uuid: In(spaceUuids) } },
+      relations: ['space'],
+    });
+
+    if (existingBookables.length > 0) {
+      const existingUuids = [
+        ...new Set(existingBookables.map((b) => b.space.uuid)),
+      ];
+      throw new ConflictException(
+        `Bookable configuration already exists for spaces: ${existingUuids.join(', ')}`,
+      );
+    }
+  }
+
+  /**
+   * Ensure the slot start time is before the end time
+   */
+  private validateTimeSlot(startTime: string, endTime: string): void {
+    const start = timeToMinutes(startTime);
+    const end = timeToMinutes(endTime);
+
+    if (start >= end) {
+      throw new BadRequestException(
+        `End time must be after start time for slot: ${startTime}-${endTime}`,
+      );
+    }
+  }
+
+  /**
+   * Create bookable space entries after all validations pass
+   */
+  private async createBookableSpaces(
+    spaces: SpaceEntity[],
+    dto: CreateBookableSpaceDto,
+  ) {
+    try {
+      const entries = spaces.map((space) =>
+        this.bookableSpaceEntityRepository.create({
+          space,
+          daysAvailable: dto.daysAvailable,
+          startTime: dto.startTime,
+          endTime: dto.endTime,
+          points: dto.points,
+        }),
+      );
+
+      return this.bookableSpaceEntityRepository.save(entries);
+    } catch (error) {
+      if (error.code === '23505') {
+        throw new ConflictException(
+          'Duplicate bookable space configuration detected',
+        );
+      }
+      throw error;
+    }
+  }
+}

src/booking/services/index.ts

@@ -0,0 +1 @@
+export * from './bookable-space.service';

src/commission-device/commission-device.module.ts

@@ -30,6 +30,8 @@ import { PowerClampService } from '@app/common/helper/services/power.clamp.servi
 import { SqlLoaderService } from '@app/common/helper/services/sql-loader.service';
 import { OccupancyService } from '@app/common/helper/services/occupancy.service';
 import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
+import { PresenceSensorDailySpaceRepository } from '@app/common/modules/presence-sensor/repositories';
+import { AqiSpaceDailyPollutantStatsRepository } from '@app/common/modules/aqi/repositories';
 
 @Module({
   imports: [ConfigModule, SpaceRepositoryModule],
@@ -59,6 +61,8 @@ import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
     SqlLoaderService,
     OccupancyService,
     AqiDataService,
+    PresenceSensorDailySpaceRepository,
+    AqiSpaceDailyPollutantStatsRepository,
   ],
   exports: [],
 })

src/commission-device/services/commission-device.service.ts

@@ -3,6 +3,7 @@ import * as fs from 'fs';
 
 import { ProjectParam } from '@app/common/dto/project-param.dto';
 import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
+import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
 import { TuyaService } from '@app/common/integrations/tuya/services/tuya.service';
 import { CommunityRepository } from '@app/common/modules/community/repositories';
 import { DeviceRepository } from '@app/common/modules/device/repositories';
@@ -20,6 +21,7 @@ export class DeviceCommissionService {
   constructor(
     private readonly tuyaService: TuyaService,
     private readonly deviceService: DeviceService,
+    private readonly deviceStatusFirebaseService: DeviceStatusFirebaseService,
     private readonly communityRepository: CommunityRepository,
     private readonly spaceRepository: SpaceRepository,
     private readonly subspaceRepository: SubspaceRepository,
@@ -209,6 +211,10 @@ export class DeviceCommissionService {
         rawDeviceId,
         tuyaSpaceId,
       );
+
+      await this.deviceStatusFirebaseService.addDeviceStatusByDeviceUuid(
+        rawDeviceId,
+      );
       successCount.value++;
       console.log(
         `Device ${rawDeviceId} successfully processed and transferred to Tuya space ${tuyaSpaceId}`,

src/community/community.module.ts

@@ -5,7 +5,6 @@ import { ConfigModule } from '@nestjs/config';
 import { SpaceRepositoryModule } from '@app/common/modules/space/space.repository.module';
 import {
   InviteSpaceRepository,
-  SpaceLinkRepository,
   SpaceProductAllocationRepository,
   SpaceRepository,
 } from '@app/common/modules/space/repositories';
@@ -16,14 +15,12 @@ import { CommunityRepository } from '@app/common/modules/community/repositories'
 import { TuyaService } from '@app/common/integrations/tuya/services/tuya.service';
 import { ProjectRepository } from '@app/common/modules/project/repositiories';
 import {
-  SpaceLinkService,
   SpaceService,
   SubspaceDeviceService,
   SubSpaceService,
   ValidationService,
 } from 'src/space/services';
 import { TagService as NewTagService } from 'src/tags/services';
-import { TagService } from 'src/space/services/tag';
 import {
   SpaceModelService,
   SubSpaceModelService,
@@ -64,6 +61,8 @@ import {
 import { SqlLoaderService } from '@app/common/helper/services/sql-loader.service';
 import { OccupancyService } from '@app/common/helper/services/occupancy.service';
 import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
+import { PresenceSensorDailySpaceRepository } from '@app/common/modules/presence-sensor/repositories';
+import { AqiSpaceDailyPollutantStatsRepository } from '@app/common/modules/aqi/repositories';
 
 @Module({
   imports: [ConfigModule, SpaceRepositoryModule, UserRepositoryModule],
@@ -78,16 +77,14 @@ import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
     ProjectRepository,
     SpaceService,
     InviteSpaceRepository,
-    SpaceLinkService,
+    // Todo: find out why this is needed
     SubSpaceService,
     ValidationService,
     NewTagService,
     SpaceModelService,
     SpaceProductAllocationService,
-    SpaceLinkRepository,
     SubspaceRepository,
     // Todo: find out why this is needed
-    TagService,
     SubspaceDeviceService,
     SubspaceProductAllocationService,
     SpaceModelRepository,
@@ -117,6 +114,8 @@ import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
     SqlLoaderService,
     OccupancyService,
     AqiDataService,
+    PresenceSensorDailySpaceRepository,
+    AqiSpaceDailyPollutantStatsRepository,
   ],
   exports: [CommunityService, SpacePermissionService],
 })

src/community/controllers/community.controller.ts

@@ -1,4 +1,3 @@
-import { CommunityService } from '../services/community.service';
 import {
   Body,
   Controller,
@@ -10,17 +9,18 @@ import {
   Query,
   UseGuards,
 } from '@nestjs/common';
-import { ApiTags, ApiBearerAuth, ApiOperation } from '@nestjs/swagger';
+import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { AddCommunityDto } from '../dtos/add.community.dto';
 import { GetCommunityParams } from '../dtos/get.community.dto';
 import { UpdateCommunityNameDto } from '../dtos/update.community.dto';
+import { CommunityService } from '../services/community.service';
 // import { CheckUserCommunityGuard } from 'src/guards/user.community.guard';
 import { ControllerRoute } from '@app/common/constants/controller-route';
 import { BaseResponseDto } from '@app/common/dto/base.response.dto';
-import { ProjectParam } from '../dtos';
-import { PermissionsGuard } from 'src/guards/permissions.guard';
-import { Permissions } from 'src/decorators/permissions.decorator';
 import { PaginationRequestWithSearchGetListDto } from '@app/common/dto/pagination-with-search.request.dto';
+import { Permissions } from 'src/decorators/permissions.decorator';
+import { PermissionsGuard } from 'src/guards/permissions.guard';
+import { ProjectParam } from '../dtos';
 
 @ApiTags('Community Module')
 @Controller({
@@ -45,6 +45,21 @@ export class CommunityController {
     return await this.communityService.createCommunity(param, addCommunityDto);
   }
 
+  @ApiBearerAuth()
+  @UseGuards(PermissionsGuard)
+  @Permissions('COMMUNITY_VIEW')
+  @ApiOperation({
+    summary: ControllerRoute.COMMUNITY.ACTIONS.LIST_COMMUNITY_SUMMARY,
+    description: ControllerRoute.COMMUNITY.ACTIONS.LIST_COMMUNITY_DESCRIPTION,
+  })
+  @Get('v2')
+  async getCommunitiesV2(
+    @Param() param: ProjectParam,
+    @Query() query: PaginationRequestWithSearchGetListDto,
+  ): Promise<any> {
+    return this.communityService.getCommunitiesV2(param, query);
+  }
+
   @ApiBearerAuth()
   @UseGuards(PermissionsGuard)
   @Permissions('COMMUNITY_VIEW')

src/community/services/community.service.ts

@@ -1,4 +1,7 @@
-import { ORPHAN_COMMUNITY_NAME } from '@app/common/constants/orphan-constant';
+import {
+  ORPHAN_COMMUNITY_NAME,
+  ORPHAN_SPACE_NAME,
+} from '@app/common/constants/orphan-constant';
 import { BaseResponseDto } from '@app/common/dto/base.response.dto';
 import { PageResponse } from '@app/common/dto/pagination.response.dto';
 import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
@@ -22,7 +25,7 @@ import {
   NotFoundException,
 } from '@nestjs/common';
 import { SpaceService } from 'src/space/services';
-import { SelectQueryBuilder } from 'typeorm';
+import { QueryRunner, SelectQueryBuilder } from 'typeorm';
 import { AddCommunityDto, GetCommunityParams, ProjectParam } from '../dtos';
 import { UpdateCommunityNameDto } from '../dtos/update.community.dto';
 
@@ -69,12 +72,18 @@ export class CommunityService {
     }
   }
 
-  async getCommunityById(params: GetCommunityParams): Promise<BaseResponseDto> {
+  async getCommunityById(
+    params: GetCommunityParams,
+    queryRunner?: QueryRunner,
+  ): Promise<BaseResponseDto> {
     const { communityUuid, projectUuid } = params;
 
     await this.validateProject(projectUuid);
 
-    const community = await this.communityRepository.findOneBy({
+    const communityRepository =
+      queryRunner?.manager.getRepository(CommunityEntity) ||
+      this.communityRepository;
+    const community = await communityRepository.findOneBy({
       uuid: communityUuid,
     });
 
@@ -162,6 +171,75 @@ export class CommunityService {
     }
   }
 
+  async getCommunitiesV2(
+    { projectUuid }: ProjectParam,
+    {
+      search,
+      includeSpaces,
+      ...pageable
+    }: Partial<ExtendedTypeORMCustomModelFindAllQuery>,
+  ) {
+    try {
+      const project = await this.validateProject(projectUuid);
+
+      let qb: undefined | SelectQueryBuilder<CommunityEntity> = undefined;
+
+      qb = this.communityRepository
+        .createQueryBuilder('c')
+        .where('c.project = :projectUuid', { projectUuid })
+        .andWhere(`c.name != '${ORPHAN_COMMUNITY_NAME}-${project.name}'`)
+        .distinct(true);
+
+      if (includeSpaces) {
+        qb.leftJoinAndSelect(
+          'c.spaces',
+          'space',
+          'space.disabled = :disabled AND space.spaceName != :orphanSpaceName',
+          { disabled: false, orphanSpaceName: ORPHAN_SPACE_NAME },
+        )
+          .leftJoinAndSelect('space.parent', 'parent')
+          .leftJoinAndSelect(
+            'space.children',
+            'children',
+            'children.disabled = :disabled',
+            { disabled: false },
+          );
+        // .leftJoinAndSelect('space.spaceModel', 'spaceModel')
+      }
+
+      if (search) {
+        qb.andWhere(
+          `c.name ILIKE :search ${includeSpaces ? 'OR space.space_name ILIKE :search' : ''}`,
+          { search: `%${search}%` },
+        );
+      }
+
+      const customModel = TypeORMCustomModel(this.communityRepository);
+
+      const { baseResponseDto, paginationResponseDto } =
+        await customModel.findAll({ ...pageable, modelName: 'community' }, qb);
+      if (includeSpaces) {
+        baseResponseDto.data = baseResponseDto.data.map((community) => ({
+          ...community,
+          spaces: this.spaceService.buildSpaceHierarchy(community.spaces || []),
+        }));
+      }
+      return new PageResponse<CommunityDto>(
+        baseResponseDto,
+        paginationResponseDto,
+      );
+    } catch (error) {
+      // Generic error handling
+      if (error instanceof HttpException) {
+        throw error;
+      }
+      throw new HttpException(
+        error.message || 'An error occurred while fetching communities.',
+        HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
+
   async updateCommunity(
     params: GetCommunityParams,
     updateCommunityDto: UpdateCommunityNameDto,

src/device/commands/cur2-commands.ts

@@ -0,0 +1,28 @@
+interface BaseCommand {
+  code: string;
+  value: any;
+}
+export interface ControlCur2Command extends BaseCommand {
+  code: 'control';
+  value: 'open' | 'close' | 'stop';
+}
+export interface ControlCur2PercentCommand extends BaseCommand {
+  code: 'percent_control';
+  value: 10 | 20 | 30 | 40 | 50 | 60 | 70 | 80 | 90 | 100;
+}
+export interface ControlCur2AccurateCalibrationCommand extends BaseCommand {
+  code: 'accurate_calibration';
+  value: 'start' | 'end'; // Assuming this is a numeric value for calibration
+}
+export interface ControlCur2TDirectionConCommand extends BaseCommand {
+  code: 'control_t_direction_con';
+  value: 'forward' | 'back';
+}
+export interface ControlCur2QuickCalibrationCommand extends BaseCommand {
+  code: 'tr_timecon';
+  value: number; // between 10 and 120
+}
+export interface ControlCur2MotorModeCommand extends BaseCommand {
+  code: 'elec_machinery_mode';
+  value: 'strong_power' | 'dry_contact';
+}

src/device/controllers/device-project.controller.ts

@@ -1,11 +1,11 @@
-import { DeviceService } from '../services/device.service';
-import { Controller, Get, Param, Query, UseGuards } from '@nestjs/common';
-import { ApiTags, ApiBearerAuth, ApiOperation } from '@nestjs/swagger';
-import { EnableDisableStatusEnum } from '@app/common/constants/days.enum';
 import { ControllerRoute } from '@app/common/constants/controller-route';
-import { PermissionsGuard } from 'src/guards/permissions.guard';
+import { EnableDisableStatusEnum } from '@app/common/constants/days.enum';
+import { Controller, Get, Param, Query, UseGuards } from '@nestjs/common';
+import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { Permissions } from 'src/decorators/permissions.decorator';
-import { GetDoorLockDevices, ProjectParam } from '../dtos';
+import { PermissionsGuard } from 'src/guards/permissions.guard';
+import { GetDevicesFilterDto, ProjectParam } from '../dtos';
+import { DeviceService } from '../services/device.service';
 
 @ApiTags('Device Module')
 @Controller({
@@ -25,7 +25,7 @@ export class DeviceProjectController {
   })
   async getAllDevices(
     @Param() param: ProjectParam,
-    @Query() query: GetDoorLockDevices,
+    @Query() query: GetDevicesFilterDto,
   ) {
     return await this.deviceService.getAllDevices(param, query);
   }

src/device/controllers/device.controller.ts

@@ -1,39 +1,41 @@
-import { DeviceService } from '../services/device.service';
+import { ControllerRoute } from '@app/common/constants/controller-route';
+import { EnableDisableStatusEnum } from '@app/common/constants/days.enum';
+import { RoleType } from '@app/common/constants/role.type.enum';
+import { BaseResponseDto } from '@app/common/dto/base.response.dto';
 import {
   Body,
   Controller,
-  Get,
-  Post,
-  Query,
-  Param,
-  UseGuards,
-  Put,
   Delete,
+  Get,
+  Param,
+  Post,
+  Put,
+  Query,
   Req,
+  UnauthorizedException,
+  UseGuards,
 } from '@nestjs/common';
-import { ApiTags, ApiBearerAuth, ApiOperation } from '@nestjs/swagger';
+import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
+import { Permissions } from 'src/decorators/permissions.decorator';
+import { PermissionsGuard } from 'src/guards/permissions.guard';
+import { CheckRoomGuard } from 'src/guards/room.guard';
+import { CheckFourAndSixSceneDeviceTypeGuard } from 'src/guards/scene.device.type.guard';
 import {
   AddDeviceDto,
   AddSceneToFourSceneDeviceDto,
   AssignDeviceToSpaceDto,
   UpdateDeviceDto,
 } from '../dtos/add.device.dto';
-import { GetDeviceLogsDto } from '../dtos/get.device.dto';
 import {
-  ControlDeviceDto,
   BatchControlDevicesDto,
   BatchStatusDevicesDto,
+  ControlDeviceDto,
   GetSceneFourSceneDeviceDto,
 } from '../dtos/control.device.dto';
-import { CheckRoomGuard } from 'src/guards/room.guard';
-import { EnableDisableStatusEnum } from '@app/common/constants/days.enum';
-import { CheckFourAndSixSceneDeviceTypeGuard } from 'src/guards/scene.device.type.guard';
-import { ControllerRoute } from '@app/common/constants/controller-route';
-import { BaseResponseDto } from '@app/common/dto/base.response.dto';
-import { DeviceSceneParamDto } from '../dtos/device.param.dto';
 import { DeleteSceneFromSceneDeviceDto } from '../dtos/delete.device.dto';
-import { PermissionsGuard } from 'src/guards/permissions.guard';
+import { DeviceSceneParamDto } from '../dtos/device.param.dto';
-import { Permissions } from 'src/decorators/permissions.decorator';
+import { GetDeviceLogsDto } from '../dtos/get.device.dto';
+import { DeviceService } from '../services/device.service';
 
 @ApiTags('Device Module')
 @Controller({
@@ -340,4 +342,22 @@ export class DeviceController {
       projectUuid,
     );
   }
+
+  @ApiBearerAuth()
+  @UseGuards(PermissionsGuard)
+  @Permissions('DEVICE_UPDATE')
+  @Post('/populate-tuya-const-uuids')
+  @ApiOperation({
+    summary: ControllerRoute.DEVICE.ACTIONS.POPULATE_TUYA_CONST_UUID_SUMMARY,
+    description:
+      ControllerRoute.DEVICE.ACTIONS.POPULATE_TUYA_CONST_UUID_DESCRIPTION,
+  })
+  async populateTuyaConstUuid(@Req() req: any): Promise<void> {
+    const userUuid = req['user']?.userUuid;
+    const userRole = req['user']?.role;
+    if (!userUuid || (userRole && userRole !== RoleType.SUPER_ADMIN)) {
+      throw new UnauthorizedException('Unauthorized to perform this action');
+    }
+    return this.deviceService.addTuyaConstUuidToDevices();
+  }
 }

src/device/dtos/add.device.dto.ts

@@ -18,6 +18,14 @@ export class AddDeviceDto {
   @IsNotEmpty()
   public spaceUuid: string;
 
+  @ApiProperty({
+    description: 'tagUuid',
+    required: true,
+  })
+  @IsString()
+  @IsNotEmpty()
+  public tagUuid: string;
+
   @ApiProperty({
     description: 'deviceName',
     required: true,

src/device/dtos/get.device.dto.ts

@@ -1,5 +1,6 @@
 import { DeviceTypeEnum } from '@app/common/constants/device-type.enum';
 import { ApiProperty } from '@nestjs/swagger';
+import { Transform } from 'class-transformer';
 import {
   IsEnum,
   IsNotEmpty,
@@ -41,16 +42,7 @@ export class GetDeviceLogsDto {
   @IsOptional()
   public endTime: string;
 }
-export class GetDoorLockDevices {
+
-  @ApiProperty({
-    description: 'Device Type',
-    enum: DeviceTypeEnum,
-    required: false,
-  })
-  @IsEnum(DeviceTypeEnum)
-  @IsOptional()
-  public deviceType: DeviceTypeEnum;
-}
 export class GetDevicesBySpaceOrCommunityDto {
   @ApiProperty({
     description: 'Device Product Type',
@@ -72,3 +64,44 @@ export class GetDevicesBySpaceOrCommunityDto {
   @IsNotEmpty({ message: 'Either spaceUuid or communityUuid must be provided' })
   requireEither?: never; // This ensures at least one of them is provided
 }
+
+export class GetDevicesFilterDto {
+  @ApiProperty({
+    description: 'Device Type',
+    enum: DeviceTypeEnum,
+    required: false,
+  })
+  @IsEnum(DeviceTypeEnum)
+  @IsOptional()
+  public deviceType: DeviceTypeEnum;
+
+  @ApiProperty({
+    description: 'List of Space IDs to filter devices',
+    required: false,
+    example: ['60d21b4667d0d8992e610c85', '60d21b4967d0d8992e610c86'],
+  })
+  @IsOptional()
+  @Transform(({ value }) => {
+    if (!Array.isArray(value)) {
+      return [value];
+    }
+    return value;
+  })
+  @IsUUID('4', { each: true })
+  public spaces?: string[];
+
+  @ApiProperty({
+    description: 'List of Community IDs to filter devices',
+    required: false,
+    example: ['60d21b4667d0d8992e610c85', '60d21b4967d0d8992e610c86'],
+  })
+  @Transform(({ value }) => {
+    if (!Array.isArray(value)) {
+      return [value];
+    }
+    return value;
+  })
+  @IsOptional()
+  @IsUUID('4', { each: true })
+  public communities?: string[];
+}

src/door-lock/door.lock.module.ts

@@ -30,6 +30,8 @@ import { SqlLoaderService } from '@app/common/helper/services/sql-loader.service
 import { OccupancyService } from '@app/common/helper/services/occupancy.service';
 import { CommunityRepository } from '@app/common/modules/community/repositories';
 import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
+import { PresenceSensorDailySpaceRepository } from '@app/common/modules/presence-sensor/repositories';
+import { AqiSpaceDailyPollutantStatsRepository } from '@app/common/modules/aqi/repositories';
 @Module({
   imports: [ConfigModule, DeviceRepositoryModule],
   controllers: [DoorLockController],
@@ -58,6 +60,8 @@ import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
     OccupancyService,
     CommunityRepository,
     AqiDataService,
+    PresenceSensorDailySpaceRepository,
+    AqiSpaceDailyPollutantStatsRepository,
   ],
   exports: [DoorLockService],
 })

src/group/group.module.ts

@@ -28,6 +28,8 @@ import { SqlLoaderService } from '@app/common/helper/services/sql-loader.service
 import { OccupancyService } from '@app/common/helper/services/occupancy.service';
 import { CommunityRepository } from '@app/common/modules/community/repositories';
 import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
+import { PresenceSensorDailySpaceRepository } from '@app/common/modules/presence-sensor/repositories';
+import { AqiSpaceDailyPollutantStatsRepository } from '@app/common/modules/aqi/repositories';
 @Module({
   imports: [ConfigModule, DeviceRepositoryModule],
   controllers: [GroupController],
@@ -55,6 +57,8 @@ import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
     OccupancyService,
     CommunityRepository,
     AqiDataService,
+    PresenceSensorDailySpaceRepository,
+    AqiSpaceDailyPollutantStatsRepository,
   ],
   exports: [GroupService],
 })

src/invite-user/dtos/add.invite-user.dto.ts

@@ -5,6 +5,7 @@ import {
   IsNotEmpty,
   IsOptional,
   IsString,
+  IsUUID,
 } from 'class-validator';
 
 export class AddUserInvitationDto {
@@ -44,6 +45,15 @@ export class AddUserInvitationDto {
   @IsOptional()
   public jobTitle?: string;
 
+  @ApiProperty({
+    description: 'The company name of the user',
+    example: 'Tech Corp',
+    required: false,
+  })
+  @IsString()
+  @IsOptional()
+  public companyName?: string;
+
   @ApiProperty({
     description: 'The phone number of the user',
     example: '+1234567890',
@@ -58,7 +68,7 @@ export class AddUserInvitationDto {
     example: 'd290f1ee-6c54-4b01-90e6-d701748f0851',
     required: true,
   })
-  @IsString()
+  @IsUUID('4')
   @IsNotEmpty()
   public roleUuid: string;
   @ApiProperty({
@@ -66,15 +76,17 @@ export class AddUserInvitationDto {
     example: 'd290f1ee-6c54-4b01-90e6-d701748f0851',
     required: true,
   })
-  @IsString()
+  @IsUUID('4')
   @IsNotEmpty()
   public projectUuid: string;
+
   @ApiProperty({
     description: 'The array of space UUIDs (at least one required)',
     example: ['b5f3c9d2-58b7-4377-b3f7-60acb711d5d9'],
     required: true,
   })
   @IsArray()
+  @IsUUID('4', { each: true })
   @ArrayMinSize(1)
   public spaceUuids: string[];
   constructor(dto: Partial<AddUserInvitationDto>) {

src/invite-user/dtos/update.invite-user.dto.ts

@@ -1,78 +1,10 @@
-import { ApiProperty } from '@nestjs/swagger';
+import { ApiProperty, OmitType } from '@nestjs/swagger';
-import {
+import { IsBoolean, IsNotEmpty, IsString } from 'class-validator';
-  ArrayMinSize,
+import { AddUserInvitationDto } from './add.invite-user.dto';
-  IsArray,
-  IsBoolean,
-  IsNotEmpty,
-  IsOptional,
-  IsString,
-} from 'class-validator';
 
-export class UpdateUserInvitationDto {
+export class UpdateUserInvitationDto extends OmitType(AddUserInvitationDto, [
-  @ApiProperty({
+  'email',
-    description: 'The first name of the user',
+]) {}
-    example: 'John',
-    required: true,
-  })
-  @IsString()
-  @IsNotEmpty()
-  public firstName: string;
-
-  @ApiProperty({
-    description: 'The last name of the user',
-    example: 'Doe',
-    required: true,
-  })
-  @IsString()
-  @IsNotEmpty()
-  public lastName: string;
-
-  @ApiProperty({
-    description: 'The job title of the user',
-    example: 'Software Engineer',
-    required: false,
-  })
-  @IsString()
-  @IsOptional()
-  public jobTitle?: string;
-
-  @ApiProperty({
-    description: 'The phone number of the user',
-    example: '+1234567890',
-    required: false,
-  })
-  @IsString()
-  @IsOptional()
-  public phoneNumber?: string;
-
-  @ApiProperty({
-    description: 'The role uuid of the user',
-    example: 'd290f1ee-6c54-4b01-90e6-d701748f0851',
-    required: true,
-  })
-  @IsString()
-  @IsNotEmpty()
-  public roleUuid: string;
-  @ApiProperty({
-    description: 'The project uuid of the user',
-    example: 'd290f1ee-6c54-4b01-90e6-d701748f0851',
-    required: true,
-  })
-  @IsString()
-  @IsNotEmpty()
-  public projectUuid: string;
-  @ApiProperty({
-    description: 'The array of space UUIDs (at least one required)',
-    example: ['b5f3c9d2-58b7-4377-b3f7-60acb711d5d9'],
-    required: true,
-  })
-  @IsArray()
-  @ArrayMinSize(1)
-  public spaceUuids: string[];
-  constructor(dto: Partial<UpdateUserInvitationDto>) {
-    Object.assign(this, dto);
-  }
-}
 export class DisableUserInvitationDto {
   @ApiProperty({
     description: 'The disable status of the user',

src/invite-user/invite-user.module.ts

@@ -38,7 +38,6 @@ import {
 } from '@app/common/modules/scene/repositories';
 import {
   InviteSpaceRepository,
-  SpaceLinkRepository,
   SpaceProductAllocationRepository,
   SpaceRepository,
 } from '@app/common/modules/space';
@@ -71,7 +70,6 @@ import {
 import { SpaceModelProductAllocationService } from 'src/space-model/services/space-model-product-allocation.service';
 import { SubspaceModelProductAllocationService } from 'src/space-model/services/subspace/subspace-model-product-allocation.service';
 import {
-  SpaceLinkService,
   SpaceService,
   SpaceUserService,
   SubspaceDeviceService,
@@ -83,6 +81,8 @@ import { SubspaceProductAllocationService } from 'src/space/services/subspace/su
 import { TagService as NewTagService } from 'src/tags/services';
 import { UserDevicePermissionService } from 'src/user-device-permission/services';
 import { UserService, UserSpaceService } from 'src/users/services';
+import { PresenceSensorDailySpaceRepository } from '@app/common/modules/presence-sensor/repositories';
+import { AqiSpaceDailyPollutantStatsRepository } from '@app/common/modules/aqi/repositories';
 
 @Module({
   imports: [ConfigModule, InviteUserRepositoryModule, CommunityModule],
@@ -115,13 +115,11 @@ import { UserService, UserSpaceService } from 'src/users/services';
     TimeZoneRepository,
     SpaceService,
     InviteSpaceRepository,
-    SpaceLinkService,
     SubSpaceService,
     ValidationService,
     NewTagService,
     SpaceModelService,
     SpaceProductAllocationService,
-    SpaceLinkRepository,
     SubspaceRepository,
     SubspaceDeviceService,
     SubspaceProductAllocationService,
@@ -152,6 +150,8 @@ import { UserService, UserSpaceService } from 'src/users/services';
     SqlLoaderService,
     OccupancyService,
     AqiDataService,
+    PresenceSensorDailySpaceRepository,
+    AqiSpaceDailyPollutantStatsRepository,
   ],
   exports: [InviteUserService],
 })

src/invite-user/services/invite-user.service.ts

@@ -8,6 +8,8 @@ import {
   InviteUserRepository,
   InviteUserSpaceRepository,
 } from '@app/common/modules/Invite-user/repositiories';
+import { ProjectEntity } from '@app/common/modules/project/entities';
+import { RoleTypeEntity } from '@app/common/modules/role-type/entities';
 import { RoleTypeRepository } from '@app/common/modules/role-type/repositories';
 import { SpaceRepository } from '@app/common/modules/space';
 import { SpaceEntity } from '@app/common/modules/space/entities/space.entity';
@@ -61,6 +63,7 @@ export class InviteUserService {
       lastName,
       email,
       jobTitle,
+      companyName,
       phoneNumber,
       roleUuid,
       spaceUuids,
@@ -90,6 +93,8 @@ export class InviteUserService {
         );
       }
 
+      await this.checkRole(roleUuid, queryRunner);
+      await this.checkProject(projectUuid, queryRunner);
       // Validate spaces
       const validSpaces = await this.validateSpaces(
         spaceUuids,
@@ -102,6 +107,7 @@ export class InviteUserService {
         lastName,
         email,
         jobTitle,
+        companyName,
         phoneNumber,
         roleType: { uuid: roleUuid },
         status: UserStatusEnum.INVITED,
@@ -111,6 +117,7 @@ export class InviteUserService {
       });
 
       const invitedUser = await queryRunner.manager.save(inviteUser);
+      const invitedRoleType = await this.getRoleTypeByUuid(roleUuid);
 
       // Link user to spaces
       const spacePromises = validSpaces.map(async (space) => {
@@ -128,7 +135,7 @@ export class InviteUserService {
       await this.emailService.sendEmailWithInvitationTemplate(email, {
         name: firstName,
         invitationCode,
-        role: roleType,
+        role: invitedRoleType.replace(/_/g, ' '),
         spacesList: spaceNames,
       });
 
@@ -156,185 +163,6 @@ export class InviteUserService {
       await queryRunner.release();
     }
   }
-  private async validateSpaces(
-    spaceUuids: string[],
-    entityManager: EntityManager,
-  ): Promise<SpaceEntity[]> {
-    const spaceRepo = entityManager.getRepository(SpaceEntity);
-
-    const validSpaces = await spaceRepo.find({
-      where: { uuid: In(spaceUuids) },
-    });
-
-    if (validSpaces.length !== spaceUuids.length) {
-      const validSpaceUuids = validSpaces.map((space) => space.uuid);
-      const invalidSpaceUuids = spaceUuids.filter(
-        (uuid) => !validSpaceUuids.includes(uuid),
-      );
-      throw new HttpException(
-        `Invalid space UUIDs: ${invalidSpaceUuids.join(', ')}`,
-        HttpStatus.BAD_REQUEST,
-      );
-    }
-
-    return validSpaces;
-  }
-
-  async checkEmailAndProject(dto: CheckEmailDto): Promise<BaseResponseDto> {
-    const { email } = dto;
-
-    try {
-      const user = await this.userRepository.findOne({
-        where: { email },
-        relations: ['project'],
-      });
-      this.validateUserOrInvite(user, 'User');
-      const invitedUser = await this.inviteUserRepository.findOne({
-        where: { email },
-        relations: ['project'],
-      });
-      this.validateUserOrInvite(invitedUser, 'Invited User');
-
-      return new SuccessResponseDto({
-        statusCode: HttpStatus.OK,
-        success: true,
-        message: 'Valid email',
-      });
-    } catch (error) {
-      console.error('Error checking email and project:', error);
-      throw new HttpException(
-        error.message ||
-          'An unexpected error occurred while checking the email',
-        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
-
-  private validateUserOrInvite(user: any, userType: string): void {
-    if (user) {
-      if (!user.isActive) {
-        throw new HttpException(
-          `${userType} is deleted`,
-          HttpStatus.BAD_REQUEST,
-        );
-      }
-      if (user.project) {
-        throw new HttpException(
-          `${userType} already has a project`,
-          HttpStatus.BAD_REQUEST,
-        );
-      }
-    }
-  }
-
-  async activationCode(dto: ActivateCodeDto): Promise<BaseResponseDto> {
-    const { activationCode, userUuid } = dto;
-
-    try {
-      const user = await this.getUser(userUuid);
-
-      const invitedUser = await this.inviteUserRepository.findOne({
-        where: {
-          email: user.email,
-          status: UserStatusEnum.INVITED,
-          isActive: true,
-        },
-        relations: ['project', 'spaces.space.community', 'roleType'],
-      });
-
-      if (invitedUser) {
-        if (invitedUser.invitationCode !== activationCode) {
-          throw new HttpException(
-            'Invalid activation code',
-            HttpStatus.BAD_REQUEST,
-          );
-        }
-
-        // Handle invited user with valid activation code
-        await this.handleInvitedUser(user, invitedUser);
-      } else {
-        // Handle case for non-invited user
-        await this.handleNonInvitedUser(activationCode, userUuid);
-      }
-      return new SuccessResponseDto({
-        statusCode: HttpStatus.OK,
-        success: true,
-        message: 'The code has been successfully activated',
-      });
-    } catch (error) {
-      console.error('Error activating the code:', error);
-      throw new HttpException(
-        error.message ||
-          'An unexpected error occurred while activating the code',
-        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
-
-  private async getUser(userUuid: string): Promise<UserEntity> {
-    const user = await this.userRepository.findOne({
-      where: { uuid: userUuid, isActive: true, isUserVerified: true },
-    });
-
-    if (!user) {
-      throw new HttpException('User not found', HttpStatus.NOT_FOUND);
-    }
-    return user;
-  }
-
-  private async handleNonInvitedUser(
-    activationCode: string,
-    userUuid: string,
-  ): Promise<void> {
-    await this.userSpaceService.verifyCodeAndAddUserSpace(
-      { inviteCode: activationCode },
-      userUuid,
-    );
-  }
-
-  private async handleInvitedUser(
-    user: UserEntity,
-    invitedUser: InviteUserEntity,
-  ): Promise<void> {
-    for (const invitedSpace of invitedUser.spaces) {
-      try {
-        const deviceUUIDs = await this.userSpaceService.getDeviceUUIDsForSpace(
-          invitedSpace.space.uuid,
-        );
-
-        await this.userSpaceService.addUserPermissionsToDevices(
-          user.uuid,
-          deviceUUIDs,
-        );
-
-        await this.spaceUserService.associateUserToSpace({
-          communityUuid: invitedSpace.space.community.uuid,
-          spaceUuid: invitedSpace.space.uuid,
-          userUuid: user.uuid,
-          projectUuid: invitedUser.project.uuid,
-        });
-      } catch (spaceError) {
-        console.error(
-          `Error processing space ${invitedSpace.space.uuid}:`,
-          spaceError,
-        );
-        continue; // Skip to the next space
-      }
-    }
-
-    // Update invited user and associated user data
-    await this.inviteUserRepository.update(
-      { uuid: invitedUser.uuid },
-      { status: UserStatusEnum.ACTIVE, user: { uuid: user.uuid } },
-    );
-    await this.userRepository.update(
-      { uuid: user.uuid },
-      {
-        project: { uuid: invitedUser.project.uuid },
-        roleType: { uuid: invitedUser.roleType.uuid },
-      },
-    );
-  }
 
   async updateUserInvitation(
     dto: UpdateUserInvitationDto,
@@ -356,6 +184,9 @@ export class InviteUserService {
         throw new HttpException('User not found', HttpStatus.NOT_FOUND);
       }
 
+      await this.checkRole(dto.roleUuid, queryRunner);
+      await this.checkProject(projectUuid, queryRunner);
+
       // Perform update actions if status is 'INVITED'
       if (userOldData.status === UserStatusEnum.INVITED) {
         await this.updateWhenUserIsInvite(queryRunner, dto, invitedUserUuid);
@@ -438,174 +269,7 @@ export class InviteUserService {
       await queryRunner.release();
     }
   }
-  private async getRoleTypeByUuid(roleUuid: string) {
-    const role = await this.roleTypeRepository.findOne({
-      where: { uuid: roleUuid },
-    });
 
-    return role.type;
-  }
-
-  private async updateWhenUserIsInvite(
-    queryRunner: QueryRunner,
-    dto: UpdateUserInvitationDto,
-    invitedUserUuid: string,
-  ): Promise<void> {
-    const { firstName, lastName, jobTitle, phoneNumber, roleUuid, spaceUuids } =
-      dto;
-
-    // Update user invitation details
-    await queryRunner.manager.update(
-      this.inviteUserRepository.target,
-      { uuid: invitedUserUuid },
-      {
-        firstName,
-        lastName,
-        jobTitle,
-        phoneNumber,
-        roleType: { uuid: roleUuid },
-      },
-    );
-
-    // Remove old space associations
-    await queryRunner.manager.delete(this.inviteUserSpaceRepository.target, {
-      inviteUser: { uuid: invitedUserUuid },
-    });
-
-    // Save new space associations
-    const spaceData = spaceUuids.map((spaceUuid) => ({
-      inviteUser: { uuid: invitedUserUuid },
-      space: { uuid: spaceUuid },
-    }));
-    await queryRunner.manager.save(
-      this.inviteUserSpaceRepository.target,
-      spaceData,
-    );
-  }
-  private async updateWhenUserIsActive(
-    queryRunner: QueryRunner,
-    dto: UpdateUserInvitationDto,
-    invitedUserUuid: string,
-  ): Promise<void> {
-    const {
-      firstName,
-      lastName,
-      jobTitle,
-      phoneNumber,
-      roleUuid,
-      spaceUuids,
-      projectUuid,
-    } = dto;
-
-    const userData = await this.inviteUserRepository.findOne({
-      where: { uuid: invitedUserUuid },
-      relations: ['user.userSpaces.space', 'user.userSpaces.space.community'],
-    });
-
-    if (!userData) {
-      throw new HttpException(
-        `User with invitedUserUuid ${invitedUserUuid} not found`,
-        HttpStatus.NOT_FOUND,
-      );
-    }
-
-    // Update user details
-    await queryRunner.manager.update(
-      this.inviteUserRepository.target,
-      { uuid: invitedUserUuid },
-      {
-        firstName,
-        lastName,
-        jobTitle,
-        phoneNumber,
-        roleType: { uuid: roleUuid },
-      },
-    );
-    await this.userRepository.update(
-      { uuid: userData.user.uuid },
-      {
-        roleType: { uuid: roleUuid },
-      },
-    );
-    // Disassociate the user from all current spaces
-    const disassociatePromises = userData.user.userSpaces.map((userSpace) =>
-      this.spaceUserService
-        .disassociateUserFromSpace({
-          communityUuid: userSpace.space.community.uuid,
-          spaceUuid: userSpace.space.uuid,
-          userUuid: userData.user.uuid,
-          projectUuid,
-        })
-        .catch((error) => {
-          console.error(
-            `Failed to disassociate user from space ${userSpace.space.uuid}:`,
-            error,
-          );
-          throw error;
-        }),
-    );
-
-    await Promise.allSettled(disassociatePromises);
-
-    // Process new spaces
-    const associatePromises = spaceUuids.map(async (spaceUuid) => {
-      try {
-        // Fetch space details
-        const spaceDetails = await this.getSpaceByUuid(spaceUuid);
-
-        // Fetch device UUIDs for the space
-        const deviceUUIDs =
-          await this.userSpaceService.getDeviceUUIDsForSpace(spaceUuid);
-
-        // Grant permissions to the user for all devices in the space
-        await this.userSpaceService.addUserPermissionsToDevices(
-          userData.user.uuid,
-          deviceUUIDs,
-        );
-
-        // Associate the user with the new space
-        await this.spaceUserService.associateUserToSpace({
-          communityUuid: spaceDetails.communityUuid,
-          spaceUuid: spaceUuid,
-          userUuid: userData.user.uuid,
-          projectUuid,
-        });
-      } catch (error) {
-        console.error(`Failed to process space ${spaceUuid}:`, error);
-        throw error;
-      }
-    });
-
-    await Promise.all(associatePromises);
-  }
-
-  async getSpaceByUuid(spaceUuid: string) {
-    try {
-      const space = await this.spaceRepository.findOne({
-        where: {
-          uuid: spaceUuid,
-        },
-        relations: ['community'],
-      });
-      if (!space) {
-        throw new BadRequestException(`Invalid space UUID ${spaceUuid}`);
-      }
-      return {
-        uuid: space.uuid,
-        createdAt: space.createdAt,
-        updatedAt: space.updatedAt,
-        name: space.spaceName,
-        spaceTuyaUuid: space.community.externalId,
-        communityUuid: space.community.uuid,
-      };
-    } catch (err) {
-      if (err instanceof BadRequestException) {
-        throw err; // Re-throw BadRequestException
-      } else {
-        throw new HttpException('Space not found', HttpStatus.NOT_FOUND);
-      }
-    }
-  }
   async disableUserInvitation(
     dto: DisableUserInvitationDto,
     invitedUserUuid: string,
@@ -685,74 +349,6 @@ export class InviteUserService {
     }
   }
 
-  private async updateUserStatus(
-    invitedUserUuid: string,
-    projectUuid: string,
-    isEnabled: boolean,
-  ) {
-    await this.inviteUserRepository.update(
-      { uuid: invitedUserUuid, project: { uuid: projectUuid } },
-      { isEnabled },
-    );
-  }
-
-  private async disassociateUserFromSpaces(user: any, projectUuid: string) {
-    const disassociatePromises = user.userSpaces.map((userSpace) =>
-      this.spaceUserService.disassociateUserFromSpace({
-        communityUuid: userSpace.space.community.uuid,
-        spaceUuid: userSpace.space.uuid,
-        userUuid: user.uuid,
-        projectUuid,
-      }),
-    );
-
-    const results = await Promise.allSettled(disassociatePromises);
-
-    results.forEach((result, index) => {
-      if (result.status === 'rejected') {
-        console.error(
-          `Failed to disassociate user from space ${user.userSpaces[index].space.uuid}:`,
-          result.reason,
-        );
-      }
-    });
-  }
-  private async associateUserToSpaces(
-    user: any,
-    userData: any,
-    projectUuid: string,
-    invitedUserUuid: string,
-    disable: boolean,
-  ) {
-    const spaceUuids = userData.spaces.map((space) => space.space.uuid);
-
-    const associatePromises = spaceUuids.map(async (spaceUuid) => {
-      try {
-        const spaceDetails = await this.getSpaceByUuid(spaceUuid);
-
-        const deviceUUIDs =
-          await this.userSpaceService.getDeviceUUIDsForSpace(spaceUuid);
-        await this.userSpaceService.addUserPermissionsToDevices(
-          user.uuid,
-          deviceUUIDs,
-        );
-
-        await this.spaceUserService.associateUserToSpace({
-          communityUuid: spaceDetails.communityUuid,
-          spaceUuid,
-          userUuid: user.uuid,
-          projectUuid,
-        });
-
-        await this.updateUserStatus(invitedUserUuid, projectUuid, disable);
-      } catch (error) {
-        console.error(`Failed to associate user to space ${spaceUuid}:`, error);
-      }
-    });
-
-    await Promise.allSettled(associatePromises);
-  }
-
   async deleteUserInvitation(
     invitedUserUuid: string,
   ): Promise<BaseResponseDto> {
@@ -823,4 +419,486 @@ export class InviteUserService {
       await queryRunner.release();
     }
   }
+
+  async activationCode(dto: ActivateCodeDto): Promise<BaseResponseDto> {
+    const { activationCode, userUuid } = dto;
+
+    try {
+      const user = await this.getUser(userUuid);
+
+      const invitedUser = await this.inviteUserRepository.findOne({
+        where: {
+          email: user.email,
+          status: UserStatusEnum.INVITED,
+          isActive: true,
+        },
+        relations: ['project', 'spaces.space.community', 'roleType'],
+      });
+
+      if (invitedUser) {
+        if (invitedUser.invitationCode !== activationCode) {
+          throw new HttpException(
+            'Invalid activation code',
+            HttpStatus.BAD_REQUEST,
+          );
+        }
+
+        // Handle invited user with valid activation code
+        await this.handleInvitedUser(user, invitedUser);
+      } else {
+        // Handle case for non-invited user
+        await this.handleNonInvitedUser(activationCode, userUuid);
+      }
+      return new SuccessResponseDto({
+        statusCode: HttpStatus.OK,
+        success: true,
+        message: 'The code has been successfully activated',
+      });
+    } catch (error) {
+      console.error('Error activating the code:', error);
+      throw new HttpException(
+        error.message ||
+          'An unexpected error occurred while activating the code',
+        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
+
+  async checkEmailAndProject(dto: CheckEmailDto): Promise<BaseResponseDto> {
+    const { email } = dto;
+
+    try {
+      const user = await this.userRepository.findOne({
+        where: { email },
+        relations: ['project'],
+      });
+      this.validateUserOrInvite(user, 'User');
+      const invitedUser = await this.inviteUserRepository.findOne({
+        where: { email },
+        relations: ['project'],
+      });
+      this.validateUserOrInvite(invitedUser, 'Invited User');
+
+      return new SuccessResponseDto({
+        statusCode: HttpStatus.OK,
+        success: true,
+        message: 'Valid email',
+      });
+    } catch (error) {
+      console.error('Error checking email and project:', error);
+      throw new HttpException(
+        error.message ||
+          'An unexpected error occurred while checking the email',
+        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
+
+  private async getSpaceByUuid(spaceUuid: string) {
+    try {
+      const space = await this.spaceRepository.findOne({
+        where: {
+          uuid: spaceUuid,
+        },
+        relations: ['community'],
+      });
+      if (!space) {
+        throw new BadRequestException(`Invalid space UUID ${spaceUuid}`);
+      }
+      return {
+        uuid: space.uuid,
+        createdAt: space.createdAt,
+        updatedAt: space.updatedAt,
+        name: space.spaceName,
+        spaceTuyaUuid: space.community.externalId,
+        communityUuid: space.community.uuid,
+      };
+    } catch (err) {
+      if (err instanceof BadRequestException) {
+        throw err; // Re-throw BadRequestException
+      } else {
+        throw new HttpException('Space not found', HttpStatus.NOT_FOUND);
+      }
+    }
+  }
+
+  private async validateSpaces(
+    spaceUuids: string[],
+    entityManager: EntityManager,
+  ): Promise<SpaceEntity[]> {
+    const spaceRepo = entityManager.getRepository(SpaceEntity);
+
+    const validSpaces = await spaceRepo.find({
+      where: { uuid: In(spaceUuids) },
+    });
+
+    if (validSpaces.length !== spaceUuids.length) {
+      const validSpaceUuids = validSpaces.map((space) => space.uuid);
+      const invalidSpaceUuids = spaceUuids.filter(
+        (uuid) => !validSpaceUuids.includes(uuid),
+      );
+      throw new HttpException(
+        `Invalid space UUIDs: ${invalidSpaceUuids.join(', ')}`,
+        HttpStatus.BAD_REQUEST,
+      );
+    }
+
+    return validSpaces;
+  }
+
+  private async checkRole(
+    roleUuid: string,
+    queryRunner: QueryRunner,
+  ): Promise<BaseResponseDto> {
+    try {
+      const role = await queryRunner.manager.findOne(RoleTypeEntity, {
+        where: { uuid: roleUuid },
+      });
+
+      if (!role) {
+        throw new HttpException('Role not found', HttpStatus.NOT_FOUND);
+      }
+
+      return new SuccessResponseDto({
+        statusCode: HttpStatus.OK,
+        success: true,
+        message: 'Valid role',
+      });
+    } catch (error) {
+      console.error('Error checking role:', error);
+      throw new HttpException(
+        error.message || 'An unexpected error occurred while checking the role',
+        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
+
+  private async checkProject(
+    projectUuid: string,
+    queryRunner: QueryRunner,
+  ): Promise<BaseResponseDto> {
+    try {
+      const project = await queryRunner.manager.findOne(ProjectEntity, {
+        where: { uuid: projectUuid },
+      });
+
+      if (!project) {
+        throw new HttpException('Project not found', HttpStatus.NOT_FOUND);
+      }
+
+      return new SuccessResponseDto({
+        statusCode: HttpStatus.OK,
+        success: true,
+        message: 'Valid project',
+      });
+    } catch (error) {
+      console.error('Error checking project:', error);
+      throw new HttpException(
+        error.message ||
+          'An unexpected error occurred while checking the project',
+        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
+
+  private validateUserOrInvite(user: any, userType: string): void {
+    if (user) {
+      if (!user.isActive) {
+        throw new HttpException(
+          `${userType} is deleted`,
+          HttpStatus.BAD_REQUEST,
+        );
+      }
+      if (user.project) {
+        throw new HttpException(
+          `${userType} already has a project`,
+          HttpStatus.BAD_REQUEST,
+        );
+      }
+    }
+  }
+
+  private async getUser(userUuid: string): Promise<UserEntity> {
+    const user = await this.userRepository.findOne({
+      where: { uuid: userUuid, isActive: true, isUserVerified: true },
+    });
+
+    if (!user) {
+      throw new HttpException('User not found', HttpStatus.NOT_FOUND);
+    }
+    return user;
+  }
+
+  private async handleNonInvitedUser(
+    activationCode: string,
+    userUuid: string,
+  ): Promise<void> {
+    await this.userSpaceService.verifyCodeAndAddUserSpace(
+      { inviteCode: activationCode },
+      userUuid,
+    );
+  }
+
+  private async handleInvitedUser(
+    user: UserEntity,
+    invitedUser: InviteUserEntity,
+  ): Promise<void> {
+    for (const invitedSpace of invitedUser.spaces) {
+      try {
+        const deviceUUIDs = await this.userSpaceService.getDeviceUUIDsForSpace(
+          invitedSpace.space.uuid,
+        );
+
+        await this.userSpaceService.addUserPermissionsToDevices(
+          user.uuid,
+          deviceUUIDs,
+        );
+
+        await this.spaceUserService.associateUserToSpace({
+          communityUuid: invitedSpace.space.community.uuid,
+          spaceUuid: invitedSpace.space.uuid,
+          userUuid: user.uuid,
+          projectUuid: invitedUser.project.uuid,
+        });
+      } catch (spaceError) {
+        console.error(
+          `Error processing space ${invitedSpace.space.uuid}:`,
+          spaceError,
+        );
+        continue; // Skip to the next space
+      }
+    }
+
+    // Update invited user and associated user data
+    await this.inviteUserRepository.update(
+      { uuid: invitedUser.uuid },
+      { status: UserStatusEnum.ACTIVE, user: { uuid: user.uuid } },
+    );
+    await this.userRepository.update(
+      { uuid: user.uuid },
+      {
+        project: { uuid: invitedUser.project.uuid },
+        roleType: { uuid: invitedUser.roleType.uuid },
+      },
+    );
+  }
+
+  private async getRoleTypeByUuid(roleUuid: string) {
+    const role = await this.roleTypeRepository.findOne({
+      where: { uuid: roleUuid },
+    });
+
+    return role.type;
+  }
+
+  private async updateWhenUserIsInvite(
+    queryRunner: QueryRunner,
+    dto: UpdateUserInvitationDto,
+    invitedUserUuid: string,
+  ): Promise<void> {
+    const {
+      firstName,
+      lastName,
+      jobTitle,
+      companyName,
+      phoneNumber,
+      roleUuid,
+      spaceUuids,
+    } = dto;
+
+    // Update user invitation details
+    await queryRunner.manager.update(
+      this.inviteUserRepository.target,
+      { uuid: invitedUserUuid },
+      {
+        firstName,
+        lastName,
+        jobTitle,
+        companyName,
+        phoneNumber,
+        roleType: { uuid: roleUuid },
+      },
+    );
+
+    // Remove old space associations
+    await queryRunner.manager.delete(this.inviteUserSpaceRepository.target, {
+      inviteUser: { uuid: invitedUserUuid },
+    });
+
+    // Save new space associations
+    const spaceData = spaceUuids.map((spaceUuid) => ({
+      inviteUser: { uuid: invitedUserUuid },
+      space: { uuid: spaceUuid },
+    }));
+    await queryRunner.manager.save(
+      this.inviteUserSpaceRepository.target,
+      spaceData,
+    );
+  }
+  private async updateWhenUserIsActive(
+    queryRunner: QueryRunner,
+    dto: UpdateUserInvitationDto,
+    invitedUserUuid: string,
+  ): Promise<void> {
+    const {
+      firstName,
+      lastName,
+      jobTitle,
+      companyName,
+      phoneNumber,
+      roleUuid,
+      spaceUuids,
+      projectUuid,
+    } = dto;
+
+    const userData = await this.inviteUserRepository.findOne({
+      where: { uuid: invitedUserUuid },
+      relations: ['user.userSpaces.space', 'user.userSpaces.space.community'],
+    });
+
+    if (!userData) {
+      throw new HttpException(
+        `User with invitedUserUuid ${invitedUserUuid} not found`,
+        HttpStatus.NOT_FOUND,
+      );
+    }
+
+    // Update user details
+    await queryRunner.manager.update(
+      this.inviteUserRepository.target,
+      { uuid: invitedUserUuid },
+      {
+        firstName,
+        lastName,
+        jobTitle,
+        companyName,
+        phoneNumber,
+        roleType: { uuid: roleUuid },
+      },
+    );
+    await this.userRepository.update(
+      { uuid: userData.user.uuid },
+      {
+        roleType: { uuid: roleUuid },
+      },
+    );
+    // Disassociate the user from all current spaces
+    const disassociatePromises = userData.user.userSpaces.map((userSpace) =>
+      this.spaceUserService
+        .disassociateUserFromSpace({
+          communityUuid: userSpace.space.community.uuid,
+          spaceUuid: userSpace.space.uuid,
+          userUuid: userData.user.uuid,
+          projectUuid,
+        })
+        .catch((error) => {
+          console.error(
+            `Failed to disassociate user from space ${userSpace.space.uuid}:`,
+            error,
+          );
+          throw error;
+        }),
+    );
+
+    await Promise.allSettled(disassociatePromises);
+
+    // Process new spaces
+    const associatePromises = spaceUuids.map(async (spaceUuid) => {
+      try {
+        // Fetch space details
+        const spaceDetails = await this.getSpaceByUuid(spaceUuid);
+
+        // Fetch device UUIDs for the space
+        const deviceUUIDs =
+          await this.userSpaceService.getDeviceUUIDsForSpace(spaceUuid);
+
+        // Grant permissions to the user for all devices in the space
+        await this.userSpaceService.addUserPermissionsToDevices(
+          userData.user.uuid,
+          deviceUUIDs,
+        );
+
+        // Associate the user with the new space
+        await this.spaceUserService.associateUserToSpace({
+          communityUuid: spaceDetails.communityUuid,
+          spaceUuid: spaceUuid,
+          userUuid: userData.user.uuid,
+          projectUuid,
+        });
+      } catch (error) {
+        console.error(`Failed to process space ${spaceUuid}:`, error);
+        throw error;
+      }
+    });
+
+    await Promise.all(associatePromises);
+  }
+
+  private async updateUserStatus(
+    invitedUserUuid: string,
+    projectUuid: string,
+    isEnabled: boolean,
+  ) {
+    await this.inviteUserRepository.update(
+      { uuid: invitedUserUuid, project: { uuid: projectUuid } },
+      { isEnabled },
+    );
+  }
+
+  private async disassociateUserFromSpaces(user: any, projectUuid: string) {
+    const disassociatePromises = user.userSpaces.map((userSpace) =>
+      this.spaceUserService.disassociateUserFromSpace({
+        communityUuid: userSpace.space.community.uuid,
+        spaceUuid: userSpace.space.uuid,
+        userUuid: user.uuid,
+        projectUuid,
+      }),
+    );
+
+    const results = await Promise.allSettled(disassociatePromises);
+
+    results.forEach((result, index) => {
+      if (result.status === 'rejected') {
+        console.error(
+          `Failed to disassociate user from space ${user.userSpaces[index].space.uuid}:`,
+          result.reason,
+        );
+      }
+    });
+  }
+  private async associateUserToSpaces(
+    user: any,
+    userData: any,
+    projectUuid: string,
+    invitedUserUuid: string,
+    disable: boolean,
+  ) {
+    const spaceUuids = userData.spaces.map((space) => space.space.uuid);
+
+    const associatePromises = spaceUuids.map(async (spaceUuid) => {
+      try {
+        const spaceDetails = await this.getSpaceByUuid(spaceUuid);
+
+        const deviceUUIDs =
+          await this.userSpaceService.getDeviceUUIDsForSpace(spaceUuid);
+        await this.userSpaceService.addUserPermissionsToDevices(
+          user.uuid,
+          deviceUUIDs,
+        );
+
+        await this.spaceUserService.associateUserToSpace({
+          communityUuid: spaceDetails.communityUuid,
+          spaceUuid,
+          userUuid: user.uuid,
+          projectUuid,
+        });
+
+        await this.updateUserStatus(invitedUserUuid, projectUuid, disable);
+      } catch (error) {
+        console.error(`Failed to associate user to space ${spaceUuid}:`, error);
+      }
+    });
+
+    await Promise.allSettled(associatePromises);
+  }
 }

src/main.ts

@@ -1,15 +1,13 @@
-import { NestFactory } from '@nestjs/core';
-import { AppModule } from './app.module';
-import rateLimit from 'express-rate-limit';
-import helmet from 'helmet';
-import { setupSwaggerAuthentication } from '../libs/common/src/util/user-auth.swagger.utils';
-import { ValidationPipe } from '@nestjs/common';
-import { json, urlencoded } from 'body-parser';
-import { SeederService } from '@app/common/seed/services/seeder.service';
-import { HttpExceptionFilter } from './common/filters/http-exception/http-exception.filter';
-import { Logger } from '@nestjs/common';
-import { WINSTON_MODULE_NEST_PROVIDER } from 'nest-winston';
 import { RequestContextMiddleware } from '@app/common/middleware/request-context.middleware';
+import { SeederService } from '@app/common/seed/services/seeder.service';
+import { Logger, ValidationPipe } from '@nestjs/common';
+import { NestFactory } from '@nestjs/core';
+import { json, urlencoded } from 'body-parser';
+import helmet from 'helmet';
+import { WINSTON_MODULE_NEST_PROVIDER } from 'nest-winston';
+import { setupSwaggerAuthentication } from '../libs/common/src/util/user-auth.swagger.utils';
+import { AppModule } from './app.module';
+import { HttpExceptionFilter } from './common/filters/http-exception/http-exception.filter';
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
@@ -23,13 +21,6 @@ async function bootstrap() {
 
   app.use(new RequestContextMiddleware().use);
 
-  app.use(
-    rateLimit({
-      windowMs: 5 * 60 * 1000,
-      max: 500,
-    }),
-  );
-
   app.use(
     helmet({
       contentSecurityPolicy: false,

src/power-clamp/power-clamp.module.ts

@@ -1,4 +1,5 @@
 import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
+import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
 import { OccupancyService } from '@app/common/helper/services/occupancy.service';
 import { PowerClampService } from '@app/common/helper/services/power.clamp.service';
 import { SqlLoaderService } from '@app/common/helper/services/sql-loader.service';
@@ -21,7 +22,6 @@ import {
 } from '@app/common/modules/scene/repositories';
 import {
   InviteSpaceRepository,
-  SpaceLinkRepository,
   SpaceProductAllocationRepository,
   SpaceRepository,
 } from '@app/common/modules/space';
@@ -49,7 +49,6 @@ import { SpaceModelProductAllocationService } from 'src/space-model/services/spa
 import { SubspaceModelProductAllocationService } from 'src/space-model/services/subspace/subspace-model-product-allocation.service';
 import {
   SpaceDeviceService,
-  SpaceLinkService,
   SpaceService,
   SubspaceDeviceService,
   SubSpaceService,
@@ -60,7 +59,8 @@ import { SubspaceProductAllocationService } from 'src/space/services/subspace/su
 import { TagService } from 'src/tags/services';
 import { PowerClampController } from './controllers';
 import { PowerClampService as PowerClamp } from './services/power-clamp.service';
-import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
+import { PresenceSensorDailySpaceRepository } from '@app/common/modules/presence-sensor/repositories';
+import { AqiSpaceDailyPollutantStatsRepository } from '@app/common/modules/aqi/repositories';
 @Module({
   imports: [ConfigModule],
   controllers: [PowerClampController],
@@ -90,13 +90,11 @@ import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
     SceneRepository,
     AutomationRepository,
     InviteSpaceRepository,
-    SpaceLinkService,
     SubSpaceService,
     TagService,
     SpaceModelService,
     SpaceProductAllocationService,
     SqlLoaderService,
-    SpaceLinkRepository,
     SubspaceRepository,
     SubspaceDeviceService,
     SubspaceProductAllocationService,
@@ -111,6 +109,8 @@ import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
     SubspaceModelProductAllocationRepoitory,
     OccupancyService,
     AqiDataService,
+    PresenceSensorDailySpaceRepository,
+    AqiSpaceDailyPollutantStatsRepository,
   ],
   exports: [PowerClamp],
 })

src/project/project.module.ts

@@ -23,7 +23,6 @@ import {
 } from '@app/common/modules/scene/repositories';
 import {
   InviteSpaceRepository,
-  SpaceLinkRepository,
   SpaceProductAllocationRepository,
   SpaceRepository,
 } from '@app/common/modules/space';
@@ -54,7 +53,6 @@ import {
 import { SpaceModelProductAllocationService } from 'src/space-model/services/space-model-product-allocation.service';
 import { SubspaceModelProductAllocationService } from 'src/space-model/services/subspace/subspace-model-product-allocation.service';
 import {
-  SpaceLinkService,
   SpaceService,
   SubspaceDeviceService,
   SubSpaceService,
@@ -68,6 +66,8 @@ import { ProjectUserController } from './controllers/project-user.controller';
 import { CreateOrphanSpaceHandler } from './handler';
 import { ProjectService } from './services';
 import { ProjectUserService } from './services/project-user.service';
+import { PresenceSensorDailySpaceRepository } from '@app/common/modules/presence-sensor/repositories';
+import { AqiSpaceDailyPollutantStatsRepository } from '@app/common/modules/aqi/repositories';
 
 const CommandHandlers = [CreateOrphanSpaceHandler];
 
@@ -87,14 +87,12 @@ const CommandHandlers = [CreateOrphanSpaceHandler];
     UserRepository,
     SpaceService,
     InviteSpaceRepository,
-    SpaceLinkService,
     SubSpaceService,
     ValidationService,
     TagService,
     SpaceModelService,
     DeviceService,
     SpaceProductAllocationService,
-    SpaceLinkRepository,
     SubspaceRepository,
     SubspaceDeviceService,
     SubspaceProductAllocationService,
@@ -126,6 +124,8 @@ const CommandHandlers = [CreateOrphanSpaceHandler];
     SqlLoaderService,
     OccupancyService,
     AqiDataService,
+    PresenceSensorDailySpaceRepository,
+    AqiSpaceDailyPollutantStatsRepository,
   ],
   exports: [ProjectService, CqrsModule],
 })

src/project/services/project-user.service.ts

@@ -33,6 +33,7 @@ export class ProjectUserService {
           'status',
           'phoneNumber',
           'jobTitle',
+          'companyName',
           'invitedBy',
           'isEnabled',
         ],
@@ -91,6 +92,7 @@ export class ProjectUserService {
           'status',
           'phoneNumber',
           'jobTitle',
+          'companyName',
           'invitedBy',
           'isEnabled',
         ],

src/project/services/project.service.ts

@@ -24,6 +24,7 @@ import { SpaceService } from 'src/space/services';
 import { PassThrough } from 'stream';
 import { CreateOrphanSpaceCommand } from '../command/create-orphan-space-command';
 import { CreateProjectDto, GetProjectParam } from '../dto';
+import { QueryRunner } from 'typeorm';
 
 @Injectable()
 export class ProjectService {
@@ -212,8 +213,14 @@ export class ProjectService {
     }
   }
 
-  async findOne(uuid: string): Promise<ProjectEntity> {
+  async findOne(
-    const project = await this.projectRepository.findOne({ where: { uuid } });
+    uuid: string,
+    queryRunner?: QueryRunner,
+  ): Promise<ProjectEntity> {
+    const projectRepository = queryRunner
+      ? queryRunner.manager.getRepository(ProjectEntity)
+      : this.projectRepository;
+    const project = await projectRepository.findOne({ where: { uuid } });
     if (!project) {
       throw new HttpException(
         `Invalid project with uuid ${uuid}`,

src/schedule/constants/device-function-map.ts

@@ -0,0 +1,32 @@
+import {
+  ControlCur2AccurateCalibrationCommand,
+  ControlCur2Command,
+  ControlCur2PercentCommand,
+  ControlCur2QuickCalibrationCommand,
+  ControlCur2TDirectionConCommand,
+} from 'src/device/commands/cur2-commands';
+
+export enum ScheduleProductType {
+  CUR_2 = 'CUR_2',
+}
+export const DeviceFunctionMap: {
+  [T in ScheduleProductType]: (body: DeviceFunction[T]) => any;
+} = {
+  [ScheduleProductType.CUR_2]: ({ code, value }) => {
+    return [
+      {
+        code,
+        value,
+      },
+    ];
+  },
+};
+
+type DeviceFunction = {
+  [ScheduleProductType.CUR_2]:
+    | ControlCur2Command
+    | ControlCur2PercentCommand
+    | ControlCur2AccurateCalibrationCommand
+    | ControlCur2TDirectionConCommand
+    | ControlCur2QuickCalibrationCommand;
+};

src/schedule/services/schedule.service.ts

@@ -49,23 +49,11 @@ export class ScheduleService {
       }
 
       // Corrected condition for supported device types
-      if (
+      this.ensureProductTypeSupportedForSchedule(
-        deviceDetails.productDevice.prodType !== ProductType.THREE_G &&
+        deviceDetails.productDevice.prodType as ProductType,
-        deviceDetails.productDevice.prodType !== ProductType.ONE_G &&
-        deviceDetails.productDevice.prodType !== ProductType.TWO_G &&
-        deviceDetails.productDevice.prodType !== ProductType.WH &&
-        deviceDetails.productDevice.prodType !== ProductType.ONE_1TG &&
-        deviceDetails.productDevice.prodType !== ProductType.TWO_2TG &&
-        deviceDetails.productDevice.prodType !== ProductType.THREE_3TG &&
-        deviceDetails.productDevice.prodType !== ProductType.GD &&
-        deviceDetails.productDevice.prodType !== ProductType.CUR_2
-      ) {
-        throw new HttpException(
-          'This device is not supported for schedule',
-          HttpStatus.BAD_REQUEST,
       );
-      }
+
-      return await this.enableScheduleDeviceInTuya(
+      return this.enableScheduleDeviceInTuya(
         deviceDetails.deviceTuyaUuid,
         enableScheduleDto,
       );
@@ -76,7 +64,281 @@ export class ScheduleService {
       );
     }
   }
-  async enableScheduleDeviceInTuya(
+  async deleteDeviceSchedule(deviceUuid: string, scheduleId: string) {
+    try {
+      const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
+
+      if (!deviceDetails || !deviceDetails.deviceTuyaUuid) {
+        throw new HttpException('Device Not Found', HttpStatus.NOT_FOUND);
+      }
+
+      // Corrected condition for supported device types
+      this.ensureProductTypeSupportedForSchedule(
+        deviceDetails.productDevice.prodType as ProductType,
+      );
+
+      return await this.deleteScheduleDeviceInTuya(
+        deviceDetails.deviceTuyaUuid,
+        scheduleId,
+      );
+    } catch (error) {
+      throw new HttpException(
+        error.message || 'Error While Deleting Schedule',
+        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
+  async addDeviceSchedule(deviceUuid: string, addScheduleDto: AddScheduleDto) {
+    try {
+      const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
+
+      if (!deviceDetails || !deviceDetails.deviceTuyaUuid) {
+        throw new HttpException('Device Not Found', HttpStatus.NOT_FOUND);
+      }
+
+      if (
+        deviceDetails.productDevice.prodType == ProductType.CUR_2 &&
+        addScheduleDto.category != 'Timer'
+      ) {
+        throw new HttpException(
+          'Invalid category for CUR_2 devices',
+          HttpStatus.BAD_REQUEST,
+        );
+      }
+
+      if (
+        deviceDetails.productDevice.prodType == ProductType.CUR_2 &&
+        addScheduleDto.category != 'Timer'
+      ) {
+        throw new HttpException(
+          'Invalid category for CUR_2 devices',
+          HttpStatus.BAD_REQUEST,
+        );
+      }
+
+      this.ensureProductTypeSupportedForSchedule(
+        deviceDetails.productDevice.prodType as ProductType,
+      );
+
+      await this.addScheduleDeviceInTuya(
+        deviceDetails.deviceTuyaUuid,
+        addScheduleDto,
+        deviceDetails.productDevice.prodType as ProductType,
+      );
+    } catch (error) {
+      throw new HttpException(
+        error.message || 'Error While Adding Schedule',
+        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
+  async getDeviceScheduleByCategory(deviceUuid: string, category: string) {
+    try {
+      const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
+
+      if (!deviceDetails || !deviceDetails.deviceTuyaUuid) {
+        throw new HttpException('Device Not Found', HttpStatus.NOT_FOUND);
+      }
+      // Corrected condition for supported device types
+      this.ensureProductTypeSupportedForSchedule(
+        deviceDetails.productDevice.prodType as ProductType,
+      );
+      const schedules = await this.getScheduleDeviceInTuya(
+        deviceDetails.deviceTuyaUuid,
+        category,
+        deviceDetails.productDevice.prodType as ProductType,
+      );
+      const result = schedules.result.map((schedule: any) => {
+        return {
+          category:
+            deviceDetails.productDevice.prodType == ProductType.CUR_2
+              ? schedule.category
+              : schedule.category.replace('category_', ''),
+          enable: schedule.enable,
+          function: {
+            code: schedule.functions[0].code,
+            value: schedule.functions[0].value,
+          },
+          time: schedule.time,
+          schedule_id: schedule.timer_id,
+          timezone_id: schedule.timezone_id,
+          days: getEnabledDays(schedule.loops),
+        };
+      });
+      return convertKeysToCamelCase(result);
+    } catch (error) {
+      throw new HttpException(
+        error.message || 'Error While Adding Schedule',
+        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
+  async updateDeviceSchedule(
+    deviceUuid: string,
+    updateScheduleDto: UpdateScheduleDto,
+  ) {
+    try {
+      const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
+
+      if (!deviceDetails || !deviceDetails.deviceTuyaUuid) {
+        throw new HttpException('Device Not Found', HttpStatus.NOT_FOUND);
+      }
+
+      if (
+        deviceDetails.productDevice.prodType == ProductType.CUR_2 &&
+        updateScheduleDto.category != 'Timer'
+      ) {
+        throw new HttpException(
+          'Invalid category for CUR_2 devices',
+          HttpStatus.BAD_REQUEST,
+        );
+      }
+
+      if (
+        deviceDetails.productDevice.prodType == ProductType.CUR_2 &&
+        updateScheduleDto.category != 'Timer'
+      ) {
+        throw new HttpException(
+          'Invalid category for CUR_2 devices',
+          HttpStatus.BAD_REQUEST,
+        );
+      }
+
+      // Corrected condition for supported device types
+      this.ensureProductTypeSupportedForSchedule(
+        deviceDetails.productDevice.prodType as ProductType,
+      );
+
+      await this.updateScheduleDeviceInTuya(
+        deviceDetails.deviceTuyaUuid,
+        updateScheduleDto,
+        deviceDetails.productDevice.prodType as ProductType,
+      );
+    } catch (error) {
+      throw new HttpException(
+        error.message || 'Error While Updating Schedule',
+        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
+
+  private getDeviceByDeviceUuid(
+    deviceUuid: string,
+    withProductDevice: boolean = true,
+  ) {
+    return this.deviceRepository.findOne({
+      where: {
+        uuid: deviceUuid,
+        isActive: true,
+      },
+      ...(withProductDevice && { relations: ['productDevice'] }),
+    });
+  }
+
+  private async addScheduleDeviceInTuya(
+    deviceId: string,
+    addScheduleDto: AddScheduleDto,
+    deviceType: ProductType,
+  ): Promise<addScheduleDeviceInterface> {
+    try {
+      const convertedTime = convertTimestampToDubaiTime(addScheduleDto.time);
+      const loops = getScheduleStatus(addScheduleDto.days);
+
+      const path = `/v2.0/cloud/timer/device/${deviceId}`;
+      const response = await this.tuya.request({
+        method: 'POST',
+        path,
+        body: {
+          time: convertedTime.time,
+          timezone_id: 'Asia/Dubai',
+          loops: `${loops}`,
+          functions: [
+            {
+              ...addScheduleDto.function,
+            },
+          ],
+          category:
+            deviceType == ProductType.CUR_2
+              ? addScheduleDto.category
+              : `category_${addScheduleDto.category}`,
+        },
+      });
+
+      return response as addScheduleDeviceInterface;
+    } catch (error) {
+      throw new HttpException(
+        'Error adding schedule from Tuya',
+        HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
+
+  private async getScheduleDeviceInTuya(
+    deviceId: string,
+    category: string,
+    deviceType: ProductType,
+  ): Promise<getDeviceScheduleInterface> {
+    try {
+      const categoryToSent =
+        deviceType == ProductType.CUR_2 ? category : `category_${category}`;
+      const path = `/v2.0/cloud/timer/device/${deviceId}?category=${categoryToSent}`;
+      const response = await this.tuya.request({
+        method: 'GET',
+        path,
+      });
+
+      return response as getDeviceScheduleInterface;
+    } catch (error) {
+      console.error('Error fetching device schedule from Tuya:', error);
+
+      throw new HttpException(
+        'Error fetching device schedule from Tuya',
+        HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
+
+  private async updateScheduleDeviceInTuya(
+    deviceId: string,
+    updateScheduleDto: UpdateScheduleDto,
+    deviceType: ProductType,
+  ): Promise<addScheduleDeviceInterface> {
+    try {
+      const convertedTime = convertTimestampToDubaiTime(updateScheduleDto.time);
+      const loops = getScheduleStatus(updateScheduleDto.days);
+
+      const path = `/v2.0/cloud/timer/device/${deviceId}`;
+      const response = await this.tuya.request({
+        method: 'PUT',
+        path,
+        body: {
+          timer_id: updateScheduleDto.scheduleId,
+          time: convertedTime.time,
+          timezone_id: 'Asia/Dubai',
+          loops: `${loops}`,
+          functions: [
+            {
+              code: updateScheduleDto.function.code,
+              value: updateScheduleDto.function.value,
+            },
+          ],
+          category:
+            deviceType == ProductType.CUR_2
+              ? updateScheduleDto.category
+              : `category_${updateScheduleDto.category}`,
+        },
+      });
+
+      return response as addScheduleDeviceInterface;
+    } catch (error) {
+      throw new HttpException(
+        'Error updating schedule from Tuya',
+        HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
+
+  private async enableScheduleDeviceInTuya(
     deviceId: string,
     enableScheduleDto: EnableScheduleDto,
   ): Promise<addScheduleDeviceInterface> {
@@ -99,43 +361,8 @@ export class ScheduleService {
       );
     }
   }
-  async deleteDeviceSchedule(deviceUuid: string, scheduleId: string) {
-    try {
-      const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
 
-      if (!deviceDetails || !deviceDetails.deviceTuyaUuid) {
+  private async deleteScheduleDeviceInTuya(
-        throw new HttpException('Device Not Found', HttpStatus.NOT_FOUND);
-      }
-
-      // Corrected condition for supported device types
-      if (
-        deviceDetails.productDevice.prodType !== ProductType.THREE_G &&
-        deviceDetails.productDevice.prodType !== ProductType.ONE_G &&
-        deviceDetails.productDevice.prodType !== ProductType.TWO_G &&
-        deviceDetails.productDevice.prodType !== ProductType.WH &&
-        deviceDetails.productDevice.prodType !== ProductType.ONE_1TG &&
-        deviceDetails.productDevice.prodType !== ProductType.TWO_2TG &&
-        deviceDetails.productDevice.prodType !== ProductType.THREE_3TG &&
-        deviceDetails.productDevice.prodType !== ProductType.GD &&
-        deviceDetails.productDevice.prodType !== ProductType.CUR_2
-      ) {
-        throw new HttpException(
-          'This device is not supported for schedule',
-          HttpStatus.BAD_REQUEST,
-        );
-      }
-      return await this.deleteScheduleDeviceInTuya(
-        deviceDetails.deviceTuyaUuid,
-        scheduleId,
-      );
-    } catch (error) {
-      throw new HttpException(
-        error.message || 'Error While Deleting Schedule',
-        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
-  async deleteScheduleDeviceInTuya(
     deviceId: string,
     scheduleId: string,
   ): Promise<addScheduleDeviceInterface> {
@@ -154,231 +381,25 @@ export class ScheduleService {
       );
     }
   }
-  async addDeviceSchedule(deviceUuid: string, addScheduleDto: AddScheduleDto) {
-    try {
-      const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
 
-      if (!deviceDetails || !deviceDetails.deviceTuyaUuid) {
+  private ensureProductTypeSupportedForSchedule(deviceType: ProductType): void {
-        throw new HttpException('Device Not Found', HttpStatus.NOT_FOUND);
-      }
-
-      // Corrected condition for supported device types
     if (
-        deviceDetails.productDevice.prodType !== ProductType.THREE_G &&
+      ![
-        deviceDetails.productDevice.prodType !== ProductType.ONE_G &&
+        ProductType.THREE_G,
-        deviceDetails.productDevice.prodType !== ProductType.TWO_G &&
+        ProductType.ONE_G,
-        deviceDetails.productDevice.prodType !== ProductType.WH &&
+        ProductType.TWO_G,
-        deviceDetails.productDevice.prodType !== ProductType.ONE_1TG &&
+        ProductType.WH,
-        deviceDetails.productDevice.prodType !== ProductType.TWO_2TG &&
+        ProductType.ONE_1TG,
-        deviceDetails.productDevice.prodType !== ProductType.THREE_3TG &&
+        ProductType.TWO_2TG,
-        deviceDetails.productDevice.prodType !== ProductType.GD &&
+        ProductType.THREE_3TG,
-        deviceDetails.productDevice.prodType !== ProductType.CUR_2
+        ProductType.GD,
+        ProductType.CUR_2,
+      ].includes(deviceType)
     ) {
       throw new HttpException(
         'This device is not supported for schedule',
         HttpStatus.BAD_REQUEST,
       );
     }
-      await this.addScheduleDeviceInTuya(
-        deviceDetails.deviceTuyaUuid,
-        addScheduleDto,
-      );
-    } catch (error) {
-      throw new HttpException(
-        error.message || 'Error While Adding Schedule',
-        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
-  async addScheduleDeviceInTuya(
-    deviceId: string,
-    addScheduleDto: AddScheduleDto,
-  ): Promise<addScheduleDeviceInterface> {
-    try {
-      const convertedTime = convertTimestampToDubaiTime(addScheduleDto.time);
-      const loops = getScheduleStatus(addScheduleDto.days);
-
-      const path = `/v2.0/cloud/timer/device/${deviceId}`;
-      const response = await this.tuya.request({
-        method: 'POST',
-        path,
-        body: {
-          time: convertedTime.time,
-          timezone_id: 'Asia/Dubai',
-          loops: `${loops}`,
-          functions: [
-            {
-              code: addScheduleDto.function.code,
-              value: addScheduleDto.function.value,
-            },
-          ],
-          category: `category_${addScheduleDto.category}`,
-        },
-      });
-
-      return response as addScheduleDeviceInterface;
-    } catch (error) {
-      throw new HttpException(
-        'Error adding schedule from Tuya',
-        HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
-  async getDeviceScheduleByCategory(deviceUuid: string, category: string) {
-    try {
-      const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
-
-      if (!deviceDetails || !deviceDetails.deviceTuyaUuid) {
-        throw new HttpException('Device Not Found', HttpStatus.NOT_FOUND);
-      }
-      // Corrected condition for supported device types
-      if (
-        deviceDetails.productDevice.prodType !== ProductType.THREE_G &&
-        deviceDetails.productDevice.prodType !== ProductType.ONE_G &&
-        deviceDetails.productDevice.prodType !== ProductType.TWO_G &&
-        deviceDetails.productDevice.prodType !== ProductType.WH &&
-        deviceDetails.productDevice.prodType !== ProductType.ONE_1TG &&
-        deviceDetails.productDevice.prodType !== ProductType.TWO_2TG &&
-        deviceDetails.productDevice.prodType !== ProductType.THREE_3TG &&
-        deviceDetails.productDevice.prodType !== ProductType.GD &&
-        deviceDetails.productDevice.prodType !== ProductType.CUR_2
-      ) {
-        throw new HttpException(
-          'This device is not supported for schedule',
-          HttpStatus.BAD_REQUEST,
-        );
-      }
-      const schedules = await this.getScheduleDeviceInTuya(
-        deviceDetails.deviceTuyaUuid,
-        category,
-      );
-      const result = schedules.result.map((schedule: any) => {
-        return {
-          category: schedule.category.replace('category_', ''),
-          enable: schedule.enable,
-          function: {
-            code: schedule.functions[0].code,
-            value: schedule.functions[0].value,
-          },
-          time: schedule.time,
-          schedule_id: schedule.timer_id,
-          timezone_id: schedule.timezone_id,
-          days: getEnabledDays(schedule.loops),
-        };
-      });
-      return convertKeysToCamelCase(result);
-    } catch (error) {
-      throw new HttpException(
-        error.message || 'Error While Adding Schedule',
-        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
-  async getScheduleDeviceInTuya(
-    deviceId: string,
-    category: string,
-  ): Promise<getDeviceScheduleInterface> {
-    try {
-      const path = `/v2.0/cloud/timer/device/${deviceId}?category=category_${category}`;
-      const response = await this.tuya.request({
-        method: 'GET',
-        path,
-      });
-
-      return response as getDeviceScheduleInterface;
-    } catch (error) {
-      console.error('Error fetching device schedule from Tuya:', error);
-
-      throw new HttpException(
-        'Error fetching device schedule from Tuya',
-        HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
-  async getDeviceByDeviceUuid(
-    deviceUuid: string,
-    withProductDevice: boolean = true,
-  ) {
-    return await this.deviceRepository.findOne({
-      where: {
-        uuid: deviceUuid,
-        isActive: true,
-      },
-      ...(withProductDevice && { relations: ['productDevice'] }),
-    });
-  }
-  async updateDeviceSchedule(
-    deviceUuid: string,
-    updateScheduleDto: UpdateScheduleDto,
-  ) {
-    try {
-      const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
-
-      if (!deviceDetails || !deviceDetails.deviceTuyaUuid) {
-        throw new HttpException('Device Not Found', HttpStatus.NOT_FOUND);
-      }
-
-      // Corrected condition for supported device types
-      if (
-        deviceDetails.productDevice.prodType !== ProductType.THREE_G &&
-        deviceDetails.productDevice.prodType !== ProductType.ONE_G &&
-        deviceDetails.productDevice.prodType !== ProductType.TWO_G &&
-        deviceDetails.productDevice.prodType !== ProductType.WH &&
-        deviceDetails.productDevice.prodType !== ProductType.ONE_1TG &&
-        deviceDetails.productDevice.prodType !== ProductType.TWO_2TG &&
-        deviceDetails.productDevice.prodType !== ProductType.THREE_3TG &&
-        deviceDetails.productDevice.prodType !== ProductType.GD &&
-        deviceDetails.productDevice.prodType !== ProductType.CUR_2
-      ) {
-        throw new HttpException(
-          'This device is not supported for schedule',
-          HttpStatus.BAD_REQUEST,
-        );
-      }
-      await this.updateScheduleDeviceInTuya(
-        deviceDetails.deviceTuyaUuid,
-        updateScheduleDto,
-      );
-    } catch (error) {
-      throw new HttpException(
-        error.message || 'Error While Updating Schedule',
-        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
-  async updateScheduleDeviceInTuya(
-    deviceId: string,
-    updateScheduleDto: UpdateScheduleDto,
-  ): Promise<addScheduleDeviceInterface> {
-    try {
-      const convertedTime = convertTimestampToDubaiTime(updateScheduleDto.time);
-      const loops = getScheduleStatus(updateScheduleDto.days);
-
-      const path = `/v2.0/cloud/timer/device/${deviceId}`;
-      const response = await this.tuya.request({
-        method: 'PUT',
-        path,
-        body: {
-          timer_id: updateScheduleDto.scheduleId,
-          time: convertedTime.time,
-          timezone_id: 'Asia/Dubai',
-          loops: `${loops}`,
-          functions: [
-            {
-              code: updateScheduleDto.function.code,
-              value: updateScheduleDto.function.value,
-            },
-          ],
-          category: `category_${updateScheduleDto.category}`,
-        },
-      });
-
-      return response as addScheduleDeviceInterface;
-    } catch (error) {
-      throw new HttpException(
-        'Error updating schedule from Tuya',
-        HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
   }
 }

src/scheduler/scheduler.module.ts

@@ -0,0 +1,25 @@
+import { DatabaseModule } from '@app/common/database/database.module';
+import { SqlLoaderService } from '@app/common/helper/services/sql-loader.service';
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { SchedulerService } from './scheduler.service';
+import { ScheduleModule as NestScheduleModule } from '@nestjs/schedule';
+import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
+import { OccupancyService } from '@app/common/helper/services/occupancy.service';
+import { PowerClampService } from '@app/common/helper/services/power.clamp.service';
+
+@Module({
+  imports: [
+    NestScheduleModule.forRoot(),
+    TypeOrmModule.forFeature([]),
+    DatabaseModule,
+  ],
+  providers: [
+    SchedulerService,
+    SqlLoaderService,
+    PowerClampService,
+    OccupancyService,
+    AqiDataService,
+  ],
+})
+export class SchedulerModule {}

src/scheduler/scheduler.service.ts

@@ -0,0 +1,92 @@
+import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
+import { Injectable } from '@nestjs/common';
+import { Cron, CronExpression } from '@nestjs/schedule';
+import { OccupancyService } from '@app/common/helper/services/occupancy.service';
+import { PowerClampService } from '@app/common/helper/services/power.clamp.service';
+
+@Injectable()
+export class SchedulerService {
+  constructor(
+    private readonly powerClampService: PowerClampService,
+    private readonly occupancyService: OccupancyService,
+    private readonly aqiDataService: AqiDataService,
+  ) {
+    console.log('SchedulerService initialized!');
+  }
+
+  @Cron(CronExpression.EVERY_HOUR)
+  async runHourlyProcedures() {
+    console.log('\n======== Starting Procedures ========');
+    console.log(new Date().toISOString(), 'Scheduler running...');
+
+    try {
+      const results = await Promise.allSettled([
+        this.executeTask(
+          () => this.powerClampService.updateEnergyConsumedHistoricalData(),
+          'Energy Consumption',
+        ),
+        this.executeTask(
+          () => this.occupancyService.updateOccupancyDataProcedures(),
+          'Occupancy Data',
+        ),
+        this.executeTask(
+          () => this.aqiDataService.updateAQISensorHistoricalData(),
+          'AQI Data',
+        ),
+      ]);
+
+      this.logResults(results);
+    } catch (error) {
+      console.error('MAIN SCHEDULER ERROR:', error);
+      if (error.stack) {
+        console.error('Error stack:', error.stack);
+      }
+    }
+  }
+
+  private async executeTask(
+    task: () => Promise<void>,
+    name: string,
+  ): Promise<{ name: string; status: string }> {
+    try {
+      console.log(`[${new Date().toISOString()}] Starting ${name} task...`);
+      await task();
+      console.log(
+        `[${new Date().toISOString()}] ${name} task completed successfully`,
+      );
+      return { name, status: 'success' };
+    } catch (error) {
+      console.error(
+        `[${new Date().toISOString()}] ${name} task failed:`,
+        error.message,
+      );
+      if (error.stack) {
+        console.error('Task error stack:', error.stack);
+      }
+      return { name, status: 'failed' };
+    }
+  }
+
+  private logResults(results: PromiseSettledResult<any>[]) {
+    const successCount = results.filter((r) => r.status === 'fulfilled').length;
+    const failedCount = results.length - successCount;
+
+    console.log('\n======== Task Results ========');
+    console.log(`Successful tasks: ${successCount}`);
+    console.log(`Failed tasks: ${failedCount}`);
+
+    if (failedCount > 0) {
+      console.log('\n======== Failed Tasks Details ========');
+      results.forEach((result, index) => {
+        if (result.status === 'rejected') {
+          console.error(`Task ${index + 1} failed:`, result.reason);
+          if (result.reason.stack) {
+            console.error('Error stack:', result.reason.stack);
+          }
+        }
+      });
+    }
+
+    console.log('\n======== Scheduler Completed ========\n');
+  }
+}

src/space-model/services/subspace/subspace-model.service.ts

@@ -51,8 +51,12 @@ export class SubSpaceModelService {
       for (const [index, dto] of dtos.entries()) {
         const subspaceModel = savedSubspaces[index];
 
-        const processedTags = await this.tagService.processTags(
+        const processedTags = await this.tagService.upsertTags(
-          dto.tags,
+          dto.tags.map((tag) => ({
+            tagName: tag.name,
+            productUuid: tag.productUuid,
+            tagUuid: tag.uuid,
+          })),
           spaceModel.project.uuid,
           queryRunner,
         );

src/space-model/space-model.module.ts

@@ -22,7 +22,6 @@ import {
 } from '@app/common/modules/scene/repositories';
 import {
   InviteSpaceRepository,
-  SpaceLinkRepository,
   SpaceProductAllocationRepository,
   SpaceRepository,
 } from '@app/common/modules/space';
@@ -46,7 +45,6 @@ import { CommunityService } from 'src/community/services';
 import { DeviceService } from 'src/device/services';
 import { SceneService } from 'src/scene/services';
 import {
-  SpaceLinkService,
   SpaceService,
   SubspaceDeviceService,
   SubSpaceService,
@@ -64,6 +62,8 @@ import {
 import { SpaceModelService, SubSpaceModelService } from './services';
 import { SpaceModelProductAllocationService } from './services/space-model-product-allocation.service';
 import { SubspaceModelProductAllocationService } from './services/subspace/subspace-model-product-allocation.service';
+import { PresenceSensorDailySpaceRepository } from '@app/common/modules/presence-sensor/repositories';
+import { AqiSpaceDailyPollutantStatsRepository } from '@app/common/modules/aqi/repositories';
 
 const CommandHandlers = [
   PropogateUpdateSpaceModelHandler,
@@ -92,8 +92,6 @@ const CommandHandlers = [
     DeviceRepository,
     TuyaService,
     CommunityRepository,
-    SpaceLinkService,
-    SpaceLinkRepository,
     InviteSpaceRepository,
     NewTagService,
     DeviceService,
@@ -122,6 +120,8 @@ const CommandHandlers = [
     SqlLoaderService,
     OccupancyService,
     AqiDataService,
+    PresenceSensorDailySpaceRepository,
+    AqiSpaceDailyPollutantStatsRepository,
   ],
   exports: [CqrsModule, SpaceModelService],
 })

src/space/controllers/space.controller.ts

@@ -1,23 +1,26 @@
-import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
-import { SpaceService } from '../services';
 import { ControllerRoute } from '@app/common/constants/controller-route';
+import { BaseResponseDto } from '@app/common/dto/base.response.dto';
+import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
 import {
   Body,
   Controller,
   Delete,
   Get,
   Param,
+  ParseUUIDPipe,
   Post,
   Put,
   Query,
   UseGuards,
 } from '@nestjs/common';
-import { AddSpaceDto, CommunitySpaceParam, UpdateSpaceDto } from '../dtos';
+import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
-import { BaseResponseDto } from '@app/common/dto/base.response.dto';
-import { GetSpaceParam } from '../dtos/get.space.param';
-import { PermissionsGuard } from 'src/guards/permissions.guard';
 import { Permissions } from 'src/decorators/permissions.decorator';
+import { PermissionsGuard } from 'src/guards/permissions.guard';
+import { AddSpaceDto, CommunitySpaceParam, UpdateSpaceDto } from '../dtos';
 import { GetSpaceDto } from '../dtos/get.space.dto';
+import { GetSpaceParam } from '../dtos/get.space.param';
+import { OrderSpacesDto } from '../dtos/order.spaces.dto';
+import { SpaceService } from '../services';
 
 @ApiTags('Space Module')
 @Controller({
@@ -65,6 +68,30 @@ export class SpaceController {
     );
   }
 
+  @ApiBearerAuth()
+  @UseGuards(PermissionsGuard)
+  @Permissions('SPACE_UPDATE')
+  @ApiOperation({
+    summary:
+      ControllerRoute.SPACE.ACTIONS
+        .UPDATE_CHILDREN_SPACES_ORDER_OF_A_SPACE_SUMMARY,
+    description:
+      ControllerRoute.SPACE.ACTIONS
+        .UPDATE_CHILDREN_SPACES_ORDER_OF_A_SPACE_DESCRIPTION,
+  })
+  @Post(':parentSpaceUuid/spaces/order')
+  async updateSpacesOrder(
+    @Body() orderSpacesDto: OrderSpacesDto,
+    @Param() communitySpaceParam: CommunitySpaceParam,
+    @Param('parentSpaceUuid', ParseUUIDPipe) parentSpaceUuid: string,
+  ) {
+    await this.spaceService.updateSpacesOrder(parentSpaceUuid, orderSpacesDto);
+    return new SuccessResponseDto({
+      statusCode: 200,
+      message: 'Spaces order updated successfully',
+    });
+  }
+
   @ApiBearerAuth()
   @UseGuards(PermissionsGuard)
   @Permissions('SPACE_DELETE')

src/space/dtos/add.space.dto.ts

@@ -3,7 +3,8 @@ import { ApiProperty } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
 import {
   ArrayUnique,
-  IsBoolean,
+  IsArray,
+  IsMongoId,
   IsNotEmpty,
   IsNumber,
   IsOptional,
@@ -12,7 +13,7 @@ import {
   NotEquals,
   ValidateNested,
 } from 'class-validator';
-import { ProcessTagDto } from 'src/tags/dtos';
+import { CreateProductAllocationDto } from './create-product-allocation.dto';
 import { AddSubspaceDto } from './subspace';
 
 export class AddSpaceDto {
@@ -47,14 +48,6 @@ export class AddSpaceDto {
   @IsOptional()
   public icon?: string;
 
-  @ApiProperty({
-    description: 'Indicates whether the space is private or public',
-    example: false,
-    default: false,
-  })
-  @IsBoolean()
-  isPrivate: boolean;
-
   @ApiProperty({ description: 'X position on canvas', example: 120 })
   @IsNumber()
   x: number;
@@ -64,23 +57,19 @@ export class AddSpaceDto {
   y: number;
 
   @ApiProperty({
-    description: 'UUID of the Space',
+    description: 'UUID of the Space Model',
     example: 'd290f1ee-6c54-4b01-90e6-d701748f0851',
   })
-  @IsString()
+  @IsMongoId()
   @IsOptional()
   spaceModelUuid?: string;
 
-  @ApiProperty({ description: 'Y position on canvas', example: 200 })
-  @IsString()
-  @IsOptional()
-  direction?: string;
-
   @ApiProperty({
     description: 'List of subspaces included in the model',
     type: [AddSubspaceDto],
   })
   @IsOptional()
+  @IsArray()
   @ValidateNested({ each: true })
   @ArrayUnique((subspace) => subspace.subspaceName, {
     message(validationArguments) {
@@ -100,51 +89,21 @@ export class AddSpaceDto {
   subspaces?: AddSubspaceDto[];
 
   @ApiProperty({
-    description: 'List of tags associated with the space model',
+    description: 'List of allocations associated with the space',
-    type: [ProcessTagDto],
+    type: [CreateProductAllocationDto],
   })
+  @IsOptional()
+  @IsArray()
   @ValidateNested({ each: true })
-  @Type(() => ProcessTagDto)
+  @Type(() => CreateProductAllocationDto)
-  tags?: ProcessTagDto[];
+  productAllocations?: CreateProductAllocationDto[];
-}
 
-export class AddUserSpaceDto {
   @ApiProperty({
-    description: 'spaceUuid',
+    description: 'List of children spaces associated with the space',
-    required: true,
+    type: [AddSpaceDto],
   })
-  @IsString()
+  @IsOptional()
-  @IsNotEmpty()
+  @ValidateNested({ each: true })
-  public spaceUuid: string;
+  @Type(() => AddSpaceDto)
-  @ApiProperty({
+  children?: AddSpaceDto[];
-    description: 'userUuid',
-    required: true,
-  })
-  @IsString()
-  @IsNotEmpty()
-  public userUuid: string;
-  constructor(dto: Partial<AddUserSpaceDto>) {
-    Object.assign(this, dto);
-  }
-}
-
-export class AddUserSpaceUsingCodeDto {
-  @ApiProperty({
-    description: 'userUuid',
-    required: true,
-  })
-  @IsString()
-  @IsNotEmpty()
-  public userUuid: string;
-  @ApiProperty({
-    description: 'inviteCode',
-    required: true,
-  })
-  @IsString()
-  @IsNotEmpty()
-  public inviteCode: string;
-
-  constructor(dto: Partial<AddUserSpaceDto>) {
-    Object.assign(this, dto);
-  }
 }

src/space/dtos/create-allocations.dto.ts

@@ -1,14 +1,14 @@
 import { SpaceEntity } from '@app/common/modules/space/entities/space.entity';
 import { SubspaceEntity } from '@app/common/modules/space/entities/subspace/subspace.entity';
-import { ProcessTagDto } from 'src/tags/dtos';
 import { QueryRunner } from 'typeorm';
+import { CreateProductAllocationDto } from './create-product-allocation.dto';
 
 export enum AllocationsOwnerType {
   SPACE = 'space',
   SUBSPACE = 'subspace',
 }
 export class BaseCreateAllocationsDto {
-  tags: ProcessTagDto[];
+  productAllocations: CreateProductAllocationDto[];
   projectUuid: string;
   queryRunner: QueryRunner;
   type: AllocationsOwnerType;

src/space/dtos/create-product-allocation.dto.ts

@@ -0,0 +1,36 @@
+import { ApiProperty } from '@nestjs/swagger';
+import {
+  IsNotEmpty,
+  IsOptional,
+  IsString,
+  IsUUID,
+  ValidateIf,
+} from 'class-validator';
+
+export class CreateProductAllocationDto {
+  @ApiProperty({
+    description: 'The name of the tag (if creating a new tag)',
+    example: 'New Tag',
+  })
+  @IsString()
+  @IsNotEmpty()
+  @ValidateIf((o) => !o.tagUuid)
+  tagName: string;
+
+  @ApiProperty({
+    description: 'UUID of the tag (if selecting an existing tag)',
+    example: '123e4567-e89b-12d3-a456-426614174000',
+  })
+  @IsUUID()
+  @IsNotEmpty()
+  @ValidateIf((o) => !o.tagName)
+  tagUuid: string;
+
+  @ApiProperty({
+    description: 'UUID of the product',
+    example: '550e8400-e29b-41d4-a716-446655440000',
+  })
+  @IsUUID()
+  @IsOptional()
+  productUuid: string;
+}

src/space/dtos/index.ts

@@ -1,8 +1,10 @@
 export * from './add.space.dto';
 export * from './community-space.param';
+export * from './create-allocations.dto';
+export * from './create-product-allocation.dto';
 export * from './get.space.param';
-export * from './user-space.param';
-export * from './subspace';
 export * from './project.param.dto';
-export * from './update.space.dto';
+export * from './subspace';
 export * from './tag';
+export * from './update.space.dto';
+export * from './user-space.param';

src/space/dtos/order.spaces.dto.ts

@@ -0,0 +1,13 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { ArrayUnique, IsNotEmpty, IsUUID } from 'class-validator';
+
+export class OrderSpacesDto {
+  @ApiProperty({
+    description: 'List of children spaces associated with the space',
+    type: [String],
+  })
+  @IsNotEmpty()
+  @ArrayUnique()
+  @IsUUID('4', { each: true, message: 'Invalid space UUID provided' })
+  spacesUuids: string[];
+}

src/space/dtos/subspace/add.subspace.dto.ts

@@ -1,4 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
 import {
   IsArray,
   IsNotEmpty,
@@ -6,8 +7,8 @@ import {
   IsString,
   ValidateNested,
 } from 'class-validator';
-import { Type } from 'class-transformer';
 import { ProcessTagDto } from 'src/tags/dtos';
+import { CreateProductAllocationDto } from '../create-product-allocation.dto';
 
 export class AddSubspaceDto {
   @ApiProperty({
@@ -24,7 +25,7 @@ export class AddSubspaceDto {
   })
   @IsArray()
   @ValidateNested({ each: true })
-  @Type(() => ProcessTagDto)
+  @Type(() => CreateProductAllocationDto)
   @IsOptional()
-  tags?: ProcessTagDto[];
+  productAllocations?: CreateProductAllocationDto[];
 }

src/space/dtos/subspace/index.ts

@@ -1,6 +1,5 @@
-export * from './add.subspace.dto';
-export * from './get.subspace.param';
 export * from './add.subspace-device.param';
-export * from './update.subspace.dto';
+export * from './add.subspace.dto';
 export * from './delete.subspace.dto';
-export * from './modify.subspace.dto';
+export * from './get.subspace.param';
+export * from './update.subspace.dto';

src/space/dtos/subspace/modify.subspace.dto.ts

@@ -1,14 +0,0 @@
-import { ApiPropertyOptional, PartialType } from '@nestjs/swagger';
-import { IsOptional, IsUUID } from 'class-validator';
-import { AddSubspaceDto } from './add.subspace.dto';
-
-export class ModifySubspaceDto extends PartialType(AddSubspaceDto) {
-  @ApiPropertyOptional({
-    description:
-      'UUID of the subspace (will present if updating an existing subspace)',
-    example: '123e4567-e89b-12d3-a456-426614174000',
-  })
-  @IsOptional()
-  @IsUUID()
-  uuid?: string;
-}

src/space/dtos/subspace/update.subspace.dto.ts

@@ -1,16 +1,14 @@
-import { ApiProperty } from '@nestjs/swagger';
+import { ApiPropertyOptional, PartialType } from '@nestjs/swagger';
-import { IsNotEmpty, IsString } from 'class-validator';
+import { IsOptional, IsUUID } from 'class-validator';
+import { AddSubspaceDto } from './add.subspace.dto';
 
-export class UpdateSubspaceDto {
+export class UpdateSubspaceDto extends PartialType(AddSubspaceDto) {
-  @ApiProperty({
+  @ApiPropertyOptional({
-    description: 'Name of the subspace',
+    description:
-    example: 'Living Room',
+      'UUID of the subspace (will present if updating an existing subspace)',
+    example: '123e4567-e89b-12d3-a456-426614174000',
   })
-  @IsNotEmpty()
+  @IsOptional()
-  @IsString()
+  @IsUUID()
-  subspaceName?: string;
+  uuid?: string;
-
-  @IsNotEmpty()
-  @IsString()
-  subspaceUuid: string;
 }

src/space/dtos/update.space.dto.ts

@@ -2,6 +2,7 @@ import { ORPHAN_SPACE_NAME } from '@app/common/constants/orphan-constant';
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
 import {
+  ArrayUnique,
   IsArray,
   IsNumber,
   IsOptional,
@@ -9,8 +10,8 @@ import {
   NotEquals,
   ValidateNested,
 } from 'class-validator';
-import { ModifySubspaceDto } from './subspace';
+import { CreateProductAllocationDto } from './create-product-allocation.dto';
-import { ModifyTagDto } from './tag/modify-tag.dto';
+import { UpdateSubspaceDto } from './subspace';
 
 export class UpdateSpaceDto {
   @ApiProperty({
@@ -46,25 +47,39 @@ export class UpdateSpaceDto {
   y?: number;
 
   @ApiPropertyOptional({
-    description: 'List of subspace modifications (add/update/delete)',
+    description: 'List of subspace modifications',
-    type: [ModifySubspaceDto],
+    type: [UpdateSubspaceDto],
+  })
+  @ArrayUnique((subspace) => subspace.subspaceName ?? subspace.uuid, {
+    message(validationArguments) {
+      const subspaces = validationArguments.value;
+      const nameCounts = subspaces.reduce((acc, curr) => {
+        acc[curr.subspaceName ?? curr.uuid] =
+          (acc[curr.subspaceName ?? curr.uuid] || 0) + 1;
+        return acc;
+      }, {});
+      // Find duplicates
+      const duplicates = Object.keys(nameCounts).filter(
+        (name) => nameCounts[name] > 1,
+      );
+      return `Duplicate subspace names found: ${duplicates.join(', ')}`;
+    },
   })
   @IsOptional()
   @IsArray()
   @ValidateNested({ each: true })
-  @Type(() => ModifySubspaceDto)
+  @Type(() => UpdateSubspaceDto)
-  subspaces?: ModifySubspaceDto[];
+  subspaces?: UpdateSubspaceDto[];
 
   @ApiPropertyOptional({
-    description:
+    description: 'List of allocations modifications',
-      'List of tag modifications (add/update/delete) for the space model',
+    type: [CreateProductAllocationDto],
-    type: [ModifyTagDto],
   })
   @IsOptional()
   @IsArray()
   @ValidateNested({ each: true })
-  @Type(() => ModifyTagDto)
+  @Type(() => CreateProductAllocationDto)
-  tags?: ModifyTagDto[];
+  productAllocations?: CreateProductAllocationDto[];
 
   @ApiProperty({
     description: 'UUID of the Space',

src/space/handlers/disable-space.handler.ts

@@ -5,11 +5,7 @@ import { DeviceService } from 'src/device/services';
 import { UserSpaceService } from 'src/users/services';
 import { DataSource } from 'typeorm';
 import { DisableSpaceCommand } from '../commands';
-import {
+import { SpaceSceneService, SubSpaceService } from '../services';
-  SpaceLinkService,
-  SpaceSceneService,
-  SubSpaceService,
-} from '../services';
 
 @CommandHandler(DisableSpaceCommand)
 export class DisableSpaceHandler
@@ -19,7 +15,6 @@ export class DisableSpaceHandler
     private readonly subSpaceService: SubSpaceService,
     private readonly userService: UserSpaceService,
     private readonly deviceService: DeviceService,
-    private readonly spaceLinkService: SpaceLinkService,
     private readonly sceneService: SpaceSceneService,
     private readonly dataSource: DataSource,
   ) {}
@@ -39,8 +34,6 @@ export class DisableSpaceHandler
           'subspaces',
           'parent',
           'devices',
-          'outgoingConnections',
-          'incomingConnections',
           'scenes',
           'children',
           'userSpaces',
@@ -79,7 +72,6 @@ export class DisableSpaceHandler
           orphanSpace,
           queryRunner,
         ),
-        this.spaceLinkService.deleteSpaceLink(space, queryRunner),
         this.sceneService.deleteScenes(space, queryRunner),
       ];
 

src/space/services/index.ts

@@ -2,6 +2,5 @@ export * from './space.service';
 export * from './space-user.service';
 export * from './space-device.service';
 export * from './subspace';
-export * from './space-link';
 export * from './space-scene.service';
 export * from './space-validation.service';

src/space/services/product-allocation/product-allocation.service.ts

@@ -16,10 +16,10 @@ export class ProductAllocationService {
   ) {}
 
   async createAllocations(dto: CreateAllocationsDto): Promise<void> {
-    const { projectUuid, queryRunner, tags, type } = dto;
+    const { projectUuid, queryRunner, productAllocations, type } = dto;
 
-    const allocationsData = await this.tagService.processTags(
+    const allocationsData = await this.tagService.upsertTags(
-      tags,
+      productAllocations,
       projectUuid,
       queryRunner,
     );
@@ -29,15 +29,17 @@ export class ProductAllocationService {
     const createdTagsByName = new Map(allocationsData.map((t) => [t.name, t]));
 
     // Create the product-tag mapping based on the processed tags
-    const productTagMapping = tags.map(({ uuid, name, productUuid }) => {
+    const productTagMapping = productAllocations.map(
-      const inputTag = uuid
+      ({ tagUuid, tagName, productUuid }) => {
-        ? createdTagsByUUID.get(uuid)
+        const inputTag = tagUuid
-        : createdTagsByName.get(name);
+          ? createdTagsByUUID.get(tagUuid)
+          : createdTagsByName.get(tagName);
         return {
           tag: inputTag?.uuid,
           product: productUuid,
         };
-    });
+      },
+    );
 
     switch (type) {
       case AllocationsOwnerType.SPACE: {

src/space/services/space-link/index.ts

@@ -1 +0,0 @@
-export * from './space-link.service';

src/space/services/space-link/space-link.service.ts

@@ -1,121 +0,0 @@
-import { SpaceLinkEntity } from '@app/common/modules/space/entities/space-link.entity';
-import { SpaceEntity } from '@app/common/modules/space/entities/space.entity';
-import { SpaceLinkRepository } from '@app/common/modules/space/repositories';
-import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
-import { QueryRunner } from 'typeorm';
-
-@Injectable()
-export class SpaceLinkService {
-  constructor(private readonly spaceLinkRepository: SpaceLinkRepository) {}
-
-  async saveSpaceLink(
-    startSpaceId: string,
-    endSpaceId: string,
-    direction: string,
-    queryRunner: QueryRunner,
-  ): Promise<void> {
-    try {
-      // Check if a link between the startSpace and endSpace already exists
-      const existingLink = await queryRunner.manager.findOne(SpaceLinkEntity, {
-        where: {
-          startSpace: { uuid: startSpaceId },
-          endSpace: { uuid: endSpaceId },
-          disabled: false,
-        },
-      });
-
-      if (existingLink) {
-        // Update the direction if the link exists
-        existingLink.direction = direction;
-        await queryRunner.manager.save(SpaceLinkEntity, existingLink);
-        return;
-      }
-
-      const existingEndSpaceLink = await queryRunner.manager.findOne(
-        SpaceLinkEntity,
-        {
-          where: { endSpace: { uuid: endSpaceId } },
-        },
-      );
-
-      if (
-        existingEndSpaceLink &&
-        existingEndSpaceLink.startSpace.uuid !== startSpaceId
-      ) {
-        throw new Error(
-          `Space with ID ${endSpaceId} is already an endSpace in another link and cannot be reused.`,
-        );
-      }
-
-      // Find start space
-      const startSpace = await queryRunner.manager.findOne(SpaceEntity, {
-        where: { uuid: startSpaceId },
-      });
-
-      if (!startSpace) {
-        throw new HttpException(
-          `Start space with ID ${startSpaceId} not found.`,
-          HttpStatus.NOT_FOUND,
-        );
-      }
-
-      // Find end space
-      const endSpace = await queryRunner.manager.findOne(SpaceEntity, {
-        where: { uuid: endSpaceId },
-      });
-
-      if (!endSpace) {
-        throw new HttpException(
-          `End space with ID ${endSpaceId} not found.`,
-          HttpStatus.NOT_FOUND,
-        );
-      }
-
-      // Create and save the space link
-      const spaceLink = this.spaceLinkRepository.create({
-        startSpace,
-        endSpace,
-        direction,
-      });
-
-      await queryRunner.manager.save(SpaceLinkEntity, spaceLink);
-    } catch (error) {
-      throw new HttpException(
-        error.message ||
-          `Failed to save space link. Internal Server Error: ${error.message}`,
-        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
-  async deleteSpaceLink(
-    space: SpaceEntity,
-    queryRunner: QueryRunner,
-  ): Promise<void> {
-    try {
-      const spaceLinks = await queryRunner.manager.find(SpaceLinkEntity, {
-        where: [
-          { startSpace: space, disabled: false },
-          { endSpace: space, disabled: false },
-        ],
-      });
-
-      if (spaceLinks.length === 0) {
-        return;
-      }
-
-      const linkIds = spaceLinks.map((link) => link.uuid);
-
-      await queryRunner.manager
-        .createQueryBuilder()
-        .update(SpaceLinkEntity)
-        .set({ disabled: true })
-        .whereInIds(linkIds)
-        .execute();
-    } catch (error) {
-      throw new HttpException(
-        `Failed to disable space links for the given space: ${error.message}`,
-        HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
-}

src/space/services/space-validation.service.ts

@@ -16,7 +16,7 @@ import {
   Inject,
   Injectable,
 } from '@nestjs/common';
-import { In } from 'typeorm';
+import { In, QueryRunner } from 'typeorm';
 import { CommunityService } from '../../community/services';
 import { ProjectService } from '../../project/services';
 import { ProjectParam } from '../dtos';
@@ -69,12 +69,17 @@ export class ValidationService {
   async validateCommunityAndProject(
     communityUuid: string,
     projectUuid: string,
+    queryRunner?: QueryRunner,
   ) {
-    const project = await this.projectService.findOne(projectUuid);
+    const project = await this.projectService.findOne(projectUuid, queryRunner);
-    const community = await this.communityService.getCommunityById({
+
+    const community = await this.communityService.getCommunityById(
+      {
         communityUuid,
         projectUuid,
-    });
+      },
+      queryRunner,
+    );
 
     return { community: community.data, project: project };
   }
@@ -170,8 +175,14 @@ export class ValidationService {
     return space;
   }
 
-  async validateSpaceModel(spaceModelUuid: string): Promise<SpaceModelEntity> {
+  async validateSpaceModel(
-    const queryBuilder = this.spaceModelRepository
+    spaceModelUuid: string,
+    queryRunner?: QueryRunner,
+  ): Promise<SpaceModelEntity> {
+    const queryBuilder = (
+      queryRunner.manager.getRepository(SpaceModelEntity) ||
+      this.spaceModelRepository
+    )
       .createQueryBuilder('spaceModel')
       .leftJoinAndSelect(
         'spaceModel.subspaceModels',

src/space/services/space.service.ts

@@ -22,7 +22,6 @@ import {
 import { CommandBus } from '@nestjs/cqrs';
 import { DeviceService } from 'src/device/services';
 import { SpaceModelService } from 'src/space-model/services';
-import { ProcessTagDto } from 'src/tags/dtos';
 import { TagService } from 'src/tags/services/tags.service';
 import { DataSource, In, Not, QueryRunner } from 'typeorm';
 import { DisableSpaceCommand } from '../commands';
@@ -32,9 +31,10 @@ import {
   GetSpaceParam,
   UpdateSpaceDto,
 } from '../dtos';
+import { CreateProductAllocationDto } from '../dtos/create-product-allocation.dto';
 import { GetSpaceDto } from '../dtos/get.space.dto';
+import { OrderSpacesDto } from '../dtos/order.spaces.dto';
 import { SpaceWithParentsDto } from '../dtos/space.parents.dto';
-import { SpaceLinkService } from './space-link';
 import { SpaceProductAllocationService } from './space-product-allocation.service';
 import { ValidationService } from './space-validation.service';
 import { SubSpaceService } from './subspace';
@@ -44,7 +44,6 @@ export class SpaceService {
     private readonly dataSource: DataSource,
     private readonly spaceRepository: SpaceRepository,
     private readonly inviteSpaceRepository: InviteSpaceRepository,
-    private readonly spaceLinkService: SpaceLinkService,
     private readonly subSpaceService: SubSpaceService,
     private readonly validationService: ValidationService,
     private readonly tagService: TagService,
@@ -57,50 +56,72 @@ export class SpaceService {
   async createSpace(
     addSpaceDto: AddSpaceDto,
     params: CommunitySpaceParam,
+    queryRunner?: QueryRunner,
+    recursiveCallParentEntity?: SpaceEntity,
   ): Promise<BaseResponseDto> {
-    const { parentUuid, direction, spaceModelUuid, subspaces, tags } =
+    const isRecursiveCall = !!queryRunner;
-      addSpaceDto;
+
+    const {
+      parentUuid,
+      spaceModelUuid,
+      subspaces,
+      productAllocations,
+      children,
+    } = addSpaceDto;
     const { communityUuid, projectUuid } = params;
 
-    const queryRunner = this.dataSource.createQueryRunner();
+    if (!queryRunner) {
-
+      queryRunner = this.dataSource.createQueryRunner();
       await queryRunner.connect();
       await queryRunner.startTransaction();
+    }
 
     const { community } =
       await this.validationService.validateCommunityAndProject(
         communityUuid,
         projectUuid,
+        queryRunner,
       );
 
-    this.validateSpaceCreationCriteria({ spaceModelUuid, subspaces, tags });
+    this.validateSpaceCreationCriteria({
+      spaceModelUuid,
+      subspaces,
+      productAllocations,
+    });
 
-    const parent = parentUuid
+    const parent =
+      parentUuid && !isRecursiveCall
         ? await this.validationService.validateSpace(parentUuid)
         : null;
 
     const spaceModel = spaceModelUuid
       ? await this.validationService.validateSpaceModel(spaceModelUuid)
       : null;
-
     try {
       const space = queryRunner.manager.create(SpaceEntity, {
-        ...addSpaceDto,
+        // todo: find a better way to handle this instead of naming every key
+        spaceName: addSpaceDto.spaceName,
+        icon: addSpaceDto.icon,
+        x: addSpaceDto.x,
+        y: addSpaceDto.y,
         spaceModel,
-        parent: parentUuid ? parent : null,
+        parent: isRecursiveCall
+          ? recursiveCallParentEntity
+          : parentUuid
+            ? parent
+            : null,
         community,
       });
 
       const newSpace = await queryRunner.manager.save(space);
-
+      this.checkDuplicateTags([
-      const subspaceTags =
+        ...(productAllocations || []),
-        subspaces?.flatMap((subspace) => subspace.tags || []) || [];
+        ...(subspaces?.flatMap(
-
+          (subspace) => subspace.productAllocations || [],
-      this.checkDuplicateTags([...tags, ...subspaceTags]);
+        ) || []),
+      ]);
 
       if (spaceModelUuid) {
-        // no need to check for existing dependencies here as validateSpaceCreationCriteria
-        // ensures no tags or subspaces are present along with spaceModelUuid
         await this.spaceModelService.linkToSpace(
           newSpace,
           spaceModel,
@@ -109,15 +130,6 @@ export class SpaceService {
       }
 
       await Promise.all([
-        // todo: remove this logic as we are not using space links anymore
-        direction && parent
-          ? this.spaceLinkService.saveSpaceLink(
-              parent.uuid,
-              newSpace.uuid,
-              direction,
-              queryRunner,
-            )
-          : Promise.resolve(),
         subspaces?.length
           ? this.subSpaceService.createSubspacesFromDto(
               subspaces,
@@ -126,12 +138,32 @@ export class SpaceService {
               projectUuid,
             )
           : Promise.resolve(),
-        tags?.length
+        productAllocations?.length
-          ? this.createAllocations(tags, projectUuid, queryRunner, newSpace)
+          ? this.createAllocations(
+              productAllocations,
+              projectUuid,
+              queryRunner,
+              newSpace,
+            )
           : Promise.resolve(),
       ]);
 
+      if (children?.length) {
+        await Promise.all(
+          children.map((child) =>
+            this.createSpace(
+              { ...child, parentUuid: newSpace.uuid },
+              { communityUuid, projectUuid },
+              queryRunner,
+              newSpace,
+            ),
+          ),
+        );
+      }
+
+      if (!isRecursiveCall) {
         await queryRunner.commitTransaction();
+      }
 
       return new SuccessResponseDto({
         statusCode: HttpStatus.CREATED,
@@ -139,34 +171,34 @@ export class SpaceService {
         message: 'Space created successfully',
       });
     } catch (error) {
-      await queryRunner.rollbackTransaction();
+      !isRecursiveCall ? await queryRunner.rollbackTransaction() : null;
 
       if (error instanceof HttpException) {
         throw error;
       }
       throw new HttpException(error.message, HttpStatus.INTERNAL_SERVER_ERROR);
     } finally {
-      await queryRunner.release();
+      !isRecursiveCall ? await queryRunner.release() : null;
     }
   }
-  private checkDuplicateTags(allTags: ProcessTagDto[]) {
+  private checkDuplicateTags(allocations: CreateProductAllocationDto[]) {
     const tagUuidSet = new Set<string>();
     const tagNameProductSet = new Set<string>();
 
-    for (const tag of allTags) {
+    for (const allocation of allocations) {
-      if (tag.uuid) {
+      if (allocation.tagUuid) {
-        if (tagUuidSet.has(tag.uuid)) {
+        if (tagUuidSet.has(allocation.tagUuid)) {
           throw new HttpException(
-            `Duplicate tag UUID found: ${tag.uuid}`,
+            `Duplicate tag UUID found: ${allocation.tagUuid}`,
             HttpStatus.BAD_REQUEST,
           );
         }
-        tagUuidSet.add(tag.uuid);
+        tagUuidSet.add(allocation.tagUuid);
       } else {
-        const tagKey = `${tag.name}-${tag.productUuid}`;
+        const tagKey = `${allocation.tagName}-${allocation.productUuid}`;
         if (tagNameProductSet.has(tagKey)) {
           throw new HttpException(
-            `Duplicate tag found with name "${tag.name}" and product "${tag.productUuid}".`,
+            `Duplicate tag found with name "${allocation.tagName}" and product "${allocation.productUuid}".`,
             HttpStatus.BAD_REQUEST,
           );
         }
@@ -195,12 +227,7 @@ export class SpaceService {
           'children.disabled = :disabled',
           { disabled: false },
         )
-        .leftJoinAndSelect(
+
-          'space.incomingConnections',
-          'incomingConnections',
-          'incomingConnections.disabled = :incomingConnectionDisabled',
-          { incomingConnectionDisabled: false },
-        )
         .leftJoinAndSelect('space.productAllocations', 'productAllocations')
         .leftJoinAndSelect('productAllocations.tag', 'tag')
         .leftJoinAndSelect('productAllocations.product', 'product')
@@ -271,7 +298,6 @@ export class SpaceService {
     }
   }
 
-  // todo refactor this method to eliminate wrong use of tags
   async findOne(params: GetSpaceParam): Promise<BaseResponseDto> {
     const { communityUuid, spaceUuid, projectUuid } = params;
     try {
@@ -282,19 +308,6 @@ export class SpaceService {
 
       const queryBuilder = this.spaceRepository
         .createQueryBuilder('space')
-        .leftJoinAndSelect('space.parent', 'parent')
-        .leftJoinAndSelect(
-          'space.children',
-          'children',
-          'children.disabled = :disabled',
-          { disabled: false },
-        )
-        .leftJoinAndSelect(
-          'space.incomingConnections',
-          'incomingConnections',
-          'incomingConnections.disabled = :incomingConnectionDisabled',
-          { incomingConnectionDisabled: false },
-        )
         .leftJoinAndSelect('space.productAllocations', 'productAllocations')
         .leftJoinAndSelect('productAllocations.tag', 'spaceTag')
         .leftJoinAndSelect('productAllocations.product', 'spaceProduct')
@@ -321,7 +334,12 @@ export class SpaceService {
         .andWhere('space.disabled = :disabled', { disabled: false });
 
       const space = await queryBuilder.getOne();
-
+      if (!space) {
+        throw new HttpException(
+          `Space with ID ${spaceUuid} not found`,
+          HttpStatus.NOT_FOUND,
+        );
+      }
       return new SuccessResponseDto({
         message: `Space with ID ${spaceUuid} successfully fetched`,
         data: space,
@@ -331,13 +349,61 @@ export class SpaceService {
         throw error; // If it's an HttpException, rethrow it
       } else {
         throw new HttpException(
-          'An error occurred while deleting the community',
+          'An error occurred while fetching the space',
           HttpStatus.INTERNAL_SERVER_ERROR,
         );
       }
     }
   }
 
+  async updateSpacesOrder(
+    parentSpaceUuid: string,
+    { spacesUuids }: OrderSpacesDto,
+  ) {
+    const parentSpace = await this.spaceRepository.findOne({
+      where: { uuid: parentSpaceUuid, disabled: false },
+      relations: ['children'],
+    });
+    if (!parentSpace) {
+      throw new HttpException(
+        `Parent space with ID ${parentSpaceUuid} not found`,
+        HttpStatus.NOT_FOUND,
+      );
+    }
+    // ensure that all sent spaces belong to the parent space
+    const missingSpaces = spacesUuids.filter(
+      (uuid) => !parentSpace.children.some((child) => child.uuid === uuid),
+    );
+    if (missingSpaces.length > 0) {
+      throw new HttpException(
+        `Some spaces with IDs ${missingSpaces.join(
+          ', ',
+        )} do not belong to the parent space with ID ${parentSpaceUuid}`,
+        HttpStatus.BAD_REQUEST,
+      );
+    }
+    try {
+      await this.spaceRepository.update(
+        { uuid: In(spacesUuids), parent: { uuid: parentSpaceUuid } },
+        {
+          order: () =>
+            'CASE ' +
+            spacesUuids
+              .map((s, index) => `WHEN uuid = '${s}' THEN ${index + 1}`)
+              .join(' ') +
+            ' END',
+        },
+      );
+      return;
+    } catch (error) {
+      console.error('Error updating spaces order:', error);
+      throw new HttpException(
+        'An error occurred while updating spaces order',
+        HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
+
   async delete(params: GetSpaceParam): Promise<BaseResponseDto> {
     const queryRunner = this.dataSource.createQueryRunner();
     await queryRunner.connect();
@@ -409,7 +475,7 @@ export class SpaceService {
     }
   }
 
-  async disableSpace(space: SpaceEntity, orphanSpace: SpaceEntity) {
+  private async disableSpace(space: SpaceEntity, orphanSpace: SpaceEntity) {
     await this.commandBus.execute(
       new DisableSpaceCommand({ spaceUuid: space.uuid, orphanSpace }),
     );
@@ -423,7 +489,7 @@ export class SpaceService {
 
     const queryRunner = this.dataSource.createQueryRunner();
     const hasSubspace = updateSpaceDto.subspaces?.length > 0;
-    const hasTags = updateSpaceDto.tags?.length > 0;
+    const hasAllocations = updateSpaceDto.productAllocations?.length > 0;
 
     try {
       await queryRunner.connect();
@@ -448,7 +514,7 @@ export class SpaceService {
 
       await this.updateSpaceProperties(space, updateSpaceDto, queryRunner);
 
-      if (hasSubspace || hasTags) {
+      if (hasSubspace || hasAllocations) {
         await queryRunner.manager.update(SpaceEntity, space.uuid, {
           spaceModel: null,
         });
@@ -492,7 +558,7 @@ export class SpaceService {
         await this.subSpaceService.unlinkModels(space.subspaces, queryRunner);
       }
 
-      if (hasTags && space.productAllocations && space.spaceModel) {
+      if (hasAllocations && space.productAllocations && space.spaceModel) {
         await this.spaceProductAllocationService.unlinkModels(
           space,
           queryRunner,
@@ -508,13 +574,13 @@ export class SpaceService {
         );
       }
 
-      if (updateSpaceDto.tags) {
+      if (updateSpaceDto.productAllocations) {
         await queryRunner.manager.delete(SpaceProductAllocationEntity, {
           space: { uuid: space.uuid },
           tag: {
             uuid: Not(
               In(
-                updateSpaceDto.tags
+                updateSpaceDto.productAllocations
                   .filter((tag) => tag.tagUuid)
                   .map((tag) => tag.tagUuid),
               ),
@@ -522,11 +588,7 @@ export class SpaceService {
           },
         });
         await this.createAllocations(
-          updateSpaceDto.tags.map((tag) => ({
+          updateSpaceDto.productAllocations,
-            name: tag.name,
-            uuid: tag.tagUuid,
-            productUuid: tag.productUuid,
-          })),
           projectUuid,
           queryRunner,
           space,
@@ -673,7 +735,7 @@ export class SpaceService {
     }
   }
 
-  private buildSpaceHierarchy(spaces: SpaceEntity[]): SpaceEntity[] {
+  buildSpaceHierarchy(spaces: SpaceEntity[]): SpaceEntity[] {
     const map = new Map<string, SpaceEntity>();
 
     // Step 1: Create a map of spaces by UUID
@@ -696,19 +758,34 @@ export class SpaceService {
         rootSpaces.push(map.get(space.uuid)!); // Push only root spaces
       }
     });
-
+    rootSpaces.forEach(this.sortSpaceChildren.bind(this));
     return rootSpaces;
   }
 
+  private sortSpaceChildren(space: SpaceEntity) {
+    if (space.children && space.children.length > 0) {
+      space.children.sort((a, b) => {
+        const aOrder = a.order ?? Infinity;
+        const bOrder = b.order ?? Infinity;
+        return aOrder - bOrder;
+      });
+      space.children.forEach(this.sortSpaceChildren.bind(this)); // Recursively sort children of children
+    }
+  }
+
   private validateSpaceCreationCriteria({
     spaceModelUuid,
-    tags,
+    productAllocations,
     subspaces,
-  }: Pick<AddSpaceDto, 'spaceModelUuid' | 'tags' | 'subspaces'>): void {
+  }: Pick<
-    const hasTagsOrSubspaces =
+    AddSpaceDto,
-      (tags && tags.length > 0) || (subspaces && subspaces.length > 0);
+    'spaceModelUuid' | 'productAllocations' | 'subspaces'
+  >): void {
+    const hasProductsOrSubspaces =
+      (productAllocations && productAllocations.length > 0) ||
+      (subspaces && subspaces.length > 0);
 
-    if (spaceModelUuid && hasTagsOrSubspaces) {
+    if (spaceModelUuid && hasProductsOrSubspaces) {
       throw new HttpException(
         'For space creation choose either space model or products and subspace',
         HttpStatus.CONFLICT,
@@ -717,13 +794,13 @@ export class SpaceService {
   }
 
   private async createAllocations(
-    tags: ProcessTagDto[],
+    productAllocations: CreateProductAllocationDto[],
     projectUuid: string,
     queryRunner: QueryRunner,
     space: SpaceEntity,
   ): Promise<void> {
-    const allocationsData = await this.tagService.processTags(
+    const allocationsData = await this.tagService.upsertTags(
-      tags,
+      productAllocations,
       projectUuid,
       queryRunner,
     );
@@ -733,15 +810,17 @@ export class SpaceService {
     const createdTagsByName = new Map(allocationsData.map((t) => [t.name, t]));
 
     // Create the product-tag mapping based on the processed tags
-    const productTagMapping = tags.map(({ uuid, name, productUuid }) => {
+    const productTagMapping = productAllocations.map(
-      const inputTag = uuid
+      ({ tagUuid, tagName, productUuid }) => {
-        ? createdTagsByUUID.get(uuid)
+        const inputTag = tagUuid
-        : createdTagsByName.get(name);
+          ? createdTagsByUUID.get(tagUuid)
+          : createdTagsByName.get(tagName);
         return {
           tag: inputTag?.uuid,
           product: productUuid,
         };
-    });
+      },
+    );
 
     await this.spaceProductAllocationService.createProductAllocations(
       space,

src/space/services/subspace/subspace-product-allocation.service.ts

@@ -3,7 +3,7 @@ import { SubspaceProductAllocationEntity } from '@app/common/modules/space/entit
 import { SubspaceEntity } from '@app/common/modules/space/entities/subspace/subspace.entity';
 import { SubspaceProductAllocationRepository } from '@app/common/modules/space/repositories/subspace.repository';
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
-import { UpdateSpaceAllocationDto } from 'src/space/interfaces/update-subspace-allocation.dto';
+import { UpdateSubspaceDto } from 'src/space/dtos';
 import { TagService as NewTagService } from 'src/tags/services';
 import { In, Not, QueryRunner } from 'typeorm';
 
@@ -23,7 +23,7 @@ export class SubspaceProductAllocationService {
     // spaceAllocationsToExclude?: SpaceProductAllocationEntity[],
   ): Promise<void> {
     try {
-      if (!allocationsData.length) return;
+      if (!allocationsData?.length) return;
 
       const allocations: SubspaceProductAllocationEntity[] = [];
 
@@ -60,31 +60,46 @@ export class SubspaceProductAllocationService {
   }
 
   async updateSubspaceProductAllocationsV2(
-    subSpaces: UpdateSpaceAllocationDto[],
+    subSpaces: UpdateSubspaceDto[],
     projectUuid: string,
     queryRunner: QueryRunner,
   ) {
     await Promise.all(
       subSpaces.map(async (subspace) => {
         await queryRunner.manager.delete(SubspaceProductAllocationEntity, {
-          subspace: { uuid: subspace.uuid },
+          subspace: subspace.uuid ? { uuid: subspace.uuid } : undefined,
-          tag: {
+          tag: subspace.productAllocations
+            ? {
                 uuid: Not(
                   In(
-                subspace.tags.filter((tag) => tag.uuid).map((tag) => tag.uuid),
+                    subspace.productAllocations
+                      .filter((allocation) => allocation.tagUuid)
+                      .map((allocation) => allocation.tagUuid),
                   ),
                 ),
-          },
+              }
+            : undefined,
+          product: subspace.productAllocations
+            ? {
+                uuid: Not(
+                  In(
+                    subspace.productAllocations
+                      .filter((allocation) => allocation.productUuid)
+                      .map((allocation) => allocation.productUuid),
+                  ),
+                ),
+              }
+            : undefined,
         });
+
         const subspaceEntity = await queryRunner.manager.findOne(
           SubspaceEntity,
           {
             where: { uuid: subspace.uuid },
           },
         );
-
+        const processedTags = await this.tagService.upsertTags(
-        const processedTags = await this.tagService.processTags(
+          subspace.productAllocations,
-          subspace.tags,
           projectUuid,
           queryRunner,
         );
@@ -97,11 +112,11 @@ export class SubspaceProductAllocationService {
         );
 
         // Create the product-tag mapping based on the processed tags
-        const productTagMapping = subspace.tags.map(
+        const productTagMapping = subspace.productAllocations?.map(
-          ({ uuid, name, productUuid }) => {
+          ({ tagUuid, tagName, productUuid }) => {
-            const inputTag = uuid
+            const inputTag = tagUuid
-              ? createdTagsByUUID.get(uuid)
+              ? createdTagsByUUID.get(tagUuid)
-              : createdTagsByName.get(name);
+              : createdTagsByName.get(tagName);
             return {
               tag: inputTag?.uuid,
               product: productUuid,
@@ -118,71 +133,6 @@ export class SubspaceProductAllocationService {
     );
   }
 
-  // async processDeleteActions(dtos: ModifyTagDto[], queryRunner: QueryRunner) {
-  //   // : Promise<SubspaceProductAllocationEntity[]>
-  //   try {
-  //     // if (!dtos || dtos.length === 0) {
-  //     //   throw new Error('No DTOs provided for deletion.');
-  //     // }
-  //     // const tagUuidsToDelete = dtos
-  //     //   .filter((dto) => dto.action === ModifyAction.DELETE && dto.tagUuid)
-  //     //   .map((dto) => dto.tagUuid);
-  //     // if (tagUuidsToDelete.length === 0) return [];
-  //     // const allocationsToUpdate = await queryRunner.manager.find(
-  //     //   SubspaceProductAllocationEntity,
-  //     //   {
-  //     //     where: { tag: In(tagUuidsToDelete) },
-  //     //   },
-  //     // );
-  //     // if (!allocationsToUpdate || allocationsToUpdate.length === 0) return [];
-  //     // const deletedAllocations: SubspaceProductAllocationEntity[] = [];
-  //     // const allocationUpdates: SubspaceProductAllocationEntity[] = [];
-  //     // for (const allocation of allocationsToUpdate) {
-  //     //   const updatedTags = allocation.tags.filter(
-  //     //     (tag) => !tagUuidsToDelete.includes(tag.uuid),
-  //     //   );
-  //     //   if (updatedTags.length === allocation.tags.length) {
-  //     //     continue;
-  //     //   }
-  //     //   if (updatedTags.length === 0) {
-  //     //     deletedAllocations.push(allocation);
-  //     //   } else {
-  //     //     allocation.tags = updatedTags;
-  //     //     allocationUpdates.push(allocation);
-  //     //   }
-  //     // }
-  //     // if (allocationUpdates.length > 0) {
-  //     //   await queryRunner.manager.save(
-  //     //     SubspaceProductAllocationEntity,
-  //     //     allocationUpdates,
-  //     //   );
-  //     // }
-  //     // if (deletedAllocations.length > 0) {
-  //     //   await queryRunner.manager.remove(
-  //     //     SubspaceProductAllocationEntity,
-  //     //     deletedAllocations,
-  //     //   );
-  //     // }
-  //     // await queryRunner.manager
-  //     //   .createQueryBuilder()
-  //     //   .delete()
-  //     //   .from('subspace_product_tags')
-  //     //   .where(
-  //     //     'subspace_product_allocation_uuid NOT IN ' +
-  //     //       queryRunner.manager
-  //     //         .createQueryBuilder()
-  //     //         .select('allocation.uuid')
-  //     //         .from(SubspaceProductAllocationEntity, 'allocation')
-  //     //         .getQuery() +
-  //     //       ')',
-  //     //   )
-  //     //   .execute();
-  //     // return deletedAllocations;
-  //   } catch (error) {
-  //     throw this.handleError(error, `Failed to delete tags in subspace`);
-  //   }
-  // }
-
   async unlinkModels(
     allocations: SubspaceProductAllocationEntity[],
     queryRunner: QueryRunner,
@@ -205,67 +155,6 @@ export class SubspaceProductAllocationService {
     }
   }
 
-  // private async validateTagWithinSubspace(
-  //   queryRunner: QueryRunner | undefined,
-  //   tag: NewTagEntity & { product: string },
-  //   subspace: SubspaceEntity,
-  //   spaceAllocationsToExclude?: SpaceProductAllocationEntity[],
-  // ): Promise<void> {
-  //   // const existingTagInSpace = await (queryRunner
-  //   //   ? queryRunner.manager.findOne(SpaceProductAllocationEntity, {
-  //   //       where: {
-  //   //         product: { uuid: tag.product },
-  //   //         space: { uuid: subspace.space.uuid },
-  //   //         tag: { uuid: tag.uuid },
-  //   //       },
-  //   //     })
-  //   //   : this.spaceProductAllocationRepository.findOne({
-  //   //       where: {
-  //   //         product: { uuid: tag.product },
-  //   //         space: { uuid: subspace.space.uuid },
-  //   //         tag: { uuid: tag.uuid },
-  //   //       },
-  //   //     }));
-  //   // const isExcluded = spaceAllocationsToExclude?.some(
-  //   //   (excludedAllocation) =>
-  //   //     excludedAllocation.product.uuid === tag.product &&
-  //   //     excludedAllocation.tags.some((t) => t.uuid === tag.uuid),
-  //   // );
-  //   // if (!isExcluded && existingTagInSpace) {
-  //   //   throw new HttpException(
-  //   //     `Tag ${tag.uuid} (Product: ${tag.product}) is already allocated at the space level (${subspace.space.uuid}). Cannot allocate the same tag in a subspace.`,
-  //   //     HttpStatus.BAD_REQUEST,
-  //   //   );
-  //   // }
-  //   // // ?: Check if the tag is already allocated in another "subspace" within the same space
-  //   // const existingTagInSameSpace = await (queryRunner
-  //   //   ? queryRunner.manager.findOne(SubspaceProductAllocationEntity, {
-  //   //       where: {
-  //   //         product: { uuid: tag.product },
-  //   //         subspace: { space: subspace.space },
-  //   //         tag: { uuid: tag.uuid },
-  //   //       },
-  //   //       relations: ['subspace'],
-  //   //     })
-  //   //   : this.subspaceProductAllocationRepository.findOne({
-  //   //       where: {
-  //   //         product: { uuid: tag.product },
-  //   //         subspace: { space: subspace.space },
-  //   //         tag: { uuid: tag.uuid },
-  //   //       },
-  //   //       relations: ['subspace'],
-  //   //     }));
-  //   // if (
-  //   //   existingTagInSameSpace &&
-  //   //   existingTagInSameSpace.subspace.uuid !== subspace.uuid
-  //   // ) {
-  //   //   throw new HttpException(
-  //   //     `Tag ${tag.uuid} (Product: ${tag.product}) is already allocated in another subspace (${existingTagInSameSpace.subspace.uuid}) within the same space (${subspace.space.uuid}).`,
-  //   //     HttpStatus.BAD_REQUEST,
-  //   //   );
-  //   // }
-  // }
-
   private createNewSubspaceAllocation(
     subspace: SubspaceEntity,
     allocationData: { product: string; tag: string },

src/space/services/subspace/subspace.service.ts

@@ -12,7 +12,7 @@ import {
   AddSubspaceDto,
   GetSpaceParam,
   GetSubSpaceParam,
-  ModifySubspaceDto,
+  UpdateSubspaceDto,
 } from '../../dtos';
 
 import { SubspaceModelEntity } from '@app/common/modules/space-model';
@@ -39,7 +39,7 @@ export class SubSpaceService {
     private readonly subspaceProductAllocationService: SubspaceProductAllocationService,
   ) {}
 
-  async createSubspaces(
+  private async createSubspaces(
     subspaceData: Array<{
       subspaceName: string;
       space: SpaceEntity;
@@ -103,13 +103,13 @@ export class SubSpaceService {
         queryRunner,
       );
       await Promise.all(
-        addSubspaceDtos.map(async ({ tags }, index) => {
+        addSubspaceDtos.map(async ({ productAllocations }, index) => {
           // map the dto to the corresponding subspace
           const subspace = createdSubspaces[index];
           await this.createAllocations({
             projectUuid,
             queryRunner,
-            tags,
+            productAllocations,
             type: AllocationsOwnerType.SUBSPACE,
             subspace,
           });
@@ -145,7 +145,7 @@ export class SubSpaceService {
         space,
       );
       const newSubspace = this.subspaceRepository.create({
-        ...addSubspaceDto,
+        subspaceName: addSubspaceDto.subspaceName,
         space,
       });
 
@@ -305,7 +305,7 @@ export class SubSpaceService {
   } */
 
   async updateSubspaceInSpace(
-    subspaceDtos: ModifySubspaceDto[],
+    subspaceDtos: UpdateSubspaceDto[],
     queryRunner: QueryRunner,
     space: SpaceEntity,
     projectUuid: string,
@@ -324,42 +324,63 @@ export class SubSpaceService {
           disabled: true,
         },
       );
-
       await queryRunner.manager.delete(SubspaceProductAllocationEntity, {
-        subspace: { uuid: Not(In(subspaceDtos.map((dto) => dto.uuid))) },
+        subspace: {
+          uuid: Not(
+            In(subspaceDtos.filter(({ uuid }) => uuid).map(({ uuid }) => uuid)),
+          ),
+        },
       });
 
       // create or update subspaces provided in the list
       const newSubspaces = this.subspaceRepository.create(
-        subspaceDtos.filter((dto) => !dto.uuid),
+        subspaceDtos
+          .filter((dto) => !dto.uuid)
+          .map((dto) => ({
+            subspaceName: dto.subspaceName,
+            space,
+          })),
       );
 
+      const existingSubspaces = await this.subspaceRepository.find({
+        where: {
+          uuid: In(
+            subspaceDtos.filter((dto) => dto.uuid).map((dto) => dto.uuid),
+          ),
+        },
+      });
+
+      if (
+        existingSubspaces.length !==
+        subspaceDtos.filter((dto) => dto.uuid).length
+      ) {
+        throw new HttpException(
+          `Some subspaces with provided UUIDs do not exist in the space.`,
+          HttpStatus.NOT_FOUND,
+        );
+      }
+
       const updatedSubspaces: SubspaceEntity[] = await queryRunner.manager.save(
         SubspaceEntity,
-        [...newSubspaces, ...subspaceDtos.filter((dto) => dto.uuid)].map(
+        newSubspaces,
-          (subspace) => ({ ...subspace, space }),
-        ),
       );
-
+      const allSubspaces = [...updatedSubspaces, ...existingSubspaces];
       // create or update allocations for the subspaces
-      if (updatedSubspaces.length > 0) {
+      if (allSubspaces.length > 0) {
         await this.subspaceProductAllocationService.updateSubspaceProductAllocationsV2(
-          subspaceDtos.map((dto) => {
+          subspaceDtos.map((dto) => ({
-            if (!dto.uuid) {
+            ...dto,
-              dto.uuid = updatedSubspaces.find(
+            uuid:
-                (subspace) => subspace.subspaceName === dto.subspaceName,
+              dto.uuid ||
-              )?.uuid;
+              allSubspaces.find((s) => s.subspaceName === dto.subspaceName)
-            }
+                ?.uuid,
-            return {
+          })),
-              tags: dto.tags || [],
-              uuid: dto.uuid,
-            };
-          }),
           projectUuid,
           queryRunner,
         );
       }
     } catch (error) {
+      console.log(error);
       throw new HttpException(
         `An error occurred while modifying subspaces: ${error.message}`,
         HttpStatus.INTERNAL_SERVER_ERROR,
@@ -478,10 +499,10 @@ export class SubSpaceService {
   }
 
   async createAllocations(dto: CreateAllocationsDto): Promise<void> {
-    const { projectUuid, queryRunner, tags, type } = dto;
+    const { projectUuid, queryRunner, productAllocations, type } = dto;
-
+    if (!productAllocations) return;
-    const allocationsData = await this.newTagService.processTags(
+    const allocationsData = await this.newTagService.upsertTags(
-      tags,
+      productAllocations,
       projectUuid,
       queryRunner,
     );
@@ -491,15 +512,17 @@ export class SubSpaceService {
     const createdTagsByName = new Map(allocationsData.map((t) => [t.name, t]));
 
     // Create the product-tag mapping based on the processed tags
-    const productTagMapping = tags.map(({ uuid, name, productUuid }) => {
+    const productTagMapping = productAllocations.map(
-      const inputTag = uuid
+      ({ tagUuid, tagName, productUuid }) => {
-        ? createdTagsByUUID.get(uuid)
+        const inputTag = tagUuid
-        : createdTagsByName.get(name);
+          ? createdTagsByUUID.get(tagUuid)
+          : createdTagsByName.get(tagName);
         return {
           tag: inputTag?.uuid,
           product: productUuid,
         };
-    });
+      },
+    );
 
     switch (type) {
       case AllocationsOwnerType.SUBSPACE: {

src/space/services/tag/index.ts

@@ -1 +0,0 @@
-export * from './tag.service';

src/space/services/tag/tag.service.ts

@@ -1,8 +0,0 @@
-import { Injectable } from '@nestjs/common';
-
-// todo: find out why we need to import this
-// in community module in order for the whole system to work
-@Injectable()
-export class TagService {
-  constructor() {}
-}