adjusted the codes completely

.eslintrc.js

@@ -21,7 +21,6 @@ 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

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

.github/workflows/main_syncrow(staging).yml

@@ -1,7 +1,4 @@
-# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
-# More GitHub Actions for Azure: https://github.com/Azure/actions
-
-name: Build and deploy container app to Azure Web App - syncrow(staging)
+name: Backend deployment to Azure App Service
 
 on:
   push:
@@ -9,43 +6,50 @@ on:
       - main
   workflow_dispatch:
 
+env:
+  AZURE_WEB_APP_NAME: 'syncrow'
+  AZURE_WEB_APP_SLOT_NAME: 'staging'
+  ACR_REGISTRY: 'syncrow.azurecr.io'
+  IMAGE_NAME: 'backend'
+  IMAGE_TAG: 'latest'
+
 jobs:
-  build:
-    runs-on: 'ubuntu-latest'
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to registry
-        uses: docker/login-action@v2
-        with:
-          registry: https://syncrow.azurecr.io/
-          username: ${{ secrets.AzureAppService_ContainerUsername_47395803300340b49931ea82f6d80be3 }}
-          password: ${{ secrets.AzureAppService_ContainerPassword_e7b0ff54f54d44cba04a970a22384848 }}
-
-      - name: Build and push container image to registry
-        uses: docker/build-push-action@v3
-        with:
-          push: true
-          tags: syncrow.azurecr.io/${{ secrets.AzureAppService_ContainerUsername_47395803300340b49931ea82f6d80be3 }}/syncrow/backend:${{ github.sha }}
-          file: ./Dockerfile
-
-  deploy:
+  build_and_deploy:
     runs-on: ubuntu-latest
-    needs: build
-    environment:
-      name: 'staging'
-      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
 
     steps:
-      - name: Deploy to Azure Web App
-        id: deploy-to-webapp
-        uses: azure/webapps-deploy@v2
+      - uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
         with:
