Add methods to handle SOS events and device status updates in Firebase and our DB

Revert "SP-1778-be-fix-time-out-connections-in-the-db"

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

@@ -125,7 +125,7 @@ import { VisitorPasswordEntity } from '../modules/visitor-password/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
             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/firebase/devices-status/services/devices-status.service.ts

@@ -76,6 +76,28 @@ export class DeviceStatusFirebaseService {
       );
     }
   }
+  async addDeviceStatusToOurDb(
+    addDeviceStatusDto: AddDeviceStatusDto,
+  ): Promise<AddDeviceStatusDto | null> {
+    try {
+      const device = await this.getDeviceByDeviceTuyaUuid(
+        addDeviceStatusDto.deviceTuyaUuid,
+      );
+
+      if (device?.uuid) {
+        return await this.createDeviceStatusInOurDb({
+          deviceUuid: device.uuid,
+          ...addDeviceStatusDto,
+          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;
+    }
+  }
   async addDeviceStatusToFirebase(
     addDeviceStatusDto: AddDeviceStatusDto,
   ): Promise<AddDeviceStatusDto | null> {
@@ -211,6 +233,13 @@ export class DeviceStatusFirebaseService {
       return existingData;
     });
 
+    // Return the updated data
+    const snapshot: DataSnapshot = await get(dataRef);
+    return snapshot.val();
+  }
+  async createDeviceStatusInOurDb(
+    addDeviceStatusDto: AddDeviceStatusDto,
+  ): Promise<any> {
     // Save logs to your repository
     const newLogs = addDeviceStatusDto.log.properties.map((property) => {
       return this.deviceStatusLogRepository.create({
@@ -269,8 +298,5 @@ export class DeviceStatusFirebaseService {
         addDeviceStatusDto.deviceUuid,
       );
     }
-    // Return the updated data
-    const snapshot: DataSnapshot = await get(dataRef);
-    return snapshot.val();
   }
 }

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

@@ -16,7 +16,7 @@ export class SosHandlerService {
     );
   }
 
-  async handleSosEvent(devId: string, logData: any): Promise<void> {
+  async handleSosEventFirebase(devId: string, logData: any): Promise<void> {
     try {
       await this.deviceStatusFirebaseService.addDeviceStatusToFirebase({
         deviceTuyaUuid: devId,
@@ -39,4 +39,28 @@ export class SosHandlerService {
       this.logger.error('Failed to send SOS true value', err);
     }
   }
+
+  async handleSosEventOurDb(devId: string, logData: any): Promise<void> {
+    try {
+      await this.deviceStatusFirebaseService.addDeviceStatusToOurDb({
+        deviceTuyaUuid: devId,
+        status: [{ code: 'sos', value: true }],
+        log: logData,
+      });
+
+      setTimeout(async () => {
+        try {
+          await this.deviceStatusFirebaseService.addDeviceStatusToOurDb({
+            deviceTuyaUuid: devId,
+            status: [{ code: 'sos', value: false }],
+            log: logData,
+          });
+        } catch (err) {
+          this.logger.error('Failed to send SOS false value', err);
+        }
+      }, 2000);
+    } catch (err) {
+      this.logger.error('Failed to send SOS true value', err);
+    }
+  }
 }

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

@@ -9,6 +9,14 @@ export class TuyaWebSocketService {
   private client: any;
   private readonly isDevEnv: boolean;
 
+  private messageQueue: {
+    devId: string;
+    status: any;
+    logData: any;
+  }[] = [];
+
+  private isProcessing = false;
+
   constructor(
     private readonly configService: ConfigService,
     private readonly deviceStatusFirebaseService: DeviceStatusFirebaseService,
@@ -26,12 +34,12 @@ 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();
     }
+
+    // Trigger the queue processor every 2 seconds
+    setInterval(() => this.processQueue(), 10000);
   }
 
   private setupEventHandlers() {
@@ -43,10 +51,10 @@ export class TuyaWebSocketService {
     this.client.message(async (ws: WebSocket, message: any) => {
       try {
         const { devId, status, logData } = this.extractMessageData(message);
-
         if (this.sosHandlerService.isSosTriggered(status)) {
-          await this.sosHandlerService.handleSosEvent(devId, logData);
+          await this.sosHandlerService.handleSosEventFirebase(devId, logData);
         } else {
+          // Firebase real-time update
           await this.deviceStatusFirebaseService.addDeviceStatusToFirebase({
             deviceTuyaUuid: devId,
             status: status,
@@ -54,9 +62,13 @@ export class TuyaWebSocketService {
           });
         }
 
+        // Push to internal queue
+        this.messageQueue.push({ devId, status, logData });
+
+        // Acknowledge the message
         this.client.ackMessage(message.messageId);
       } catch (error) {
-        console.error('Error processing message:', error);
+        console.error('Error receiving message:', error);
       }
     });
 
@@ -80,6 +92,38 @@ export class TuyaWebSocketService {
       console.error('WebSocket error:', error);
     });
   }
+  private async processQueue() {
+    if (this.isProcessing || this.messageQueue.length === 0) return;
+
+    this.isProcessing = true;
+
+    const batch = [...this.messageQueue];
+    this.messageQueue = [];
+
+    try {
+      for (const item of batch) {
+        if (this.sosHandlerService.isSosTriggered(item.status)) {
+          await this.sosHandlerService.handleSosEventOurDb(
+            item.devId,
+            item.logData,
+          );
+        } else {
+          await this.deviceStatusFirebaseService.addDeviceStatusToOurDb({
+            deviceTuyaUuid: item.devId,
+            status: item.status,
+            log: item.logData,
+          });
+        }
+      }
+    } catch (error) {
+      console.error('Error processing batch:', error);
+      // Re-add the batch to the queue for retry
+      this.messageQueue.unshift(...batch);
+    } finally {
+      this.isProcessing = false;
+    }
+  }
+
   private extractMessageData(message: any): {
     devId: string;
     status: any;

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

@@ -1,4 +1,3 @@
--- 1. Load all presence-related logs
 WITH device_logs AS (
     SELECT 
         device.uuid AS device_id,
@@ -16,7 +15,7 @@ WITH device_logs AS (
       AND "device-status-log".code = 'presence_state'
 ),
 
--- 2. Standard transitions: 'none' → 'motion' or 'presence'
+-- 1. All 'none' → presence or motion
 presence_transitions AS (
     SELECT 
         space_id,
@@ -24,31 +23,10 @@ presence_transitions AS (
         event_time::date AS event_date,
         value
     FROM device_logs
-    WHERE value IN ('motion', 'presence') AND prev_value = 'none'
+    WHERE (value = 'motion' OR value = 'presence') AND prev_value = 'none'
 ),
 
--- 3. Fallback: days with 'motion' or 'presence' but no 'none'
+-- 2. Cluster events per space_id within 30s
-fallback_daily_presence AS (
-    SELECT 
-        space_id,
-        event_time::date AS event_date,
-        MIN(event_time) AS event_time,
-        'presence'::text AS value
-    FROM device_logs
-    WHERE value IN ('motion', 'presence', 'none')
-    GROUP BY space_id, event_time::date
-    HAVING BOOL_OR(value = 'motion') OR BOOL_OR(value = 'presence')
-       AND NOT BOOL_OR(value = 'none')
-),
-
--- 4. Merge both detection sources
-all_presence_events AS (
-    SELECT * FROM presence_transitions
-    UNION ALL
-    SELECT space_id, event_time, event_date, value FROM fallback_daily_presence
-),
-
--- 5. Cluster events per space_id within 30 seconds
 clustered_events AS (
     SELECT 
         space_id,
@@ -62,11 +40,11 @@ clustered_events AS (
                 WHEN event_time - LAG(event_time) OVER (PARTITION BY space_id ORDER BY event_time) > INTERVAL '30 seconds'
                 THEN 1 ELSE 0
             END AS new_cluster_flag
-        FROM all_presence_events
+        FROM presence_transitions
     ) marked
 ),
 
--- 6. Determine dominant type (motion vs presence) per cluster
+-- 3. Determine dominant type (motion vs presence) per cluster
 cluster_type AS (
     SELECT 
         space_id,
@@ -82,7 +60,7 @@ cluster_type AS (
     GROUP BY space_id, event_date, cluster_id
 ),
 
--- 7. Count clusters by dominant type
+-- 4. Count clusters by dominant type
 summary AS (
     SELECT 
         space_id,
@@ -92,16 +70,15 @@ summary AS (
         COUNT(*) AS count_total_presence_detected
     FROM cluster_type
     GROUP BY space_id, event_date
-),
-
--- 8. Prepare final result
-final_table AS (
-    SELECT *
-    FROM summary
-    ORDER BY space_id, event_date
 )
 
--- 9. Insert or upsert into the destination table
+-- 5. Output
+, final_table as (
+SELECT *
+FROM summary
+ORDER BY space_id, event_date)
+
+
 INSERT INTO public."presence-sensor-daily-space-detection" (
 	space_uuid,
 	event_date,

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

@@ -4,7 +4,6 @@ WITH params AS (
       $2::uuid AS space_id
 ),
 
--- 1. Load logs
 device_logs AS (
     SELECT 
         device.uuid AS device_id,
@@ -22,7 +21,7 @@ device_logs AS (
       AND "device-status-log".code = 'presence_state'
 ),
 
--- 2. Transitions from 'none' → motion/presence
+-- 1. All 'none' → presence or motion
 presence_transitions AS (
     SELECT 
         space_id,
@@ -30,30 +29,10 @@ presence_transitions AS (
         event_time::date AS event_date,
         value
     FROM device_logs
-    WHERE value IN ('motion', 'presence') AND prev_value = 'none'
+    WHERE (value = 'motion' OR value = 'presence') AND prev_value = 'none'
 ),
 
--- 3. Fallback: days with motion/presence but no 'none'
+-- 2. Cluster events per space_id within 30s
-fallback_daily_presence AS (
-    SELECT 
-        space_id,
-        event_time::date AS event_date,
-        MIN(event_time) AS event_time,
-        'presence'::text AS value
-    FROM device_logs
-    GROUP BY space_id, event_time::date
-    HAVING BOOL_OR(value = 'motion') OR BOOL_OR(value = 'presence')
-       AND NOT BOOL_OR(value = 'none')
-),
-
--- 4. Combine standard and fallback detections
-all_presence_events AS (
-    SELECT * FROM presence_transitions
-    UNION ALL
-    SELECT * FROM fallback_daily_presence
-),
-
--- 5. Cluster detections (within 30s)
 clustered_events AS (
     SELECT 
         space_id,
@@ -67,11 +46,11 @@ clustered_events AS (
                 WHEN event_time - LAG(event_time) OVER (PARTITION BY space_id ORDER BY event_time) > INTERVAL '30 seconds'
                 THEN 1 ELSE 0
             END AS new_cluster_flag
-        FROM all_presence_events
+        FROM presence_transitions
     ) marked
 ),
 
--- 6. Dominant type per cluster
+-- 3. Determine dominant type (motion vs presence) per cluster
 cluster_type AS (
     SELECT 
         space_id,
@@ -87,7 +66,7 @@ cluster_type AS (
     GROUP BY space_id, event_date, cluster_id
 ),
 
--- 7. Count presence by type
+-- 4. Count clusters by dominant type
 summary AS (
     SELECT 
         space_id,
@@ -97,22 +76,22 @@ summary AS (
         COUNT(*) AS count_total_presence_detected
     FROM cluster_type
     GROUP BY space_id, event_date
-),
+)
 
--- 8. Filter by params and return final table
+-- 5. Output
-final_table AS (
+, final_table as (
-    SELECT 
+SELECT summary.space_id,
-        summary.space_id,
        summary.event_date,
        count_motion_detected,
        count_presence_detected,
        count_total_presence_detected
 FROM summary
-    JOIN params p ON summary.space_id = p.space_id
+JOIN params P ON true
-    WHERE p.event_date IS NULL OR summary.event_date = p.event_date
+where summary.space_id = P.space_id
-)
+and (P.event_date IS NULL or summary.event_date::date = P.event_date)
+ORDER BY space_id, event_date)
+
 
--- 9. Insert or upsert into the table
 INSERT INTO public."presence-sensor-daily-space-detection" (
 	space_uuid,
 	event_date,

libs/common/src/sql/queries/fact_hourly_space_presence_detected/fact_hourly_space_presence_detected.sql

@@ -30,19 +30,6 @@ presence_detection AS (
     FROM device_logs
 ),
 
-fallback_daily_presence AS (
-    SELECT 
-        space_id,
-        event_time::date AS event_date,
-        0 AS event_hour,
-        COUNT(*) > 0 AS has_presence,
-        BOOL_OR(value = 'none') AS has_none
-    FROM device_logs
-    WHERE value IN ('motion', 'presence', 'none')
-    GROUP BY space_id, event_time::date
-    HAVING COUNT(*) > 0 AND NOT BOOL_OR(value = 'none')
-),
-
 space_level_presence_events AS (
     SELECT DISTINCT 
         pd.space_id,
@@ -51,15 +38,6 @@ space_level_presence_events AS (
         pd.event_time
     FROM presence_detection pd
     WHERE presence_started = 1
-
-    UNION
-
-    SELECT 
-        fdp.space_id,
-        fdp.event_date,
-        fdp.event_hour,
-        NULL::timestamp AS event_time
-    FROM fallback_daily_presence fdp
 ),
 
 space_level_presence_summary AS (
@@ -99,4 +77,3 @@ LEFT JOIN space_level_presence_summary pds
 ORDER BY space_id, event_date, event_hour;
 
 
-

src/community/services/community.service.ts

@@ -190,24 +190,26 @@ export class CommunityService {
         .distinct(true);
 
       if (includeSpaces) {
-        qb.leftJoinAndSelect('c.spaces', 'space', 'space.disabled = false')
+        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')
-          .andWhere('space.spaceName != :orphanSpaceName', {
-            orphanSpaceName: ORPHAN_SPACE_NAME,
-          })
-          .andWhere('space.disabled = :disabled', { disabled: false });
       }
 
       if (search) {
         qb.andWhere(
-          `c.name ILIKE '%${search}%' ${includeSpaces ? "OR space.space_name ILIKE '%" + search + "%'" : ''}`,
+          `c.name ILIKE :search ${includeSpaces ? 'OR space.space_name ILIKE :search' : ''}`,
+          { search },
         );
       }
 
@@ -215,12 +217,21 @@ export class CommunityService {
 
       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,

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/dtos/get.device.dto.ts

@@ -1,6 +1,7 @@
 import { DeviceTypeEnum } from '@app/common/constants/device-type.enum';
 import { ApiProperty } from '@nestjs/swagger';
 import {
+  IsArray,
   IsEnum,
   IsNotEmpty,
   IsOptional,
@@ -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,23 @@ 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()
+  @IsArray()
+  @IsUUID('4', { each: true })
+  public spaces?: string[];
+}

src/device/services/device.service.ts

@@ -53,7 +53,7 @@ import { DeviceSceneParamDto } from '../dtos/device.param.dto';
 import {
   GetDeviceLogsDto,
   GetDevicesBySpaceOrCommunityDto,
-  GetDoorLockDevices,
+  GetDevicesFilterDto,
 } from '../dtos/get.device.dto';
 import {
   controlDeviceInterface,
@@ -955,19 +955,20 @@ export class DeviceService {
 
   async getAllDevices(
     param: ProjectParam,
-    query: GetDoorLockDevices,
+    { deviceType, spaces }: GetDevicesFilterDto,
   ): Promise<BaseResponseDto> {
     try {
       await this.validateProject(param.projectUuid);
-      if (query.deviceType === DeviceTypeEnum.DOOR_LOCK) {
+      if (deviceType === DeviceTypeEnum.DOOR_LOCK) {
-        return await this.getDoorLockDevices(param.projectUuid);
+        return await this.getDoorLockDevices(param.projectUuid, spaces);
-      } else if (!query.deviceType) {
+      } else if (!deviceType) {
         const devices = await this.deviceRepository.find({
           where: {
             isActive: true,
             spaceDevice: {
-              community: { project: { uuid: param.projectUuid } },
+              uuid: spaces && spaces.length ? In(spaces) : undefined,
               spaceName: Not(ORPHAN_SPACE_NAME),
+              community: { project: { uuid: param.projectUuid } },
             },
           },
           relations: [
@@ -1563,7 +1564,7 @@ export class DeviceService {
     }
   }
 
-  async getDoorLockDevices(projectUuid: string) {
+  async getDoorLockDevices(projectUuid: string, spaces?: string[]) {
     await this.validateProject(projectUuid);
 
     const devices = await this.deviceRepository.find({
@@ -1573,6 +1574,7 @@ export class DeviceService {
         },
         spaceDevice: {
           spaceName: Not(ORPHAN_SPACE_NAME),
+          uuid: spaces && spaces.length ? In(spaces) : undefined,
           community: {
             project: {
               uuid: projectUuid,

src/main.ts

@@ -26,8 +26,6 @@ async function bootstrap() {
     rateLimit({
       windowMs: 5 * 60 * 1000,
       max: 500,
-      standardHeaders: true,
-      legacyHeaders: false,
     }),
   );
 
@@ -36,7 +34,7 @@ async function bootstrap() {
     next();
   });
 
-  app.getHttpAdapter().getInstance().set('trust proxy', 1);
+  // app.getHttpAdapter().getInstance().set('trust proxy', 1);
 
   app.use(
     helmet({

src/space/services/space.service.ts

@@ -681,7 +681,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