Increase desired count for ECS service from 1 to 2

Improves the deployment script to use the UAE  region and adds context for the CDK stack.

.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/production.yml

@@ -0,0 +1,40 @@
+name: 🚀 Production Deployment
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: ⬇️ Checkout Code
+        uses: actions/checkout@v4
+
+      - name: 🐢 Set up Node.js 20.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: 🐳 Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: 🔐 Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: me-central-1
+
+      - name: 🗂️ Write .env file from ENV_FILE Secret
+        run: echo "${{ secrets.ENV_FILE }}" > .env
+
+      - name: 📦 Install Dependencies
+        run: npm install
+
+      - name: 🛠️ Run Production Build & Deploy Script
+        run: |
+          chmod +x ./build.sh
+          ./build.sh

.gitignore

@@ -4,7 +4,7 @@
 /build
 
 #github 
-/.github/workflows
+/.github
 
 # Logs
 logs
@@ -58,4 +58,9 @@ pids
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 
-config.dev
+config.dev
+cdk.out
+backend-cdk-new.out
+web-cdk.out
+backend-cdk.out
+backend-cdk-final.out

Dockerfile

@@ -1,16 +1,28 @@
-FROM node:20-alpine
+FROM --platform=linux/amd64 node:20-alpine
+
+# curl for health checks
+RUN apk add --no-cache curl
 
 WORKDIR /app
 
+
 COPY package*.json ./
 
-RUN npm install
+RUN npm install --production --ignore-scripts
-RUN npm install -g @nestjs/cli
 
 COPY . .
 
 RUN npm run build
 
-EXPOSE 4000
+RUN addgroup -g 1001 -S nodejs
+RUN adduser -S nestjs -u 1001
 
-CMD ["npm", "run", "start"]
+RUN chown -R nestjs:nodejs /app
+USER nestjs
+
+EXPOSE 3000
+
+HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
+  CMD curl -f http://localhost:3000/health || exit 1
+
+CMD ["npm", "run", "start:prod"]

GITHUB_SETUP.md

