presence count

libs/common/src/constants/product-type.enum.ts

@@ -15,7 +15,6 @@ export enum ProductType {
   WL = 'WL',
   GD = 'GD',
   CUR = 'CUR',
-  CUR_2 = 'CUR_2',
   PC = 'PC',
   FOUR_S = '4S',
   SIX_S = '6S',

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

@@ -125,7 +125,7 @@ import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
           logger: typeOrmLogger,
           extra: {
             charset: 'utf8mb4',
-            max: 100, // set pool max size
+            max: 20, // 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,28 +76,6 @@ 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> {
@@ -233,13 +211,6 @@ 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({
@@ -298,5 +269,8 @@ 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 handleSosEventFirebase(devId: string, logData: any): Promise<void> {
+  async handleSosEvent(devId: string, logData: any): Promise<void> {
     try {
       await this.deviceStatusFirebaseService.addDeviceStatusToFirebase({
         deviceTuyaUuid: devId,
@@ -39,28 +39,4 @@ 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,14 +9,6 @@ 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,
@@ -34,12 +26,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() {
@@ -51,10 +43,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.handleSosEventFirebase(devId, logData);
+          await this.sosHandlerService.handleSosEvent(devId, logData);
         } else {
-          // Firebase real-time update
           await this.deviceStatusFirebaseService.addDeviceStatusToFirebase({
             deviceTuyaUuid: devId,
             status: status,
@@ -62,13 +54,9 @@ 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 receiving message:', error);
+        console.error('Error processing message:', error);
       }
     });
 
@@ -92,38 +80,6 @@ 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_daily_space_aqi/proceduce_update_daily_space_aqi.sql

@@ -1,6 +1,7 @@
 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
@@ -276,10 +277,7 @@ 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
-JOIN params  
-    ON params.event_date = a.event_date
+  ON p.space_id = a.space_id AND p.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,6 +1,7 @@
 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 (
@@ -85,7 +86,8 @@ 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.event_date = s.event_date
+    ON p.space_id = s.space_id 
+   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,5 +1,6 @@
 WITH params AS (
     SELECT 
+        $1::uuid AS device_id,
         $2::date AS target_date
 ),
 total_energy AS (
@@ -13,7 +14,8 @@ total_energy AS (
         MAX(log.value)::integer AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumed'
-    AND log.event_time::date = params.target_date
+      AND log.device_id = params.device_id
+      AND log.event_time::date = params.target_date
     GROUP BY 1,2,3,4,5
 ),
 energy_phase_A AS (
@@ -27,7 +29,8 @@ energy_phase_A AS (
         MAX(log.value)::integer AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedA'
-    AND log.event_time::date = params.target_date
+      AND log.device_id = params.device_id
+      AND log.event_time::date = params.target_date
     GROUP BY 1,2,3,4,5
 ),
 energy_phase_B AS (
@@ -41,7 +44,8 @@ energy_phase_B AS (
         MAX(log.value)::integer AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedB'
-    AND log.event_time::date = params.target_date
+      AND log.device_id = params.device_id
+      AND log.event_time::date = params.target_date
     GROUP BY 1,2,3,4,5
 ),
 energy_phase_C AS (
@@ -55,7 +59,8 @@ energy_phase_C AS (
         MAX(log.value)::integer AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedC'
-    AND log.event_time::date = params.target_date
+      AND log.device_id = params.device_id
+      AND log.event_time::date = params.target_date
     GROUP BY 1,2,3,4,5
 ),
 final_data AS (

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

@@ -1,6 +1,8 @@
 WITH params AS (
     SELECT 
-        $2::date AS target_date
+        $1::uuid AS device_id,
+        $2::date AS target_date,
+        $3::text AS target_hour
 ),
 total_energy AS (
     SELECT 
@@ -13,7 +15,9 @@ 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 (
@@ -27,7 +31,9 @@ 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 (
@@ -41,7 +47,9 @@ 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 (
@@ -55,7 +63,9 @@ 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,5 +1,6 @@
 WITH params AS (
     SELECT 
+        $1::uuid AS device_id,
         $2::text AS target_month  -- Format should match 'MM-YYYY'
 ),
 total_energy AS (
@@ -13,6 +14,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 TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month
     GROUP BY 1,2,3,4,5
 ),
@@ -27,6 +29,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 TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month
     GROUP BY 1,2,3,4,5
 ),
@@ -41,6 +44,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 TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month
     GROUP BY 1,2,3,4,5
 ),
@@ -55,6 +59,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 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_insert_all_fact_space_occupancy_count.sql

@@ -1,3 +1,4 @@
+-- 1. Load all presence-related logs
 WITH device_logs AS (
     SELECT 
         device.uuid AS device_id,
@@ -15,7 +16,7 @@ WITH device_logs AS (
       AND "device-status-log".code = 'presence_state'
 ),
 
--- 1. All 'none' → presence or motion
+-- 2. Standard transitions: 'none' → 'motion' or 'presence'
 presence_transitions AS (
     SELECT 
         space_id,
@@ -23,10 +24,31 @@ presence_transitions AS (
         event_time::date AS event_date,
         value
     FROM device_logs
-    WHERE (value = 'motion' OR value = 'presence') AND prev_value = 'none'
+    WHERE value IN ('motion', 'presence') AND prev_value = 'none'
 ),
 
--- 2. Cluster events per space_id within 30s
+-- 3. Fallback: days with 'motion' or 'presence' but no 'none'
+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,
@@ -40,11 +62,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 presence_transitions
+        FROM all_presence_events
     ) marked
 ),
 
--- 3. Determine dominant type (motion vs presence) per cluster
+-- 6. Determine dominant type (motion vs presence) per cluster
 cluster_type AS (
     SELECT 
         space_id,
@@ -60,7 +82,7 @@ cluster_type AS (
     GROUP BY space_id, event_date, cluster_id
 ),
 
--- 4. Count clusters by dominant type
+-- 7. Count clusters by dominant type
 summary AS (
     SELECT 
         space_id,
@@ -70,15 +92,16 @@ 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
 )
 
--- 5. Output
-, final_table as (
-SELECT *
-FROM summary
-ORDER BY space_id, event_date)
-
-
+-- 9. Insert or upsert into the destination table
 INSERT INTO public."presence-sensor-daily-space-detection" (
 	space_uuid,
 	event_date,
@@ -97,4 +120,4 @@ ON CONFLICT (space_uuid, event_date) DO UPDATE
 SET
     count_motion_detected = EXCLUDED.count_motion_detected,
     count_presence_detected = EXCLUDED.count_presence_detected,
-    count_total_presence_detected = EXCLUDED.count_total_presence_detected;
+    count_total_presence_detected = EXCLUDED.count_total_presence_detected;

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

@@ -1,8 +1,10 @@
 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
 ),
 
+-- 1. Load logs
 device_logs AS (
     SELECT 
         device.uuid AS device_id,
@@ -20,7 +22,7 @@ device_logs AS (
       AND "device-status-log".code = 'presence_state'
 ),
 
--- 1. All 'none' → presence or motion
+-- 2. Transitions from 'none' → motion/presence
 presence_transitions AS (
     SELECT 
         space_id,
@@ -28,10 +30,30 @@ presence_transitions AS (
         event_time::date AS event_date,
         value
     FROM device_logs
-    WHERE (value = 'motion' OR value = 'presence') AND prev_value = 'none'
+    WHERE value IN ('motion', 'presence') AND prev_value = 'none'
 ),
 
--- 2. Cluster events per space_id within 30s
+-- 3. Fallback: days with motion/presence but no 'none'
+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,
@@ -45,11 +67,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 presence_transitions
+        FROM all_presence_events
     ) marked
 ),
 
--- 3. Determine dominant type (motion vs presence) per cluster
+-- 6. Dominant type per cluster
 cluster_type AS (
     SELECT 
         space_id,
@@ -65,7 +87,7 @@ cluster_type AS (
     GROUP BY space_id, event_date, cluster_id
 ),
 
--- 4. Count clusters by dominant type
+-- 7. Count presence by type
 summary AS (
     SELECT 
         space_id,
@@ -75,21 +97,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
+final_table AS (
+    SELECT 
+        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
+    WHERE p.event_date IS NULL OR summary.event_date = p.event_date
 )
 
--- 5. Output
-, final_table as (
-SELECT summary.space_id,
-       summary.event_date,
-       count_motion_detected,
-       count_presence_detected,
-       count_total_presence_detected
-FROM summary
-JOIN params P ON true
-where (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,6 +30,19 @@ 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,
@@ -38,6 +51,15 @@ 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 (
@@ -77,3 +99,4 @@ LEFT JOIN space_level_presence_summary pds
 ORDER BY space_id, event_date, event_hour;
 
 
+

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_GUARD, APP_INTERCEPTOR } from '@nestjs/core';
+import { APP_INTERCEPTOR } from '@nestjs/core';
 import { WinstonModule } from 'nest-winston';
 import { AuthenticationModule } from './auth/auth.module';
 import { AutomationModule } from './automation/automation.module';
@@ -35,9 +35,6 @@ 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';
@@ -47,18 +44,9 @@ import { WeatherModule } from './weather/weather.module';
     ConfigModule.forRoot({
       load: config,
     }),
-    ThrottlerModule.forRoot({
-      throttlers: [{ ttl: 60000, limit: 30 }],
-      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;
-      },
-    }),
+    /*   ThrottlerModule.forRoot({
+      throttlers: [{ ttl: 100000, limit: 30 }],
+    }), */
     WinstonModule.forRoot(winstonLoggerOptions),
     ClientModule,
     AuthenticationModule,
@@ -100,10 +88,10 @@ import { WeatherModule } from './weather/weather.module';
       provide: APP_INTERCEPTOR,
       useClass: LoggingInterceptor,
     },
-    {
+    /*  {
       provide: APP_GUARD,
       useClass: ThrottlerGuard,
-    },
+    }, */
   ],
 })
 export class AppModule {}

src/community/services/community.service.ts

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

@@ -1,28 +0,0 @@
-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 { ControllerRoute } from '@app/common/constants/controller-route';
-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 { PermissionsGuard } from 'src/guards/permissions.guard';
-import { GetDevicesFilterDto, ProjectParam } from '../dtos';
 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 { Permissions } from 'src/decorators/permissions.decorator';
+import { GetDoorLockDevices, ProjectParam } from '../dtos';
 
 @ApiTags('Device Module')
 @Controller({
@@ -25,7 +25,7 @@ export class DeviceProjectController {
   })
   async getAllDevices(
     @Param() param: ProjectParam,
-    @Query() query: GetDevicesFilterDto,
+    @Query() query: GetDoorLockDevices,
   ) {
     return await this.deviceService.getAllDevices(param, query);
   }

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

@@ -1,7 +1,6 @@
 import { DeviceTypeEnum } from '@app/common/constants/device-type.enum';
 import { ApiProperty } from '@nestjs/swagger';
 import {
-  IsArray,
   IsEnum,
   IsNotEmpty,
   IsOptional,
@@ -42,7 +41,16 @@ 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',
@@ -64,23 +72,3 @@ 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,
-  GetDevicesFilterDto,
+  GetDoorLockDevices,
 } from '../dtos/get.device.dto';
 import {
   controlDeviceInterface,
@@ -955,20 +955,19 @@ export class DeviceService {
 
   async getAllDevices(
     param: ProjectParam,
-    { deviceType, spaces }: GetDevicesFilterDto,
+    query: GetDoorLockDevices,
   ): Promise<BaseResponseDto> {
     try {
       await this.validateProject(param.projectUuid);
-      if (deviceType === DeviceTypeEnum.DOOR_LOCK) {
-        return await this.getDoorLockDevices(param.projectUuid, spaces);
-      } else if (!deviceType) {
+      if (query.deviceType === DeviceTypeEnum.DOOR_LOCK) {
+        return await this.getDoorLockDevices(param.projectUuid);
+      } else if (!query.deviceType) {
         const devices = await this.deviceRepository.find({
           where: {
             isActive: true,
             spaceDevice: {
-              uuid: spaces && spaces.length ? In(spaces) : undefined,
-              spaceName: Not(ORPHAN_SPACE_NAME),
               community: { project: { uuid: param.projectUuid } },
+              spaceName: Not(ORPHAN_SPACE_NAME),
             },
           },
           relations: [
@@ -1564,7 +1563,7 @@ export class DeviceService {
     }
   }
 
-  async getDoorLockDevices(projectUuid: string, spaces?: string[]) {
+  async getDoorLockDevices(projectUuid: string) {
     await this.validateProject(projectUuid);
 
     const devices = await this.deviceRepository.find({
@@ -1574,7 +1573,6 @@ export class DeviceService {
         },
         spaceDevice: {
           spaceName: Not(ORPHAN_SPACE_NAME),
-          uuid: spaces && spaces.length ? In(spaces) : undefined,
           community: {
             project: {
               uuid: projectUuid,

src/main.ts

@@ -3,6 +3,7 @@ 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 rateLimit from 'express-rate-limit';
 import helmet from 'helmet';
 import { WINSTON_MODULE_NEST_PROVIDER } from 'nest-winston';
 import { setupSwaggerAuthentication } from '../libs/common/src/util/user-auth.swagger.utils';
@@ -21,6 +22,22 @@ async function bootstrap() {
 
   app.use(new RequestContextMiddleware().use);
 
+  app.use(
+    rateLimit({
+      windowMs: 5 * 60 * 1000,
+      max: 500,
+      standardHeaders: true,
+      legacyHeaders: false,
+    }),
+  );
+
+  app.use((req, res, next) => {
+    console.log('Real IP:', req.ip);
+    next();
+  });
+
+  app.getHttpAdapter().getInstance().set('trust proxy', 1);
+
   app.use(
     helmet({
       contentSecurityPolicy: false,

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

@@ -1,32 +0,0 @@
-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

@@ -1,6 +1,6 @@
-import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
+import { Injectable, HttpException, HttpStatus } from '@nestjs/common';
 import { TuyaContext } from '@tuya/tuya-connector-nodejs';
+import { ConfigService } from '@nestjs/config';
 import {
   AddScheduleDto,
   EnableScheduleDto,
@@ -11,14 +11,14 @@ import {
   getDeviceScheduleInterface,
 } from '../interfaces/get.schedule.interface';
 
-import { ProductType } from '@app/common/constants/product-type.enum';
 import { convertKeysToCamelCase } from '@app/common/helper/camelCaseConverter';
+import { DeviceRepository } from '@app/common/modules/device/repositories';
+import { ProductType } from '@app/common/constants/product-type.enum';
 import { convertTimestampToDubaiTime } from '@app/common/helper/convertTimestampToDubaiTime';
 import {
   getEnabledDays,
   getScheduleStatus,
 } from '@app/common/helper/getScheduleStatus';
-import { DeviceRepository } from '@app/common/modules/device/repositories';
 
 @Injectable()
 export class ScheduleService {
@@ -49,11 +49,22 @@ export class ScheduleService {
       }
 
       // Corrected condition for supported device types
-      this.ensureProductTypeSupportedForSchedule(
-        ProductType[deviceDetails.productDevice.prodType],
-      );
-
-      return this.enableScheduleDeviceInTuya(
+      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
+      ) {
+        throw new HttpException(
+          'This device is not supported for schedule',
+          HttpStatus.BAD_REQUEST,
+        );
+      }
+      return await this.enableScheduleDeviceInTuya(
         deviceDetails.deviceTuyaUuid,
         enableScheduleDto,
       );
@@ -64,6 +75,29 @@ export class ScheduleService {
       );
     }
   }
+  async enableScheduleDeviceInTuya(
+    deviceId: string,
+    enableScheduleDto: EnableScheduleDto,
+  ): Promise<addScheduleDeviceInterface> {
+    try {
+      const path = `/v2.0/cloud/timer/device/${deviceId}/state`;
+      const response = await this.tuya.request({
+        method: 'PUT',
+        path,
+        body: {
+          enable: enableScheduleDto.enable,
+          timer_id: enableScheduleDto.scheduleId,
+        },
+      });
+
+      return response as addScheduleDeviceInterface;
+    } catch (error) {
+      throw new HttpException(
+        'Error while updating schedule from Tuya',
+        HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
   async deleteDeviceSchedule(deviceUuid: string, scheduleId: string) {
     try {
       const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
@@ -73,10 +107,21 @@ export class ScheduleService {
       }
 
       // Corrected condition for supported device types
-      this.ensureProductTypeSupportedForSchedule(
-        ProductType[deviceDetails.productDevice.prodType],
-      );
-
+      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
+      ) {
+        throw new HttpException(
+          'This device is not supported for schedule',
+          HttpStatus.BAD_REQUEST,
+        );
+      }
       return await this.deleteScheduleDeviceInTuya(
         deviceDetails.deviceTuyaUuid,
         scheduleId,
@@ -88,6 +133,25 @@ export class ScheduleService {
       );
     }
   }
+  async deleteScheduleDeviceInTuya(
+    deviceId: string,
+    scheduleId: string,
+  ): Promise<addScheduleDeviceInterface> {
+    try {
+      const path = `/v2.0/cloud/timer/device/${deviceId}/batch?timer_ids=${scheduleId}`;
+      const response = await this.tuya.request({
+        method: 'DELETE',
+        path,
+      });
+
+      return response as addScheduleDeviceInterface;
+    } catch (error) {
+      throw new HttpException(
+        'Error while deleting schedule from Tuya',
+        HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
   async addDeviceSchedule(deviceUuid: string, addScheduleDto: AddScheduleDto) {
     try {
       const deviceDetails = await this.getDeviceByDeviceUuid(deviceUuid);
@@ -96,10 +160,22 @@ export class ScheduleService {
         throw new HttpException('Device Not Found', HttpStatus.NOT_FOUND);
       }
 
-      this.ensureProductTypeSupportedForSchedule(
-        ProductType[deviceDetails.productDevice.prodType],
-      );
-
+      // 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
+      ) {
+        throw new HttpException(
+          'This device is not supported for schedule',
+          HttpStatus.BAD_REQUEST,
+        );
+      }
       await this.addScheduleDeviceInTuya(
         deviceDetails.deviceTuyaUuid,
         addScheduleDto,
@@ -111,6 +187,40 @@ export class ScheduleService {
       );
     }
   }
+  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);
@@ -119,10 +229,21 @@ export class ScheduleService {
         throw new HttpException('Device Not Found', HttpStatus.NOT_FOUND);
       }
       // Corrected condition for supported device types
-      this.ensureProductTypeSupportedForSchedule(
-        ProductType[deviceDetails.productDevice.prodType],
-      );
-
+      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
+      ) {
+        throw new HttpException(
+          'This device is not supported for schedule',
+          HttpStatus.BAD_REQUEST,
+        );
+      }
       const schedules = await this.getScheduleDeviceInTuya(
         deviceDetails.deviceTuyaUuid,
         category,
@@ -149,82 +270,7 @@ export class ScheduleService {
       );
     }
   }
-  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
-      this.ensureProductTypeSupportedForSchedule(
-        ProductType[deviceDetails.productDevice.prodType],
-      );
-
-      await this.updateScheduleDeviceInTuya(
-        deviceDetails.deviceTuyaUuid,
-        updateScheduleDto,
-      );
-    } 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,
-  ): 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: `category_${addScheduleDto.category}`,
-        },
-      });
-
-      return response as addScheduleDeviceInterface;
-    } catch (error) {
-      throw new HttpException(
-        'Error adding schedule from Tuya',
-        HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
-
-  private async getScheduleDeviceInTuya(
+  async getScheduleDeviceInTuya(
     deviceId: string,
     category: string,
   ): Promise<getDeviceScheduleInterface> {
@@ -245,8 +291,57 @@ export class ScheduleService {
       );
     }
   }
+  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);
 
-  private async updateScheduleDeviceInTuya(
+      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
+      ) {
+        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> {
@@ -281,69 +376,4 @@ export class ScheduleService {
       );
     }
   }
-
-  private async enableScheduleDeviceInTuya(
-    deviceId: string,
-    enableScheduleDto: EnableScheduleDto,
-  ): Promise<addScheduleDeviceInterface> {
-    try {
-      const path = `/v2.0/cloud/timer/device/${deviceId}/state`;
-      const response = await this.tuya.request({
-        method: 'PUT',
-        path,
-        body: {
-          enable: enableScheduleDto.enable,
-          timer_id: enableScheduleDto.scheduleId,
-        },
-      });
-
-      return response as addScheduleDeviceInterface;
-    } catch (error) {
-      throw new HttpException(
-        'Error while updating schedule from Tuya',
-        HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
-
-  private async deleteScheduleDeviceInTuya(
-    deviceId: string,
-    scheduleId: string,
-  ): Promise<addScheduleDeviceInterface> {
-    try {
-      const path = `/v2.0/cloud/timer/device/${deviceId}/batch?timer_ids=${scheduleId}`;
-      const response = await this.tuya.request({
-        method: 'DELETE',
-        path,
-      });
-
-      return response as addScheduleDeviceInterface;
-    } catch (error) {
-      throw new HttpException(
-        'Error while deleting schedule from Tuya',
-        HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
-
-  private ensureProductTypeSupportedForSchedule(deviceType: ProductType): void {
-    if (
-      ![
-        ProductType.THREE_G,
-        ProductType.ONE_G,
-        ProductType.TWO_G,
-        ProductType.WH,
-        ProductType.ONE_1TG,
-        ProductType.TWO_2TG,
-        ProductType.THREE_3TG,
-        ProductType.GD,
-        ProductType.CUR_2,
-      ].includes(deviceType)
-    ) {
-      throw new HttpException(
-        'This device is not supported for schedule',
-        HttpStatus.BAD_REQUEST,
-      );
-    }
-  }
 }

src/space/services/space.service.ts

@@ -333,12 +333,7 @@ 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,
@@ -348,7 +343,7 @@ export class SpaceService {
         throw error; // If it's an HttpException, rethrow it
       } else {
         throw new HttpException(
-          'An error occurred while fetching the space',
+          'An error occurred while deleting the community',
           HttpStatus.INTERNAL_SERVER_ERROR,
         );
       }
@@ -686,7 +681,7 @@ export class SpaceService {
     }
   }
 
-  buildSpaceHierarchy(spaces: SpaceEntity[]): SpaceEntity[] {
+  private buildSpaceHierarchy(spaces: SpaceEntity[]): SpaceEntity[] {
     const map = new Map<string, SpaceEntity>();
 
     // Step 1: Create a map of spaces by UUID