-          app-name: 'syncrow'
-          slot-name: 'staging'
-          publish-profile: ${{ secrets.AzureAppService_PublishProfile_44f7766441ec4796b74789e9761ef589 }}
-          images: 'syncrow.azurecr.io/${{ secrets.AzureAppService_ContainerUsername_47395803300340b49931ea82f6d80be3 }}/syncrow/backend:${{ github.sha }}'
+          node-version: '20'
+
+      - name: Install dependencies and build project
+        run: |
+          npm install
+          npm run build
+
+      - name: Log in to Azure
+        uses: azure/login@v1
+        with:
+          creds: ${{ secrets.AZURE_CREDENTIALS }}
+
+      - name: Log in to Azure Container Registry
+        run: az acr login --name ${{ env.ACR_REGISTRY }}
+
+      - name: List build output
+        run: ls -R dist/
+
+      - name: Build and push Docker image
+        run: |
+          docker build . -t ${{ env.ACR_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
+          docker push ${{ env.ACR_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
+
+      - name: Set Web App with Docker container
+        run: |
+          az webapp config container set \
+          --name ${{ env.AZURE_WEB_APP_NAME }} \
+          --resource-group backend \
+          --docker-custom-image-name ${{ env.ACR_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} \
+          --docker-registry-server-url https://${{ env.ACR_REGISTRY }}

.github/workflows/main_syncrow(stg).yml

@@ -1,73 +0,0 @@
-# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
-# More GitHub Actions for Azure: https://github.com/Azure/actions
-
-name: Build and deploy Node.js app to Azure Web App - syncrow
-
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read #This is required for actions/checkout
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Node.js version
-        uses: actions/setup-node@v3
-        with:
-          node-version: '20.x'
-
-      - name: npm install, build, and test
-        run: |
-          npm install
-          npm run build --if-present
-          npm run test --if-present
-
-      - name: Zip artifact for deployment
-        run: zip release.zip ./* -r
-
-      - name: Upload artifact for deployment job
-        uses: actions/upload-artifact@v4
-        with:
-          name: node-app
-          path: release.zip
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build
-    environment:
-      name: 'stg'
-      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
-    permissions:
-      id-token: write #This is required for requesting the JWT
-      contents: read #This is required for actions/checkout
-
-    steps:
-      - name: Download artifact from build job
-        uses: actions/download-artifact@v4
-        with:
-          name: node-app
-
-      - name: Unzip artifact for deployment
-        run: unzip release.zip
-
-      - name: Login to Azure
-        uses: azure/login@v2
-        with:
-          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_515C8E782CFF431AB20448C85CA0FE58 }}
-          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_2AEFE5534424490387C08FAE41573CC2 }}
-          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_00623C33023749FEA5F6BC36884F9C8A }}
-
-      - name: 'Deploy to Azure Web App'
-        id: deploy-to-webapp
-        uses: azure/webapps-deploy@v3
-        with:
-          app-name: 'syncrow'
-          slot-name: 'stg'
-          package: .

.github/workflows/pr-description.yml

@@ -1,64 +0,0 @@
-name: 🤖 AI PR Description Commenter (100% Safe with jq)
-
-on:
-  pull_request:
-    types: [opened, edited]
-
-jobs:
-  generate-description:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-
-      - name: Install GitHub CLI and jq
-        run: |
-          sudo apt-get update
-          sudo apt-get install gh jq -y
-
-      - name: Fetch PR Commits
-        id: fetch_commits
-        run: |
-          COMMITS=$(gh pr view ${{ github.event.pull_request.number }} --json commits --jq '.commits[].message' | sed 's/^/- /')
-          echo "commits<<EOF" >> $GITHUB_ENV
-          echo "$COMMITS" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-        env:
-          GH_TOKEN: ${{ secrets.GH_PERSONAL_TOKEN }}
-
-      - name: Generate PR Description with OpenAI (Safe JSON with jq)
-        run: |
-          REQUEST_BODY=$(jq -n \
-            --arg model "gpt-4o" \
-            --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.openai.com/v1/chat/completions \
-            -H "Authorization: Bearer $OPENAI_API_KEY" \
-            -H "Content-Type: application/json" \
-            -d "$REQUEST_BODY")
-
-          DESCRIPTION=$(echo "$RESPONSE" | jq -r '.choices[0].message.content')
-
-          echo "---------- OpenAI Raw Response ----------"
-          echo "$RESPONSE"
-          echo "---------- Extracted Description ----------"
-          echo "$DESCRIPTION"
-
-          echo "description<<EOF" >> $GITHUB_ENV
-          echo "$DESCRIPTION" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-        env:
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          commits: ${{ env.commits }}
-
-      - name: Post AI Generated Description as Comment
-        run: |
-          gh pr comment ${{ github.event.pull_request.number }} --body "${{ env.description }}"
-        env:
-          GH_TOKEN: ${{ secrets.GH_PERSONAL_TOKEN }}

.gitignore

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

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

@@ -1,6 +1,5 @@
 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,
@@ -33,7 +32,7 @@ export class AuthService {
     pass: string,
     regionUuid?: string,
     platform?: PlatformType,
-  ): Promise<Omit<UserEntity, 'password'>> {
+  ): Promise<any> {
     const user = await this.userRepository.findOne({
       where: {
         email,
@@ -71,9 +70,8 @@ export class AuthService {
     }
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    // const { password, ...result } = user;
-    delete user.password;
-    return user;
+    const { password, ...result } = user;
+    return result;
   }
 
   async createSession(data): Promise<UserSessionEntity> {
@@ -116,7 +114,6 @@ 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/common.module.ts

@@ -1,11 +1,12 @@
 import { Module } from '@nestjs/common';
-import { ConfigModule } from '@nestjs/config';
-import { ErrorMessageService } from 'src/error-message/error-message.service';
-import { AuthModule } from './auth/auth.module';
 import { CommonService } from './common.service';
-import config from './config';
 import { DatabaseModule } from './database/database.module';
 import { HelperModule } from './helper/helper.module';
+import { AuthModule } from './auth/auth.module';
+import { ConfigModule } from '@nestjs/config';
+import config from './config';
+import { EmailService } from './util/email.service';
+import { ErrorMessageService } from 'src/error-message/error-message.service';
 import { TuyaService } from './integrations/tuya/services/tuya.service';
 import { SceneDeviceRepository } from './modules/scene-device/repositories';
 import { SpaceRepository } from './modules/space';
@@ -14,7 +15,6 @@ import {
   SubspaceModelRepository,
 } from './modules/space-model';
 import { SubspaceRepository } from './modules/space/repositories/subspace.repository';
-import { EmailService } from './util/email/email.service';
 @Module({
   providers: [
     CommonService,

libs/common/src/config/email.config.ts

@@ -10,8 +10,6 @@ export default registerAs(
     SMTP_USER: process.env.SMTP_USER,
     SMTP_SENDER: process.env.SMTP_SENDER,
     SMTP_PASSWORD: process.env.SMTP_PASSWORD,
-    BATCH_EMAIL_API_URL: process.env.BATCH_EMAIL_API_URL,
-    SEND_EMAIL_API_URL: process.env.SEND_EMAIL_API_URL,
     MAILTRAP_API_TOKEN: process.env.MAILTRAP_API_TOKEN,
     MAILTRAP_INVITATION_TEMPLATE_UUID:
       process.env.MAILTRAP_INVITATION_TEMPLATE_UUID,
@@ -23,9 +21,5 @@ export default registerAs(
       process.env.MAILTRAP_EDIT_USER_TEMPLATE_UUID,
     MAILTRAP_SEND_OTP_TEMPLATE_UUID:
       process.env.MAILTRAP_SEND_OTP_TEMPLATE_UUID,
-    MAILTRAP_SEND_BOOKING_AVAILABILITY_UPDATE_TEMPLATE_UUID:
-      process.env.MAILTRAP_SEND_BOOKING_AVAILABILITY_UPDATE_TEMPLATE_UUID,
-    MAILTRAP_SEND_BOOKING_TIMING_UPDATE_TEMPLATE_UUID:
-      process.env.MAILTRAP_SEND_BOOKING_TIMING_UPDATE_TEMPLATE_UUID,
   }),
 );

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

@@ -69,47 +69,7 @@ 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 BOOKING = class {
-    public static readonly ROUTE = 'bookings';
-    static ACTIONS = class {
-      public static readonly ADD_BOOKING_SUMMARY = 'Add new booking';
-
-      public static readonly ADD_BOOKING_DESCRIPTION =
-        'This endpoint allows you to add new booking by providing the required details.';
-
-      public static readonly GET_ALL_BOOKINGS_SUMMARY = 'Get all bookings';
-
-      public static readonly GET_ALL_BOOKINGS_DESCRIPTION =
-        'This endpoint retrieves all bookings.';
-
-      public static readonly GET_MY_BOOKINGS_SUMMARY = 'Get my bookings';
-
-      public static readonly GET_MY_BOOKINGS_DESCRIPTION =
-        'This endpoint retrieves all bookings for the authenticated user.';
-    };
-  };
   static COMMUNITY = class {
     public static readonly ROUTE = '/projects/:projectUuid/communities';
     static ACTIONS = class {
@@ -188,11 +148,6 @@ export class ControllerRoute {
   static SCENE = class {
     public static readonly ROUTE = 'scene';
     static ACTIONS = class {
-      public static readonly GET_TAP_TO_RUN_SCENES_SUMMARY =
-        'Get Tap-to-Run Scenes by spaces';
-      public static readonly GET_TAP_TO_RUN_SCENES_DESCRIPTION =
-        'Gets Tap-to-Run scenes by spaces';
-
       public static readonly CREATE_TAP_TO_RUN_SCENE_SUMMARY =
         'Create a Tap-to-Run Scene';
       public static readonly CREATE_TAP_TO_RUN_SCENE_DESCRIPTION =
@@ -228,10 +183,6 @@ export class ControllerRoute {
       public static readonly CREATE_SPACE_DESCRIPTION =
         'This endpoint allows you to create a space in a specified community. Optionally, you can specify a parent space to nest the new space under it.';
 
-      public static readonly DUPLICATE_SPACE_SUMMARY = 'Duplicate a space';
-      public static readonly DUPLICATE_SPACE_DESCRIPTION =
-        'This endpoint allows you to create a copy of an existing space in a specified community.';
-
       public static readonly LIST_SPACE_SUMMARY = 'List spaces in community';
       public static readonly LIST_SPACE_DESCRIPTION =
         'List spaces in specified community by community id';
@@ -248,11 +199,6 @@ 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. ';
@@ -451,11 +397,6 @@ export class ControllerRoute {
       public static readonly DELETE_USER_SUMMARY = 'Delete user by UUID';
       public static readonly DELETE_USER_DESCRIPTION =
         'This endpoint deletes a user identified by their UUID. Accessible only by users with the Super Admin role.';
-
-      public static readonly DELETE_USER_PROFILE_SUMMARY =
-        'Delete user profile by UUID';
-      public static readonly DELETE_USER_PROFILE_DESCRIPTION =
-        'This endpoint deletes a user profile identified by their UUID. Accessible only by users with the Super Admin role.';
       public static readonly UPDATE_USER_WEB_AGREEMENT_SUMMARY =
         'Update user web agreement by user UUID';
       public static readonly UPDATE_USER_WEB_AGREEMENT_DESCRIPTION =
@@ -560,6 +501,7 @@ export class ControllerRoute {
   };
   static PowerClamp = class {
     public static readonly ROUTE = 'power-clamp';
+
     static ACTIONS = class {
       public static readonly GET_ENERGY_SUMMARY =
         'Get power clamp historical data';
@@ -582,20 +524,6 @@ export class ControllerRoute {
         'This endpoint retrieves the occupancy heat map data based on the provided parameters.';
     };
   };
-  static AQI = class {
-    public static readonly ROUTE = 'aqi';
-
-    static ACTIONS = class {
-      public static readonly GET_AQI_RANGE_DATA_SUMMARY = 'Get AQI range data';
-      public static readonly GET_AQI_RANGE_DATA_DESCRIPTION =
-        'This endpoint retrieves the AQI (Air Quality Index) range data based on the provided parameters.';
-
-      public static readonly GET_AQI_DISTRIBUTION_DATA_SUMMARY =
-        'Get AQI distribution data';
-      public static readonly GET_AQI_DISTRIBUTION_DATA_DESCRIPTION =
-        'This endpoint retrieves the AQI (Air Quality Index) distribution data based on the provided parameters.';
-    };
-  };
   static DEVICE = class {
     public static readonly ROUTE = 'devices';
 
@@ -686,11 +614,6 @@ 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 {
@@ -777,10 +700,6 @@ export class ControllerRoute {
       public static readonly ADD_AUTOMATION_DESCRIPTION =
         'This endpoint creates a new automation based on the provided details.';
 
-      public static readonly GET_AUTOMATION_SUMMARY = 'Get all automations';
-      public static readonly GET_AUTOMATION_DESCRIPTION =
-        'This endpoint retrieves automations data';
-
       public static readonly GET_AUTOMATION_DETAILS_SUMMARY =
         'Get automation details';
       public static readonly GET_AUTOMATION_DETAILS_DESCRIPTION =

libs/common/src/constants/mail-trap.ts

@@ -0,0 +1,3 @@
+export const SEND_EMAIL_API_URL_PROD = 'https://send.api.mailtrap.io/api/send/';
+export const SEND_EMAIL_API_URL_DEV =
+  'https://sandbox.api.mailtrap.io/api/send/2634012';

libs/common/src/constants/pollutants.enum.ts

@@ -1,8 +0,0 @@
-export enum PollutantType {
-  AQI = 'aqi',
-  PM25 = 'pm25',
-  PM10 = 'pm10',
-  VOC = 'voc',
-  CO2 = 'co2',
-  CH2O = 'ch2o',
-}

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

@@ -15,10 +15,8 @@ export enum ProductType {
   WL = 'WL',
   GD = 'GD',
   CUR = 'CUR',
-  CUR_2 = 'CUR_2',
   PC = 'PC',
   FOUR_S = '4S',
   SIX_S = '6S',
   SOS = 'SOS',
-  AQI = 'AQI',
 }

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

@@ -1,33 +1,51 @@
 import { Module } from '@nestjs/common';
 import { ConfigModule, ConfigService } from '@nestjs/config';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { DeviceEntity } from '../modules/device/entities';
-import { PermissionTypeEntity } from '../modules/permission/entities';
-import { ProductEntity } from '../modules/product/entities';
+import { SnakeNamingStrategy } from './strategies';
+import { UserEntity } from '../modules/user/entities/user.entity';
 import { UserSessionEntity } from '../modules/session/entities/session.entity';
 import { UserOtpEntity } from '../modules/user/entities';
-import { UserEntity } from '../modules/user/entities/user.entity';
-import { SnakeNamingStrategy } from './strategies';
+import { ProductEntity } from '../modules/product/entities';
+import { DeviceEntity } from '../modules/device/entities';
+import { PermissionTypeEntity } from '../modules/permission/entities';
 
-import { TypeOrmWinstonLogger } from '@app/common/logger/services/typeorm.logger';
-import { createLogger } from 'winston';
-import { winstonLoggerOptions } from '../logger/services/winston.logger';
-import { AqiSpaceDailyPollutantStatsEntity } from '../modules/aqi/entities';
-import { AutomationEntity } from '../modules/automation/entities';
-import { BookableSpaceEntity } from '../modules/booking/entities/bookable-space.entity';
-import { BookingEntity } from '../modules/booking/entities/booking.entity';
-import { ClientEntity } from '../modules/client/entities';
+import { UserSpaceEntity } from '../modules/user/entities';
+import { DeviceUserPermissionEntity } from '../modules/device/entities';
+import { RoleTypeEntity } from '../modules/role-type/entities';
+import { UserNotificationEntity } from '../modules/user/entities';
+import { DeviceNotificationEntity } from '../modules/device/entities';
+import { RegionEntity } from '../modules/region/entities';
+import { TimeZoneEntity } from '../modules/timezone/entities';
+import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
 import { CommunityEntity } from '../modules/community/entities';
 import { DeviceStatusLogEntity } from '../modules/device-status-log/entities';
+import { SceneEntity, SceneIconEntity } from '../modules/scene/entities';
+import { SceneDeviceEntity } from '../modules/scene-device/entities';
+import { ProjectEntity } from '../modules/project/entities';
 import {
-  DeviceNotificationEntity,
-  DeviceUserPermissionEntity,
-} from '../modules/device/entities';
+  SpaceModelEntity,
+  SubspaceModelEntity,
+  TagModel,
+  SpaceModelProductAllocationEntity,
+  SubspaceModelProductAllocationEntity,
+} from '../modules/space-model/entities';
 import {
   InviteUserEntity,
   InviteUserSpaceEntity,
 } from '../modules/Invite-user/entities';
-import { SpaceDailyOccupancyDurationEntity } from '../modules/occupancy/entities';
+import { InviteSpaceEntity } from '../modules/space/entities/invite-space.entity';
+import { AutomationEntity } from '../modules/automation/entities';
+import { SpaceProductAllocationEntity } from '../modules/space/entities/space-product-allocation.entity';
+import { NewTagEntity } from '../modules/tag/entities/tag.entity';
+import { SpaceEntity } from '../modules/space/entities/space.entity';
+import { SpaceLinkEntity } from '../modules/space/entities/space-link.entity';
+import { SubspaceProductAllocationEntity } from '../modules/space/entities/subspace/subspace-product-allocation.entity';
+import { SubspaceEntity } from '../modules/space/entities/subspace/subspace.entity';
+import { TagEntity } from '../modules/space/entities/tag.entity';
+import { ClientEntity } from '../modules/client/entities';
+import { TypeOrmWinstonLogger } from '@app/common/logger/services/typeorm.logger';
+import { createLogger } from 'winston';
+import { winstonLoggerOptions } from '../logger/services/winston.logger';
 import {
   PowerClampDailyEntity,
   PowerClampHourlyEntity,
@@ -37,29 +55,6 @@ import {
   PresenceSensorDailyDeviceEntity,
   PresenceSensorDailySpaceEntity,
 } from '../modules/presence-sensor/entities';
-import { ProjectEntity } from '../modules/project/entities';
-import { RegionEntity } from '../modules/region/entities';
-import { RoleTypeEntity } from '../modules/role-type/entities';
-import { SceneDeviceEntity } from '../modules/scene-device/entities';
-import { SceneEntity, SceneIconEntity } from '../modules/scene/entities';
-import {
-  SpaceModelEntity,
-  SpaceModelProductAllocationEntity,
-  SubspaceModelEntity,
-  SubspaceModelProductAllocationEntity,
-} from '../modules/space-model/entities';
-import { InviteSpaceEntity } from '../modules/space/entities/invite-space.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';
-import { SubspaceEntity } from '../modules/space/entities/subspace/subspace.entity';
-import { NewTagEntity } from '../modules/tag/entities/tag.entity';
-import { TimeZoneEntity } from '../modules/timezone/entities';
-import {
-  UserNotificationEntity,
-  UserSpaceEntity,
-} from '../modules/user/entities';
-import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
 @Module({
   imports: [
     TypeOrmModule.forRootAsync({
@@ -88,7 +83,9 @@ import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
             PermissionTypeEntity,
             CommunityEntity,
             SpaceEntity,
+            SpaceLinkEntity,
             SubspaceEntity,
+            TagEntity,
             UserSpaceEntity,
             DeviceUserPermissionEntity,
             RoleTypeEntity,
@@ -103,6 +100,7 @@ import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
             SceneDeviceEntity,
             SpaceModelEntity,
             SubspaceModelEntity,
+            TagModel,
             InviteUserEntity,
             InviteUserSpaceEntity,
             InviteSpaceEntity,
@@ -117,10 +115,6 @@ import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
             PowerClampMonthlyEntity,
             PresenceSensorDailyDeviceEntity,
             PresenceSensorDailySpaceEntity,
-            AqiSpaceDailyPollutantStatsEntity,
-            SpaceDailyOccupancyDurationEntity,
-            BookableSpaceEntity,
-            BookingEntity,
           ],
           namingStrategy: new SnakeNamingStrategy(),
           synchronize: Boolean(JSON.parse(configService.get('DB_SYNC'))),
@@ -129,8 +123,8 @@ import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
           logger: typeOrmLogger,
           extra: {
             charset: 'utf8mb4',
-            max: 100, // set pool max size
-            idleTimeoutMillis: 3000, // close idle clients after 5 second
+            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/dto/pagination.request.dto.ts

@@ -1,9 +1,10 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Transform } from 'class-transformer';
-import { IsBoolean, IsOptional } from 'class-validator';
-import { BooleanValues } from '../constants/boolean-values.enum';
+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 { BooleanValues } from '../constants/boolean-values.enum';
 
 export class PaginationRequestGetListDto {
   @ApiProperty({
@@ -18,7 +19,6 @@ export class PaginationRequestGetListDto {
     return value.obj.includeSpaces === BooleanValues.TRUE;
   })
   public includeSpaces?: boolean = false;
-
   @IsOptional()
   @IsPageRequestParam({
     message: 'Page must be bigger than 0',
@@ -40,4 +40,40 @@ 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,12 +3,26 @@ 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';
 
 @Module({
   providers: [
     DeviceStatusFirebaseService,
     DeviceRepository,
     DeviceStatusLogRepository,
+    PowerClampService,
+    PowerClampHourlyRepository,
+    PowerClampDailyRepository,
+    PowerClampMonthlyRepository,
+    SqlLoaderService,
+    OccupancyService,
   ],
   controllers: [DeviceStatusFirebaseController],
   exports: [DeviceStatusFirebaseService, DeviceStatusLogRepository],

libs/common/src/firebase/devices-status/dtos/add.devices-status.dto.ts

@@ -13,7 +13,6 @@ class StatusDto {
 
   @IsNotEmpty()
   value: any;
-  t?: string | number | Date;
 }
 
 export class AddDeviceStatusDto {

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

@@ -1,13 +1,15 @@
-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 { ConfigService } from '@nestjs/config';
+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 {
   Database,
   DataSnapshot,
@@ -15,18 +17,21 @@ import {
   ref,
   runTransaction,
 } from 'firebase/database';
-import { GetDeviceDetailsFunctionsStatusInterface } from 'src/device/interfaces/get.device.interface';
-import { firebaseDataBase } from '../../firebase.config';
-import { AddDeviceStatusDto } from '../dtos/add.devices-status.dto';
+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';
 @Injectable()
 export class DeviceStatusFirebaseService {
   private tuya: TuyaContext;
   private firebaseDb: Database;
-  private readonly isDevEnv: boolean;
-
   constructor(
     private readonly configService: ConfigService,
     private readonly deviceRepository: DeviceRepository,
+    private readonly powerClampService: PowerClampService,
+    private readonly occupancyService: OccupancyService,
     private deviceStatusLogRepository: DeviceStatusLogRepository,
   ) {
     const accessKey = this.configService.get<string>('auth-config.ACCESS_KEY');
@@ -40,8 +45,6 @@ export class DeviceStatusFirebaseService {
 
     // Initialize firebaseDb using firebaseDataBase function
     this.firebaseDb = firebaseDataBase(this.configService);
-    this.isDevEnv =
-      this.configService.get<string>('NODE_ENV') === 'development';
   }
   async addDeviceStatusByDeviceUuid(
     deviceTuyaUuid: string,
@@ -56,7 +59,7 @@ export class DeviceStatusFirebaseService {
           const deviceStatusSaved = await this.createDeviceStatusFirebase({
             deviceUuid: device.uuid,
             deviceTuyaUuid: deviceTuyaUuid,
-            status: deviceStatus?.status,
+            status: deviceStatus.status,
             productUuid: deviceStatus.productUuid,
             productType: deviceStatus.productType,
           });
@@ -71,107 +74,25 @@ export class DeviceStatusFirebaseService {
       );
     }
   }
-  async addBatchDeviceStatusToOurDb(
-    batch: {
-      deviceTuyaUuid: string;
-      status: any;
-      log: any;
-      device: any;
-    }[],
-  ): Promise<void> {
-    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;
-      }
-
-      // 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: device.productDevice?.uuid,
-          log: item.log,
-          code: property.code,
-          value: property.value,
-          eventId: item.log?.dataId,
-          eventTime: new Date(
-            this.isDevEnv ? property.time : property.t,
-          ).toISOString(),
-        }),
-      );
-
-      allLogs.push(...logs);
-    }
-
-    console.log(`📝 Total logs to insert: ${allLogs.length}`);
-
-    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')
-          .values(chunk)
-          .orIgnore()
-          .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}`);
-  }
-
   async addDeviceStatusToFirebase(
-    addDeviceStatusDto: AddDeviceStatusDto & { device?: any },
+    addDeviceStatusDto: AddDeviceStatusDto,
   ): Promise<AddDeviceStatusDto | null> {
     try {
-      let device = addDeviceStatusDto.device;
-      if (!device) {
-        device = await this.getDeviceByDeviceTuyaUuid(
-          addDeviceStatusDto.deviceTuyaUuid,
-        );
-      }
+      const 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;
     }
   }
@@ -185,15 +106,6 @@ 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);
@@ -208,7 +120,7 @@ export class DeviceStatusFirebaseService {
       return {
         productUuid: deviceDetails.productDevice.uuid,
         productType: deviceDetails.productDevice.prodType,
-        status: deviceStatus.result[0]?.status,
+        status: deviceStatus.result[0].status,
       };
     } catch (error) {
       throw new HttpException(
@@ -273,18 +185,18 @@ export class DeviceStatusFirebaseService {
       if (!existingData.productType) {
         existingData.productType = addDeviceStatusDto.productType;
       }
-      if (!existingData?.status) {
+      if (!existingData.status) {
         existingData.status = [];
       }
 
       // Create a map to track existing status codes
       const statusMap = new Map(
-        existingData?.status.map((item) => [item.code, item.value]),
+        existingData.status.map((item) => [item.code, item.value]),
       );
 
       // Update or add status codes
 
-      for (const statusItem of addDeviceStatusDto?.status) {
+      for (const statusItem of addDeviceStatusDto.status) {
         statusMap.set(statusItem.code, statusItem.value);
       }
 
@@ -297,6 +209,60 @@ export class DeviceStatusFirebaseService {
       return existingData;
     });
 
+    // 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,
+        );
+      }
+    }
+
     // Return the updated data
     const snapshot: DataSnapshot = await get(dataRef);
     return snapshot.val();

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

@@ -8,10 +8,7 @@ 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,
-  DeviceRepository,
-} from '../modules/device/repositories';
+import { DeviceNotificationRepository } 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';
@@ -30,7 +27,6 @@ import { SosHandlerService } from './services/sos.handler.service';
     DeviceNotificationRepository,
     CommunityRepository,
     SosHandlerService,
-    DeviceRepository,
   ],
   exports: [
     HelperHashService,

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

@@ -1,66 +0,0 @@
-import { Injectable } from '@nestjs/common';
-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,
-  ) {}
-
-  async updateAQISensorHistoricalData(): Promise<void> {
-    try {
-      const { dateStr } = this.getFormattedDates();
-
-      // Execute all procedures in parallel
-      await Promise.all([
-        this.executeProcedureWithRetry(
-          'proceduce_update_daily_space_aqi',
-          [dateStr],
-          'fact_daily_space_aqi',
-        ),
-      ]);
-    } catch (err) {
-      console.error('Failed to update AQI sensor historical data:', err);
-      throw err;
-    }
-  }
-  private getFormattedDates(): { dateStr: string } {
-    const now = new Date();
-    return {
-      dateStr: now.toLocaleDateString('en-CA'), // YYYY-MM-DD
-    };
-  }
-  private async executeProcedureWithRetry(
-    procedureFileName: string,
-    params: (string | number | null)[],
-    folderName: string,
-    retries = 3,
-  ): Promise<void> {
-    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 {
-    return this.sqlLoader.loadQuery(folderName, fileName, SQL_PROCEDURES_PATH);
-  }
-}

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

@@ -1,69 +1,66 @@
+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 updateOccupancyDataProcedures(): Promise<void> {
-    try {
-      const { dateStr } = this.getFormattedDates();
-
-      // Execute all procedures in parallel
-      await Promise.all([
-        this.executeProcedureWithRetry(
-          'procedure_update_fact_space_occupancy',
-          [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 update occupancy data:', err);
-      throw err;
-    }
-  }
-  private getFormattedDates(): { dateStr: string } {
-    const now = new Date();
-    return {
-      dateStr: now.toLocaleDateString('en-CA'), // YYYY-MM-DD
-    };
-  }
-  private async executeProcedureWithRetry(
-    procedureFileName: string,
-    params: (string | number | null)[],
-    folderName: string,
-    retries = 3,
+  async updateOccupancySensorHistoricalDurationData(
+    deviceUuid: string,
   ): Promise<void> {
     try {
-      const query = this.loadQuery(folderName, procedureFileName);
-      await this.dataSource.query(query, params);
-      console.log(`Procedure ${procedureFileName} executed successfully.`);
+      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(
+        'fact_daily_space_occupancy_duration',
+        'procedure_update_daily_space_occupancy_duration',
+        [dateStr, device.spaceDevice?.uuid],
+      );
     } 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);
+      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 = now.toLocaleDateString('en-CA'); // YYYY-MM-DD
+      const device = await this.deviceRepository.findOne({
+        where: { uuid: deviceUuid },
+        relations: ['spaceDevice'],
+      });
+
+      await this.executeProcedure(
+        'fact_space_occupancy_count',
+        'procedure_update_fact_space_occupancy',
+        [dateStr, device.spaceDevice?.uuid],
+      );
+    } catch (err) {
+      console.error('Failed to insert or update occupancy data:', err);
+      throw err;
+    }
+  }
+
+  private async executeProcedure(
+    procedureFolderName: string,
+    procedureFileName: string,
+    params: (string | number | null)[],
+  ): Promise<void> {
+    const query = this.loadQuery(procedureFolderName, procedureFileName);
+    await this.dataSource.query(query, params);
+    console.log(`Procedure ${procedureFileName} executed successfully.`);
+  }
 
   private loadQuery(folderName: string, fileName: string): string {
     return this.sqlLoader.loadQuery(folderName, fileName, SQL_PROCEDURES_PATH);

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,74 +10,50 @@ export class PowerClampService {
     private readonly dataSource: DataSource,
   ) {}
 
-  async updateEnergyConsumedHistoricalData(): Promise<void> {
+  async updateEnergyConsumedHistoricalData(deviceUuid: string): Promise<void> {
     try {
-      const { dateStr, monthYear } = this.getFormattedDates();
-
-      // Execute all procedures in parallel
-      await Promise.all([
-        this.executeProcedureWithRetry(
-          'fact_hourly_device_energy_consumed_procedure',
-          [dateStr],
-          'fact_device_energy_consumed',
-        ),
-        this.executeProcedureWithRetry(
-          'fact_daily_device_energy_consumed_procedure',
-          [dateStr],
-          'fact_device_energy_consumed',
-        ),
-        this.executeProcedureWithRetry(
-          'fact_monthly_device_energy_consumed_procedure',
-          [monthYear],
-          'fact_device_energy_consumed',
-        ),
-      ]);
-    } catch (err) {
-      console.error('Failed to update energy consumption data:', err);
-      throw err;
-    }
-  }
-
-  private getFormattedDates(): { dateStr: string; monthYear: string } {
-    const now = new Date();
-    return {
-      dateStr: now.toLocaleDateString('en-CA'), // YYYY-MM-DD
-      monthYear: now
+      const now = new Date();
+      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
-    };
-  }
+        .replace('/', '-'); // MM-YYYY
 
-  private async executeProcedureWithRetry(
-    procedureFileName: string,
-    params: (string | number | null)[],
-    folderName: string,
-    retries = 3,
-  ): Promise<void> {
-    try {
-      const query = this.loadQuery(folderName, procedureFileName);
-      await this.dataSource.query(query, params);
-      console.log(`Procedure ${procedureFileName} executed successfully.`);
+      await this.executeProcedure(
+        'fact_hourly_device_energy_consumed_procedure',
+        [deviceUuid, dateStr, hour],
+      );
+
+      await this.executeProcedure(
+        'fact_daily_device_energy_consumed_procedure',
+        [deviceUuid, dateStr],
+      );
+
+      await this.executeProcedure(
+        'fact_monthly_device_energy_consumed_procedure',
+        [deviceUuid, monthYear],
+      );
     } 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);
+      console.error('Failed to insert or update energy data:', err);
       throw err;
     }
   }
 
+  private async executeProcedure(
+    procedureFileName: string,
+    params: (string | number | null)[],
+  ): Promise<void> {
+    const query = this.loadQuery(
+      'fact_device_energy_consumed',
+      procedureFileName,
+    );
+    await this.dataSource.query(query, params);
+    console.log(`Procedure ${procedureFileName} executed successfully.`);
+  }
+
   private loadQuery(folderName: string, fileName: string): string {
     return this.sqlLoader.loadQuery(folderName, fileName, SQL_PROCEDURES_PATH);
   }

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

@@ -16,46 +16,21 @@ export class SosHandlerService {
     );
   }
 
-  async handleSosEventFirebase(device: any, logData: any): Promise<void> {
-    const sosTrueStatus = [{ code: 'sos', value: true }];
-    const sosFalseStatus = [{ code: 'sos', value: false }];
-
+  async handleSosEvent(devId: string, logData: any): Promise<void> {
     try {
-      // ✅ Send true status
       await this.deviceStatusFirebaseService.addDeviceStatusToFirebase({
-        deviceTuyaUuid: device.deviceTuyaUuid,
-        status: sosTrueStatus,
+        deviceTuyaUuid: devId,
+        status: [{ code: 'sos', value: true }],
         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: device.deviceTuyaUuid,
-            status: sosFalseStatus,
+            deviceTuyaUuid: devId,
+            status: [{ code: 'sos', value: false }],
             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,24 +1,13 @@
-import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
-import { Injectable, OnModuleInit } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import * as NodeCache from 'node-cache';
+import { Injectable } 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';
 
 @Injectable()
-export class TuyaWebSocketService implements OnModuleInit {
+export class TuyaWebSocketService {
   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,
@@ -37,36 +26,16 @@ export class TuyaWebSocketService implements OnModuleInit {
     });
 
     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');
     });
@@ -74,43 +43,23 @@ export class TuyaWebSocketService implements OnModuleInit {
     this.client.message(async (ws: WebSocket, message: any) => {
       try {
         const { devId, status, logData } = this.extractMessageData(message);
-        // console.log(
-        //   `📬 Received message for device: ${devId}, status:`,
-        //   status,
-        //   logData,
-        // );
-        if (!Array.isArray(status)) {
-          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.handleSosEventFirebase(devId, logData);
+          await this.sosHandlerService.handleSosEvent(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 receiving message:', error);
+        console.error('Error processing message:', error);
       }
     });
+
     this.client.reconnect(() => {
       console.log('reconnect');
     });
@@ -131,44 +80,11 @@ export class TuyaWebSocketService implements OnModuleInit {
       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;
     logData: any;
   } {
-    // console.log('Received message:', message);
-
     const payloadData = message.payload.data;
 
     if (this.isDevEnv) {

libs/common/src/helper/timeToMinutes.ts

@@ -1,5 +0,0 @@
-// 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) {
-    //   throw new HttpException(
-    //     `Error fetching device details: ${response.msg}`,
-    //     HttpStatus.BAD_REQUEST,
-    //   );
-    // }
+    if (!response.success) {
+      throw new HttpException(
+        `Error fetching device details: ${response.msg}`,
+        HttpStatus.BAD_REQUEST,
+      );
+    }
 
     return response.result;
   }

libs/common/src/logger/services/winston.logger.ts

@@ -1,26 +1,43 @@
 import { utilities as nestWinstonModuleUtilities } from 'nest-winston';
 import * as winston from 'winston';
+const environment = process.env.NODE_ENV || 'local';
 
 export const winstonLoggerOptions: winston.LoggerOptions = {
   level:
-    process.env.AZURE_POSTGRESQL_DATABASE === 'development' ? 'debug' : 'error',
+    environment === 'local'
+      ? 'debug'
+      : environment === 'development'
+        ? 'warn'
+        : 'error',
   transports: [
     new winston.transports.Console({
+      level:
+        environment === 'local'
+          ? 'debug'
+          : environment === 'development'
+            ? 'warn'
+            : 'error',
       format: winston.format.combine(
         winston.format.timestamp(),
         nestWinstonModuleUtilities.format.nestLike('MyApp', {
-          prettyPrint: true,
+          prettyPrint: environment === 'local',
         }),
       ),
     }),
-    new winston.transports.File({
-      filename: 'logs/error.log',
-      level: 'error',
-      format: winston.format.json(),
-    }),
-    new winston.transports.File({
-      filename: 'logs/combined.log',
-      format: winston.format.json(),
-    }),
+    // Only create file logs if NOT local
+    ...(environment !== 'local'
+      ? [
+          new winston.transports.File({
+            filename: 'logs/error.log',
+            level: 'error',
+            format: winston.format.json(),
+          }),
+          new winston.transports.File({
+            filename: 'logs/combined.log',
+            level: 'info',
+            format: winston.format.json(),
+          }),
+        ]
+      : []),
   ],
 };

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, IsOptional, IsString } from 'class-validator';
+import { IsEnum, IsNotEmpty, IsString } from 'class-validator';
 
 export class InviteUserDto {
   @IsString()
@@ -12,12 +12,8 @@ export class InviteUserDto {
   public email: string;
 
   @IsString()
-  @IsOptional()
-  public jobTitle?: string;
-
-  @IsString()
-  @IsOptional()
-  public companyName?: string;
+  @IsNotEmpty()
+  public jobTitle: string;
 
   @IsEnum(UserStatusEnum)
   @IsNotEmpty()

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

@@ -8,14 +8,14 @@ import {
   Unique,
 } from 'typeorm';
 
-import { RoleType } from '@app/common/constants/role.type.enum';
-import { UserStatusEnum } from '@app/common/constants/user-status.enum';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { ProjectEntity } from '../../project/entities';
 import { RoleTypeEntity } from '../../role-type/entities';
-import { SpaceEntity } from '../../space/entities/space.entity';
+import { UserStatusEnum } from '@app/common/constants/user-status.enum';
 import { UserEntity } from '../../user/entities';
+import { RoleType } from '@app/common/constants/role.type.enum';
 import { InviteUserDto, InviteUserSpaceDto } from '../dtos';
+import { ProjectEntity } from '../../project/entities';
+import { SpaceEntity } from '../../space/entities/space.entity';
 
 @Entity({ name: 'invite-user' })
 @Unique(['email', 'project'])
@@ -37,11 +37,6 @@ export class InviteUserEntity extends AbstractEntity<InviteUserDto> {
   })
   jobTitle: string;
 
-  @Column({
-    nullable: true,
-  })
-  companyName: string;
-
   @Column({
     nullable: false,
     enum: Object.values(UserStatusEnum),
@@ -87,10 +82,7 @@ export class InviteUserEntity extends AbstractEntity<InviteUserDto> {
     onDelete: 'CASCADE',
   })
   public roleType: RoleTypeEntity;
-  @OneToOne(() => UserEntity, (user) => user.inviteUser, {
-    nullable: true,
-    onDelete: 'CASCADE',
-  })
+  @OneToOne(() => UserEntity, (user) => user.inviteUser, { nullable: true })
   @JoinColumn({ name: 'user_uuid' })
   user: UserEntity;
   @OneToMany(
@@ -120,9 +112,7 @@ export class InviteUserSpaceEntity extends AbstractEntity<InviteUserSpaceDto> {
   })
   public uuid: string;
 
-  @ManyToOne(() => InviteUserEntity, (inviteUser) => inviteUser.spaces, {
-    onDelete: 'CASCADE',
-  })
+  @ManyToOne(() => InviteUserEntity, (inviteUser) => inviteUser.spaces)
   @JoinColumn({ name: 'invite_user_uuid' })
   public inviteUser: InviteUserEntity;
 

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

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

libs/common/src/modules/aqi/dtos/aqi.dto.ts

@@ -1,82 +0,0 @@
-import { IsNotEmpty, IsNumber, IsString } from 'class-validator';
-
-export class AqiSpaceDailyPollutantStatsDto {
-  @IsString()
-  @IsNotEmpty()
-  public uuid: string;
-
-  @IsNotEmpty()
-  @IsString()
-  spaceUuid: string;
-
-  @IsNotEmpty()
-  @IsString()
-  eventDay: string;
-
-  @IsNotEmpty()
-  @IsNumber()
-  eventHour: number;
-
-  @IsNumber()
-  pm1Min: number;
-
-  @IsNumber()
-  pm1Avg: number;
-
-  @IsNumber()
-  pm1Max: number;
-
-  @IsNumber()
-  pm10Min: number;
-
-  @IsNumber()
-  pm10Avg: number;
-
-  @IsNumber()
-  pm10Max: number;
-
-  @IsNumber()
-  pm25Min: number;
-
-  @IsNumber()
-  pm25Avg: number;
-
-  @IsNumber()
-  pm25Max: number;
-
-  @IsNumber()
-  ch2oMin: number;
-
-  @IsNumber()
-  ch2oAvg: number;
-
-  @IsNumber()
-  ch2oMax: number;
-
-  @IsNumber()
-  vocMin: number;
-
-  @IsNumber()
-  vocAvg: number;
-
-  @IsNumber()
-  vocMax: number;
-
-  @IsNumber()
-  co2Min: number;
-
-  @IsNumber()
-  co2Avg: number;
-
-  @IsNumber()
-  co2Max: number;
-
-  @IsNumber()
-  aqiMin: number;
-
-  @IsNumber()
-  aqiAvg: number;
-
-  @IsNumber()
-  aqiMax: number;
-}

libs/common/src/modules/aqi/dtos/index.ts

@@ -1 +0,0 @@
-export * from './aqi.dto';

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

@@ -1,184 +0,0 @@
-import { Column, Entity, ManyToOne, Unique } from 'typeorm';
-import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { SpaceEntity } from '../../space/entities/space.entity';
-import { AqiSpaceDailyPollutantStatsDto } from '../dtos';
-
-@Entity({ name: 'space-daily-pollutant-stats' })
-@Unique(['spaceUuid', 'eventDate'])
-export class AqiSpaceDailyPollutantStatsEntity extends AbstractEntity<AqiSpaceDailyPollutantStatsDto> {
-  @Column({ nullable: false })
-  public spaceUuid: string;
-
-  @ManyToOne(() => SpaceEntity, (space) => space.aqiSensorDaily)
-  space: SpaceEntity;
-
-  @Column({ type: 'date', nullable: false })
-  public eventDate: Date;
-
-  @Column('float', { nullable: true })
-  public goodAqiPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public moderateAqiPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public unhealthySensitiveAqiPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public unhealthyAqiPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public veryUnhealthyAqiPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public hazardousAqiPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public dailyAvgAqi?: number;
-
-  @Column('float', { nullable: true })
-  public dailyMaxAqi?: number;
-
-  @Column('float', { nullable: true })
-  public dailyMinAqi?: number;
-
-  @Column('float', { nullable: true })
-  public goodPm25Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public moderatePm25Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public unhealthySensitivePm25Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public unhealthyPm25Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public veryUnhealthyPm25Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public hazardousPm25Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public dailyAvgPm25?: number;
-
-  @Column('float', { nullable: true })
-  public dailyMaxPm25?: number;
-
-  @Column('float', { nullable: true })
-  public dailyMinPm25?: number;
-
-  @Column('float', { nullable: true })
-  public goodPm10Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public moderatePm10Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public unhealthySensitivePm10Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public unhealthyPm10Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public veryUnhealthyPm10Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public hazardousPm10Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public dailyAvgPm10?: number;
-
-  @Column('float', { nullable: true })
-  public dailyMaxPm10?: number;
-
-  @Column('float', { nullable: true })
-  public dailyMinPm10?: number;
-
-  @Column('float', { nullable: true })
-  public goodVocPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public moderateVocPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public unhealthySensitiveVocPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public unhealthyVocPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public veryUnhealthyVocPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public hazardousVocPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public dailyAvgVoc?: number;
-
-  @Column('float', { nullable: true })
-  public dailyMaxVoc?: number;
-
-  @Column('float', { nullable: true })
-  public dailyMinVoc?: number;
-
-  @Column('float', { nullable: true })
-  public goodCo2Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public moderateCo2Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public unhealthySensitiveCo2Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public unhealthyCo2Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public veryUnhealthyCo2Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public hazardousCo2Percentage?: number;
-
-  @Column('float', { nullable: true })
-  public dailyAvgCo2?: number;
-
-  @Column('float', { nullable: true })
-  public dailyMaxCo2?: number;
-
-  @Column('float', { nullable: true })
-  public dailyMinCo2?: number;
-
-  @Column('float', { nullable: true })
-  public goodCh2oPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public moderateCh2oPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public unhealthySensitiveCh2oPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public unhealthyCh2oPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public veryUnhealthyCh2oPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public hazardousCh2oPercentage?: number;
-
-  @Column('float', { nullable: true })
-  public dailyAvgCh2o?: number;
-
-  @Column('float', { nullable: true })
-  public dailyMaxCh2o?: number;
-
-  @Column('float', { nullable: true })
-  public dailyMinCh2o?: number;
-
-  constructor(partial: Partial<AqiSpaceDailyPollutantStatsEntity>) {
-    super();
-    Object.assign(this, partial);
-  }
-}

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

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

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

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

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

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

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

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

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

@@ -1,51 +0,0 @@
-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/booking.entity.ts

@@ -1,44 +0,0 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  ManyToOne,
-  UpdateDateColumn,
-} from 'typeorm';
-import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { SpaceEntity } from '../../space/entities/space.entity';
-import { UserEntity } from '../../user/entities';
-
-@Entity('booking')
-export class BookingEntity extends AbstractEntity {
-  @Column({
-    type: 'uuid',
-    default: () => 'gen_random_uuid()',
-    nullable: false,
-  })
-  public uuid: string;
-
-  @ManyToOne(() => SpaceEntity, (space) => space.bookableConfig)
-  space: SpaceEntity;
-
-  @ManyToOne(() => UserEntity, (user) => user.bookings)
-  user: UserEntity;
-
-  @Column({ type: Date, nullable: false })
-  date: Date;
-
-  @Column({ type: 'time' })
-  startTime: string;
-
-  @Column({ type: 'time' })
-  endTime: string;
-
-  @Column({ type: 'int', default: null })
-  cost?: number;
-
-  @CreateDateColumn()
-  createdAt: Date;
-
-  @UpdateDateColumn()
-  updatedAt: Date;
-}

libs/common/src/modules/booking/repositories/bookable-space.repository.ts

@@ -1,10 +0,0 @@
-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/booking.repository.ts

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

libs/common/src/modules/device-status-log/entities/device-status-log.entity.ts

@@ -2,15 +2,15 @@ import { SourceType } from '@app/common/constants/source-type.enum';
 import { Entity, Column, PrimaryColumn, Unique } from 'typeorm';
 
 @Entity('device-status-log')
-@Unique('event_time_idx', ['eventTime', 'deviceId', 'code', 'value'])
+@Unique('event_time_idx', ['eventTime'])
 export class DeviceStatusLogEntity {
-  @PrimaryColumn({ type: 'int', generated: true, unsigned: true })
+  @Column({ type: 'int', generated: true, unsigned: true })
   id: number;
 
   @Column({ type: 'text' })
   eventId: string;
 
-  @Column({ type: 'timestamptz' })
+  @PrimaryColumn({ type: 'timestamptz' })
   eventTime: Date;
 
   @Column({

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

@@ -1,24 +1,24 @@
 import {
   Column,
   Entity,
-  Index,
-  JoinColumn,
   ManyToOne,
   OneToMany,
   Unique,
+  Index,
+  JoinColumn,
 } from 'typeorm';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { PermissionTypeEntity } from '../../permission/entities';
-import { PowerClampHourlyEntity } from '../../power-clamp/entities/power-clamp.entity';
-import { PresenceSensorDailyDeviceEntity } from '../../presence-sensor/entities';
+import { DeviceDto, DeviceUserPermissionDto } from '../dtos/device.dto';
 import { ProductEntity } from '../../product/entities';
+import { UserEntity } from '../../user/entities';
+import { DeviceNotificationDto } from '../dtos';
+import { PermissionTypeEntity } from '../../permission/entities';
 import { SceneDeviceEntity } from '../../scene-device/entities';
 import { SpaceEntity } from '../../space/entities/space.entity';
 import { SubspaceEntity } from '../../space/entities/subspace/subspace.entity';
 import { NewTagEntity } from '../../tag';
-import { UserEntity } from '../../user/entities';
-import { DeviceNotificationDto } from '../dtos';
-import { DeviceDto, DeviceUserPermissionDto } from '../dtos/device.dto';
+import { PowerClampHourlyEntity } from '../../power-clamp/entities/power-clamp.entity';
+import { PresenceSensorDailyDeviceEntity } from '../../presence-sensor/entities';
 
 @Entity({ name: 'device' })
 @Unique(['deviceTuyaUuid'])
@@ -28,11 +28,6 @@ export class DeviceEntity extends AbstractEntity<DeviceDto> {
   })
   deviceTuyaUuid: string;
 
-  @Column({
-    nullable: true,
-  })
-  deviceTuyaConstUuid: string;
-
   @Column({
     nullable: true,
     default: true,
@@ -83,8 +78,8 @@ export class DeviceEntity extends AbstractEntity<DeviceDto> {
   @OneToMany(() => SceneDeviceEntity, (sceneDevice) => sceneDevice.device, {})
   sceneDevices: SceneDeviceEntity[];
 
-  @ManyToOne(() => NewTagEntity, (tag) => tag.devices)
-  @JoinColumn({ name: 'tag_uuid' })
+  @OneToMany(() => NewTagEntity, (tag) => tag.devices)
+  // @JoinTable({ name: 'device_tags' })
   public tag: NewTagEntity;
   @OneToMany(() => PowerClampHourlyEntity, (powerClamp) => powerClamp.device)
   powerClampHourly: PowerClampHourlyEntity[];
@@ -116,7 +111,6 @@ export class DeviceNotificationEntity extends AbstractEntity<DeviceNotificationD
 
   @ManyToOne(() => UserEntity, (user) => user.userPermission, {
     nullable: false,
-    onDelete: 'CASCADE',
   })
   user: UserEntity;
 
@@ -155,7 +149,6 @@ export class DeviceUserPermissionEntity extends AbstractEntity<DeviceUserPermiss
 
   @ManyToOne(() => UserEntity, (user) => user.userPermission, {
     nullable: false,
-    onDelete: 'CASCADE',
   })
   user: UserEntity;
   constructor(partial: Partial<DeviceUserPermissionEntity>) {

libs/common/src/modules/occupancy/dtos/index.ts

@@ -1 +0,0 @@
-export * from './occupancy.dto';

libs/common/src/modules/occupancy/dtos/occupancy.dto.ts

@@ -1,23 +0,0 @@
-import { IsNotEmpty, IsNumber, IsString } from 'class-validator';
-
-export class SpaceDailyOccupancyDurationDto {
-  @IsString()
-  @IsNotEmpty()
-  public uuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public spaceUuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public eventDate: string;
-
-  @IsNumber()
-  @IsNotEmpty()
-  public occupancyPercentage: number;
-
-  @IsNumber()
-  @IsNotEmpty()
-  public occupiedSeconds: number;
-}

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

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

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

@@ -1,32 +0,0 @@
-import { Column, Entity, ManyToOne, Unique } from 'typeorm';
-import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { SpaceEntity } from '../../space/entities/space.entity';
-import { SpaceDailyOccupancyDurationDto } from '../dtos';
-
-@Entity({ name: 'space-daily-occupancy-duration' })
-@Unique(['spaceUuid', 'eventDate'])
-export class SpaceDailyOccupancyDurationEntity extends AbstractEntity<SpaceDailyOccupancyDurationDto> {
-  @Column({ nullable: false })
-  public spaceUuid: string;
-
-  @Column({ nullable: false, type: 'date' })
-  public eventDate: string;
-
-  public CountTotalPresenceDetected: number;
-
-  @ManyToOne(() => SpaceEntity, (space) => space.presenceSensorDaily)
-  space: SpaceEntity;
-
-  @Column({ type: 'int' })
-  occupancyPercentage: number;
-
-  @Column({ type: 'int', nullable: true })
-  occupiedSeconds?: number;
-
-  @Column({ type: 'int', nullable: true })
-  deviceCount?: number;
-  constructor(partial: Partial<SpaceDailyOccupancyDurationEntity>) {
-    super();
-    Object.assign(this, partial);
-  }
-}

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

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

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

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

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

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

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

@@ -1,7 +1,10 @@
 import { Column, Entity, OneToMany } from 'typeorm';
+import { ProductDto } from '../dtos';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
 import { DeviceEntity } from '../../device/entities';
-import { ProductDto } from '../dtos';
+import { TagModel } from '../../space-model';
+import { TagEntity } from '../../space/entities/tag.entity';
+import { NewTagEntity } from '../../tag/entities';
 @Entity({ name: 'product' })
 export class ProductEntity extends AbstractEntity<ProductDto> {
   @Column({
@@ -25,6 +28,15 @@ export class ProductEntity extends AbstractEntity<ProductDto> {
   })
   public prodType: string;
 
+  @OneToMany(() => NewTagEntity, (tag) => tag.product, { cascade: true })
+  public newTags: NewTagEntity[];
+
+  @OneToMany(() => TagModel, (tag) => tag.product)
+  tagModels: TagModel[];
+
+  @OneToMany(() => TagEntity, (tag) => tag.product)
+  tags: TagEntity[];
+
   @OneToMany(
     () => DeviceEntity,
     (devicesProductEntity) => devicesProductEntity.productDevice,

libs/common/src/modules/space-model/dtos/tag-model.dto.ts

@@ -0,0 +1,21 @@
+import { IsNotEmpty, IsString } from 'class-validator';
+
+export class TagModelDto {
+  @IsString()
+  @IsNotEmpty()
+  public uuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public name: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public productUuid: string;
+
+  @IsString()
+  spaceModelUuid: string;
+
+  @IsString()
+  subspaceModelUuid: string;
+}

libs/common/src/modules/space-model/entities/index.ts

@@ -1,3 +1,4 @@
-export * from './space-model-product-allocation.entity';
 export * from './space-model.entity';
 export * from './subspace-model';
+export * from './tag-model.entity';
+export * from './space-model-product-allocation.entity';

libs/common/src/modules/space-model/entities/space-model-product-allocation.entity.ts

@@ -1,12 +1,18 @@
-import { Column, Entity, ManyToOne, OneToMany, Unique } from 'typeorm';
-import { AbstractEntity } from '../../abstract/entities/abstract.entity';
+import {
+  Entity,
+  Column,
+  ManyToOne,
+  ManyToMany,
+  JoinTable,
+  OneToMany,
+} from 'typeorm';
+import { SpaceModelEntity } from './space-model.entity';
+import { NewTagEntity } from '../../tag/entities/tag.entity';
 import { ProductEntity } from '../../product/entities/product.entity';
 import { SpaceProductAllocationEntity } from '../../space/entities/space-product-allocation.entity';
-import { NewTagEntity } from '../../tag/entities/tag.entity';
-import { SpaceModelEntity } from './space-model.entity';
+import { AbstractEntity } from '../../abstract/entities/abstract.entity';
 
 @Entity({ name: 'space_model_product_allocation' })
-@Unique(['spaceModel', 'product', 'tag'])
 export class SpaceModelProductAllocationEntity extends AbstractEntity<SpaceModelProductAllocationEntity> {
   @Column({
     type: 'uuid',
@@ -25,8 +31,9 @@ export class SpaceModelProductAllocationEntity extends AbstractEntity<SpaceModel
   @ManyToOne(() => ProductEntity, { nullable: false, onDelete: 'CASCADE' })
   public product: ProductEntity;
 
-  @ManyToOne(() => NewTagEntity, { nullable: true, onDelete: 'CASCADE' })
-  public tag: NewTagEntity;
+  @ManyToMany(() => NewTagEntity, { cascade: true, onDelete: 'CASCADE' })
+  @JoinTable({ name: 'space_model_product_tags' })
+  public tags: NewTagEntity[];
 
   @OneToMany(
     () => SpaceProductAllocationEntity,

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

@@ -1,10 +1,11 @@
-import { Column, Entity, JoinColumn, ManyToOne, OneToMany } from 'typeorm';
+import { Entity, Column, OneToMany, ManyToOne, JoinColumn } from 'typeorm';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { ProjectEntity } from '../../project/entities';
-import { SpaceEntity } from '../../space/entities/space.entity';
 import { SpaceModelDto } from '../dtos';
-import { SpaceModelProductAllocationEntity } from './space-model-product-allocation.entity';
 import { SubspaceModelEntity } from './subspace-model';
+import { ProjectEntity } from '../../project/entities';
+import { TagModel } from './tag-model.entity';
+import { SpaceModelProductAllocationEntity } from './space-model-product-allocation.entity';
+import { SpaceEntity } from '../../space/entities/space.entity';
 
 @Entity({ name: 'space-model' })
 export class SpaceModelEntity extends AbstractEntity<SpaceModelDto> {
@@ -48,6 +49,9 @@ export class SpaceModelEntity extends AbstractEntity<SpaceModelDto> {
   })
   public spaces: SpaceEntity[];
 
+  @OneToMany(() => TagModel, (tag) => tag.spaceModel)
+  tags: TagModel[];
+
   @OneToMany(
     () => SpaceModelProductAllocationEntity,
     (allocation) => allocation.spaceModel,

libs/common/src/modules/space-model/entities/subspace-model/subspace-model-product-allocation.entity.ts

@@ -1,12 +1,11 @@
-import { AbstractEntity } from '@app/common/modules/abstract/entities/abstract.entity';
+import { Entity, Column, ManyToOne, ManyToMany, JoinTable } from 'typeorm';
+import { SubspaceModelEntity } from './subspace-model.entity';
 import { ProductEntity } from '@app/common/modules/product/entities/product.entity';
 import { NewTagEntity } from '@app/common/modules/tag/entities/tag.entity';
-import { Column, Entity, ManyToOne, Unique } from 'typeorm';
 import { SubspaceModelProductAllocationDto } from '../../dtos/subspace-model/subspace-model-product-allocation.dto';
-import { SubspaceModelEntity } from './subspace-model.entity';
+import { AbstractEntity } from '@app/common/modules/abstract/entities/abstract.entity';
 
 @Entity({ name: 'subspace_model_product_allocation' })
-@Unique(['subspaceModel', 'product', 'tag'])
 export class SubspaceModelProductAllocationEntity extends AbstractEntity<SubspaceModelProductAllocationDto> {
   @Column({
     type: 'uuid',
@@ -28,8 +27,12 @@ export class SubspaceModelProductAllocationEntity extends AbstractEntity<Subspac
   @ManyToOne(() => ProductEntity, { nullable: false, onDelete: 'CASCADE' })
   public product: ProductEntity;
 
-  @ManyToOne(() => NewTagEntity, { nullable: true, onDelete: 'CASCADE' })
-  public tag: NewTagEntity;
+  @ManyToMany(() => NewTagEntity, (tag) => tag.subspaceModelAllocations, {
+    cascade: true,
+    onDelete: 'CASCADE',
+  })
+  @JoinTable({ name: 'subspace_model_product_tags' })
+  public tags: NewTagEntity[];
 
   constructor(partial: Partial<SubspaceModelProductAllocationEntity>) {
     super();

libs/common/src/modules/space-model/entities/subspace-model/subspace-model.entity.ts

@@ -1,9 +1,10 @@
 import { AbstractEntity } from '@app/common/modules/abstract/entities/abstract.entity';
-import { SubspaceEntity } from '@app/common/modules/space/entities/subspace/subspace.entity';
 import { Column, Entity, ManyToOne, OneToMany } from 'typeorm';
 import { SubSpaceModelDto } from '../../dtos';
 import { SpaceModelEntity } from '../space-model.entity';
+import { TagModel } from '../tag-model.entity';
 import { SubspaceModelProductAllocationEntity } from './subspace-model-product-allocation.entity';
+import { SubspaceEntity } from '@app/common/modules/space/entities/subspace/subspace.entity';
 
 @Entity({ name: 'subspace-model' })
 export class SubspaceModelEntity extends AbstractEntity<SubSpaceModelDto> {
@@ -40,6 +41,9 @@ export class SubspaceModelEntity extends AbstractEntity<SubSpaceModelDto> {
   })
   public disabled: boolean;
 
+  @OneToMany(() => TagModel, (tag) => tag.subspaceModel)
+  tags: TagModel[];
+
   @OneToMany(
     () => SubspaceModelProductAllocationEntity,
     (allocation) => allocation.subspaceModel,

libs/common/src/modules/space-model/entities/tag-model.entity.ts

@@ -0,0 +1,38 @@
+import { Column, Entity, JoinColumn, ManyToOne, OneToMany } from 'typeorm';
+import { AbstractEntity } from '../../abstract/entities/abstract.entity';
+import { TagModelDto } from '../dtos/tag-model.dto';
+import { SpaceModelEntity } from './space-model.entity';
+import { SubspaceModelEntity } from './subspace-model';
+import { ProductEntity } from '../../product/entities';
+import { TagEntity } from '../../space/entities/tag.entity';
+
+@Entity({ name: 'tag_model' })
+export class TagModel extends AbstractEntity<TagModelDto> {
+  @Column({ type: 'varchar', length: 255 })
+  tag: string;
+
+  @ManyToOne(() => ProductEntity, (product) => product.tagModels, {
+    nullable: false,
+  })
+  @JoinColumn({ name: 'product_id' })
+  product: ProductEntity;
+
+  @ManyToOne(() => SpaceModelEntity, (space) => space.tags, { nullable: true })
+  @JoinColumn({ name: 'space_model_id' })
+  spaceModel: SpaceModelEntity;
+
+  @ManyToOne(() => SubspaceModelEntity, (subspace) => subspace.tags, {
+    nullable: true,
+  })
+  @JoinColumn({ name: 'subspace_model_id' })
+  subspaceModel: SubspaceModelEntity;
+
+  @Column({
+    nullable: false,
+    default: false,
+  })
+  public disabled: boolean;
+
+  @OneToMany(() => TagEntity, (tag) => tag.model)
+  tags: TagEntity[];
+}

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

@@ -1,10 +1,11 @@
-import { Injectable } from '@nestjs/common';
 import { DataSource, Repository } from 'typeorm';
+import { Injectable } from '@nestjs/common';
 import {
   SpaceModelEntity,
   SpaceModelProductAllocationEntity,
   SubspaceModelEntity,
   SubspaceModelProductAllocationEntity,
+  TagModel,
 } from '../entities';
 
 @Injectable()
@@ -20,6 +21,13 @@ export class SubspaceModelRepository extends Repository<SubspaceModelEntity> {
   }
 }
 
+@Injectable()
+export class TagModelRepository extends Repository<TagModel> {
+  constructor(private dataSource: DataSource) {
+    super(TagModel, dataSource.createEntityManager());
+  }
+}
+
 @Injectable()
 export class SpaceModelProductAllocationRepoitory extends Repository<SpaceModelProductAllocationEntity> {
   constructor(private dataSource: DataSource) {

libs/common/src/modules/space-model/space-model.repository.module.ts

@@ -1,11 +1,13 @@
-import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { SpaceModelEntity, SubspaceModelEntity } from './entities';
+import { SpaceModelEntity, SubspaceModelEntity, TagModel } from './entities';
+import { Module } from '@nestjs/common';
 
 @Module({
   providers: [],
   exports: [],
   controllers: [],
-  imports: [TypeOrmModule.forFeature([SpaceModelEntity, SubspaceModelEntity])],
+  imports: [
+    TypeOrmModule.forFeature([SpaceModelEntity, SubspaceModelEntity, TagModel]),
+  ],
 })
 export class SpaceModelRepositoryModule {}

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

@@ -0,0 +1,32 @@
+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-product-allocation.entity.ts

@@ -1,13 +1,12 @@
-import { Column, Entity, ManyToOne, Unique } from 'typeorm';
-import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { ProductEntity } from '../../product/entities/product.entity';
-import { SpaceModelProductAllocationEntity } from '../../space-model/entities/space-model-product-allocation.entity';
-import { NewTagEntity } from '../../tag/entities/tag.entity';
-import { SpaceProductAllocationDto } from '../dtos/space-product-allocation.dto';
+import { Entity, Column, ManyToOne, ManyToMany, JoinTable } from 'typeorm';
 import { SpaceEntity } from './space.entity';
+import { SpaceModelProductAllocationEntity } from '../../space-model/entities/space-model-product-allocation.entity';
+import { ProductEntity } from '../../product/entities/product.entity';
+import { NewTagEntity } from '../../tag/entities/tag.entity';
+import { AbstractEntity } from '../../abstract/entities/abstract.entity';
+import { SpaceProductAllocationDto } from '../dtos/space-product-allocation.dto';
 
 @Entity({ name: 'space_product_allocation' })
-@Unique(['space', 'product', 'tag'], {})
 export class SpaceProductAllocationEntity extends AbstractEntity<SpaceProductAllocationDto> {
   @Column({
     type: 'uuid',
@@ -22,11 +21,6 @@ export class SpaceProductAllocationEntity extends AbstractEntity<SpaceProductAll
   })
   public space: SpaceEntity;
 
-  @Column({
-    name: 'space_uuid',
-  })
-  public spaceUuid: string;
-
   @ManyToOne(() => SpaceModelProductAllocationEntity, {
     nullable: true,
     onDelete: 'SET NULL',
@@ -36,18 +30,9 @@ export class SpaceProductAllocationEntity extends AbstractEntity<SpaceProductAll
   @ManyToOne(() => ProductEntity, { nullable: false, onDelete: 'CASCADE' })
   public product: ProductEntity;
 
-  @Column({
-    name: 'product_uuid',
-  })
-  public productUuid: string;
-
-  @ManyToOne(() => NewTagEntity, { nullable: true, onDelete: 'CASCADE' })
-  public tag: NewTagEntity;
-
-  @Column({
-    name: 'tag_uuid',
-  })
-  public tagUuid: string;
+  @ManyToMany(() => NewTagEntity)
+  @JoinTable({ name: 'space_product_tags' })
+  public tags: NewTagEntity[];
 
   constructor(partial: Partial<SpaceProductAllocationEntity>) {
     super();

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

@@ -1,26 +1,16 @@
-import {
-  Column,
-  Entity,
-  JoinColumn,
-  ManyToOne,
-  OneToMany,
-  OneToOne,
-} from 'typeorm';
+import { Column, Entity, JoinColumn, ManyToOne, OneToMany } from 'typeorm';
+import { SpaceDto } from '../dtos';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { AqiSpaceDailyPollutantStatsEntity } from '../../aqi/entities';
-import { BookableSpaceEntity } from '../../booking/entities/bookable-space.entity';
-import { BookingEntity } from '../../booking/entities/booking.entity';
-import { CommunityEntity } from '../../community/entities';
+import { UserSpaceEntity } from '../../user/entities';
 import { DeviceEntity } from '../../device/entities';
-import { InviteUserSpaceEntity } from '../../Invite-user/entities';
-import { SpaceDailyOccupancyDurationEntity } from '../../occupancy/entities';
-import { PresenceSensorDailySpaceEntity } from '../../presence-sensor/entities';
+import { CommunityEntity } from '../../community/entities';
+import { SpaceLinkEntity } from './space-link.entity';
 import { SceneEntity } from '../../scene/entities';
 import { SpaceModelEntity } from '../../space-model';
-import { UserSpaceEntity } from '../../user/entities';
-import { SpaceDto } from '../dtos';
+import { InviteUserSpaceEntity } from '../../Invite-user/entities';
 import { SpaceProductAllocationEntity } from './space-product-allocation.entity';
 import { SubspaceEntity } from './subspace/subspace.entity';
+import { PresenceSensorDailySpaceEntity } from '../../presence-sensor/entities';
 
 @Entity({ name: 'space' })
 export class SpaceEntity extends AbstractEntity<SpaceDto> {
@@ -47,26 +37,12 @@ export class SpaceEntity extends AbstractEntity<SpaceDto> {
   @JoinColumn({ name: 'community_id' })
   community: CommunityEntity;
 
-  @Column({
-    name: 'community_id',
-  })
-  communityId: string;
-
-  @ManyToOne(() => SpaceEntity, (space) => space.children, {
-    nullable: true,
-  })
+  @ManyToOne(() => SpaceEntity, (space) => space.children, { nullable: true })
   parent: SpaceEntity;
 
-  @Column({
-    name: 'parent_uuid',
-    nullable: true,
-  })
-  public parentUuid: string;
-
   @OneToMany(() => SpaceEntity, (space) => space.parent, {
     nullable: false,
     onDelete: 'CASCADE',
-    cascade: true,
   })
   children: SpaceEntity[];
 
@@ -79,24 +55,34 @@ export class SpaceEntity extends AbstractEntity<SpaceDto> {
   })
   public disabled: boolean;
 
-  @Column({
-    nullable: true,
-    type: Number,
-  })
-  public order?: number;
-
   @OneToMany(() => SubspaceEntity, (subspace) => subspace.space, {
     nullable: true,
-    cascade: true,
   })
   subspaces?: SubspaceEntity[];
 
+  // Position columns
+  @Column({ type: 'float', nullable: false, default: 0 })
+  public x: number; // X coordinate for position
+
+  @Column({ type: 'float', nullable: false, default: 0 })
+  public y: number; // Y coordinate for position
+
   @OneToMany(
     () => DeviceEntity,
     (devicesSpaceEntity) => devicesSpaceEntity.spaceDevice,
   )
   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',
@@ -129,21 +115,6 @@ export class SpaceEntity extends AbstractEntity<SpaceDto> {
   @OneToMany(() => PresenceSensorDailySpaceEntity, (sensor) => sensor.space)
   presenceSensorDaily: PresenceSensorDailySpaceEntity[];
 
-  @OneToMany(() => AqiSpaceDailyPollutantStatsEntity, (aqi) => aqi.space)
-  aqiSensorDaily: AqiSpaceDailyPollutantStatsEntity[];
-
-  @OneToMany(
-    () => SpaceDailyOccupancyDurationEntity,
-    (occupancy) => occupancy.space,
-  )
-  occupancyDaily: SpaceDailyOccupancyDurationEntity[];
-
-  @OneToOne(() => BookableSpaceEntity, (bookable) => bookable.space)
-  bookableConfig: BookableSpaceEntity;
-
-  @OneToMany(() => BookingEntity, (booking) => booking.space)
-  bookings: BookingEntity[];
-
   constructor(partial: Partial<SpaceEntity>) {
     super();
     Object.assign(this, partial);

libs/common/src/modules/space/entities/subspace/subspace-product-allocation.entity.ts

@@ -1,13 +1,20 @@
-import { AbstractEntity } from '@app/common/modules/abstract/entities/abstract.entity';
+import {
+  Entity,
+  Column,
+  ManyToOne,
+  ManyToMany,
+  JoinTable,
+  Unique,
+} from 'typeorm';
+import { SubspaceEntity } from './subspace.entity';
 import { ProductEntity } from '@app/common/modules/product/entities';
 import { SubspaceModelProductAllocationEntity } from '@app/common/modules/space-model';
 import { NewTagEntity } from '@app/common/modules/tag/entities/tag.entity';
-import { Column, Entity, ManyToOne, Unique } from 'typeorm';
+import { AbstractEntity } from '@app/common/modules/abstract/entities/abstract.entity';
 import { SubspaceProductAllocationDto } from '../../dtos/subspace-product-allocation.dto';
-import { SubspaceEntity } from './subspace.entity';
 
 @Entity({ name: 'subspace_product_allocation' })
-@Unique(['subspace', 'product', 'tag'])
+// @Unique(['subspace', 'product'])
 export class SubspaceProductAllocationEntity extends AbstractEntity<SubspaceProductAllocationDto> {
   @Column({
     type: 'uuid',
@@ -22,11 +29,6 @@ export class SubspaceProductAllocationEntity extends AbstractEntity<SubspaceProd
   })
   public subspace: SubspaceEntity;
 
-  @Column({
-    name: 'subspace_uuid',
-  })
-  public subspaceUuid: string;
-
   @ManyToOne(() => SubspaceModelProductAllocationEntity, {
     nullable: true,
     onDelete: 'SET NULL',
@@ -36,18 +38,9 @@ export class SubspaceProductAllocationEntity extends AbstractEntity<SubspaceProd
   @ManyToOne(() => ProductEntity, { nullable: false, onDelete: 'CASCADE' })
   public product: ProductEntity;
 
-  @Column({
-    name: 'product_uuid',
-  })
-  public productUuid: string;
-
-  @ManyToOne(() => NewTagEntity, { nullable: true, onDelete: 'CASCADE' })
-  public tag: NewTagEntity;
-
-  @Column({
-    name: 'tag_uuid',
-  })
-  public tagUuid: string;
+  @ManyToMany(() => NewTagEntity)
+  @JoinTable({ name: 'subspace_product_tags' })
+  public tags: NewTagEntity[];
 
   constructor(partial: Partial<SubspaceProductAllocationEntity>) {
     super();

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

@@ -4,6 +4,7 @@ import { SubspaceModelEntity } from '@app/common/modules/space-model';
 import { Column, Entity, JoinColumn, ManyToOne, OneToMany } from 'typeorm';
 import { SubspaceDto } from '../../dtos';
 import { SpaceEntity } from '../space.entity';
+import { TagEntity } from '../tag.entity';
 import { SubspaceProductAllocationEntity } from './subspace-product-allocation.entity';
 
 @Entity({ name: 'subspace' })
@@ -26,11 +27,6 @@ export class SubspaceEntity extends AbstractEntity<SubspaceDto> {
   @JoinColumn({ name: 'space_uuid' })
   space: SpaceEntity;
 
-  @Column({
-    name: 'space_uuid',
-  })
-  public spaceUuid: string;
-
   @Column({
     nullable: false,
     default: false,
@@ -47,6 +43,9 @@ export class SubspaceEntity extends AbstractEntity<SubspaceDto> {
   })
   subSpaceModel?: SubspaceModelEntity;
 
+  @OneToMany(() => TagEntity, (tag) => tag.subspace)
+  tags: TagEntity[];
+
   @OneToMany(
     () => SubspaceProductAllocationEntity,
     (allocation) => allocation.subspace,

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

@@ -0,0 +1,41 @@
+import { Entity, Column, ManyToOne, JoinColumn, OneToOne } from 'typeorm';
+import { AbstractEntity } from '../../abstract/entities/abstract.entity';
+import { ProductEntity } from '../../product/entities';
+import { TagDto } from '../dtos';
+import { TagModel } from '../../space-model/entities/tag-model.entity';
+import { DeviceEntity } from '../../device/entities';
+import { SubspaceEntity } from './subspace/subspace.entity';
+
+@Entity({ name: 'tag' })
+export class TagEntity extends AbstractEntity<TagDto> {
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  tag: string;
+
+  @ManyToOne(() => TagModel, (model) => model.tags, {
+    nullable: true,
+  })
+  model: TagModel;
+
+  @ManyToOne(() => ProductEntity, (product) => product.tags, {
+    nullable: false,
+  })
+  product: ProductEntity;
+
+  @ManyToOne(() => SubspaceEntity, (subspace) => subspace.tags, {
+    nullable: true,
+  })
+  @JoinColumn({ name: 'subspace_id' })
+  subspace: SubspaceEntity;
+
+  @Column({
+    nullable: false,
+    default: false,
+  })
+  public disabled: boolean;
+
+  @OneToOne(() => DeviceEntity, (device) => device.tag, {
+    nullable: true,
+  })
+  @JoinColumn({ name: 'device_id' })
+  device: DeviceEntity;
+}

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

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

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

@@ -6,6 +6,7 @@ import { SpaceProductAllocationEntity } from './entities/space-product-allocatio
 import { SpaceEntity } from './entities/space.entity';
 import { SubspaceProductAllocationEntity } from './entities/subspace/subspace-product-allocation.entity';
 import { SubspaceEntity } from './entities/subspace/subspace.entity';
+import { TagEntity } from './entities/tag.entity';
 
 @Module({
   providers: [],
@@ -15,6 +16,7 @@ import { SubspaceEntity } from './entities/subspace/subspace.entity';
     TypeOrmModule.forFeature([
       SpaceEntity,
       SubspaceEntity,
+      TagEntity,
       InviteSpaceEntity,
       SpaceProductAllocationEntity,
       SubspaceProductAllocationEntity,

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

@@ -1,10 +1,11 @@
-import { Column, Entity, ManyToOne, OneToMany, Unique } from 'typeorm';
-import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { DeviceEntity } from '../../device/entities/device.entity';
+import { Entity, Column, ManyToOne, Unique, ManyToMany } from 'typeorm';
+import { ProductEntity } from '../../product/entities';
 import { ProjectEntity } from '../../project/entities';
+import { AbstractEntity } from '../../abstract/entities/abstract.entity';
+import { NewTagDto } from '../dtos/tag.dto';
 import { SpaceModelProductAllocationEntity } from '../../space-model/entities/space-model-product-allocation.entity';
 import { SubspaceModelProductAllocationEntity } from '../../space-model/entities/subspace-model/subspace-model-product-allocation.entity';
-import { NewTagDto } from '../dtos/tag.dto';
+import { DeviceEntity } from '../../device/entities/device.entity';
 
 @Entity({ name: 'new_tag' })
 @Unique(['name', 'project'])
@@ -23,25 +24,31 @@ export class NewTagEntity extends AbstractEntity<NewTagDto> {
   })
   name: string;
 
+  @ManyToOne(() => ProductEntity, (product) => product.newTags, {
+    nullable: true,
+    onDelete: 'CASCADE',
+  })
+  public product: ProductEntity;
+
   @ManyToOne(() => ProjectEntity, (project) => project.tags, {
     nullable: false,
     onDelete: 'CASCADE',
   })
   public project: ProjectEntity;
 
-  @OneToMany(
+  @ManyToMany(
     () => SpaceModelProductAllocationEntity,
-    (allocation) => allocation.tag,
+    (allocation) => allocation.tags,
   )
   public spaceModelAllocations: SpaceModelProductAllocationEntity[];
 
-  @OneToMany(
+  @ManyToMany(
     () => SubspaceModelProductAllocationEntity,
-    (allocation) => allocation.tag,
+    (allocation) => allocation.tags,
   )
   public subspaceModelAllocations: SubspaceModelProductAllocationEntity[];
 
-  @OneToMany(() => DeviceEntity, (device) => device.tag)
+  @ManyToOne(() => DeviceEntity, (device) => device.tag)
   public devices: DeviceEntity[];
 
   constructor(partial: Partial<NewTagEntity>) {

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

@@ -1,4 +1,3 @@
-import { defaultProfilePicture } from '@app/common/constants/default.profile.picture';
 import {
   Column,
   DeleteDateColumn,
@@ -9,27 +8,27 @@ import {
   OneToOne,
   Unique,
 } from 'typeorm';
-import { OtpType } from '../../../../src/constants/otp-type.enum';
-import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { ClientEntity } from '../../client/entities';
-import {
-  DeviceNotificationEntity,
-  DeviceUserPermissionEntity,
-} from '../../device/entities';
-import { InviteUserEntity } from '../../Invite-user/entities';
-import { ProjectEntity } from '../../project/entities';
-import { RegionEntity } from '../../region/entities';
-import { RoleTypeEntity } from '../../role-type/entities';
-import { SpaceEntity } from '../../space/entities/space.entity';
-import { TimeZoneEntity } from '../../timezone/entities';
-import { VisitorPasswordEntity } from '../../visitor-password/entities';
 import {
   UserDto,
   UserNotificationDto,
   UserOtpDto,
   UserSpaceDto,
 } from '../dtos';
-import { BookingEntity } from '../../booking/entities/booking.entity';
+import { AbstractEntity } from '../../abstract/entities/abstract.entity';
+import {
+  DeviceNotificationEntity,
+  DeviceUserPermissionEntity,
+} from '../../device/entities';
+import { defaultProfilePicture } from '@app/common/constants/default.profile.picture';
+import { RegionEntity } from '../../region/entities';
+import { TimeZoneEntity } from '../../timezone/entities';
+import { OtpType } from '../../../../src/constants/otp-type.enum';
+import { RoleTypeEntity } from '../../role-type/entities';
+import { VisitorPasswordEntity } from '../../visitor-password/entities';
+import { InviteUserEntity } from '../../Invite-user/entities';
+import { ProjectEntity } from '../../project/entities';
+import { SpaceEntity } from '../../space/entities/space.entity';
+import { ClientEntity } from '../../client/entities';
 
 @Entity({ name: 'user' })
 export class UserEntity extends AbstractEntity<UserDto> {
@@ -83,12 +82,6 @@ export class UserEntity extends AbstractEntity<UserDto> {
   })
   public isActive: boolean;
 
-  @Column({
-    nullable: true,
-    type: Number,
-  })
-  public bookingPoints?: number;
-
   @Column({ default: false })
   hasAcceptedWebAgreement: boolean;
 
@@ -101,9 +94,7 @@ export class UserEntity extends AbstractEntity<UserDto> {
   @Column({ type: 'timestamp', nullable: true })
   appAgreementAcceptedAt: Date;
 
-  @OneToMany(() => UserSpaceEntity, (userSpace) => userSpace.user, {
-    onDelete: 'CASCADE',
-  })
+  @OneToMany(() => UserSpaceEntity, (userSpace) => userSpace.user)
   userSpaces: UserSpaceEntity[];
 
   @OneToMany(
@@ -122,9 +113,6 @@ export class UserEntity extends AbstractEntity<UserDto> {
   )
   deviceUserNotification: DeviceNotificationEntity[];
 
-  @OneToMany(() => BookingEntity, (booking) => booking.user)
-  bookings: BookingEntity[];
-
   @ManyToOne(() => RegionEntity, (region) => region.users, { nullable: true })
   region: RegionEntity;
   @ManyToOne(() => TimeZoneEntity, (timezone) => timezone.users, {
@@ -170,7 +158,6 @@ export class UserEntity extends AbstractEntity<UserDto> {
 export class UserNotificationEntity extends AbstractEntity<UserNotificationDto> {
   @ManyToOne(() => UserEntity, (user) => user.roleType, {
     nullable: false,
-    onDelete: 'CASCADE',
   })
   user: UserEntity;
   @Column({
@@ -232,10 +219,7 @@ export class UserSpaceEntity extends AbstractEntity<UserSpaceDto> {
   })
   public uuid: string;
 
-  @ManyToOne(() => UserEntity, (user) => user.userSpaces, {
-    nullable: false,
-    onDelete: 'CASCADE',
-  })
+  @ManyToOne(() => UserEntity, (user) => user.userSpaces, { nullable: false })
   user: UserEntity;
 
   @ManyToOne(() => SpaceEntity, (space) => space.userSpaces, {

libs/common/src/modules/visitor-password/entities/visitor-password.entity.ts

@@ -1,7 +1,7 @@
-import { Column, Entity, Index, JoinColumn, ManyToOne } from 'typeorm';
+import { Column, Entity, ManyToOne, JoinColumn, Index } from 'typeorm';
+import { VisitorPasswordDto } from '../dtos';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
 import { UserEntity } from '../../user/entities/user.entity';
-import { VisitorPasswordDto } from '../dtos';
 
 @Entity({ name: 'visitor-password' })
 @Index('IDX_PASSWORD_TUYA_UUID', ['passwordTuyaUuid'])
@@ -14,7 +14,6 @@ export class VisitorPasswordEntity extends AbstractEntity<VisitorPasswordDto> {
 
   @ManyToOne(() => UserEntity, (user) => user.visitorPasswords, {
     nullable: false,
-    onDelete: 'CASCADE',
   })
   @JoinColumn({ name: 'authorizer_uuid' })
   public user: UserEntity;

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_insert_all_daily_spacy_occupancy_duration.sql

@@ -13,81 +13,142 @@ WITH presence_logs AS (
     AND p.cat_name = 'hps'
 ),
 
--- Intervals when device was in 'presence' (between prev_time and event_time when value='none')
-presence_intervals AS (
+raw_absence_intervals AS (
   SELECT 
     space_id,
+    device_id,
     prev_time AS start_time,
     event_time AS end_time
   FROM presence_logs
-  WHERE value = 'none' 
-    AND prev_value = 'presence'
-    AND prev_time IS NOT NULL
+  WHERE prev_value = 'none' AND prev_time IS NOT NULL
 ),
 
--- Split intervals across days
-split_intervals AS (
+absence_intervals AS (
+  SELECT
+    r.space_id,
+    r.device_id,
+    gs.day,
+    GREATEST(r.start_time, gs.day) AS start_time,
+    LEAST(r.end_time, gs.day + INTERVAL '1 day') AS end_time
+  FROM raw_absence_intervals r
+  CROSS JOIN LATERAL (
+    SELECT generate_series(
+      date_trunc('day', r.start_time),
+      date_trunc('day', r.end_time),
+      INTERVAL '1 day'
+    ) AS day
+  ) gs
+  WHERE GREATEST(r.start_time, gs.day) < LEAST(r.end_time, gs.day + INTERVAL '1 day')
+),
+
+device_counts AS (
+  SELECT space_id, day, COUNT(DISTINCT device_id) AS device_count
+  FROM absence_intervals
+  GROUP BY 1, 2
+),
+
+timeline AS (
+  SELECT 
+    a.space_id,
+    a.day,
+    a.device_id,
+    a.start_time AS ts,
+    1 AS is_start
+  FROM absence_intervals a
+  UNION ALL
+  SELECT 
+    a.space_id,
+    a.day,
+    a.device_id,
+    a.end_time AS ts,
+    0 AS is_start
+  FROM absence_intervals a
+),
+
+ordered_events AS (
   SELECT 
     space_id,
-    generate_series(
-      date_trunc('day', start_time),
-      date_trunc('day', end_time),
-      interval '1 day'
-    )::date AS event_date,
-    GREATEST(start_time, date_trunc('day', start_time)) AS interval_start,
-    LEAST(end_time, date_trunc('day', end_time) + interval '1 day') AS interval_end
-  FROM presence_intervals
+    day,
+    ts,
+    is_start,
+    device_id,
+    SUM(CASE WHEN is_start = 1 THEN 1 ELSE -1 END) 
+      OVER (PARTITION BY space_id, day, device_id ORDER BY ts) AS device_active
+  FROM timeline
 ),
 
--- Mark and group overlapping intervals per space per day
-ordered_intervals AS (
-  SELECT 
-    space_id,
-    event_date,
-    interval_start,
-    interval_end,
-    LAG(interval_end) OVER (PARTITION BY space_id, event_date ORDER BY interval_start) AS prev_end
-  FROM split_intervals
-),
-
-grouped_intervals AS (
-  SELECT *,
-    SUM(CASE 
-          WHEN prev_end IS NULL OR interval_start > prev_end THEN 1 
-          ELSE 0 
-        END) OVER (PARTITION BY space_id, event_date ORDER BY interval_start) AS grp
-  FROM ordered_intervals
-),
-
--- Merge overlapping intervals per group
-merged_intervals AS (
-  SELECT 
-    space_id,
-    event_date,
-    MIN(interval_start) AS merged_start,
-    MAX(interval_end) AS merged_end
-  FROM grouped_intervals
-  GROUP BY space_id, event_date, grp
-),
-
--- Sum durations of merged intervals
-summed_intervals AS (
+device_state_changes AS (
   SELECT
     space_id,
-    event_date,
-    SUM(EXTRACT(EPOCH FROM (merged_end - merged_start))) AS raw_occupied_seconds
-  FROM merged_intervals
-  GROUP BY space_id, event_date
-  ),
+    day,
+    ts,
+    SUM(CASE WHEN is_start = 1 THEN 1 ELSE -1 END) 
+      OVER (PARTITION BY space_id, day ORDER BY ts) AS net_active_devices
+  FROM (
+    SELECT DISTINCT space_id, day, ts, is_start
+    FROM timeline
+  ) t
+),
 
-final_data AS (
+absence_windows AS (
+  SELECT 
+    dc.space_id,
+    dc.day,
+    ts AS start_time,
+    LEAD(ts) OVER (PARTITION BY dc.space_id, dc.day ORDER BY ts) AS end_time
+  FROM device_state_changes dsc
+  JOIN device_counts dc ON dc.space_id = dsc.space_id AND dc.day = dsc.day
+  WHERE net_active_devices = 0
+),
+
+empty_periods AS (
+  SELECT
+    space_id,
+    day,
+    EXTRACT(EPOCH FROM (end_time - start_time)) AS unoccupied_seconds
+  FROM absence_windows
+  WHERE end_time IS NOT NULL
+),
+
+unoccupied_summary AS (
+  SELECT
+    space_id,
+    day,
+    SUM(unoccupied_seconds) AS total_unoccupied_seconds
+  FROM empty_periods
+  GROUP BY space_id, day
+),
+
+-- Include device count even for days with 0 unoccupied time
+all_days_with_devices AS (
+  SELECT 
+    space_id, 
+    DATE(event_time) AS day, 
+    COUNT(DISTINCT device_id) AS device_count
+  FROM presence_logs
+  GROUP BY 1, 2
+),
+
+final_occupancy AS (
+  SELECT 
+    d.space_id,
+    d.day,
+    d.device_count,
+    COALESCE(u.total_unoccupied_seconds, 0) AS unoccupied_seconds,
+    86400 - COALESCE(u.total_unoccupied_seconds, 0) AS occupied_seconds
+  FROM all_days_with_devices d
+  LEFT JOIN unoccupied_summary u 
+    ON d.space_id = u.space_id AND d.day = u.day
+)
+, final_data as (
 SELECT 
   space_id,
-  event_date,
-  LEAST(raw_occupied_seconds, 86400) AS occupied_seconds,
-  ROUND(LEAST(raw_occupied_seconds, 86400) / 86400.0 * 100, 2) AS occupancy_percentage
-FROM summed_intervals
-ORDER BY space_id, event_date)
+  day,
+  device_count,
+  occupied_seconds,
+  ROUND(occupied_seconds / 86400.0 * 100, 2) AS occupancy_percentage
+FROM final_occupancy
+ORDER BY space_id, day)
 
 
 INSERT INTO public."space-daily-occupancy-duration" (

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 (
@@ -9,7 +10,8 @@ presence_logs AS (
     l.device_id,
     l.event_time,
     l.value,
-    LAG(l.event_time) OVER (PARTITION BY l.device_id ORDER BY l.event_time) AS prev_time
+    LAG(l.event_time) OVER (PARTITION BY l.device_id ORDER BY l.event_time) AS prev_time,
+    LAG(l.value) OVER (PARTITION BY l.device_id ORDER BY l.event_time) AS prev_value 
   FROM device d
   JOIN "device-status-log" l ON d.uuid = l.device_id
   JOIN product p ON p.uuid = d.product_device_uuid
@@ -17,76 +19,147 @@ presence_logs AS (
     AND p.cat_name = 'hps'
 ),
 
-presence_intervals AS (
+raw_absence_intervals AS (
   SELECT 
     space_id,
+    device_id,
     prev_time AS start_time,
     event_time AS end_time
   FROM presence_logs
-  WHERE value = 'none' AND prev_time IS NOT NULL
+  WHERE prev_value = 'none' AND prev_time IS NOT NULL
 ),
 
-split_intervals AS (
+absence_intervals AS (
+  SELECT
+    r.space_id,
+    r.device_id,
+    gs.day,
+    GREATEST(r.start_time, gs.day) AS start_time,
+    LEAST(r.end_time, gs.day + INTERVAL '1 day') AS end_time
+  FROM raw_absence_intervals r
+  CROSS JOIN LATERAL (
+    SELECT generate_series(
+      date_trunc('day', r.start_time),
+      date_trunc('day', r.end_time),
+      INTERVAL '1 day'
+    ) AS day
+  ) gs
+  WHERE GREATEST(r.start_time, gs.day) < LEAST(r.end_time, gs.day + INTERVAL '1 day')
+),
+
+device_counts AS (
+  SELECT space_id, day, COUNT(DISTINCT device_id) AS device_count
+  FROM absence_intervals
+  GROUP BY 1, 2
+),
+
+timeline AS (
+  SELECT 
+    a.space_id,
+    a.day,
+    a.device_id,
+    a.start_time AS ts,
+    1 AS is_start
+  FROM absence_intervals a
+  UNION ALL
+  SELECT 
+    a.space_id,
+    a.day,
+    a.device_id,
+    a.end_time AS ts,
+    0 AS is_start
+  FROM absence_intervals a
+),
+
+ordered_events AS (
   SELECT 
     space_id,
-    generate_series(
-      date_trunc('day', start_time),
-      date_trunc('day', end_time),
-      interval '1 day'
-    )::date AS event_date,
-    GREATEST(start_time, date_trunc('day', start_time)) AS interval_start,
-    LEAST(end_time, date_trunc('day', end_time) + INTERVAL '1 day') AS interval_end
-  FROM presence_intervals
+    day,
+    ts,
+    is_start,
+    device_id,
+    SUM(CASE WHEN is_start = 1 THEN 1 ELSE -1 END) 
+      OVER (PARTITION BY space_id, day, device_id ORDER BY ts) AS device_active
+  FROM timeline
 ),
 
-ordered_intervals AS (
-  SELECT 
-    space_id,
-    event_date,
-    interval_start,
-    interval_end,
-    LAG(interval_end) OVER (PARTITION BY space_id, event_date ORDER BY interval_start) AS prev_end
-  FROM split_intervals
-),
-
-grouped_intervals AS (
-  SELECT *,
-    SUM(CASE 
-          WHEN prev_end IS NULL OR interval_start > prev_end THEN 1 
-          ELSE 0 
-        END) OVER (PARTITION BY space_id, event_date ORDER BY interval_start) AS grp
-  FROM ordered_intervals
-),
-
-merged_intervals AS (
-  SELECT 
-    space_id,
-    event_date,
-    MIN(interval_start) AS merged_start,
-    MAX(interval_end) AS merged_end
-  FROM grouped_intervals
-  GROUP BY space_id, event_date, grp
-),
-
-summed_intervals AS (
+device_state_changes AS (
   SELECT
     space_id,
-    event_date,
-    SUM(EXTRACT(EPOCH FROM (merged_end - merged_start))) AS raw_occupied_seconds
-  FROM merged_intervals
-  GROUP BY space_id, event_date
+    day,
+    ts,
+    SUM(CASE WHEN is_start = 1 THEN 1 ELSE -1 END) 
+      OVER (PARTITION BY space_id, day ORDER BY ts) AS net_active_devices
+  FROM (
+    SELECT DISTINCT space_id, day, ts, is_start
+    FROM timeline
+  ) t
 ),
 
-final_data AS (
+absence_windows AS (
   SELECT 
-    s.space_id,
-    s.event_date,
-    LEAST(raw_occupied_seconds, 86400) AS occupied_seconds,
-    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
-)
+    dc.space_id,
+    dc.day,
+    ts AS start_time,
+    LEAD(ts) OVER (PARTITION BY dc.space_id, dc.day ORDER BY ts) AS end_time
+  FROM device_state_changes dsc
+  JOIN device_counts dc ON dc.space_id = dsc.space_id AND dc.day = dsc.day
+  WHERE net_active_devices = 0
+),
+
+empty_periods AS (
+  SELECT
+    space_id,
+    day,
+    EXTRACT(EPOCH FROM (end_time - start_time)) AS unoccupied_seconds
+  FROM absence_windows
+  WHERE end_time IS NOT NULL
+),
+
+unoccupied_summary AS (
+  SELECT
+    space_id,
+    day,
+    SUM(unoccupied_seconds) AS total_unoccupied_seconds
+  FROM empty_periods
+  GROUP BY space_id, day
+),
+
+-- Include device count even for days with 0 unoccupied time
+all_days_with_devices AS (
+  SELECT 
+    space_id, 
+    DATE(event_time) AS day, 
+    COUNT(DISTINCT device_id) AS device_count
+  FROM presence_logs
+  GROUP BY 1, 2
+),
+
+final_occupancy AS (
+  SELECT 
+    d.space_id,
+    d.day,
+    d.device_count,
+    COALESCE(u.total_unoccupied_seconds, 0) AS unoccupied_seconds,
+    86400 - COALESCE(u.total_unoccupied_seconds, 0) AS occupied_seconds
+  FROM all_days_with_devices d
+  LEFT JOIN unoccupied_summary u 
+    ON d.space_id = u.space_id AND d.day = u.day
+),
+
+final_data as(
+SELECT 
+  space_id,
+  day,
+  device_count,
+  occupied_seconds,
+  ROUND(occupied_seconds / 86400.0 * 100, 2) AS occupancy_percentage
+FROM final_occupancy s
+JOIN params p 
+    ON p.space_id = s.space_id 
+   AND p.event_date = s.event_date
+ORDER BY space_id, DAY)
+
 
 INSERT INTO public."space-daily-occupancy-duration" (
 	space_uuid,	

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

@@ -1,6 +1,7 @@
 WITH params AS (
     SELECT 
-        $1::date AS target_date
+        $1::uuid AS device_id,
+        $2::date AS target_date
 ),
 total_energy AS (
     SELECT 
@@ -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 
-        $1::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,6 +1,7 @@
 WITH params AS (
     SELECT 
-        $1::text AS target_month  -- Format should match 'MM-YYYY'
+        $1::uuid AS device_id,
+        $2::text AS target_month  -- Format should match 'MM-YYYY'
 ),
 total_energy AS (
     SELECT 
@@ -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/proceduce_select_fact_space_occupancy.sql

@@ -12,4 +12,8 @@ AND (
   P.event_year IS NULL 
   OR TO_CHAR(psdsd.event_date, 'YYYY') = TO_CHAR(P.event_year, 'YYYY')
 )
-ORDER BY space_uuid, event_date
+ORDER BY space_uuid, event_date
+
+
+
+

libs/common/src/sql/procedures/fact_space_occupancy_count/procedure_update_fact_space_occupancy.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
 ),
 
 device_logs AS (
@@ -86,7 +87,8 @@ SELECT summary.space_id,
        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)
+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)
 
 

libs/common/src/sql/queries/fact_daily_space_presence_duration/fact_daily_space_presence_duration.sql

@@ -13,78 +13,156 @@ WITH presence_logs AS (
     AND p.cat_name = 'hps'
 ),
 
--- Intervals when device was in 'presence' (between prev_time and event_time when value='none')
-presence_intervals AS (
+-- Intervals when device was in 'absence' (between prev_time and event_time when value='none')
+raw_absence_intervals AS (
   SELECT 
     space_id,
+    device_id,
     prev_time AS start_time,
     event_time AS end_time
   FROM presence_logs
-  WHERE value = 'none' 
-    AND prev_value = 'presence'
+  WHERE value <> 'none' 
+    AND prev_value = 'none'
     AND prev_time IS NOT NULL
 ),
 
--- Split intervals across days
-split_intervals AS (
+-- Split intervals that span multiple days into day-specific chunks
+absence_intervals AS (
+  SELECT
+    r.space_id,
+    r.device_id,
+    GREATEST(r.start_time, gs.day::timestamp) AS start_time,
+    LEAST(r.end_time, (gs.day + INTERVAL '1 day' - INTERVAL '1 second')::timestamp) AS end_time
+  FROM raw_absence_intervals r
+  CROSS JOIN LATERAL (
+    SELECT generate_series(
+      date_trunc('day', r.start_time),
+      date_trunc('day', r.end_time),
+      INTERVAL '1 day'
+    ) AS day
+  ) gs
+  WHERE GREATEST(r.start_time, gs.day::timestamp) < LEAST(r.end_time, (gs.day + INTERVAL '1 day')::timestamp)
+),
+
+-- FIXED: Count devices based on presence_logs OR absence_intervals
+devices_per_day AS (
   SELECT 
     space_id,
-    generate_series(
-      date_trunc('day', start_time),
-      date_trunc('day', end_time),
-      interval '1 day'
-    )::date AS event_date,
-    GREATEST(start_time, date_trunc('day', start_time)) AS interval_start,
-    LEAST(end_time, date_trunc('day', end_time) + interval '1 day') AS interval_end
-  FROM presence_intervals
+    day,
+    COUNT(DISTINCT device_id) AS device_count
+  FROM (
+    -- Devices that logged events on that day
+    SELECT space_id, DATE(event_time) AS day, device_id
+    FROM presence_logs
+    
+    UNION
+    
+    -- Devices that had absence intervals on that day
+    SELECT space_id, DATE(start_time) AS day, device_id
+    FROM absence_intervals
+  ) combined
+  GROUP BY space_id, day
 ),
 
--- Mark and group overlapping intervals per space per day
-ordered_intervals AS (
-  SELECT 
-    space_id,
-    event_date,
-    interval_start,
-    interval_end,
-    LAG(interval_end) OVER (PARTITION BY space_id, event_date ORDER BY interval_start) AS prev_end
-  FROM split_intervals
-),
 
-grouped_intervals AS (
-  SELECT *,
-    SUM(CASE 
-          WHEN prev_end IS NULL OR interval_start > prev_end THEN 1 
-          ELSE 0 
-        END) OVER (PARTITION BY space_id, event_date ORDER BY interval_start) AS grp
-  FROM ordered_intervals
-),
-
--- Merge overlapping intervals per group
-merged_intervals AS (
-  SELECT 
-    space_id,
-    event_date,
-    MIN(interval_start) AS merged_start,
-    MAX(interval_end) AS merged_end
-  FROM grouped_intervals
-  GROUP BY space_id, event_date, grp
-),
-
--- Sum durations of merged intervals
-summed_intervals AS (
+-- For multi-device spaces, find all time periods when ALL devices were absent
+multi_device_unoccupied AS (
+  WITH device_absence_per_day AS (
+    SELECT
+      a.space_id,
+      DATE(a.start_time) AS day,
+      a.device_id,
+      a.start_time,
+      a.end_time,
+      d.device_count
+    FROM absence_intervals a
+    JOIN devices_per_day d ON a.space_id = d.space_id AND DATE(a.start_time) = d.day
+    WHERE d.device_count > 1
+  ),
+  -- Generate time slots for each day with multiple devices
+  time_ranges AS (
+    SELECT
+      space_id,
+      day,
+      day::timestamp AS range_start,
+      (day + INTERVAL '1 day')::timestamp AS range_end,
+      device_count
+    FROM devices_per_day
+    WHERE device_count > 1
+  ),
+  
+  -- Find all time periods when all devices were absent
+  all_devices_absent AS (
+    SELECT
+      t.space_id,
+      t.day,
+      t.range_start,
+      t.range_end,
+      t.device_count,
+      -- Find the latest start time of all devices' absence intervals
+      MAX(a.start_time) OVER (PARTITION BY t.space_id, t.day) AS max_start_time,
+      -- Find the earliest end time of all devices' absence intervals
+      MIN(a.end_time) OVER (PARTITION BY t.space_id, t.day) AS min_end_time
+    FROM time_ranges t
+    LEFT JOIN device_absence_per_day a ON 
+      t.space_id = a.space_id AND 
+      t.day = a.day
+    GROUP BY t.space_id, t.day, t.range_start, t.range_end, t.device_count, a.start_time, a.end_time
+  )
+  
+  -- Calculate total unoccupied seconds when all devices were absent
   SELECT
     space_id,
-    event_date,
-    SUM(EXTRACT(EPOCH FROM (merged_end - merged_start))) AS raw_occupied_seconds
-  FROM merged_intervals
-  GROUP BY space_id, event_date
+    day,
+    CASE
+      WHEN max_start_time IS NULL OR min_end_time IS NULL THEN 0
+      WHEN max_start_time >= min_end_time THEN 0
+      ELSE EXTRACT(EPOCH FROM (LEAST(min_end_time, range_end) - GREATEST(max_start_time, range_start)))
+    END AS unoccupied_seconds
+  FROM all_devices_absent
+  GROUP BY space_id, day, range_start, range_end, device_count, max_start_time, min_end_time
+  HAVING COUNT(*) = device_count  -- Only include periods when all devices were absent
+)
+,
+
+-- Calculate unoccupied time for spaces with single device reporting
+single_device_unoccupied AS (
+  SELECT
+    a.space_id,
+    DATE(a.start_time) AS day,
+    SUM(EXTRACT(EPOCH FROM (a.end_time - a.start_time))) AS unoccupied_seconds
+  FROM absence_intervals a
+  JOIN devices_per_day d ON a.space_id = d.space_id AND DATE(a.start_time) = d.day
+  WHERE d.device_count = 1
+  GROUP BY a.space_id, DATE(a.start_time)
+)
+,
+
+-- Combine results from both single and multi-device cases
+combined_unoccupied AS (
+  SELECT space_id, day, unoccupied_seconds FROM single_device_unoccupied
+  UNION ALL
+  SELECT space_id, day, unoccupied_seconds FROM multi_device_unoccupied
+), 
+
+-- Calculate total occupied time per space per day
+daily_occupancy AS (
+  SELECT
+    space_id,
+    day,
+    -- Total seconds in day (86400) minus unoccupied seconds
+    86400 - COALESCE(SUM(unoccupied_seconds), 0) AS occupied_seconds
+  FROM combined_unoccupied
+  GROUP BY space_id, day
 )
 
--- Final output with capped seconds and percentage
+-- Final result
 SELECT 
   space_id,
-  event_date,
-  LEAST(raw_occupied_seconds, 86400) AS occupied_seconds,
-  ROUND(LEAST(raw_occupied_seconds, 86400) / 86400.0 * 100, 2) AS occupancy_percentage
-FROM summed_intervals
-ORDER BY space_id, event_date;
+  day,
+  occupied_seconds,
+  -- Also include percentage for convenience
+  ROUND((occupied_seconds / 86400.0) * 100, 2) AS occupancy_percentage
+FROM daily_occupancy
+ORDER BY space_id, day;
+

libs/common/src/util/email.service.ts

@@ -1,17 +1,15 @@
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import axios from 'axios';
 import * as nodemailer from 'nodemailer';
-import Mail from 'nodemailer/lib/mailer';
-import { BatchEmailData } from './batch-email.interface';
-import { SingleEmailData } from './single-email.interface';
+import axios from 'axios';
+import {
+  SEND_EMAIL_API_URL_DEV,
+  SEND_EMAIL_API_URL_PROD,
+} from '../constants/mail-trap';
 
 @Injectable()
 export class EmailService {
   private smtpConfig: any;
-  private API_TOKEN: string;
-  private SEND_EMAIL_API_URL: string;
-  private BATCH_EMAIL_API_URL: string;
 
   constructor(private readonly configService: ConfigService) {
     this.smtpConfig = {
@@ -24,15 +22,6 @@ export class EmailService {
         pass: this.configService.get<string>('email-config.SMTP_PASSWORD'),
       },
     };
-    this.API_TOKEN = this.configService.get<string>(
-      'email-config.MAILTRAP_API_TOKEN',
-    );
-    this.SEND_EMAIL_API_URL = this.configService.get<string>(
-      'email-config.SEND_EMAIL_API_URL',
-    );
-    this.BATCH_EMAIL_API_URL = this.configService.get<string>(
-      'email-config.BATCH_EMAIL_API_URL',
-    );
   }
 
   async sendEmail(
@@ -42,7 +31,7 @@ export class EmailService {
   ): Promise<void> {
     const transporter = nodemailer.createTransport(this.smtpConfig);
 
-    const mailOptions: Mail.Options = {
+    const mailOptions = {
       from: this.smtpConfig.sender,
       to: email,
       subject,
@@ -55,6 +44,13 @@ export class EmailService {
     email: string,
     emailInvitationData: any,
   ): Promise<void> {
+    const isProduction = process.env.NODE_ENV === 'production';
+    const API_TOKEN = this.configService.get<string>(
+      'email-config.MAILTRAP_API_TOKEN',
+    );
+    const API_URL = isProduction
+      ? SEND_EMAIL_API_URL_PROD
+      : SEND_EMAIL_API_URL_DEV;
     const TEMPLATE_UUID = this.configService.get<string>(
       'email-config.MAILTRAP_INVITATION_TEMPLATE_UUID',
     );
@@ -72,23 +68,35 @@ export class EmailService {
       template_variables: emailInvitationData,
     };
 
-    return this.sendEmailWithTemplateV2({
-      ...emailData,
-      isBatch: false,
-    });
+    try {
+      await axios.post(API_URL, emailData, {
+        headers: {
+          Authorization: `Bearer ${API_TOKEN}`,
+          'Content-Type': 'application/json',
+        },
+      });
+    } catch (error) {
+      throw new HttpException(
+        error.response?.data?.message ||
+          'Error sending email using Mailtrap template',
+        error.response?.status || HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
   }
+  async sendEmailWithTemplate(
+    email: string,
+    name: string,
+    isEnable: boolean,
+    isDelete: boolean,
+  ): Promise<void> {
+    const isProduction = process.env.NODE_ENV === 'production';
+    const API_TOKEN = this.configService.get<string>(
+      'email-config.MAILTRAP_API_TOKEN',
+    );
+    const API_URL = isProduction
+      ? SEND_EMAIL_API_URL_PROD
+      : SEND_EMAIL_API_URL_DEV;
 
-  async sendEmailWithTemplate({
-    email,
-    name,
-    isEnable,
-    isDelete,
-  }: {
-    email: string;
-    name: string;
-    isEnable: boolean;
-    isDelete: boolean;
-  }): Promise<void> {
     // Determine the template UUID based on the arguments
     const templateUuid = isDelete
       ? this.configService.get<string>(
@@ -115,16 +123,32 @@ export class EmailService {
       },
     };
 
-    return this.sendEmailWithTemplateV2({
-      ...emailData,
-      isBatch: false,
-    });
+    try {
+      await axios.post(API_URL, emailData, {
+        headers: {
+          Authorization: `Bearer ${API_TOKEN}`,
+          'Content-Type': 'application/json',
+        },
+      });
+    } catch (error) {
+      throw new HttpException(
+        error.response?.data?.message ||
+          'Error sending email using Mailtrap template',
+        error.response?.status || HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
   }
-
   async sendEditUserEmailWithTemplate(
     email: string,
     emailEditData: any,
   ): Promise<void> {
+    const isProduction = process.env.NODE_ENV === 'production';
+    const API_TOKEN = this.configService.get<string>(
+      'email-config.MAILTRAP_API_TOKEN',
+    );
+    const API_URL = isProduction
+      ? SEND_EMAIL_API_URL_PROD
+      : SEND_EMAIL_API_URL_DEV;
     const TEMPLATE_UUID = this.configService.get<string>(
       'email-config.MAILTRAP_EDIT_USER_TEMPLATE_UUID',
     );
@@ -142,15 +166,32 @@ export class EmailService {
       template_variables: emailEditData,
     };
 
-    return this.sendEmailWithTemplateV2({
-      ...emailData,
-      isBatch: false,
-    });
+    try {
+      await axios.post(API_URL, emailData, {
+        headers: {
+          Authorization: `Bearer ${API_TOKEN}`,
+          'Content-Type': 'application/json',
+        },
+      });
+    } catch (error) {
+      throw new HttpException(
+        error.response?.data?.message ||
+          'Error sending email using Mailtrap template',
+        error.response?.status || HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
   }
   async sendOtpEmailWithTemplate(
     email: string,
     emailEditData: any,
   ): Promise<void> {
+    const isProduction = process.env.NODE_ENV === 'production';
+    const API_TOKEN = this.configService.get<string>(
+      'email-config.MAILTRAP_API_TOKEN',
+    );
+    const API_URL = isProduction
+      ? SEND_EMAIL_API_URL_PROD
+      : SEND_EMAIL_API_URL_DEV;
     const TEMPLATE_UUID = this.configService.get<string>(
       'email-config.MAILTRAP_SEND_OTP_TEMPLATE_UUID',
     );
@@ -168,84 +209,20 @@ export class EmailService {
       template_variables: emailEditData,
     };
 
-    return this.sendEmailWithTemplateV2({
-      ...emailData,
-      isBatch: false,
-    });
-  }
-
-  async sendUpdateBookingTimingEmailWithTemplate(
-    emails: {
-      email: string;
-      name: string;
-      bookings: {
-        date: string;
-        start_time: string;
-        end_time: string;
-      }[];
-    }[],
-    emailVariables: {
-      space_name: string;
-      days: string;
-      start_time: string;
-      end_time: string;
-    },
-  ): Promise<void> {
-    const TEMPLATE_UUID = this.configService.get<string>(
-      'email-config.MAILTRAP_SEND_BOOKING_TIMING_UPDATE_TEMPLATE_UUID',
-    );
-
-    const emailData = {
-      base: {
-        from: {
-          email: this.smtpConfig.sender,
+    try {
+      await axios.post(API_URL, emailData, {
+        headers: {
+          Authorization: `Bearer ${API_TOKEN}`,
+          'Content-Type': 'application/json',
         },
-        template_uuid: TEMPLATE_UUID,
-      },
-      requests: emails.map(({ email, name, bookings }) => ({
-        to: [{ email }],
-        template_variables: { ...emailVariables, name, bookings },
-      })),
-    };
-
-    return this.sendEmailWithTemplateV2({
-      ...emailData,
-      isBatch: true,
-    });
-  }
-
-  async sendUpdateBookingAvailabilityEmailWithTemplate(
-    emails: { email: string; name: string }[],
-    emailVariables: {
-      space_name: string;
-      availability: string;
-      isAvailable: boolean;
-    },
-  ): Promise<void> {
-    const TEMPLATE_UUID = this.configService.get<string>(
-      'email-config.MAILTRAP_SEND_BOOKING_AVAILABILITY_UPDATE_TEMPLATE_UUID',
-    );
-
-    const emailData = {
-      base: {
-        from: {
-          email: this.smtpConfig.sender,
-        },
-        template_uuid: TEMPLATE_UUID,
-      },
-      requests: emails.map(({ email, name }) => ({
-        to: [{ email }],
-        template_variables: {
-          ...emailVariables,
-          name,
-        },
-      })),
-    };
-
-    return this.sendEmailWithTemplateV2({
-      ...emailData,
-      isBatch: true,
-    });
+      });
+    } catch (error) {
+      throw new HttpException(
+        error.response?.data?.message ||
+          'Error sending email using Mailtrap template',
+        error.response?.status || HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
   }
   generateUserChangesEmailBody(
     addedSpaceNames: string[],
@@ -282,30 +259,4 @@ export class EmailService {
       nameChanged,
     };
   }
-
-  private async sendEmailWithTemplateV2({
-    isBatch,
-    ...emailData
-  }: BatchEmailData | SingleEmailData): Promise<void> {
-    try {
-      await axios.post(
-        isBatch ? this.BATCH_EMAIL_API_URL : this.SEND_EMAIL_API_URL,
-        {
-          ...emailData,
-        },
-        {
-          headers: {
-            Authorization: `Bearer ${this.API_TOKEN}`,
-            'Content-Type': 'application/json',
-          },
-        },
-      );
-    } catch (error) {
-      throw new HttpException(
-        error.response?.data?.message ||
-          'Error sending email using Mailtrap template',
-        error.response?.status || HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
 }

libs/common/src/util/email/batch-email.interface.ts

@@ -1,8 +0,0 @@
-export interface BatchEmailData {
-  base: { from: { email: string }; template_uuid: string };
-  requests: Array<{
-    to: { email: string }[];
-    template_variables: Record<string, any>;
-  }>;
-  isBatch: true;
-}

libs/common/src/util/email/single-email.interface.ts

@@ -1,7 +0,0 @@
-export interface SingleEmailData {
-  from: { email: string };
-  to: { email: string }[];
-  template_uuid: string;
-  template_variables?: Record<string, any>;
-  isBatch: false;
-}

libs/common/src/util/time-to-12-hours-convetion.ts

@@ -1,7 +0,0 @@
-import { format, parse } from 'date-fns';
-
-export function to12HourFormat(timeString: string): string {
-  timeString = timeString.padEnd(8, ':00');
-  const parsedTime = parse(timeString, 'HH:mm:ss', new Date());
-  return format(parsedTime, 'hh:mm a');
-}

package.json

@@ -10,7 +10,6 @@
     "format": "prettier --write \"apps/**/*.ts\" \"libs/**/*.ts\"",
     "start": "npm run test && node dist/main",
     "start:dev": "npm run test && npx nest start --watch",
-    "dev": "npx nest start --watch",
     "start:debug": "npm run test && npx nest start --debug --watch",
     "start:prod": "npm run test && node dist/main",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
@@ -30,7 +29,6 @@
     "@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",
@@ -44,7 +42,6 @@
     "class-validator": "^0.14.1",
     "crypto-js": "^4.2.0",
     "csv-parser": "^3.2.0",
-    "date-fns": "^4.1.0",
     "express-rate-limit": "^7.1.5",
     "firebase": "^10.12.5",
     "google-auth-library": "^9.14.1",
@@ -52,15 +49,13 @@
     "ioredis": "^5.3.2",
     "morgan": "^1.10.0",
     "nest-winston": "^1.10.2",
-    "node-cache": "^5.1.2",
-    "nodemailer": "^7.0.5",
+    "nodemailer": "^6.9.10",
     "onesignal-node": "^3.4.0",
     "passport-jwt": "^4.0.1",
     "pg": "^8.11.3",
-    "reflect-metadata": "^0.2.2",
+    "reflect-metadata": "^0.2.0",
     "rxjs": "^7.8.1",
     "typeorm": "^0.3.20",
-    "uuid": "^11.1.0",
     "winston": "^3.17.0",
     "ws": "^8.17.0"
   },
@@ -74,7 +69,6 @@
     "@types/jest": "^29.5.2",
     "@types/multer": "^1.4.12",
     "@types/node": "^20.3.1",
-    "@types/nodemailer": "^6.4.17",
     "@types/supertest": "^6.0.0",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
@@ -92,9 +86,5 @@
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.1.3"
-  },
-  "engines": {
-    "node": "20.x",
-    "npm": "10.x"
   }
 }

src/app.module.ts

@@ -1,67 +1,52 @@
-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 { WinstonModule } from 'nest-winston';
-import { AuthenticationModule } from './auth/auth.module';
-import { AutomationModule } from './automation/automation.module';
-import { ClientModule } from './client/client.module';
-import { DeviceCommissionModule } from './commission-device/commission-device.module';
-import { CommunityModule } from './community/community.module';
 import config from './config';
-import { DeviceMessagesSubscriptionModule } from './device-messages/device-messages.module';
-import { DeviceModule } from './device/device.module';
-import { DoorLockModule } from './door-lock/door.lock.module';
+import { AuthenticationModule } from './auth/auth.module';
+import { UserModule } from './users/user.module';
 import { GroupModule } from './group/group.module';
-import { HealthModule } from './health/health.module';
+import { DeviceModule } from './device/device.module';
+import { UserDevicePermissionModule } from './user-device-permission/user-device-permission.module';
+import { CommunityModule } from './community/community.module';
+import { SeederModule } from '@app/common/seed/seeder.module';
+import { UserNotificationModule } from './user-notification/user-notification.module';
+import { DeviceMessagesSubscriptionModule } from './device-messages/device-messages.module';
+import { SceneModule } from './scene/scene.module';
+import { DoorLockModule } from './door-lock/door.lock.module';
+import { APP_GUARD, APP_INTERCEPTOR } from '@nestjs/core';
 import { LoggingInterceptor } from './interceptors/logging.interceptor';
-import { InviteUserModule } from './invite-user/invite-user.module';
-import { PermissionModule } from './permission/permission.module';
-import { PowerClampModule } from './power-clamp/power-clamp.module';
-import { PrivacyPolicyModule } from './privacy-policy/privacy-policy.module';
+import { AutomationModule } from './automation/automation.module';
+import { RegionModule } from './region/region.module';
+import { TimeZoneModule } from './timezone/timezone.module';
+import { VisitorPasswordModule } from './vistor-password/visitor-password.module';
+import { ScheduleModule } from './schedule/schedule.module';
+import { SpaceModule } from './space/space.module';
 import { ProductModule } from './product';
 import { ProjectModule } from './project';
-import { RegionModule } from './region/region.module';
-import { RoleModule } from './role/role.module';
-import { SceneModule } from './scene/scene.module';
-import { ScheduleModule } from './schedule/schedule.module';
 import { SpaceModelModule } from './space-model';
-import { SpaceModule } from './space/space.module';
-import { TagModule } from './tags/tags.module';
+import { InviteUserModule } from './invite-user/invite-user.module';
+import { PermissionModule } from './permission/permission.module';
+import { RoleModule } from './role/role.module';
 import { TermsConditionsModule } from './terms-conditions/terms-conditions.module';
-import { TimeZoneModule } from './timezone/timezone.module';
-import { UserDevicePermissionModule } from './user-device-permission/user-device-permission.module';
-import { UserNotificationModule } from './user-notification/user-notification.module';
-import { UserModule } from './users/user.module';
-import { VisitorPasswordModule } from './vistor-password/visitor-password.module';
+import { PrivacyPolicyModule } from './privacy-policy/privacy-policy.module';
+import { TagModule } from './tags/tags.module';
+import { ClientModule } from './client/client.module';
+import { DeviceCommissionModule } from './commission-device/commission-device.module';
+import { PowerClampModule } from './power-clamp/power-clamp.module';
+import { WinstonModule } from 'nest-winston';
+import { ThrottlerGuard, ThrottlerModule } from '@nestjs/throttler';
+import { HealthModule } from './health/health.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({
-      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;
-      },
-    }),
+    /*   ThrottlerModule.forRoot({
+      throttlers: [{ ttl: 100000, limit: 30 }],
+    }), */
     WinstonModule.forRoot(winstonLoggerOptions),
     ClientModule,
     AuthenticationModule,