@@ -0,0 +1,119 @@
+# GitHub Actions Setup Guide
+
+## Required GitHub Secrets
+
+Add these secrets to your GitHub repository (Settings > Secrets and variables > Actions):
+
+### AWS Credentials
+```
+AWS_ACCESS_KEY_ID=your-aws-access-key
+AWS_SECRET_ACCESS_KEY=your-aws-secret-key
+```
+
+### JWT Configuration (CRITICAL - Generate secure random strings)
+```
+JWT_SECRET=your-super-secure-jwt-secret-key-here
+JWT_SECRET_REFRESH=your-super-secure-refresh-secret-key-here
+SECRET_KEY=your-general-encryption-secret-key-here
+```
+
+### Admin Configuration
+```
+SUPER_ADMIN_EMAIL=admin@syncrow.ae
+SUPER_ADMIN_PASSWORD=YourSecureAdminPassword123!
+```
+
+### Tuya IoT Configuration
+```
+TUYA_ACCESS_ID=your-tuya-access-id
+TUYA_ACCESS_KEY=your-tuya-access-key
+TRUN_ON_TUYA_SOCKET=true-or-false
+```
+
+### Firebase Configuration
+```
+FIREBASE_API_KEY=your-firebase-api-key
+FIREBASE_AUTH_DOMAIN=your-project.firebaseapp.com
+FIREBASE_PROJECT_ID=your-project-id
+FIREBASE_STORAGE_BUCKET=your-project.appspot.com
+FIREBASE_MESSAGING_SENDER_ID=your-sender-id
+FIREBASE_APP_ID=your-app-id
+FIREBASE_MEASUREMENT_ID=your-measurement-id
+FIREBASE_DATABASE_URL=https://your-project.firebaseio.com
+```
+
+### Google OAuth
+```
+GOOGLE_CLIENT_ID=your-google-client-id
+GOOGLE_CLIENT_SECRET=your-google-client-secret
+```
+
+### OneSignal Push Notifications
+```
+ONESIGNAL_APP_ID=your-onesignal-app-id
+ONESIGNAL_API_KEY=your-onesignal-api-key
+```
+
+### Email Configuration (SMTP)
+```
+SMTP_HOST=your-smtp-host
+SMTP_USER=your-smtp-username
+SMTP_PASSWORD=your-smtp-password
+```
+
+### Mailtrap Configuration
+```
+MAILTRAP_API_TOKEN=your-mailtrap-api-token
+MAILTRAP_ENABLE_TEMPLATE_UUID=template-uuid
+MAILTRAP_DISABLE_TEMPLATE_UUID=template-uuid
+MAILTRAP_INVITATION_TEMPLATE_UUID=template-uuid
+MAILTRAP_DELETE_USER_TEMPLATE_UUID=template-uuid
+MAILTRAP_EDIT_USER_TEMPLATE_UUID=template-uuid
+```
+
+### Optional Services (leave empty if not used)
+```
+AZURE_REDIS_CONNECTIONSTRING=your-redis-connection-string
+DOPPLER_PROJECT=your-doppler-project
+DOPPLER_CONFIG=your-doppler-config
+DOPPLER_ENVIRONMENT=your-doppler-environment
+ACCESS_KEY=your-access-key
+DOCKER_REGISTRY_SERVER_URL=your-registry-url
+DOCKER_REGISTRY_SERVER_USERNAME=your-registry-username
+DOCKER_REGISTRY_SERVER_PASSWORD=your-registry-password
+```
+
+## Setup Steps
+
+1. **Add AWS Credentials**
+   - Create IAM user with ECR, ECS, CloudFormation permissions
+   - Add AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY to GitHub Secrets
+
+2. **Generate JWT Secrets**
+   - Use a secure random string generator
+   - Make JWT_SECRET and JWT_SECRET_REFRESH different values
+   - Keep these values secure and never share them
+
+3. **Configure Services**
+   - Add secrets for each service you're using
+   - Leave unused services empty (they'll default to empty strings)
+
+4. **Test Deployment**
+   - Push to master/main branch
+   - Check GitHub Actions tab for deployment status
+   - Verify API is accessible at https://api.syncrow.me
+
+## Security Notes
+
+- Never commit secrets to the repository
+- Use GitHub Secrets for all sensitive values
+- Rotate secrets regularly
+- Monitor GitHub Actions logs for any exposed values
+- Database password is automatically managed by AWS Secrets Manager
+
+## Troubleshooting
+
+- Check GitHub Actions logs for deployment errors
+- Verify all required secrets are set
+- Ensure AWS credentials have sufficient permissions
+- Check ECS service logs in CloudWatch for runtime errors

README.md

@@ -107,3 +107,29 @@ $ npm run test:cov
          |            |  Standby Node    |                |                |
          |            +------------------+----------------+                |
          +-----------------------------------------------------------------+
+
+## CDK Deployment
+
+• Bootstrap CDK (first time only): npx cdk bootstrap aws://482311766496/me-central-1
+• List available stacks: npx cdk list
+• Deploy infrastructure: npx cdk deploy --require-approval never
+• View changes before deploy: npx cdk diff
+• Generate CloudFormation template: npx cdk synth
+• Destroy infrastructure: npx cdk destroy
+• Environment variables are configured in infrastructure/stack.ts
+• After code changes: build Docker image, push to ECR, force ECS deployment
+• Database seeding happens automatically on first deployment with DB_SYNC=true
+• Admin credentials: admin@syncrow.ae / YourSecureAdminPassword123!
+• Production API: https://api.syncrow.me
+• Health check: https://api.syncrow.me/health
+
+## GitHub Actions Deployment
+
+• Automatic deployment on push to master/main branch
+• Configure GitHub Secrets (see GITHUB_SETUP.md for complete list)
+• Required secrets: AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, JWT_SECRET, JWT_SECRET_REFRESH
+• Workflow builds Docker image, pushes to ECR, and deploys CDK stack
+• Environment variables are passed securely via GitHub Secrets
+• Manual deployment: Go to Actions tab and run "Deploy Backend to AWS" workflow
+• Check deployment status in GitHub Actions tab
+• Logs available in CloudWatch under /ecs/syncrow-backend log group

build.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+set -e
+
+ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
+REGION=${AWS_DEFAULT_REGION:-me-central-1}
+REPO_NAME=syncrow-backend
+IMAGE_TAG=latest
+CLUSTER_NAME=syncrow-backend-cluster
+STACK_NAME=SyncrowBackendStack
+CERTIFICATE_ARN="arn:aws:acm:$REGION:$ACCOUNT_ID:certificate/bea1e2ae-84a1-414e-8dbf-4599397e7ed0"
+
+echo "🔐 Logging into ECR..."
+aws ecr get-login-password --region $REGION | docker login --username AWS --password-stdin "$ACCOUNT_ID.dkr.ecr.$REGION.amazonaws.com"
+
+echo "🐳 Building Docker image..."
+docker build --platform=linux/amd64 -t $REPO_NAME .
+
+echo "🏷️ Tagging image..."
+docker tag $REPO_NAME:$IMAGE_TAG "$ACCOUNT_ID.dkr.ecr.$REGION.amazonaws.com/$REPO_NAME:$IMAGE_TAG"
+
+echo "📤 Pushing image to ECR..."
+docker push "$ACCOUNT_ID.dkr.ecr.$REGION.amazonaws.com/$REPO_NAME:$IMAGE_TAG"
+
+echo "🔍 Checking if ECS service exists..."
+SERVICE_ARN=$(aws ecs list-services \
+    --cluster $CLUSTER_NAME \
+    --query 'serviceArns[0]' \
+    --output text \
+    --region $REGION 2>/dev/null || echo "")
+
+echo "📦 Deploying CDK Stack..."
+npx cdk deploy $STACK_NAME \
+    --context certificateArn=$CERTIFICATE_ARN \
+    --require-approval never
+
+if [[ "$SERVICE_ARN" != "" && "$SERVICE_ARN" != "None" ]]; then
+    SERVICE_NAME=$(basename "$SERVICE_ARN")
+    echo "🚀 Redeploying ECS Service: $SERVICE_NAME"
+    aws ecs update-service \
+        --cluster $CLUSTER_NAME \
+        --service $SERVICE_NAME \
+        --force-new-deployment \
+        --region $REGION
+fi
+
+echo "✅ All done."

cdk.context.json

@@ -0,0 +1,25 @@
+{
+  "availability-zones:account=426265406140:region=us-east-2": [
+    "us-east-2a",
+    "us-east-2b",
+    "us-east-2c"
+  ],
+  "availability-zones:account=482311766496:region=us-east-2": [
+    "us-east-2a",
+    "us-east-2b",
+    "us-east-2c"
+  ],
+  "hosted-zone:account=482311766496:domainName=syncrow.me:region=us-east-2": {
+    "Id": "/hostedzone/Z02085662NLJECF4DGJV3",
+    "Name": "syncrow.me."
+  },
+  "availability-zones:account=482311766496:region=me-central-1": [
+    "me-central-1a",
+    "me-central-1b",
+    "me-central-1c"
+  ],
+  "hosted-zone:account=482311766496:domainName=syncrow.me:region=me-central-1": {
+    "Id": "/hostedzone/Z02085662NLJECF4DGJV3",
+    "Name": "syncrow.me."
+  }
+}

cdk.json

@@ -0,0 +1,58 @@
+{
+  "app": "npx ts-node --prefer-ts-exts infrastructure/app.ts",
+  "watch": {
+    "include": [
+      "**"
+    ],
+    "exclude": [
+      "README.md",
+      "cdk*.json",
+      "**/*.d.ts",
+      "**/*.js",
+      "tsconfig.json",
+      "package*.json",
+      "yarn.lock",
+      "node_modules",
+      "test"
+    ]
+  },
+  "context": {
+    "@aws-cdk/aws-lambda:recognizeLayerVersion": true,
+    "@aws-cdk/core:checkSecretUsage": true,
+    "@aws-cdk/core:target-partitions": [
+      "aws",
+      "aws-cn"
+    ],
+    "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": true,
+    "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true,
+    "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": true,
+    "@aws-cdk/aws-iam:minimizePolicies": true,
+    "@aws-cdk/core:validateSnapshotRemovalPolicy": true,
+    "@aws-cdk/aws-codepipeline:crossAccountKeyAliasStackSafeResourceName": true,
+    "@aws-cdk/aws-s3:createDefaultLoggingPolicy": true,
+    "@aws-cdk/aws-sns-subscriptions:restrictSqsDescryption": true,
+    "@aws-cdk/aws-apigateway:disableCloudWatchRole": true,
+    "@aws-cdk/core:enablePartitionLiterals": true,
+    "@aws-cdk/aws-events:eventsTargetQueueSameAccount": true,
+    "@aws-cdk/aws-iam:standardizedServicePrincipals": true,
+    "@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker": true,
+    "@aws-cdk/aws-iam:importedRoleStackSafeDefaultPolicyName": true,
+    "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": true,
+    "@aws-cdk/aws-route53-patters:useCertificate": true,
+    "@aws-cdk/customresources:installLatestAwsSdkDefault": false,
+    "@aws-cdk/aws-rds:databaseProxyUniqueResourceName": true,
+    "@aws-cdk/aws-codedeploy:removeAlarmsFromDeploymentGroup": true,
+    "@aws-cdk/aws-apigateway:authorizerChangeDeploymentLogicalId": true,
+    "@aws-cdk/aws-ec2:launchTemplateDefaultUserData": true,
+    "@aws-cdk/aws-secretsmanager:useAttachedSecretResourcePolicyForSecretTargetAttachments": true,
+    "@aws-cdk/aws-redshift:columnId": true,
+    "@aws-cdk/aws-stepfunctions-tasks:enableLogging": true,
+    "@aws-cdk/aws-ec2:restrictDefaultSecurityGroup": true,
+    "@aws-cdk/aws-apigateway:requestValidatorUniqueId": true,
+    "@aws-cdk/aws-kms:aliasNameRef": true,
+    "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true,
+    "@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm": true,
+    "@aws-cdk/aws-rds:preventRenderingDeprecatedCredentials": true,
+    "@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForSourceAction": true
+  }
+}

deploy.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+
+ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
+REGION=${AWS_DEFAULT_REGION:-me-central-1}
+
+npx cdk deploy SyncrowBackendStack --context certificateArn=arn:aws:acm:me-central-1:482311766496:certificate/bea1e2ae-84a1-414e-8dbf-4599397e7ed0 --require-approval never
+
+aws ecr get-login-password --region $REGION | docker login --username AWS --password-stdin $ACCOUNT_ID.dkr.ecr.$REGION.amazonaws.com
+
+docker build --platform=linux/amd64 -t syncrow-backend .
+docker tag syncrow-backend:latest $ACCOUNT_ID.dkr.ecr.$REGION.amazonaws.com/syncrow-backend:latest
+docker push $ACCOUNT_ID.dkr.ecr.$REGION.amazonaws.com/syncrow-backend:latest
+
+SERVICE_ARN=$(aws ecs list-services --cluster syncrow-backend-cluster --query 'serviceArns[0]' --output text --region $REGION 2>/dev/null || echo "")
+
+if [ "$SERVICE_ARN" != "" ] && [ "$SERVICE_ARN" != "None" ]; then
+    SERVICE_NAME=$(echo $SERVICE_ARN | cut -d'/' -f3)
+    aws ecs update-service --cluster syncrow-backend-cluster --service $SERVICE_NAME --force-new-deployment --region $REGION
+else
+    npx cdk deploy SyncrowBackendStack --context certificateArn=arn:aws:acm:me-central-1:482311766496:certificate/bea1e2ae-84a1-414e-8dbf-4599397e7ed0 --require-approval never
+fi

infrastructure/app.ts

@@ -0,0 +1,16 @@
+#!/usr/bin/env node
+import * as cdk from 'aws-cdk-lib';
+import 'source-map-support/register';
+import { BackendStack } from './stack';
+
+const app = new cdk.App();
+
+new BackendStack(app, 'SyncrowBackendStack', {
+  env: {
+    account: process.env.CDK_DEFAULT_ACCOUNT,
+    region: 'me-central-1',
+  },
+  databaseName: 'postgres',
+  certificateArn:
+    'arn:aws:acm:me-central-1:482311766496:certificate/bea1e2ae-84a1-414e-8dbf-4599397e7ed0',
+});

infrastructure/stack.ts

@@ -0,0 +1,393 @@
+import * as cdk from 'aws-cdk-lib';
+import * as acm from 'aws-cdk-lib/aws-certificatemanager';
+import * as ec2 from 'aws-cdk-lib/aws-ec2';
+import * as ecr from 'aws-cdk-lib/aws-ecr';
+import * as ecs from 'aws-cdk-lib/aws-ecs';
+import * as ecsPatterns from 'aws-cdk-lib/aws-ecs-patterns';
+import * as elbv2 from 'aws-cdk-lib/aws-elasticloadbalancingv2';
+import * as logs from 'aws-cdk-lib/aws-logs';
+import * as rds from 'aws-cdk-lib/aws-rds';
+import * as route53 from 'aws-cdk-lib/aws-route53';
+import { Construct } from 'constructs';
+import * as dotenv from 'dotenv';
+
+export interface BackendStackProps extends cdk.StackProps {
+  vpcId?: string;
+  databaseName?: string;
+  certificateArn?: string;
+}
+
+export class BackendStack extends cdk.Stack {
+  public readonly apiUrl: string;
+  public readonly databaseEndpoint: string;
+  public readonly vpc: ec2.IVpc;
+
+  constructor(scope: Construct, id: string, props?: BackendStackProps) {
+    super(scope, id, props);
+
+    // Load environment variables from .env file
+    dotenv.config({ path: '.env' });
+
+    // VPC - either use existing or create new
+    this.vpc = props?.vpcId
+      ? ec2.Vpc.fromLookup(this, 'ExistingVpc', { vpcId: props.vpcId })
+      : new ec2.Vpc(this, 'SyncrowVpc', {
+          maxAzs: 2,
+          natGateways: 1,
+          subnetConfiguration: [
+            {
+              cidrMask: 24,
+              name: 'public',
+              subnetType: ec2.SubnetType.PUBLIC,
+            },
+            {
+              cidrMask: 24,
+              name: 'private',
+              subnetType: ec2.SubnetType.PRIVATE_WITH_EGRESS,
+            },
+          ],
+        });
+
+    // Security Groups
+    const dbSecurityGroup = new ec2.SecurityGroup(
+      this,
+      'DatabaseSecurityGroup',
+      {
+        vpc: this.vpc,
+        description: 'Security group for RDS PostgreSQL',
+        allowAllOutbound: false,
+      },
+    );
+
+    const ecsSecurityGroup = new ec2.SecurityGroup(this, 'EcsSecurityGroup', {
+      vpc: this.vpc,
+      description: 'Security group for ECS Fargate service',
+      allowAllOutbound: true,
+    });
+
+    const albSecurityGroup = new ec2.SecurityGroup(this, 'AlbSecurityGroup', {
+      vpc: this.vpc,
+      description: 'Security group for Application Load Balancer',
+      allowAllOutbound: true,
+    });
+
+    // Allow ALB to connect to ECS
+    ecsSecurityGroup.addIngressRule(
+      albSecurityGroup,
+      ec2.Port.tcp(3000),
+      'Allow ALB to connect to ECS service',
+    );
+
+    // Allow ECS to connect to RDS
+    dbSecurityGroup.addIngressRule(
+      ecsSecurityGroup,
+      ec2.Port.tcp(5432),
+      'Allow ECS to connect to PostgreSQL',
+    );
+
+    // Temporary access for admin IP
+    dbSecurityGroup.addIngressRule(
+      ec2.Peer.ipv4('216.126.231.231/32'),
+      ec2.Port.tcp(5432),
+      'Temporary access from admin IP',
+    );
+
+    // Allow HTTP/HTTPS traffic to ALB
+    albSecurityGroup.addIngressRule(
+      ec2.Peer.anyIpv4(),
+      ec2.Port.tcp(80),
+      'Allow HTTP traffic',
+    );
+    albSecurityGroup.addIngressRule(
+      ec2.Peer.anyIpv4(),
+      ec2.Port.tcp(443),
+      'Allow HTTPS traffic',
+    );
+
+    const dbCluster = rds.DatabaseCluster.fromDatabaseClusterAttributes(
+      this,
+      'SyncrowDatabase',
+      {
+        clusterIdentifier: 'syncrow-backend',
+        instanceIdentifiers: ['syncrowdatabase-instance-1'],
+        engine: rds.DatabaseClusterEngine.auroraPostgres({
+          version: rds.AuroraPostgresEngineVersion.VER_16_6,
+        }),
+        port: 5432,
+        securityGroups: [
+          ec2.SecurityGroup.fromSecurityGroupId(
+            this,
+            'ImportedDbSecurityGroup',
+            'sg-07e163f588b2bac25',
+          ),
+        ],
+        clusterEndpointAddress:
+          'syncrow-backend.cluster-criskv1sdkq4.me-central-1.rds.amazonaws.com',
+      },
+    );
+
+    // Import the existing database secret separately
+    const dbSecret = rds.DatabaseSecret.fromSecretCompleteArn(
+      this,
+      'ImportedDbSecret',
+      'arn:aws:secretsmanager:me-central-1:482311766496:secret:rds!cluster-43ec14cd-9301-43e2-aa79-d330a429a126-v0JDQN',
+    );
+
+    // ECR Repository for Docker images - import existing repository
+    const ecrRepository = ecr.Repository.fromRepositoryName(
+      this,
+      'SyncrowBackendRepo',
+      'syncrow-backend',
+    );
+
+    // Output the correct ECR URI for this region
+    new cdk.CfnOutput(this, 'EcrRepositoryUriRegional', {
+      value: ecrRepository.repositoryUri,
+      description: `ECR Repository URI in region ${this.region}`,
+      exportName: `${this.stackName}-EcrRepositoryUriRegional`,
+    });
+
+    // ECS Cluster
+    const cluster = new ecs.Cluster(this, 'SyncrowCluster', {
+      vpc: this.vpc,
+      clusterName: 'syncrow-backend-cluster',
+    });
+
+    // CloudWatch Log Group
+    const logGroup = new logs.LogGroup(this, 'SyncrowBackendLogs', {
+      logGroupName: '/ecs/syncrow-backend',
+      retention: logs.RetentionDays.ONE_WEEK,
+      removalPolicy: cdk.RemovalPolicy.DESTROY,
+    });
+
+    // Use existing wildcard certificate or create new one
+    const apiCertificate = props?.certificateArn
+      ? acm.Certificate.fromCertificateArn(
+          this,
+          'ApiCertificate',
+          props.certificateArn,
+        )
+      : new acm.Certificate(this, 'ApiCertificate', {
+          domainName: 'api.syncrow.me',
+          validation: acm.CertificateValidation.fromDns(),
+        });
+
+    // ECS Fargate Service with Application Load Balancer
+    const fargateService =
+      new ecsPatterns.ApplicationLoadBalancedFargateService(
+        this,
+        'SyncrowBackendService',
+        {
+          cluster,
+          memoryLimitMiB: 1024,
+          cpu: 512,
+          desiredCount: 2,
+          domainName: 'api.syncrow.me',
+          domainZone: route53.HostedZone.fromLookup(this, 'SyncrowZone', {
+            domainName: 'syncrow.me',
+          }),
+          certificate: apiCertificate,
+          protocol: elbv2.ApplicationProtocol.HTTPS,
+          redirectHTTP: true,
+          taskImageOptions: {
+            image: ecs.ContainerImage.fromEcrRepository(
+              ecrRepository,
+              'latest',
+            ),
+            containerPort: 3000,
+            enableLogging: true,
+            environment: {
+              // App settings
+              NODE_ENV: process.env.NODE_ENV || 'production',
+              PORT: process.env.PORT || '3000',
+              BASE_URL: process.env.BASE_URL || '',
+
+              // Database connection (CDK provides these automatically)
+              AZURE_POSTGRESQL_HOST: dbCluster.clusterEndpoint.hostname,
+              AZURE_POSTGRESQL_PORT: '5432',
+              AZURE_POSTGRESQL_DATABASE: props?.databaseName || 'postgres',
+              AZURE_POSTGRESQL_USER: 'postgres',
+              AZURE_POSTGRESQL_SSL: process.env.AZURE_POSTGRESQL_SSL || 'false',
+              AZURE_POSTGRESQL_SYNC:
+                process.env.AZURE_POSTGRESQL_SYNC || 'false',
+
+              // JWT Configuration - CRITICAL: These must be set
+              JWT_SECRET:
+                process.env.JWT_SECRET ||
+                'syncrow-jwt-secret-key-2025-production-environment-very-secure-random-string',
+              JWT_SECRET_REFRESH:
+                process.env.JWT_SECRET_REFRESH ||
+                'syncrow-refresh-secret-key-2025-production-environment-different-secure-string',
+              JWT_EXPIRE_TIME: process.env.JWT_EXPIRE_TIME || '1h',
+              JWT_EXPIRE_TIME_REFRESH:
+                process.env.JWT_EXPIRE_TIME_REFRESH || '7d',
+
+              // Firebase Configuration
+              FIREBASE_API_KEY: process.env.FIREBASE_API_KEY || '',
+              FIREBASE_AUTH_DOMAIN: process.env.FIREBASE_AUTH_DOMAIN || '',
+              FIREBASE_PROJECT_ID: process.env.FIREBASE_PROJECT_ID || '',
+              FIREBASE_STORAGE_BUCKET:
+                process.env.FIREBASE_STORAGE_BUCKET || '',
+              FIREBASE_MESSAGING_SENDER_ID:
+                process.env.FIREBASE_MESSAGING_SENDER_ID || '',
+              FIREBASE_APP_ID: process.env.FIREBASE_APP_ID || '',
+              FIREBASE_MEASUREMENT_ID:
+                process.env.FIREBASE_MEASUREMENT_ID || '',
+              FIREBASE_DATABASE_URL: process.env.FIREBASE_DATABASE_URL || '',
+
+              // Tuya IoT Configuration
+              TUYA_EU_URL:
+                process.env.TUYA_EU_URL || 'https://openapi.tuyaeu.com',
+              TUYA_ACCESS_ID: process.env.TUYA_ACCESS_ID || '',
+              TUYA_ACCESS_KEY: process.env.TUYA_ACCESS_KEY || '',
+              TRUN_ON_TUYA_SOCKET: process.env.TRUN_ON_TUYA_SOCKET || '',
+
+              // Email Configuration
+              SMTP_HOST: process.env.SMTP_HOST || '',
+              SMTP_PORT: process.env.SMTP_PORT || '587',
+              SMTP_SECURE: process.env.SMTP_SECURE || 'true',
+              SMTP_USER: process.env.SMTP_USER || '',
+              SMTP_PASSWORD: process.env.SMTP_PASSWORD || '',
+
+              // Mailtrap Configuration
+              MAILTRAP_API_TOKEN: process.env.MAILTRAP_API_TOKEN || '',
+              MAILTRAP_INVITATION_TEMPLATE_UUID:
+                process.env.MAILTRAP_INVITATION_TEMPLATE_UUID || '',
+              MAILTRAP_EDIT_USER_TEMPLATE_UUID:
+                process.env.MAILTRAP_EDIT_USER_TEMPLATE_UUID || '',
+              MAILTRAP_DISABLE_TEMPLATE_UUID:
+                process.env.MAILTRAP_DISABLE_TEMPLATE_UUID || '',
+              MAILTRAP_ENABLE_TEMPLATE_UUID:
+                process.env.MAILTRAP_ENABLE_TEMPLATE_UUID || '',
+              MAILTRAP_DELETE_USER_TEMPLATE_UUID:
+                process.env.MAILTRAP_DELETE_USER_TEMPLATE_UUID || '',
+
+              // OneSignal Push Notifications
+              ONESIGNAL_APP_ID: process.env.ONESIGNAL_APP_ID || '',
+              ONESIGNAL_API_KEY: process.env.ONESIGNAL_API_KEY || '',
+
+              // Admin Configuration
+              SUPER_ADMIN_EMAIL:
+                process.env.SUPER_ADMIN_EMAIL || 'admin@yourdomain.com',
+              SUPER_ADMIN_PASSWORD:
+                process.env.SUPER_ADMIN_PASSWORD ||
+                'YourSecureAdminPassword123!',
+
+              // Google OAuth
+              GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID || '',
+              GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET || '',
+
+              // Other Configuration
+              OTP_LIMITER: process.env.OTP_LIMITER || '5',
+              SECRET_KEY:
+                process.env.SECRET_KEY ||
+                'another-random-secret-key-for-general-encryption',
+              ACCESS_KEY: process.env.ACCESS_KEY || '',
+              DB_SYNC: process.env.DB_SYNC || 'txsrue',
+
+              // Redis (used?)
+              AZURE_REDIS_CONNECTIONSTRING:
+                process.env.AZURE_REDIS_CONNECTIONSTRING || '',
+
+              // Docker Registry (for deployment)
+              DOCKER_REGISTRY_SERVER_URL:
+                process.env.DOCKER_REGISTRY_SERVER_URL || '',
+              DOCKER_REGISTRY_SERVER_USERNAME:
+                process.env.DOCKER_REGISTRY_SERVER_USERNAME || '',
+              DOCKER_REGISTRY_SERVER_PASSWORD:
+                process.env.DOCKER_REGISTRY_SERVER_PASSWORD || '',
+
+              // Doppler (if used for secrets management)
+              DOPPLER_PROJECT: process.env.DOPPLER_PROJECT || '',
+              DOPPLER_CONFIG: process.env.DOPPLER_CONFIG || '',
+              DOPPLER_ENVIRONMENT: process.env.DOPPLER_ENVIRONMENT || '',
+
+              // Azure specific
+              WEBSITES_ENABLE_APP_SERVICE_STORAGE:
+                process.env.WEBSITES_ENABLE_APP_SERVICE_STORAGE || 'false',
+            },
+            secrets: {
+              AZURE_POSTGRESQL_PASSWORD: ecs.Secret.fromSecretsManager(
+                dbSecret,
+                'password',
+              ),
+            },
+            logDriver: ecs.LogDrivers.awsLogs({
+              streamPrefix: 'syncrow-backend',
+              logGroup,
+            }),
+          },
+          publicLoadBalancer: true,
+          securityGroups: [ecsSecurityGroup],
+        },
+      );
+
+    // Add security group to load balancer after creation
+    fargateService.loadBalancer.addSecurityGroup(albSecurityGroup);
+
+    // Configure health check
+    fargateService.targetGroup.configureHealthCheck({
+      path: '/health',
+      healthyHttpCodes: '200',
+      interval: cdk.Duration.seconds(30),
+      timeout: cdk.Duration.seconds(5),
+      healthyThresholdCount: 2,
+      unhealthyThresholdCount: 3,
+    });
+
+    // Auto Scaling
+    const scalableTarget = fargateService.service.autoScaleTaskCount({
+      minCapacity: 1,
+      maxCapacity: 10,
+    });
+
+    scalableTarget.scaleOnCpuUtilization('CpuScaling', {
+      targetUtilizationPercent: 70,
+      scaleInCooldown: cdk.Duration.minutes(5),
+      scaleOutCooldown: cdk.Duration.minutes(2),
+    });
+
+    scalableTarget.scaleOnMemoryUtilization('MemoryScaling', {
+      targetUtilizationPercent: 80,
+      scaleInCooldown: cdk.Duration.minutes(5),
+      scaleOutCooldown: cdk.Duration.minutes(2),
+    });
+
+    // Grant ECS task access to RDS credentials
+    dbSecret.grantRead(fargateService.taskDefinition.taskRole);
+
+    this.apiUrl = 'https://api.syncrow.me';
+    this.databaseEndpoint = dbCluster.clusterEndpoint.hostname;
+
+    // Outputs
+    new cdk.CfnOutput(this, 'ApiUrl', {
+      value: this.apiUrl,
+      description: 'Application Load Balancer URL',
+      exportName: `${this.stackName}-ApiUrl`,
+    });
+
+    new cdk.CfnOutput(this, 'DatabaseEndpoint', {
+      value: this.databaseEndpoint,
+      description: 'RDS Cluster Endpoint',
+      exportName: `${this.stackName}-DatabaseEndpoint`,
+    });
+
+    new cdk.CfnOutput(this, 'EcrRepositoryUri', {
+      value: ecrRepository.repositoryUri,
+      description: 'ECR Repository URI',
+      exportName: `${this.stackName}-EcrRepositoryUri`,
+    });
+
+    new cdk.CfnOutput(this, 'ClusterName', {
+      value: cluster.clusterName,
+      description: 'ECS Cluster Name',
+      exportName: `${this.stackName}-ClusterName`,
+    });
+
+    new cdk.CfnOutput(this, 'ServiceName', {
+      value: fargateService.service.serviceName,
+      description: 'ECS Service Name',
+      exportName: `${this.stackName}-ServiceName`,
+    });
+  }
+}

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;
+    const { password, ...result } = user;
-    delete user.password;
+    return result;
-    return user;
   }
 
   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/constants/controller-route.ts

