Merge pull request #478 from SyncrowIOT/hotfix/booking-filter

Hotfix/booking filter

.github/workflows/pr-description.yml

@@ -1,4 +1,4 @@
-name: 🤖 AI PR Description with HuggingFace Falcon
+name: 🤖 AI PR Description Commenter (100% Safe with jq)
 
 on:
   pull_request:
@@ -27,23 +27,26 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GH_PERSONAL_TOKEN }}
 
-      - name: Generate PR Description with HuggingFace Falcon
+      - name: Generate PR Description with OpenAI (Safe JSON with jq)
         run: |
           REQUEST_BODY=$(jq -n \
-            --arg inputs "Given the following commit messages:\n\n${commits}\n\nGenerate a clear and professional pull request description." \
+            --arg model "gpt-4o" \
-            '{ inputs: $inputs }'
+            --arg content "Given the following commit messages:\n\n${commits}\n\nGenerate a clear and professional pull request description." \
+            '{
+              model: $model,
+              messages: [{ role: "user", content: $content }]
+            }'
           )
 
-          RESPONSE=$(curl -s https://api-inference.huggingface.co/models/tiiuae/falcon-7b-instruct \
+          RESPONSE=$(curl -s https://api.openai.com/v1/chat/completions \
-            -H "Authorization: Bearer $HUGGINGFACE_API_KEY" \
+            -H "Authorization: Bearer $OPENAI_API_KEY" \
             -H "Content-Type: application/json" \
             -d "$REQUEST_BODY")
 
-          echo "---------- HuggingFace Raw Response ----------"
+          DESCRIPTION=$(echo "$RESPONSE" | jq -r '.choices[0].message.content')
+
+          echo "---------- OpenAI Raw Response ----------"
           echo "$RESPONSE"
-
-          DESCRIPTION=$(echo "$RESPONSE" | jq -r 'if type=="array" then .[0].generated_text else .error else "Error: Unexpected response" end')
-
           echo "---------- Extracted Description ----------"
           echo "$DESCRIPTION"
 
@@ -51,7 +54,7 @@ jobs:
           echo "$DESCRIPTION" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
         env:
-          HUGGINGFACE_API_KEY: ${{ secrets.HUGGINGFACE_API_KEY }}
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           commits: ${{ env.commits }}
 
       - name: Post AI Generated Description as Comment

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

@@ -1,15 +1,13 @@
+import { DeviceStatusLogRepository } from '@app/common/modules/device-status-log/repositories';
+import { DeviceRepository } from '@app/common/modules/device/repositories';
 import {
   HttpException,
   HttpStatus,
   Injectable,
   NotFoundException,
 } from '@nestjs/common';
-import { AddDeviceStatusDto } from '../dtos/add.devices-status.dto';
-import { DeviceRepository } from '@app/common/modules/device/repositories';
-import { GetDeviceDetailsFunctionsStatusInterface } from 'src/device/interfaces/get.device.interface';
-import { TuyaContext } from '@tuya/tuya-connector-nodejs';
 import { ConfigService } from '@nestjs/config';
-import { firebaseDataBase } from '../../firebase.config';
+import { TuyaContext } from '@tuya/tuya-connector-nodejs';
 import {
   Database,
   DataSnapshot,
@@ -17,7 +15,9 @@ import {
   ref,
   runTransaction,
 } from 'firebase/database';
-import { DeviceStatusLogRepository } from '@app/common/modules/device-status-log/repositories';
+import { GetDeviceDetailsFunctionsStatusInterface } from 'src/device/interfaces/get.device.interface';
+import { firebaseDataBase } from '../../firebase.config';
+import { AddDeviceStatusDto } from '../dtos/add.devices-status.dto';
 @Injectable()
 export class DeviceStatusFirebaseService {
   private tuya: TuyaContext;
@@ -79,64 +79,77 @@ export class DeviceStatusFirebaseService {
       device: any;
     }[],
   ): Promise<void> {
-    const allLogs = [];
-
     console.log(`🔁 Preparing logs from batch of ${batch.length} items...`);
 
+    const allLogs = [];
+
     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) =>
+      // Determine properties based on environment
+      const properties =
+        this.isDevEnv && Array.isArray(item.log?.properties)
+          ? item.log.properties
+          : Array.isArray(item.status)
+            ? item.status
+            : null;
+
+      if (!properties) {
+        console.log(
+          `⛔ Skipped invalid status/properties for device: ${item.deviceTuyaUuid}`,
+        );
+        continue;
+      }
+
+      const logs = properties.map((property) =>
         this.deviceStatusLogRepository.create({
           deviceId: device.uuid,
           deviceTuyaId: item.deviceTuyaUuid,
-          productId: item.log.productId,
+          productId: device.productDevice?.uuid,
           log: item.log,
           code: property.code,
           value: property.value,
-          eventId: item.log.dataId,
+          eventId: item.log?.dataId,
-          eventTime: new Date(property.time).toISOString(),
+          eventTime: new Date(
+            this.isDevEnv ? property.time : property.t,
+          ).toISOString(),
         }),
       );
+
       allLogs.push(...logs);
     }
 
     console.log(`📝 Total logs to insert: ${allLogs.length}`);
 
-    const insertLogsPromise = (async () => {
+    const chunkSize = 300;
-      const chunkSize = 300;
+    let insertedCount = 0;
-      let insertedCount = 0;
 
-      for (let i = 0; i < allLogs.length; i += chunkSize) {
+    for (let i = 0; i < allLogs.length; i += chunkSize) {
-        const chunk = allLogs.slice(i, i + chunkSize);
+      const chunk = allLogs.slice(i, i + chunkSize);
-        try {
+      try {
-          const result = await this.deviceStatusLogRepository
+        const result = await this.deviceStatusLogRepository
-            .createQueryBuilder()
+          .createQueryBuilder()
-            .insert()
+          .insert()
-            .into('device-status-log') // or use DeviceStatusLogEntity
+          .into('device-status-log')
-            .values(chunk)
+          .values(chunk)
-            .orIgnore() // skip duplicates
+          .orIgnore()
-            .execute();
+          .execute();
 
-          insertedCount += result.identifiers.length;
+        insertedCount += result.identifiers.length;
-          console.log(
+        console.log(
-            `✅ Inserted ${result.identifiers.length} / ${chunk.length} logs (chunk)`,
+          `✅ Inserted ${result.identifiers.length} / ${chunk.length} logs (chunk)`,
-          );
+        );
-        } catch (error) {
+      } catch (error) {
-          console.error('❌ Insert error (skipped chunk):', error.message);
+        console.error('❌ Insert error (skipped chunk):', error.message);
-        }
       }
+    }
 
-      console.log(
+    console.log(`✅ Total logs inserted: ${insertedCount} / ${allLogs.length}`);
-        `✅ Total logs inserted: ${insertedCount} / ${allLogs.length}`,
-      );
-    })();
-
-    await insertLogsPromise;
   }
 
   async addDeviceStatusToFirebase(

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

@@ -1,9 +1,9 @@
-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 { Injectable, OnModuleInit } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
 import * as NodeCache from 'node-cache';
+import TuyaWebsocket from '../../config/tuya-web-socket-config';
+import { SosHandlerService } from './sos.handler.service';
 
 @Injectable()
 export class TuyaWebSocketService implements OnModuleInit {
@@ -74,7 +74,12 @@ export class TuyaWebSocketService implements OnModuleInit {
     this.client.message(async (ws: WebSocket, message: any) => {
       try {
         const { devId, status, logData } = this.extractMessageData(message);
-        if (!Array.isArray(logData?.properties)) {
+        // console.log(
+        //   `📬 Received message for device: ${devId}, status:`,
+        //   status,
+        //   logData,
+        // );
+        if (!Array.isArray(status)) {
           this.client.ackMessage(message.messageId);
           return;
         }
@@ -162,6 +167,8 @@ export class TuyaWebSocketService implements OnModuleInit {
     status: any;
     logData: any;
   } {
+    // console.log('Received message:', message);
+
     const payloadData = message.payload.data;
 
     if (this.isDevEnv) {

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

@@ -3,11 +3,11 @@ import { IsNotEmpty, IsOptional, IsUUID, Matches } from 'class-validator';
 
 export class BookingRequestDto {
   @ApiProperty({
-    description: 'Month in MM/YYYY format',
+    description: 'Month in MM-YYYY format',
-    example: '07/2025',
+    example: '07-2025',
   })
   @IsNotEmpty()
-  @Matches(/^(0[1-9]|1[0-2])\/\d{4}$/, {
+  @Matches(/^(0[1-9]|1[0-2])\-\d{4}$/, {
     message: 'Date must be in MM/YYYY format',
   })
   month: string;

src/booking/services/booking.service.ts

@@ -51,7 +51,7 @@ export class BookingService {
   }
 
   async findAll({ month, space }: BookingRequestDto, project: string) {
-    const [monthNumber, year] = month.split('/').map(Number);
+    const [monthNumber, year] = month.split('-').map(Number);
     const fromDate = new Date(year, monthNumber - 1, 1);
     const toDate = new Date(year, monthNumber, 0, 23, 59, 59);
     return this.bookingEntityRepository.find({