@@ -96,20 +81,16 @@ import { BookingModule } from './booking';
     HealthModule,
     OccupancyModule,
     WeatherModule,
-    AqiModule,
-    SchedulerModule,
-    NestScheduleModule.forRoot(),
-    BookingModule,
   ],
   providers: [
     {
       provide: APP_INTERCEPTOR,
       useClass: LoggingInterceptor,
     },
-    {
+    /*  {
       provide: APP_GUARD,
       useClass: ThrottlerGuard,
-    },
+    }, */
   ],
 })
 export class AppModule {}

src/aqi/aqi.module.ts

@@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-import { ConfigModule } from '@nestjs/config';
-import { SqlLoaderService } from '@app/common/helper/services/sql-loader.service';
-import { AqiService } from './services';
-import { AqiController } from './controllers';
-@Module({
-  imports: [ConfigModule],
-  controllers: [AqiController],
-  providers: [AqiService, SqlLoaderService],
-})
-export class AqiModule {}

src/aqi/controllers/aqi.controller.ts

@@ -1,64 +0,0 @@
-import { Controller, Get, Param, Query, UseGuards } from '@nestjs/common';
-import {
-  ApiTags,
-  ApiBearerAuth,
-  ApiOperation,
-  ApiParam,
-} from '@nestjs/swagger';
-import { EnableDisableStatusEnum } from '@app/common/constants/days.enum';
-import { ControllerRoute } from '@app/common/constants/controller-route';
-import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard';
-import { AqiService } from '../services/aqi.service';
-import {
-  GetAqiDailyBySpaceDto,
-  GetAqiPollutantBySpaceDto,
-} from '../dto/get-aqi.dto';
-import { BaseResponseDto } from '@app/common/dto/base.response.dto';
-import { SpaceParamsDto } from '../dto/aqi-params.dto';
-
-@ApiTags('AQI Module')
-@Controller({
-  version: EnableDisableStatusEnum.ENABLED,
-  path: ControllerRoute.AQI.ROUTE,
-})
-export class AqiController {
-  constructor(private readonly aqiService: AqiService) {}
-
-  @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
-  @Get('range/space/:spaceUuid')
-  @ApiOperation({
-    summary: ControllerRoute.AQI.ACTIONS.GET_AQI_RANGE_DATA_SUMMARY,
-    description: ControllerRoute.AQI.ACTIONS.GET_AQI_RANGE_DATA_DESCRIPTION,
-  })
-  @ApiParam({
-    name: 'spaceUuid',
-    description: 'UUID of the Space',
-    required: true,
-  })
-  async getAQIRangeDataBySpace(
-    @Param() params: SpaceParamsDto,
-    @Query() query: GetAqiDailyBySpaceDto,
-  ): Promise<BaseResponseDto> {
-    return await this.aqiService.getAQIRangeDataBySpace(params, query);
-  }
-  @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
-  @Get('distribution/space/:spaceUuid')
-  @ApiOperation({
-    summary: ControllerRoute.AQI.ACTIONS.GET_AQI_DISTRIBUTION_DATA_SUMMARY,
-    description:
-      ControllerRoute.AQI.ACTIONS.GET_AQI_DISTRIBUTION_DATA_DESCRIPTION,
-  })
-  @ApiParam({
-    name: 'spaceUuid',
-    description: 'UUID of the Space',
-    required: true,
-  })
-  async getAQIDistributionDataBySpace(
-    @Param() params: SpaceParamsDto,
-    @Query() query: GetAqiPollutantBySpaceDto,
-  ): Promise<BaseResponseDto> {
-    return await this.aqiService.getAQIDistributionDataBySpace(params, query);
-  }
-}