@@ -69,28 +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 COMMUNITY = class {
     public static readonly ROUTE = '/projects/:projectUuid/communities';
     static ACTIONS = class {
@@ -220,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. ';
@@ -658,11 +632,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 {

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

@@ -25,7 +25,6 @@ import {
   InviteUserEntity,
   InviteUserSpaceEntity,
 } from '../modules/Invite-user/entities';
-import { SpaceDailyOccupancyDurationEntity } from '../modules/occupancy/entities';
 import {
   PowerClampDailyEntity,
   PowerClampHourlyEntity,
@@ -47,6 +46,7 @@ import {
   SubspaceModelProductAllocationEntity,
 } from '../modules/space-model/entities';
 import { InviteSpaceEntity } from '../modules/space/entities/invite-space.entity';
+import { SpaceLinkEntity } from '../modules/space/entities/space-link.entity';
 import { SpaceProductAllocationEntity } from '../modules/space/entities/space-product-allocation.entity';
 import { SpaceEntity } from '../modules/space/entities/space.entity';
 import { SubspaceProductAllocationEntity } from '../modules/space/entities/subspace/subspace-product-allocation.entity';
@@ -58,7 +58,7 @@ import {
   UserSpaceEntity,
 } from '../modules/user/entities';
 import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
-import { BookableSpaceEntity } from '../modules/booking/entities';
+import { SpaceDailyOccupancyDurationEntity } from '../modules/occupancy/entities';
 @Module({
   imports: [
     TypeOrmModule.forRootAsync({
@@ -87,6 +87,7 @@ import { BookableSpaceEntity } from '../modules/booking/entities';
             PermissionTypeEntity,
             CommunityEntity,
             SpaceEntity,
+            SpaceLinkEntity,
             SubspaceEntity,
             UserSpaceEntity,
             DeviceUserPermissionEntity,
@@ -118,7 +119,6 @@ import { BookableSpaceEntity } from '../modules/booking/entities';
             PresenceSensorDailySpaceEntity,
             AqiSpaceDailyPollutantStatsEntity,
             SpaceDailyOccupancyDurationEntity,
-            BookableSpaceEntity,
           ],
           namingStrategy: new SnakeNamingStrategy(),
           synchronize: Boolean(JSON.parse(configService.get('DB_SYNC'))),
@@ -127,8 +127,8 @@ import { BookableSpaceEntity } from '../modules/booking/entities';
           logger: typeOrmLogger,
           extra: {
             charset: 'utf8mb4',
-            max: 100, // set pool max size
+            max: 20, // set pool max size
-            idleTimeoutMillis: 3000, // close idle clients after 5 second
+            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 { IsBoolean, IsDate, IsOptional } from 'class-validator';
-import { Transform } from 'class-transformer';
-import { IsBoolean, IsOptional } from 'class-validator';
-import { BooleanValues } from '../constants/boolean-values.enum';
 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,28 @@ import { DeviceStatusFirebaseController } from './controllers/devices-status.con
 import { DeviceStatusFirebaseService } from './services/devices-status.service';
 import { DeviceRepository } from '@app/common/modules/device/repositories';
 import { DeviceStatusLogRepository } from '@app/common/modules/device-status-log/repositories/device-status.repository';
+import { PowerClampService } from '@app/common/helper/services/power.clamp.service';
+import {
+  PowerClampHourlyRepository,
+  PowerClampDailyRepository,
+  PowerClampMonthlyRepository,
+} from '@app/common/modules/power-clamp/repositories';
+import { SqlLoaderService } from '@app/common/helper/services/sql-loader.service';
+import { OccupancyService } from '@app/common/helper/services/occupancy.service';
+import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
 
 @Module({
   providers: [
     DeviceStatusFirebaseService,
     DeviceRepository,
     DeviceStatusLogRepository,
+    PowerClampService,
+    PowerClampHourlyRepository,
+    PowerClampDailyRepository,
+    PowerClampMonthlyRepository,
+    SqlLoaderService,
+    OccupancyService,
+    AqiDataService,
   ],
   controllers: [DeviceStatusFirebaseController],
   exports: [DeviceStatusFirebaseService, DeviceStatusLogRepository],

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

@@ -18,6 +18,12 @@ import {
   runTransaction,
 } from 'firebase/database';
 import { DeviceStatusLogRepository } from '@app/common/modules/device-status-log/repositories';
+import { ProductType } from '@app/common/constants/product-type.enum';
+import { PowerClampService } from '@app/common/helper/services/power.clamp.service';
+import { PowerClampEnergyEnum } from '@app/common/constants/power.clamp.enargy.enum';
+import { PresenceSensorEnum } from '@app/common/constants/presence.sensor.enum';
+import { OccupancyService } from '@app/common/helper/services/occupancy.service';
+import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
 @Injectable()
 export class DeviceStatusFirebaseService {
   private tuya: TuyaContext;
@@ -27,6 +33,9 @@ export class DeviceStatusFirebaseService {
   constructor(
     private readonly configService: ConfigService,
     private readonly deviceRepository: DeviceRepository,
+    private readonly powerClampService: PowerClampService,
+    private readonly occupancyService: OccupancyService,
+    private readonly aqiDataService: AqiDataService,
     private deviceStatusLogRepository: DeviceStatusLogRepository,
   ) {
     const accessKey = this.configService.get<string>('auth-config.ACCESS_KEY');
@@ -39,7 +48,12 @@ export class DeviceStatusFirebaseService {
     });
 
     // Initialize firebaseDb using firebaseDataBase function
-    this.firebaseDb = firebaseDataBase(this.configService);
+    try {
+      this.firebaseDb = firebaseDataBase(this.configService);
+    } catch (error) {
+      console.warn('Firebase initialization failed, continuing without Firebase:', error.message);
+      this.firebaseDb = null;
+    }
     this.isDevEnv =
       this.configService.get<string>('NODE_ENV') === 'development';
   }
@@ -71,94 +85,25 @@ export class DeviceStatusFirebaseService {
       );
     }
   }
-  async addBatchDeviceStatusToOurDb(
-    batch: {
-      deviceTuyaUuid: string;
-      status: any;
-      log: any;
-      device: any;
-    }[],
-  ): Promise<void> {
-    const allLogs = [];
-
-    console.log(`🔁 Preparing logs from batch of ${batch.length} items...`);
-
-    for (const item of batch) {
-      const device = item.device;
-      if (!device?.uuid) {
-        console.log(`⛔ Skipped unknown device: ${item.deviceTuyaUuid}`);
-        continue;
-      }
-
-      const logs = item.log.properties.map((property) =>
-        this.deviceStatusLogRepository.create({
-          deviceId: device.uuid,
-          deviceTuyaId: item.deviceTuyaUuid,
-          productId: item.log.productId,
-          log: item.log,
-          code: property.code,
-          value: property.value,
-          eventId: item.log.dataId,
-          eventTime: new Date(property.time).toISOString(),
-        }),
-      );
-      allLogs.push(...logs);
-    }
-
-    console.log(`📝 Total logs to insert: ${allLogs.length}`);
-
-    const insertLogsPromise = (async () => {
-      const chunkSize = 300;
-      let insertedCount = 0;
-
-      for (let i = 0; i < allLogs.length; i += chunkSize) {
-        const chunk = allLogs.slice(i, i + chunkSize);
-        try {
-          const result = await this.deviceStatusLogRepository
-            .createQueryBuilder()
-            .insert()
-            .into('device-status-log') // or use DeviceStatusLogEntity
-            .values(chunk)
-            .orIgnore() // skip duplicates
-            .execute();
-
-          insertedCount += result.identifiers.length;
-          console.log(
-            `✅ Inserted ${result.identifiers.length} / ${chunk.length} logs (chunk)`,
-          );
-        } catch (error) {
-          console.error('❌ Insert error (skipped chunk):', error.message);
-        }
-      }
-
-      console.log(
-        `✅ Total logs inserted: ${insertedCount} / ${allLogs.length}`,
-      );
-    })();
-
-    await insertLogsPromise;
-  }
-
   async addDeviceStatusToFirebase(
-    addDeviceStatusDto: AddDeviceStatusDto & { device?: any },
+    addDeviceStatusDto: AddDeviceStatusDto,
   ): Promise<AddDeviceStatusDto | null> {
     try {
-      let device = addDeviceStatusDto.device;
+      const device = await this.getDeviceByDeviceTuyaUuid(
-      if (!device) {
+        addDeviceStatusDto.deviceTuyaUuid,
-        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;
     }
   }
@@ -172,15 +117,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);
@@ -239,6 +175,14 @@ export class DeviceStatusFirebaseService {
   async createDeviceStatusFirebase(
     addDeviceStatusDto: AddDeviceStatusDto,
   ): Promise<any> {
+    // Check if Firebase is available
+    if (!this.firebaseDb) {
+      console.warn('Firebase not available, skipping Firebase operations');
+      // Still process the database logs but skip Firebase operations
+      await this.processDeviceStatusLogs(addDeviceStatusDto);
+      return { message: 'Device status processed without Firebase' };
+    }
+
     const dataRef = ref(
       this.firebaseDb,
       `device-status/${addDeviceStatusDto.deviceUuid}`,
@@ -284,8 +228,251 @@ export class DeviceStatusFirebaseService {
       return existingData;
     });
 
+    if (this.isDevEnv) {
+      // Save logs to your repository
+      const newLogs = addDeviceStatusDto.log.properties.map((property) => {
+        return this.deviceStatusLogRepository.create({
+          deviceId: addDeviceStatusDto.deviceUuid,
+          deviceTuyaId: addDeviceStatusDto.deviceTuyaUuid,
+          productId: addDeviceStatusDto.log.productId,
+          log: addDeviceStatusDto.log,
+          code: property.code,
+          value: property.value,
+          eventId: addDeviceStatusDto.log.dataId,
+          eventTime: new Date(property.time).toISOString(),
+        });
+      });
+      await this.deviceStatusLogRepository.save(newLogs);
+
+      if (addDeviceStatusDto.productType === ProductType.PC) {
+        const energyCodes = new Set([
+          PowerClampEnergyEnum.ENERGY_CONSUMED,
+          PowerClampEnergyEnum.ENERGY_CONSUMED_A,
+          PowerClampEnergyEnum.ENERGY_CONSUMED_B,
+          PowerClampEnergyEnum.ENERGY_CONSUMED_C,
+        ]);
+
+        const energyStatus = addDeviceStatusDto?.log?.properties?.find(
+          (status) => energyCodes.has(status.code),
+        );
+
+        if (energyStatus) {
+          await this.powerClampService.updateEnergyConsumedHistoricalData(
+            addDeviceStatusDto.deviceUuid,
+          );
+        }
+      }
+
+      if (
+        addDeviceStatusDto.productType === ProductType.CPS ||
+        addDeviceStatusDto.productType === ProductType.WPS
+      ) {
+        const occupancyCodes = new Set([PresenceSensorEnum.PRESENCE_STATE]);
+
+        const occupancyStatus = addDeviceStatusDto?.log?.properties?.find(
+          (status) => occupancyCodes.has(status.code),
+        );
+
+        if (occupancyStatus) {
+          await this.occupancyService.updateOccupancySensorHistoricalData(
+            addDeviceStatusDto.deviceUuid,
+          );
+          await this.occupancyService.updateOccupancySensorHistoricalDurationData(
+            addDeviceStatusDto.deviceUuid,
+          );
+        }
+      }
+      if (addDeviceStatusDto.productType === ProductType.AQI) {
+        await this.aqiDataService.updateAQISensorHistoricalData(
+          addDeviceStatusDto.deviceUuid,
+        );
+      }
+    } else {
+      // Save logs to your repository
+      const newLogs = addDeviceStatusDto?.status.map((property) => {
+        return this.deviceStatusLogRepository.create({
+          deviceId: addDeviceStatusDto.deviceUuid,
+          deviceTuyaId: addDeviceStatusDto.deviceTuyaUuid,
+          productId: addDeviceStatusDto.log.productKey,
+          log: addDeviceStatusDto.log,
+          code: property.code,
+          value: property.value,
+          eventId: addDeviceStatusDto.log.dataId,
+          eventTime: new Date(property.t).toISOString(),
+        });
+      });
+      await this.deviceStatusLogRepository.save(newLogs);
+
+      if (addDeviceStatusDto.productType === ProductType.PC) {
+        const energyCodes = new Set([
+          PowerClampEnergyEnum.ENERGY_CONSUMED,
+          PowerClampEnergyEnum.ENERGY_CONSUMED_A,
+          PowerClampEnergyEnum.ENERGY_CONSUMED_B,
+          PowerClampEnergyEnum.ENERGY_CONSUMED_C,
+        ]);
+
+        const energyStatus = addDeviceStatusDto?.status?.find((status) => {
+          return energyCodes.has(status.code as PowerClampEnergyEnum);
+        });
+
+        if (energyStatus) {
+          await this.powerClampService.updateEnergyConsumedHistoricalData(
+            addDeviceStatusDto.deviceUuid,
+          );
+        }
+      }
+
+      if (
+        addDeviceStatusDto.productType === ProductType.CPS ||
+        addDeviceStatusDto.productType === ProductType.WPS
+      ) {
+        const occupancyCodes = new Set([PresenceSensorEnum.PRESENCE_STATE]);
+
+        const occupancyStatus = addDeviceStatusDto?.status?.find((status) => {
+          return occupancyCodes.has(status.code as PresenceSensorEnum);
+        });
+
+        if (occupancyStatus) {
+          await this.occupancyService.updateOccupancySensorHistoricalData(
+            addDeviceStatusDto.deviceUuid,
+          );
+          await this.occupancyService.updateOccupancySensorHistoricalDurationData(
+            addDeviceStatusDto.deviceUuid,
+          );
+        }
+      }
+
+      if (addDeviceStatusDto.productType === ProductType.AQI) {
+        await this.aqiDataService.updateAQISensorHistoricalData(
+          addDeviceStatusDto.deviceUuid,
+        );
+      }
+    }
     // Return the updated data
     const snapshot: DataSnapshot = await get(dataRef);
     return snapshot.val();
   }
+
+  private async processDeviceStatusLogs(addDeviceStatusDto: AddDeviceStatusDto): Promise<void> {
+    if (this.isDevEnv) {
+      // Save logs to your repository
+      const newLogs = addDeviceStatusDto.log.properties.map((property) => {
+        return this.deviceStatusLogRepository.create({
+          deviceId: addDeviceStatusDto.deviceUuid,
+          deviceTuyaId: addDeviceStatusDto.deviceTuyaUuid,
+          productId: addDeviceStatusDto.log.productId,
+          log: addDeviceStatusDto.log,
+          code: property.code,
+          value: property.value,
+          eventId: addDeviceStatusDto.log.dataId,
+          eventTime: new Date(property.time).toISOString(),
+        });
+      });
+      await this.deviceStatusLogRepository.save(newLogs);
+
+      if (addDeviceStatusDto.productType === ProductType.PC) {
+        const energyCodes = new Set([
+          PowerClampEnergyEnum.ENERGY_CONSUMED,
+          PowerClampEnergyEnum.ENERGY_CONSUMED_A,
+          PowerClampEnergyEnum.ENERGY_CONSUMED_B,
+          PowerClampEnergyEnum.ENERGY_CONSUMED_C,
+        ]);
+
+        const energyStatus = addDeviceStatusDto?.log?.properties?.find(
+          (status) => energyCodes.has(status.code),
+        );
+
+        if (energyStatus) {
+          await this.powerClampService.updateEnergyConsumedHistoricalData(
+            addDeviceStatusDto.deviceUuid,
+          );
+        }
+      }
+
+      if (
+        addDeviceStatusDto.productType === ProductType.CPS ||
+        addDeviceStatusDto.productType === ProductType.WPS
+      ) {
+        const occupancyCodes = new Set([PresenceSensorEnum.PRESENCE_STATE]);
+
+        const occupancyStatus = addDeviceStatusDto?.log?.properties?.find(
+          (status) => occupancyCodes.has(status.code),
+        );
+
+        if (occupancyStatus) {
+          await this.occupancyService.updateOccupancySensorHistoricalData(
+            addDeviceStatusDto.deviceUuid,
+          );
+          await this.occupancyService.updateOccupancySensorHistoricalDurationData(
+            addDeviceStatusDto.deviceUuid,
+          );
+        }
+      }
+      if (addDeviceStatusDto.productType === ProductType.AQI) {
+        await this.aqiDataService.updateAQISensorHistoricalData(
+          addDeviceStatusDto.deviceUuid,
+        );
+      }
+    } else {
+      // Save logs to your repository
+      const newLogs = addDeviceStatusDto?.status.map((property) => {
+        return this.deviceStatusLogRepository.create({
+          deviceId: addDeviceStatusDto.deviceUuid,
+          deviceTuyaId: addDeviceStatusDto.deviceTuyaUuid,
+          productId: addDeviceStatusDto.log.productKey,
+          log: addDeviceStatusDto.log,
+          code: property.code,
+          value: property.value,
+          eventId: addDeviceStatusDto.log.dataId,
+          eventTime: new Date(property.t).toISOString(),
+        });
+      });
+      await this.deviceStatusLogRepository.save(newLogs);
+
+      if (addDeviceStatusDto.productType === ProductType.PC) {
+        const energyCodes = new Set([
+          PowerClampEnergyEnum.ENERGY_CONSUMED,
+          PowerClampEnergyEnum.ENERGY_CONSUMED_A,
+          PowerClampEnergyEnum.ENERGY_CONSUMED_B,
+          PowerClampEnergyEnum.ENERGY_CONSUMED_C,
+        ]);
+
+        const energyStatus = addDeviceStatusDto?.status?.find((status) => {
+          return energyCodes.has(status.code as PowerClampEnergyEnum);
+        });
+
+        if (energyStatus) {
+          await this.powerClampService.updateEnergyConsumedHistoricalData(
+            addDeviceStatusDto.deviceUuid,
+          );
+        }
+      }
+
+      if (
+        addDeviceStatusDto.productType === ProductType.CPS ||
+        addDeviceStatusDto.productType === ProductType.WPS
+      ) {
+        const occupancyCodes = new Set([PresenceSensorEnum.PRESENCE_STATE]);
+
+        const occupancyStatus = addDeviceStatusDto?.status?.find((status) => {
+          return occupancyCodes.has(status.code as PresenceSensorEnum);
+        });
+
+        if (occupancyStatus) {
+          await this.occupancyService.updateOccupancySensorHistoricalData(
+            addDeviceStatusDto.deviceUuid,
+          );
+          await this.occupancyService.updateOccupancySensorHistoricalDurationData(
+            addDeviceStatusDto.deviceUuid,
+          );
+        }
+      }
+
+      if (addDeviceStatusDto.productType === ProductType.AQI) {
+        await this.aqiDataService.updateAQISensorHistoricalData(
+          addDeviceStatusDto.deviceUuid,
+        );
+      }
+    }
+  }
 }

libs/common/src/firebase/firebase.config.ts

@@ -3,21 +3,32 @@ import { getDatabase } from 'firebase/database';
 import { ConfigService } from '@nestjs/config';
 
 export const initializeFirebaseApp = (configService: ConfigService) => {
-  const firebaseConfig = {
+  try {
-    apiKey: configService.get<string>('FIREBASE_API_KEY'),
+    const firebaseConfig = {
-    authDomain: configService.get<string>('FIREBASE_AUTH_DOMAIN'),
+      apiKey: configService.get<string>('FIREBASE_API_KEY'),
-    projectId: configService.get<string>('FIREBASE_PROJECT_ID'),
+      authDomain: configService.get<string>('FIREBASE_AUTH_DOMAIN'),
-    storageBucket: configService.get<string>('FIREBASE_STORAGE_BUCKET'),
+      projectId: configService.get<string>('FIREBASE_PROJECT_ID'),
-    messagingSenderId: configService.get<string>(
+      storageBucket: configService.get<string>('FIREBASE_STORAGE_BUCKET'),
-      'FIREBASE_MESSAGING_SENDER_ID',
+      messagingSenderId: configService.get<string>(
-    ),
+        'FIREBASE_MESSAGING_SENDER_ID',
-    appId: configService.get<string>('FIREBASE_APP_ID'),
+      ),
-    measurementId: configService.get<string>('FIREBASE_MEASUREMENT_ID'),
+      appId: configService.get<string>('FIREBASE_APP_ID'),
-    databaseURL: configService.get<string>('FIREBASE_DATABASE_URL'),
+      measurementId: configService.get<string>('FIREBASE_MEASUREMENT_ID'),
-  };
+      databaseURL: configService.get<string>('FIREBASE_DATABASE_URL'),
+    };
 
-  const app = initializeApp(firebaseConfig);
+    // Check if required Firebase config is available
-  return getDatabase(app);
+    if (!firebaseConfig.projectId || firebaseConfig.projectId === 'placeholder-project') {
+      console.warn('Firebase configuration not available, Firebase features will be disabled');
+      return null;
+    }
+
+    const app = initializeApp(firebaseConfig);
+    return getDatabase(app);
+  } catch (error) {
+    console.warn('Firebase initialization failed, Firebase features will be disabled:', error.message);
+    return null;
+  }
 };
 
 export const firebaseDataBase = (configService: ConfigService) =>

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

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

@@ -1,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 updateOccupancySensorHistoricalDurationData(
-  async updateOccupancyDataProcedures(): Promise<void> {
+    deviceUuid: string,
-    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,
   ): Promise<void> {
     try {
-      const query = this.loadQuery(folderName, procedureFileName);
+      const now = new Date();
-      await this.dataSource.query(query, params);
+      const dateStr = now.toLocaleDateString('en-CA'); // YYYY-MM-DD
-      console.log(`Procedure ${procedureFileName} executed successfully.`);
+      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) {
+      console.error('Failed to insert or update occupancy duration data:', err);
-        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;
     }
   }
+  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();
+      const now = new Date();
-
+      const dateStr = now.toLocaleDateString('en-CA'); // YYYY-MM-DD
-      // Execute all procedures in parallel
+      const hour = now.getHours();
-      await Promise.all([
+      const monthYear = now
-        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
         .toLocaleDateString('en-US', {
           month: '2-digit',
           year: 'numeric',
         })
-        .replace('/', '-'), // MM-YYYY
+        .replace('/', '-'); // MM-YYYY
-    };
-  }
 
-  private async executeProcedureWithRetry(
+      await this.executeProcedure(
-    procedureFileName: string,
+        'fact_hourly_device_energy_consumed_procedure',
-    params: (string | number | null)[],
+        [deviceUuid, dateStr, hour],
-    folderName: string,
+      );
-    retries = 3,
+
-  ): Promise<void> {
+      await this.executeProcedure(
-    try {
+        'fact_daily_device_energy_consumed_procedure',
-      const query = this.loadQuery(folderName, procedureFileName);
+        [deviceUuid, dateStr],
-      await this.dataSource.query(query, params);
+      );
-      console.log(`Procedure ${procedureFileName} executed successfully.`);
+
+      await this.executeProcedure(
+        'fact_monthly_device_energy_consumed_procedure',
+        [deviceUuid, monthYear],
+      );
     } catch (err) {
-      if (retries > 0) {
+      console.error('Failed to insert or update energy data:', err);
-        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 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> {
+  async handleSosEvent(devId: string, logData: any): Promise<void> {
-    const sosTrueStatus = [{ code: 'sos', value: true }];
-    const sosFalseStatus = [{ code: 'sos', value: false }];
-
     try {
-      // ✅ Send true status
       await this.deviceStatusFirebaseService.addDeviceStatusToFirebase({
-        deviceTuyaUuid: device.deviceTuyaUuid,
+        deviceTuyaUuid: devId,
-        status: sosTrueStatus,
+        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,
+            deviceTuyaUuid: devId,
-            status: sosFalseStatus,
+            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 { Injectable, OnModuleInit } from '@nestjs/common';
+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';
-import * as NodeCache from 'node-cache';
 
 @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,38 +43,23 @@ export class TuyaWebSocketService implements OnModuleInit {
     this.client.message(async (ws: WebSocket, message: any) => {
       try {
         const { devId, status, logData } = this.extractMessageData(message);
-        if (!Array.isArray(logData?.properties)) {
-          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');
     });
@@ -126,37 +80,6 @@ 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;

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

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

@@ -1,6 +1,6 @@
 import { RoleType } from '@app/common/constants/role.type.enum';
 import { UserStatusEnum } from '@app/common/constants/user-status.enum';
-import { IsEnum, IsNotEmpty, 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()
+  @IsNotEmpty()
-  public jobTitle?: string;
+  public jobTitle: string;
-
-  @IsString()
-  @IsOptional()
-  public companyName?: string;
 
   @IsEnum(UserStatusEnum)
   @IsNotEmpty()

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

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

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

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

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

@@ -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/index.ts

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

libs/common/src/modules/booking/repositories/booking.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/index.ts

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

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

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

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

@@ -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.entity.ts

@@ -1,25 +1,18 @@
-import {
+import { Column, Entity, JoinColumn, ManyToOne, OneToMany } from 'typeorm';
-  Column,
+import { SpaceDto } from '../dtos';
-  Entity,
-  JoinColumn,
-  ManyToOne,
-  OneToMany,
-  OneToOne,
-} from 'typeorm';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { AqiSpaceDailyPollutantStatsEntity } from '../../aqi/entities';
+import { UserSpaceEntity } from '../../user/entities';
-import { BookableSpaceEntity } from '../../booking/entities';
-import { CommunityEntity } from '../../community/entities';
 import { DeviceEntity } from '../../device/entities';
-import { InviteUserSpaceEntity } from '../../Invite-user/entities';
+import { CommunityEntity } from '../../community/entities';
-import { SpaceDailyOccupancyDurationEntity } from '../../occupancy/entities';
+import { SpaceLinkEntity } from './space-link.entity';
-import { PresenceSensorDailySpaceEntity } from '../../presence-sensor/entities';
 import { SceneEntity } from '../../scene/entities';
 import { SpaceModelEntity } from '../../space-model';
-import { UserSpaceEntity } from '../../user/entities';
+import { InviteUserSpaceEntity } from '../../Invite-user/entities';
-import { SpaceDto } from '../dtos';
 import { SpaceProductAllocationEntity } from './space-product-allocation.entity';
 import { SubspaceEntity } from './subspace/subspace.entity';
+import { PresenceSensorDailySpaceEntity } from '../../presence-sensor/entities';
+import { AqiSpaceDailyPollutantStatsEntity } from '../../aqi/entities';
+import { SpaceDailyOccupancyDurationEntity } from '../../occupancy/entities';
 
 @Entity({ name: 'space' })
 export class SpaceEntity extends AbstractEntity<SpaceDto> {
@@ -64,23 +57,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,
   })
   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',
@@ -122,9 +126,6 @@ export class SpaceEntity extends AbstractEntity<SpaceDto> {
   )
   occupancyDaily: SpaceDailyOccupancyDurationEntity[];
 
-  @OneToOne(() => BookableSpaceEntity, (bookable) => bookable.space)
-  bookableConfig: BookableSpaceEntity;
-
   constructor(partial: Partial<SpaceEntity>) {
     super();
     Object.assign(this, partial);

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

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

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

@@ -82,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;
 

libs/common/src/seed/services/supper.admin.seeder.ts

@@ -61,6 +61,10 @@ export class SuperAdminSeeder {
         lastName: 'Admin',
         isUserVerified: true,
         isActive: true,
+        hasAcceptedAppAgreement: true,
+        hasAcceptedWebAgreement: true,
+        appAgreementAcceptedAt: new Date(),
+        webAgreementAcceptedAt: new Date(),
         roleType: { uuid: defaultUserRoleUuid },
       });
     } catch (err) {

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 
+  ON p.space_id = a.space_id AND p.event_date = a.event_date
-  AND p.event_date = a.event_date
-JOIN params  
-    ON params.event_date = a.event_date
 ORDER BY p.space_id, p.event_date)
 
 

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

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

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

@@ -1,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/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)
 
 

package.json

@@ -6,19 +6,25 @@
   "private": true,
   "license": "UNLICENSED",
   "scripts": {
-    "build": "npm run test && npx nest build",
+    "build": "npx nest build",
+    "build:lambda": "npx nest build && cp package*.json dist/",
     "format": "prettier --write \"apps/**/*.ts\" \"libs/**/*.ts\"",
-    "start": "npm run test && node dist/main",
+    "start": "node dist/main",
-    "start:dev": "npm run test && npx nest start --watch",
+    "start:dev": "npx nest start --watch",
     "dev": "npx nest start --watch",
-    "start:debug": "npm run test && npx nest start --debug --watch",
+    "start:debug": "npx nest start --debug --watch",
-    "start:prod": "npm run test && node dist/main",
+    "start:prod": "node dist/main",
+    "start:lambda": "node dist/lambda",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
     "test": "jest --config jest.config.js",
     "test:watch": "jest --watch --config jest.config.js",
     "test:cov": "jest --coverage --config jest.config.js",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./apps/backend/test/jest-e2e.json"
+    "test:e2e": "jest --config ./apps/backend/test/jest-e2e.json",
+    "deploy": "./deploy.sh",
+    "infra:build": "bash build.sh",
+    "infra:deploy": "cdk deploy SyncrowBackendStack",
+    "infra:destroy": "cdk destroy SyncrowBackendStack"
   },
   "dependencies": {
     "@fast-csv/format": "^5.0.2",
@@ -30,20 +36,22 @@
     "@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",
     "@nestjs/typeorm": "^10.0.2",
     "@nestjs/websockets": "^10.3.8",
     "@tuya/tuya-connector-nodejs": "^2.1.2",
+    "@types/aws-lambda": "^8.10.150",
     "argon2": "^0.40.1",
+    "aws-serverless-express": "^3.4.0",
     "axios": "^1.7.7",
     "bcryptjs": "^2.4.3",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "crypto-js": "^4.2.0",
     "csv-parser": "^3.2.0",
+    "dotenv": "^17.0.0",
     "express-rate-limit": "^7.1.5",
     "firebase": "^10.12.5",
     "google-auth-library": "^9.14.1",
@@ -51,14 +59,15 @@
     "ioredis": "^5.3.2",
     "morgan": "^1.10.0",
     "nest-winston": "^1.10.2",
-    "node-cache": "^5.1.2",
     "nodemailer": "^6.9.10",
     "onesignal-node": "^3.4.0",
+    "passport": "^0.7.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",
+    "webpack": "^5.99.9",
     "winston": "^3.17.0",
     "ws": "^8.17.0"
   },
@@ -75,7 +84,9 @@
     "@types/supertest": "^6.0.0",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
+    "aws-cdk-lib": "^2.202.0",
     "concurrently": "^8.2.2",
+    "constructs": "^10.4.2",
     "eslint": "^8.42.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.31.0",

src/app.module.ts

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

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

@@ -1,25 +1,25 @@
-import { RoleType } from '@app/common/constants/role.type.enum';
+import { UserRepository } from '../../../libs/common/src/modules/user/repositories';
-import { differenceInSeconds } from '@app/common/helper/differenceInSeconds';
 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.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/booking/booking.module.ts

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

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

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

src/booking/controllers/index.ts

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

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

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

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

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

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

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

src/booking/dtos/index.ts

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

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

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

src/booking/index.ts

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

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

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

src/booking/services/index.ts

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

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

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

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

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

src/community/community.module.ts

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

src/community/controllers/community.controller.ts

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

src/community/services/community.service.ts

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

src/device/commands/cur2-commands.ts

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

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

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

src/device/controllers/device.controller.ts

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

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

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

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

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

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

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

src/group/group.module.ts

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

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

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

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

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

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

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

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

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

src/main.ts

@@ -1,13 +1,15 @@
-import { RequestContextMiddleware } from '@app/common/middleware/request-context.middleware';
-import { SeederService } from '@app/common/seed/services/seeder.service';
-import { Logger, ValidationPipe } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
-import { json, urlencoded } from 'body-parser';
-import helmet from 'helmet';
-import { WINSTON_MODULE_NEST_PROVIDER } from 'nest-winston';
-import { setupSwaggerAuthentication } from '../libs/common/src/util/user-auth.swagger.utils';
 import { AppModule } from './app.module';
+import rateLimit from 'express-rate-limit';
+import helmet from 'helmet';
+import { setupSwaggerAuthentication } from '../libs/common/src/util/user-auth.swagger.utils';
+import { ValidationPipe } from '@nestjs/common';
+import { json, urlencoded } from 'body-parser';
+import { SeederService } from '@app/common/seed/services/seeder.service';
 import { HttpExceptionFilter } from './common/filters/http-exception/http-exception.filter';
+import { Logger } from '@nestjs/common';
+import { WINSTON_MODULE_NEST_PROVIDER } from 'nest-winston';
+import { RequestContextMiddleware } from '@app/common/middleware/request-context.middleware';
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
@@ -21,6 +23,13 @@ async function bootstrap() {
 
   app.use(new RequestContextMiddleware().use);
 
+  app.use(
+    rateLimit({
+      windowMs: 5 * 60 * 1000,
+      max: 500,
+    }),
+  );
+
   app.use(
     helmet({
       contentSecurityPolicy: false,
@@ -48,7 +57,8 @@ async function bootstrap() {
     logger.error('Seeding failed!', error.stack || error);
   }
 
-  logger.log('Starting auth at port ...', process.env.PORT || 4000);
+  const port = process.env.PORT || 3000;
-  await app.listen(process.env.PORT || 4000);
+  logger.log(`Starting application on port ${port}...`);
+  await app.listen(port, '0.0.0.0');
 }
 bootstrap();

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

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

src/project/project.module.ts

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

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

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

src/project/services/project.service.ts

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

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

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

src/schedule/services/schedule.service.ts

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

src/scheduler/scheduler.module.ts

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

src/scheduler/scheduler.service.ts

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

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

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

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

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

src/space/controllers/space.controller.ts

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

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

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

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

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

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

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

src/space/dtos/index.ts

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

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

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

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

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

src/space/dtos/subspace/index.ts

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

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

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

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

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