src/aqi/controllers/index.ts

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

src/aqi/dto/aqi-params.dto.ts

@@ -1,7 +0,0 @@
-import { IsNotEmpty, IsUUID } from 'class-validator';
-
-export class SpaceParamsDto {
-  @IsUUID('4', { message: 'Invalid UUID format' })
-  @IsNotEmpty()
-  spaceUuid: string;
-}

src/aqi/dto/get-aqi.dto.ts

@@ -1,37 +0,0 @@
-import { PollutantType } from '@app/common/constants/pollutants.enum';
-import { ApiProperty } from '@nestjs/swagger';
-import { Matches, IsNotEmpty, IsString } from 'class-validator';
-
-export class GetAqiDailyBySpaceDto {
-  @ApiProperty({
-    description: 'Month and year in format YYYY-MM',
-    example: '2025-03',
-    required: true,
-  })
-  @Matches(/^\d{4}-(0[1-9]|1[0-2])$/, {
-    message: 'monthDate must be in YYYY-MM format',
-  })
-  @IsNotEmpty()
-  monthDate: string;
-}
-export class GetAqiPollutantBySpaceDto {
-  @ApiProperty({
-    description: 'Pollutant Type',
-    enum: PollutantType,
-    example: PollutantType.AQI,
-    required: true,
-  })
-  @IsString()
-  @IsNotEmpty()
-  public pollutantType: string;
-  @ApiProperty({
-    description: 'Month and year in format YYYY-MM',
-    example: '2025-03',
-    required: true,
-  })
-  @Matches(/^\d{4}-(0[1-9]|1[0-2])$/, {
-    message: 'monthDate must be in YYYY-MM format',
-  })
-  @IsNotEmpty()
-  monthDate: string;
-}

src/aqi/services/aqi.service.ts

@@ -1,138 +0,0 @@
-import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
-import {
-  GetAqiDailyBySpaceDto,
-  GetAqiPollutantBySpaceDto,
-} from '../dto/get-aqi.dto';
-import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
-import { SpaceParamsDto } from '../dto/aqi-params.dto';
-import { SqlLoaderService } from '@app/common/helper/services/sql-loader.service';
-import { DataSource } from 'typeorm';
-import { SQL_PROCEDURES_PATH } from '@app/common/constants/sql-query-path';
-import { BaseResponseDto } from '@app/common/dto/base.response.dto';
-import { convertKeysToCamelCase } from '@app/common/helper/camelCaseConverter';
-import { PollutantType } from '@app/common/constants/pollutants.enum';
-
-@Injectable()
-export class AqiService {
-  constructor(
-    private readonly sqlLoader: SqlLoaderService,
-    private readonly dataSource: DataSource,
-  ) {}
-  async getAQIDistributionDataBySpace(
-    params: SpaceParamsDto,
-    query: GetAqiPollutantBySpaceDto,
-  ): Promise<BaseResponseDto> {
-    const { monthDate, pollutantType } = query;
-    const { spaceUuid } = params;
-
-    try {
-      const data = await this.executeProcedure(
-        'fact_daily_space_aqi',
-        'proceduce_select_daily_space_aqi',
-        [spaceUuid, monthDate],
-      );
-
-      const categories = [
-        'good',
-        'moderate',
-        'unhealthy_sensitive',
-        'unhealthy',
-        'very_unhealthy',
-        'hazardous',
-      ];
-
-      const transformedData = data.map((item) => {
-        const date = new Date(item.event_date).toLocaleDateString('en-CA'); // YYYY-MM-DD
-
-        const categoryData = categories.map((category) => {
-          const key = `${category}_${pollutantType.toLowerCase()}_percentage`;
-          return {
-            type: category,
-            percentage: item[key] ?? 0,
-          };
-        });
-
-        return { date, data: categoryData };
-      });
-
-      const response = this.buildResponse(
-        `AQI distribution data fetched successfully for ${spaceUuid} space and pollutant ${pollutantType}`,
-        transformedData,
-      );
-      return response;
-    } catch (error) {
-      console.error('Failed to fetch AQI distribution data', {
-        error,
-        spaceUuid,
-      });
-      throw new HttpException(
-        error.response?.message || 'Failed to fetch AQI distribution data',
-        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
-
-  async getAQIRangeDataBySpace(
-    params: SpaceParamsDto,
-    query: GetAqiDailyBySpaceDto,
-  ): Promise<BaseResponseDto> {
-    const { monthDate } = query;
-    const { spaceUuid } = params;
-
-    try {
-      const data = await this.executeProcedure(
-        'fact_daily_space_aqi',
-        'proceduce_select_daily_space_aqi',
-        [spaceUuid, monthDate],
-      );
-
-      // Define pollutants dynamically
-      const pollutants = Object.values(PollutantType);
-
-      const transformedData = data.map((item) => {
-        const date = new Date(item.event_date).toLocaleDateString('en-CA'); // YYYY-MM-DD
-        const dailyData = pollutants.map((type) => ({
-          type,
-          min: item[`daily_min_${type}`],
-          max: item[`daily_max_${type}`],
-          average: item[`daily_avg_${type}`],
-        }));
-        return { date, data: dailyData };
-      });
-
-      const response = this.buildResponse(
-        `AQI data fetched successfully for ${spaceUuid} space`,
-        transformedData,
-      );
-      return convertKeysToCamelCase(response);
-    } catch (error) {
-      console.error('Failed to fetch AQI data', {
-        error,
-        spaceUuid,
-      });
-      throw new HttpException(
-        error.response?.message || 'Failed to fetch AQI data',
-        error.status || HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-    }
-  }
-
-  private buildResponse(message: string, data: any[]) {
-    return new SuccessResponseDto({
-      message,
-      data,
-      statusCode: HttpStatus.OK,
-    });
-  }
-  private async executeProcedure(
-    procedureFolderName: string,
-    procedureFileName: string,
-    params: (string | number | null)[],
-  ): Promise<any[]> {
-    const query = this.loadQuery(procedureFolderName, procedureFileName);
-    return await this.dataSource.query(query, params);
-  }
-  private loadQuery(folderName: string, fileName: string): string {
-    return this.sqlLoader.loadQuery(folderName, fileName, SQL_PROCEDURES_PATH);
-  }
-}

src/aqi/services/index.ts

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

src/auth/auth.module.ts

@@ -1,17 +1,15 @@
-import { AuthService } from '@app/common/auth/services/auth.service';
-import { RoleTypeRepository } from '@app/common/modules/role-type/repositories';
-import { UserSessionRepository } from '@app/common/modules/session/repositories/session.repository';
-import {
-  UserOtpRepository,
-  UserRepository,
-} from '@app/common/modules/user/repositories';
-import { EmailService } from '@app/common/util/email/email.service';
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
-import { JwtService } from '@nestjs/jwt';
+import { UserRepository } from '@app/common/modules/user/repositories';
+import { UserSessionRepository } from '@app/common/modules/session/repositories/session.repository';
+import { UserOtpRepository } from '@app/common/modules/user/repositories';
+import { RoleTypeRepository } from '@app/common/modules/role-type/repositories';
 import { RoleService } from 'src/role/services';
 import { UserAuthController } from './controllers';
 import { UserAuthService } from './services';
+import { AuthService } from '@app/common/auth/services/auth.service';
+import { EmailService } from '@app/common/util/email.service';
+import { JwtService } from '@nestjs/jwt';
 
 @Module({
   imports: [ConfigModule],

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

@@ -1,25 +1,25 @@
-import { RoleType } from '@app/common/constants/role.type.enum';
-import { differenceInSeconds } from '@app/common/helper/differenceInSeconds';
+import { UserRepository } from '../../../libs/common/src/modules/user/repositories';
 import {
   BadRequestException,
   ForbiddenException,
   Injectable,
 } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import * as argon2 from 'argon2';
-import { RoleService } from 'src/role/services';
-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/email.service';
-import { ForgetPasswordDto, UserOtpDto, VerifyOtpDto } from '../dtos';
 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 { RoleService } from 'src/role/services';
+import { RoleType } from '@app/common/constants/role.type.enum';
 
 @Injectable()
 export class UserAuthService {
@@ -108,7 +108,7 @@ export class UserAuthService {
 
   async userLogin(data: UserLoginDto) {
     try {
-      let user: Omit<UserEntity, 'password'>;
+      let user;
       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,7 +166,6 @@ export class UserAuthService {
         hasAcceptedAppAgreement: user.hasAcceptedAppAgreement,
         project: user.project,
         sessionId: session[1].uuid,
-        bookingPoints: user.bookingPoints,
       });
       return res;
     } catch (error) {
@@ -348,7 +347,6 @@ export class UserAuthService {
       userId: user.uuid,
       uuid: user.uuid,
       type,
-      bookingPoints: user.bookingPoints,
       sessionId,
     });
     await this.authService.updateRefreshToken(user.uuid, tokens.refreshToken);

src/automation/controllers/automation.controller.ts

@@ -1,7 +1,4 @@
-import { ControllerRoute } from '@app/common/constants/controller-route';
-import { EnableDisableStatusEnum } from '@app/common/constants/days.enum';
-import { ProjectParam } from '@app/common/dto/project-param.dto';
-import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
+import { AutomationService } from '../services/automation.service';
 import {
   Body,
   Controller,
@@ -12,20 +9,20 @@ import {
   Patch,
   Post,
   Put,
-  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 { AutomationParamDto } from '../dtos';
+import { ApiTags, ApiBearerAuth, ApiOperation } from '@nestjs/swagger';
 import {
   AddAutomationDto,
   UpdateAutomationDto,
   UpdateAutomationStatusDto,
 } from '../dtos/automation.dto';
-import { GetAutomationBySpacesDto } from '../dtos/get-automation-by-spaces.dto';
-import { AutomationService } from '../services/automation.service';
+import { EnableDisableStatusEnum } from '@app/common/constants/days.enum';
+import { AutomationParamDto } from '../dtos';
+import { ControllerRoute } from '@app/common/constants/controller-route';
+import { PermissionsGuard } from 'src/guards/permissions.guard';
+import { Permissions } from 'src/decorators/permissions.decorator';
+import { ProjectParam } from '@app/common/dto/project-param.dto';
 
 @ApiTags('Automation Module')
 @Controller({
@@ -59,28 +56,6 @@ export class AutomationController {
     };
   }
 
-  @ApiBearerAuth()
-  @UseGuards(PermissionsGuard)
-  @Permissions('AUTOMATION_VIEW')
-  @Get('')
-  @ApiOperation({
-    summary: ControllerRoute.AUTOMATION.ACTIONS.GET_AUTOMATION_SUMMARY,
-    description: ControllerRoute.AUTOMATION.ACTIONS.GET_AUTOMATION_DESCRIPTION,
-  })
-  async getAutomationBySpaces(
-    @Param() param: ProjectParam,
-    @Query() spaces: GetAutomationBySpacesDto,
-  ) {
-    const automation = await this.automationService.getAutomationBySpaces(
-      spaces,
-      param.projectUuid,
-    );
-    return new SuccessResponseDto({
-      message: 'Automation retrieved Successfully',
-      data: automation,
-    });
-  }
-
   @ApiBearerAuth()
   @UseGuards(PermissionsGuard)
   @Permissions('AUTOMATION_VIEW')

src/automation/dtos/get-automation-by-spaces.dto.ts

@@ -1,20 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Transform } from 'class-transformer';
-import { IsOptional, IsUUID } from 'class-validator';
-
-export class GetAutomationBySpacesDto {
-  @ApiProperty({
-    description: 'List of Space IDs to filter automation',
-    required: false,
-    example: ['60d21b4667d0d8992e610c85', '60d21b4967d0d8992e610c86'],
-  })
-  @IsOptional()
-  @Transform(({ value }) => {
-    if (!Array.isArray(value)) {
-      return [value];
-    }
-    return value;
-  })
-  @IsUUID('4', { each: true })
-  public spaces?: string[];
-}

src/automation/services/automation.service.ts

@@ -1,42 +1,20 @@
 import {
-  ActionExecutorEnum,
-  ActionTypeEnum,
-  AUTO_PREFIX,
-  AUTOMATION_TYPE,
-  EntityTypeEnum,
-} from '@app/common/constants/automation.enum';
-import { BaseResponseDto } from '@app/common/dto/base.response.dto';
-import { GetSpaceParam } from '@app/common/dto/get.space.param';
-import { ProjectParam } from '@app/common/dto/project-param.dto';
-import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
-import { convertKeysToCamelCase } from '@app/common/helper/camelCaseConverter';
-import { convertKeysToSnakeCase } from '@app/common/helper/snakeCaseConverter';
-import { ConvertedAction } from '@app/common/integrations/tuya/interfaces';
-import { TuyaService } from '@app/common/integrations/tuya/services/tuya.service';
-import { AutomationEntity } from '@app/common/modules/automation/entities';
-import { AutomationRepository } from '@app/common/modules/automation/repositories';
-import { ProjectRepository } from '@app/common/modules/project/repositiories';
-import { SceneDeviceRepository } from '@app/common/modules/scene-device/repositories';
-import { SceneRepository } from '@app/common/modules/scene/repositories';
-import { SpaceRepository } from '@app/common/modules/space/repositories';
-import {
-  BadRequestException,
+  Injectable,
   HttpException,
   HttpStatus,
-  Injectable,
+  BadRequestException,
 } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import { TuyaContext } from '@tuya/tuya-connector-nodejs';
-import { DeviceService } from 'src/device/services';
-import { DeleteTapToRunSceneInterface } from 'src/scene/interface/scene.interface';
-import { In } from 'typeorm';
+import { SpaceRepository } from '@app/common/modules/space/repositories';
 import {
   AddAutomationDto,
   AutomationParamDto,
   UpdateAutomationDto,
   UpdateAutomationStatusDto,
 } from '../dtos';
-import { GetAutomationBySpacesDto } from '../dtos/get-automation-by-spaces.dto';
+import { ConfigService } from '@nestjs/config';
+import { TuyaContext } from '@tuya/tuya-connector-nodejs';
+import { convertKeysToSnakeCase } from '@app/common/helper/snakeCaseConverter';
+import { DeviceService } from 'src/device/services';
 import {
   Action,
   AddAutomationParams,
@@ -44,6 +22,26 @@ import {
   AutomationResponseData,
   Condition,
 } from '../interface/automation.interface';
+import { convertKeysToCamelCase } from '@app/common/helper/camelCaseConverter';
+import {
+  ActionExecutorEnum,
+  ActionTypeEnum,
+  AUTO_PREFIX,
+  AUTOMATION_TYPE,
+  EntityTypeEnum,
+} from '@app/common/constants/automation.enum';
+import { TuyaService } from '@app/common/integrations/tuya/services/tuya.service';
+import { ConvertedAction } from '@app/common/integrations/tuya/interfaces';
+import { SceneDeviceRepository } from '@app/common/modules/scene-device/repositories';
+import { SceneRepository } from '@app/common/modules/scene/repositories';
+import { AutomationRepository } from '@app/common/modules/automation/repositories';
+import { BaseResponseDto } from '@app/common/dto/base.response.dto';
+import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
+import { AutomationEntity } from '@app/common/modules/automation/entities';
+import { DeleteTapToRunSceneInterface } from 'src/scene/interface/scene.interface';
+import { ProjectParam } from '@app/common/dto/project-param.dto';
+import { ProjectRepository } from '@app/common/modules/project/repositiories';
+import { GetSpaceParam } from '@app/common/dto/get.space.param';
 
 @Injectable()
 export class AutomationService {
@@ -114,25 +112,128 @@ export class AutomationService {
           );
     }
   }
-  async getAutomationBySpace({ projectUuid, spaceUuid }: GetSpaceParam) {
-    return this.getAutomationBySpaces({ spaces: [spaceUuid] }, projectUuid);
-  }
-
-  async getAutomationBySpaces(
-    { spaces }: GetAutomationBySpacesDto,
+  async createAutomationExternalService(
+    params: AddAutomationParams,
     projectUuid: string,
   ) {
     try {
-      await this.validateProject(projectUuid);
+      const formattedActions = await this.prepareActions(
+        params.actions,
+        projectUuid,
+      );
+      const formattedCondition = await this.prepareConditions(
+        params.conditions,
+        projectUuid,
+      );
+
+      const response = await this.tuyaService.createAutomation(
+        params.spaceTuyaId,
+        params.automationName,
+        params.effectiveTime,
+        params.decisionExpr,
+        formattedCondition,
+        formattedActions,
+      );
+
+      if (!response.result?.id) {
+        throw new HttpException(
+          'Failed to create automation in Tuya',
+          HttpStatus.INTERNAL_SERVER_ERROR,
+        );
+      }
+
+      return response;
+    } catch (err) {
+      if (err instanceof HttpException) {
+        throw err;
+      } else if (err.message?.includes('tuya')) {
+        throw new HttpException(
+          'API error: Failed to create automation',
+          HttpStatus.BAD_GATEWAY,
+        );
+      } else {
+        throw new HttpException(
+          `An Internal error has been occured ${err}`,
+          HttpStatus.INTERNAL_SERVER_ERROR,
+        );
+      }
+    }
+  }
+  async add(params: AddAutomationParams, projectUuid: string) {
+    try {
+      const response = await this.createAutomationExternalService(
+        params,
+        projectUuid,
+      );
+
+      const automation = await this.automationRepository.save({
+        automationTuyaUuid: response.result.id,
+        space: { uuid: params.spaceUuid },
+      });
+
+      return automation;
+    } catch (err) {
+      if (err instanceof HttpException) {
+        throw err;
+      } else if (err.message?.includes('tuya')) {
+        throw new HttpException(
+          'API error: Failed to create automation',
+          HttpStatus.BAD_GATEWAY,
+        );
+      } else {
+        throw new HttpException(
+          'Database error: Failed to save automation',
+          HttpStatus.INTERNAL_SERVER_ERROR,
+        );
+      }
+    }
+  }
+
+  async getSpaceByUuid(spaceUuid: string, projectUuid: string) {
+    try {
+      const space = await this.spaceRepository.findOne({
+        where: {
+          uuid: spaceUuid,
+          community: {
+            project: {
+              uuid: projectUuid,
+            },
+          },
+        },
+        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,
+      };
+    } catch (err) {
+      if (err instanceof BadRequestException) {
+        throw err; // Re-throw BadRequestException
+      } else {
+        throw new HttpException('Space not found', HttpStatus.NOT_FOUND);
+      }
+    }
+  }
+
+  async getAutomationBySpace(param: GetSpaceParam) {
+    try {
+      await this.validateProject(param.projectUuid);
 
       // Fetch automation data from the repository
       const automationData = await this.automationRepository.find({
         where: {
           space: {
-            uuid: In(spaces ?? []),
+            uuid: param.spaceUuid,
             community: {
+              uuid: param.communityUuid,
               project: {
-                uuid: projectUuid,
+                uuid: param.projectUuid,
               },
             },
           },
@@ -189,277 +290,46 @@ export class AutomationService {
     }
   }
 
-  async getAutomationDetails(param: AutomationParamDto) {
-    await this.validateProject(param.projectUuid);
-
+  async findAutomationBySpace(spaceUuid: string, projectUuid: string) {
     try {
-      const automation = await this.findAutomationByUuid(
-        param.automationUuid,
-        param.projectUuid,
-      );
+      await this.getSpaceByUuid(spaceUuid, projectUuid);
 
-      const automationDetails = await this.getAutomation(automation);
-
-      return automationDetails;
-    } catch (error) {
-      console.error(
-        `Error fetching automation details for automationUuid ${param.automationUuid}:`,
-        error,
-      );
-
-      if (error instanceof HttpException) {
-        throw error;
-      } else {
-        throw new HttpException(
-          'An error occurred while retrieving automation details',
-          HttpStatus.INTERNAL_SERVER_ERROR,
-        );
-      }
-    }
-  }
-  async updateAutomation(
-    updateAutomationDto: UpdateAutomationDto,
-    param: AutomationParamDto,
-  ) {
-    await this.validateProject(param.projectUuid);
-
-    try {
-      const automation = await this.findAutomationByUuid(
-        param.automationUuid,
-        param.projectUuid,
-      );
-      const space = await this.getSpaceByUuid(
-        automation.space.uuid,
-        param.projectUuid,
-      );
-
-      const updateTuyaAutomationResponse =
-        await this.updateAutomationExternalService(
-          space.spaceTuyaUuid,
-          automation.automationTuyaUuid,
-          updateAutomationDto,
-          param.projectUuid,
-        );
-
-      if (!updateTuyaAutomationResponse.success) {
-        throw new HttpException(
-          `Failed to update a external automation`,
-          HttpStatus.BAD_GATEWAY,
-        );
-      }
-      const updatedScene = await this.automationRepository.update(
-        { uuid: param.automationUuid },
-        {
-          space: { uuid: automation.space.uuid },
-        },
-      );
-      return new SuccessResponseDto({
-        data: updatedScene,
-        message: `Automation with ID ${param.automationUuid} updated successfully`,
-      });
-    } catch (err) {
-      if (err instanceof BadRequestException) {
-        throw err; // Re-throw BadRequestException
-      } else {
-        throw new HttpException(
-          err.message || 'Automation not found',
-          err.status || HttpStatus.NOT_FOUND,
-        );
-      }
-    }
-  }
-  async updateAutomationStatus(
-    updateAutomationStatusDto: UpdateAutomationStatusDto,
-    param: AutomationParamDto,
-  ) {
-    const { isEnable, spaceUuid } = updateAutomationStatusDto;
-    await this.validateProject(param.projectUuid);
-
-    try {
-      const automation = await this.findAutomationByUuid(
-        param.automationUuid,
-        param.projectUuid,
-      );
-      const space = await this.getSpaceByUuid(spaceUuid, param.projectUuid);
-      if (!space.spaceTuyaUuid) {
-        throw new HttpException(
-          `Invalid space UUID ${spaceUuid}`,
-          HttpStatus.NOT_FOUND,
-        );
-      }
-
-      const response = await this.tuyaService.updateAutomationState(
-        space.spaceTuyaUuid,
-        automation.automationTuyaUuid,
-        isEnable,
-      );
-
-      return response;
-    } catch (err) {
-      if (err instanceof BadRequestException) {
-        throw err; // Re-throw BadRequestException
-      } else {
-        throw new HttpException(
-          err.message || 'Automation not found',
-          err.status || HttpStatus.NOT_FOUND,
-        );
-      }
-    }
-  }
-  async deleteAutomation(param: AutomationParamDto) {
-    const { automationUuid } = param;
-    await this.validateProject(param.projectUuid);
-
-    try {
-      const automationData = await this.findAutomationByUuid(
-        automationUuid,
-        param.projectUuid,
-      );
-      const space = await this.getSpaceByUuid(
-        automationData.space.uuid,
-        param.projectUuid,
-      );
-      await this.delete(automationData.automationTuyaUuid, space.spaceTuyaUuid);
-      const existingSceneDevice = await this.sceneDeviceRepository.findOne({
-        where: { automationTuyaUuid: automationData.automationTuyaUuid },
-      });
-
-      if (existingSceneDevice) {
-        await this.sceneDeviceRepository.delete({
-          automationTuyaUuid: automationData.automationTuyaUuid,
-        });
-      }
-      await this.automationRepository.update(
-        {
-          uuid: automationUuid,
-        },
-        { disabled: true },
-      );
-      return new SuccessResponseDto({
-        message: `Automation with ID ${automationUuid} deleted successfully`,
-      });
-    } catch (err) {
-      if (err instanceof HttpException) {
-        throw err;
-      } else {
-        throw new HttpException(
-          err.message || `Automation not found for id ${param.automationUuid}`,
-          err.status || HttpStatus.NOT_FOUND,
-        );
-      }
-    }
-  }
-
-  private async createAutomationExternalService(
-    params: AddAutomationParams,
-    projectUuid: string,
-  ) {
-    try {
-      const formattedActions = await this.prepareActions(
-        params.actions,
-        projectUuid,
-      );
-      const formattedCondition = await this.prepareConditions(
-        params.conditions,
-        projectUuid,
-      );
-
-      const response = await this.tuyaService.createAutomation(
-        params.spaceTuyaId,
-        params.automationName,
-        params.effectiveTime,
-        params.decisionExpr,
-        formattedCondition,
-        formattedActions,
-      );
-
-      if (!response.result?.id) {
-        throw new HttpException(
-          'Failed to create automation in Tuya',
-          HttpStatus.INTERNAL_SERVER_ERROR,
-        );
-      }
-
-      return response;
-    } catch (err) {
-      if (err instanceof HttpException) {
-        throw err;
-      } else if (err.message?.includes('tuya')) {
-        throw new HttpException(
-          'API error: Failed to create automation',
-          HttpStatus.BAD_GATEWAY,
-        );
-      } else {
-        throw new HttpException(
-          `An Internal error has been occured ${err}`,
-          HttpStatus.INTERNAL_SERVER_ERROR,
-        );
-      }
-    }
-  }
-  private async add(params: AddAutomationParams, projectUuid: string) {
-    try {
-      const response = await this.createAutomationExternalService(
-        params,
-        projectUuid,
-      );
-
-      const automation = await this.automationRepository.save({
-        automationTuyaUuid: response.result.id,
-        space: { uuid: params.spaceUuid },
-      });
-
-      return automation;
-    } catch (err) {
-      if (err instanceof HttpException) {
-        throw err;
-      } else if (err.message?.includes('tuya')) {
-        throw new HttpException(
-          'API error: Failed to create automation',
-          HttpStatus.BAD_GATEWAY,
-        );
-      } else {
-        throw new HttpException(
-          'Database error: Failed to save automation',
-          HttpStatus.INTERNAL_SERVER_ERROR,
-        );
-      }
-    }
-  }
-
-  private async getSpaceByUuid(spaceUuid: string, projectUuid: string) {
-    try {
-      const space = await this.spaceRepository.findOne({
+      const automationData = await this.automationRepository.find({
         where: {
-          uuid: spaceUuid,
-          community: {
-            project: {
-              uuid: projectUuid,
-            },
-          },
+          space: { uuid: spaceUuid },
+          disabled: false,
         },
-        relations: ['community'],
+        relations: ['space'],
       });
-      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,
-      };
+
+      const automations = await Promise.all(
+        automationData.map(async (automation) => {
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
+          const { actions, ...automationDetails } =
+            await this.getAutomation(automation);
+
+          return automationDetails;
+        }),
+      );
+
+      return automations;
     } catch (err) {
-      if (err instanceof BadRequestException) {
-        throw err; // Re-throw BadRequestException
+      console.error(
+        `Error fetching Tap-to-Run scenes for space UUID ${spaceUuid}:`,
+        err.message,
+      );
+
+      if (err instanceof HttpException) {
+        throw err;
       } else {
-        throw new HttpException('Space not found', HttpStatus.NOT_FOUND);
+        throw new HttpException(
+          'An error occurred while retrieving scenes',
+          HttpStatus.INTERNAL_SERVER_ERROR,
+        );
       }
     }
   }
-
-  private async getTapToRunSceneDetailsTuya(
+  async getTapToRunSceneDetailsTuya(
     sceneUuid: string,
   ): Promise<AutomationDetailsResult> {
     try {
@@ -491,8 +361,35 @@ export class AutomationService {
       }
     }
   }
+  async getAutomationDetails(param: AutomationParamDto) {
+    await this.validateProject(param.projectUuid);
 
-  private async getAutomation(automation: AutomationEntity) {
+    try {
+      const automation = await this.findAutomation(
+        param.automationUuid,
+        param.projectUuid,
+      );
+
+      const automationDetails = await this.getAutomation(automation);
+
+      return automationDetails;
+    } catch (error) {
+      console.error(
+        `Error fetching automation details for automationUuid ${param.automationUuid}:`,
+        error,
+      );
+
+      if (error instanceof HttpException) {
+        throw error;
+      } else {
+        throw new HttpException(
+          'An error occurred while retrieving automation details',
+          HttpStatus.INTERNAL_SERVER_ERROR,
+        );
+      }
+    }
+  }
+  async getAutomation(automation: AutomationEntity) {
     try {
       const response = await this.tuyaService.getSceneRule(
         automation.automationTuyaUuid,
@@ -599,13 +496,13 @@ export class AutomationService {
       }
     }
   }
-  private async findAutomationByUuid(
-    uuid: string,
+  async findAutomation(
+    sceneUuid: string,
     projectUuid: string,
   ): Promise<AutomationEntity> {
     const automation = await this.automationRepository.findOne({
       where: {
-        uuid: uuid,
+        uuid: sceneUuid,
         space: { community: { project: { uuid: projectUuid } } },
       },
       relations: ['space'],
@@ -613,14 +510,57 @@ export class AutomationService {
 
     if (!automation) {
       throw new HttpException(
-        `Invalid automation with id ${uuid}`,
+        `Invalid automation with id ${sceneUuid}`,
         HttpStatus.NOT_FOUND,
       );
     }
     return automation;
   }
 
-  private async delete(tuyaAutomationId: string, tuyaSpaceId: string) {
+  async deleteAutomation(param: AutomationParamDto) {
+    const { automationUuid } = param;
+    await this.validateProject(param.projectUuid);
+
+    try {
+      const automationData = await this.findAutomation(
+        automationUuid,
+        param.projectUuid,
+      );
+      const space = await this.getSpaceByUuid(
+        automationData.space.uuid,
+        param.projectUuid,
+      );
+      await this.delete(automationData.automationTuyaUuid, space.spaceTuyaUuid);
+      const existingSceneDevice = await this.sceneDeviceRepository.findOne({
+        where: { automationTuyaUuid: automationData.automationTuyaUuid },
+      });
+
+      if (existingSceneDevice) {
+        await this.sceneDeviceRepository.delete({
+          automationTuyaUuid: automationData.automationTuyaUuid,
+        });
+      }
+      await this.automationRepository.update(
+        {
+          uuid: automationUuid,
+        },
+        { disabled: true },
+      );
+      return new SuccessResponseDto({
+        message: `Automation with ID ${automationUuid} deleted successfully`,
+      });
+    } catch (err) {
+      if (err instanceof HttpException) {
+        throw err;
+      } else {
+        throw new HttpException(
+          err.message || `Automation not found for id ${param.automationUuid}`,
+          err.status || HttpStatus.NOT_FOUND,
+        );
+      }
+    }
+  }
+  async delete(tuyaAutomationId: string, tuyaSpaceId: string) {
     try {
       const response = (await this.tuyaService.deleteSceneRule(
         tuyaAutomationId,
@@ -638,7 +578,7 @@ export class AutomationService {
       }
     }
   }
-  private async updateAutomationExternalService(
+  async updateAutomationExternalService(
     spaceTuyaUuid: string,
     automationUuid: string,
     updateAutomationDto: UpdateAutomationDto,
@@ -686,6 +626,95 @@ export class AutomationService {
       }
     }
   }
+  async updateAutomation(
+    updateAutomationDto: UpdateAutomationDto,
+    param: AutomationParamDto,
+  ) {
+    await this.validateProject(param.projectUuid);
+
+    try {
+      const automation = await this.findAutomation(
+        param.automationUuid,
+        param.projectUuid,
+      );
+      const space = await this.getSpaceByUuid(
+        automation.space.uuid,
+        param.projectUuid,
+      );
+
+      const updateTuyaAutomationResponse =
+        await this.updateAutomationExternalService(
+          space.spaceTuyaUuid,
+          automation.automationTuyaUuid,
+          updateAutomationDto,
+          param.projectUuid,
+        );
+
+      if (!updateTuyaAutomationResponse.success) {
+        throw new HttpException(
+          `Failed to update a external automation`,
+          HttpStatus.BAD_GATEWAY,
+        );
+      }
+      const updatedScene = await this.automationRepository.update(
+        { uuid: param.automationUuid },
+        {
+          space: { uuid: automation.space.uuid },
+        },
+      );
+      return new SuccessResponseDto({
+        data: updatedScene,
+        message: `Automation with ID ${param.automationUuid} updated successfully`,
+      });
+    } catch (err) {
+      if (err instanceof BadRequestException) {
+        throw err; // Re-throw BadRequestException
+      } else {
+        throw new HttpException(
+          err.message || 'Automation not found',
+          err.status || HttpStatus.NOT_FOUND,
+        );
+      }
+    }
+  }
+  async updateAutomationStatus(
+    updateAutomationStatusDto: UpdateAutomationStatusDto,
+    param: AutomationParamDto,
+  ) {
+    const { isEnable, spaceUuid } = updateAutomationStatusDto;
+    await this.validateProject(param.projectUuid);
+
+    try {
+      const automation = await this.findAutomation(
+        param.automationUuid,
+        param.projectUuid,
+      );
+      const space = await this.getSpaceByUuid(spaceUuid, param.projectUuid);
+      if (!space.spaceTuyaUuid) {
+        throw new HttpException(
+          `Invalid space UUID ${spaceUuid}`,
+          HttpStatus.NOT_FOUND,
+        );
+      }
+
+      const response = await this.tuyaService.updateAutomationState(
+        space.spaceTuyaUuid,
+        automation.automationTuyaUuid,
+        isEnable,
+      );
+
+      return response;
+    } catch (err) {
+      if (err instanceof BadRequestException) {
+        throw err; // Re-throw BadRequestException
+      } else {
+        throw new HttpException(
+          err.message || 'Automation not found',
+          err.status || HttpStatus.NOT_FOUND,
+        );
+      }
+    }
+  }
 
   private async prepareActions(
     actions: Action[],
@@ -724,7 +753,7 @@ export class AutomationService {
           action.action_executor === ActionExecutorEnum.RULE_ENABLE
         ) {
           if (action.action_type === ActionTypeEnum.AUTOMATION) {
-            const automation = await this.findAutomationByUuid(
+            const automation = await this.findAutomation(
               action.entity_id,
               projectUuid,
             );

src/booking/booking.module.ts

@@ -1,29 +0,0 @@
-import { BookingRepositoryModule } from '@app/common/modules/booking/booking.repository.module';
-import { BookableSpaceEntityRepository } from '@app/common/modules/booking/repositories/bookable-space.repository';
-import { BookingEntityRepository } from '@app/common/modules/booking/repositories/booking.repository';
-import { SpaceRepository } from '@app/common/modules/space';
-import { UserRepository } from '@app/common/modules/user/repositories';
-import { EmailService } from '@app/common/util/email/email.service';
-import { Global, Module } from '@nestjs/common';
-import { BookableSpaceController } from './controllers/bookable-space.controller';
-import { BookingController } from './controllers/booking.controller';
-import { BookableSpaceService } from './services/bookable-space.service';
-import { BookingService } from './services/booking.service';
-
-@Global()
-@Module({
-  imports: [BookingRepositoryModule],
-  controllers: [BookableSpaceController, BookingController],
-  providers: [
-    BookableSpaceService,
-    BookingService,
-    EmailService,
-    BookableSpaceEntityRepository,
-    BookingEntityRepository,
-
-    SpaceRepository,
-    UserRepository,
-  ],
-  exports: [BookableSpaceService, BookingService],
-})
-export class BookingModule {}