divide 100

.github/workflows/pr-description.yml

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

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

@@ -223,10 +223,6 @@ export class ControllerRoute {
       public static readonly CREATE_SPACE_DESCRIPTION =
         'This endpoint allows you to create a space in a specified community. Optionally, you can specify a parent space to nest the new space under it.';
 
-      public static readonly DUPLICATE_SPACE_SUMMARY = 'Duplicate a space';
-      public static readonly DUPLICATE_SPACE_DESCRIPTION =
-        'This endpoint allows you to create a copy of an existing space in a specified community.';
-
       public static readonly LIST_SPACE_SUMMARY = 'List spaces in community';
       public static readonly LIST_SPACE_DESCRIPTION =
         'List spaces in specified community by community id';

libs/common/src/constants/timer-job-type.enum.ts

@@ -1,3 +0,0 @@
-export enum TimerJobTypeEnum {
-  INVITE_USER_EMAIL = 'INVITE_USER_EMAIL',
-}

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

@@ -54,7 +54,6 @@ import { SpaceEntity } from '../modules/space/entities/space.entity';
 import { SubspaceProductAllocationEntity } from '../modules/space/entities/subspace/subspace-product-allocation.entity';
 import { SubspaceEntity } from '../modules/space/entities/subspace/subspace.entity';
 import { NewTagEntity } from '../modules/tag/entities/tag.entity';
-import { TimerEntity } from '../modules/timer/entities/timer.entity';
 import { TimeZoneEntity } from '../modules/timezone/entities';
 import {
   UserNotificationEntity,
@@ -122,7 +121,6 @@ import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
             SpaceDailyOccupancyDurationEntity,
             BookableSpaceEntity,
             BookingEntity,
-            TimerEntity,
           ],
           namingStrategy: new SnakeNamingStrategy(),
           synchronize: Boolean(JSON.parse(configService.get('DB_SYNC'))),

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

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

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

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

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

@@ -15,16 +15,17 @@ import { ProjectEntity } from '../../project/entities';
 import { RoleTypeEntity } from '../../role-type/entities';
 import { SpaceEntity } from '../../space/entities/space.entity';
 import { UserEntity } from '../../user/entities';
+import { InviteUserDto, InviteUserSpaceDto } from '../dtos';
 
 @Entity({ name: 'invite-user' })
 @Unique(['email', 'project'])
-export class InviteUserEntity extends AbstractEntity {
+export class InviteUserEntity extends AbstractEntity<InviteUserDto> {
   @Column({
     type: 'uuid',
     default: () => 'gen_random_uuid()',
     nullable: false,
   })
-  uuid: string;
+  public uuid: string;
 
   @Column({
     nullable: false,
@@ -48,67 +49,50 @@ export class InviteUserEntity extends AbstractEntity {
   status: string;
 
   @Column()
-  firstName: string;
+  public firstName: string;
 
   @Column({
     nullable: false,
   })
-  lastName: string;
+  public lastName: string;
-
   @Column({
     nullable: true,
   })
-  phoneNumber: string;
+  public phoneNumber: string;
 
   @Column({
     nullable: false,
     default: true,
   })
-  isActive: boolean;
+  public isActive: boolean;
-
   @Column({
     nullable: false,
     default: true,
   })
-  isEnabled: boolean;
+  public isEnabled: boolean;
-
   @Column({
     nullable: false,
     unique: true,
   })
-  invitationCode: string;
+  public invitationCode: string;
-
-  @Column({
-    default: new Date(),
-    type: 'date',
-  })
-  accessStartDate: Date;
-
-  @Column({
-    type: 'date',
-    nullable: true,
-  })
-  accessEndDate?: Date;
 
   @Column({
     nullable: false,
     enum: Object.values(RoleType),
   })
-  invitedBy: string;
+  public invitedBy: string;
 
   @ManyToOne(() => RoleTypeEntity, (roleType) => roleType.invitedUsers, {
     nullable: false,
     onDelete: 'CASCADE',
   })
-  roleType: RoleTypeEntity;
+  public roleType: RoleTypeEntity;
-
   @OneToOne(() => UserEntity, (user) => user.inviteUser, {
     nullable: true,
     onDelete: 'CASCADE',
   })
   @JoinColumn({ name: 'user_uuid' })
   user: UserEntity;
-
   @OneToMany(
     () => InviteUserSpaceEntity,
     (inviteUserSpace) => inviteUserSpace.inviteUser,
@@ -119,34 +103,32 @@ export class InviteUserEntity extends AbstractEntity {
     nullable: true,
   })
   @JoinColumn({ name: 'project_uuid' })
-  project: ProjectEntity;
+  public project: ProjectEntity;
 
   constructor(partial: Partial<InviteUserEntity>) {
     super();
     Object.assign(this, partial);
   }
 }
-
 @Entity({ name: 'invite-user-space' })
 @Unique(['inviteUser', 'space'])
-export class InviteUserSpaceEntity extends AbstractEntity {
+export class InviteUserSpaceEntity extends AbstractEntity<InviteUserSpaceDto> {
   @Column({
     type: 'uuid',
     default: () => 'gen_random_uuid()',
     nullable: false,
   })
-  uuid: string;
+  public uuid: string;
 
   @ManyToOne(() => InviteUserEntity, (inviteUser) => inviteUser.spaces, {
     onDelete: 'CASCADE',
   })
   @JoinColumn({ name: 'invite_user_uuid' })
-  inviteUser: InviteUserEntity;
+  public inviteUser: InviteUserEntity;
 
   @ManyToOne(() => SpaceEntity, (space) => space.invitedUsers)
   @JoinColumn({ name: 'space_uuid' })
-  space: SpaceEntity;
+  public space: SpaceEntity;
-
   constructor(partial: Partial<InviteUserSpaceEntity>) {
     super();
     Object.assign(this, partial);

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

@@ -22,11 +22,6 @@ export class SpaceProductAllocationEntity extends AbstractEntity<SpaceProductAll
   })
   public space: SpaceEntity;
 
-  @Column({
-    name: 'space_uuid',
-  })
-  public spaceUuid: string;
-
   @ManyToOne(() => SpaceModelProductAllocationEntity, {
     nullable: true,
     onDelete: 'SET NULL',
@@ -36,19 +31,9 @@ export class SpaceProductAllocationEntity extends AbstractEntity<SpaceProductAll
   @ManyToOne(() => ProductEntity, { nullable: false, onDelete: 'CASCADE' })
   public product: ProductEntity;
 
-  @Column({
-    name: 'product_uuid',
-  })
-  public productUuid: string;
-
   @ManyToOne(() => NewTagEntity, { nullable: true, onDelete: 'CASCADE' })
   public tag: NewTagEntity;
 
-  @Column({
-    name: 'tag_uuid',
-  })
-  public tagUuid: string;
-
   constructor(partial: Partial<SpaceProductAllocationEntity>) {
     super();
     Object.assign(this, partial);

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

@@ -9,7 +9,6 @@ import {
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
 import { AqiSpaceDailyPollutantStatsEntity } from '../../aqi/entities';
 import { BookableSpaceEntity } from '../../booking/entities/bookable-space.entity';
-import { BookingEntity } from '../../booking/entities/booking.entity';
 import { CommunityEntity } from '../../community/entities';
 import { DeviceEntity } from '../../device/entities';
 import { InviteUserSpaceEntity } from '../../Invite-user/entities';
@@ -21,6 +20,7 @@ import { UserSpaceEntity } from '../../user/entities';
 import { SpaceDto } from '../dtos';
 import { SpaceProductAllocationEntity } from './space-product-allocation.entity';
 import { SubspaceEntity } from './subspace/subspace.entity';
+import { BookingEntity } from '../../booking/entities/booking.entity';
 
 @Entity({ name: 'space' })
 export class SpaceEntity extends AbstractEntity<SpaceDto> {
@@ -47,26 +47,12 @@ export class SpaceEntity extends AbstractEntity<SpaceDto> {
   @JoinColumn({ name: 'community_id' })
   community: CommunityEntity;
 
-  @Column({
+  @ManyToOne(() => SpaceEntity, (space) => space.children, { nullable: true })
-    name: 'community_id',
-  })
-  communityId: string;
-
-  @ManyToOne(() => SpaceEntity, (space) => space.children, {
-    nullable: true,
-  })
   parent: SpaceEntity;
 
-  @Column({
-    name: 'parent_uuid',
-    nullable: true,
-  })
-  public parentUuid: string;
-
   @OneToMany(() => SpaceEntity, (space) => space.parent, {
     nullable: false,
     onDelete: 'CASCADE',
-    cascade: true,
   })
   children: SpaceEntity[];
 
@@ -87,10 +73,16 @@ export class SpaceEntity extends AbstractEntity<SpaceDto> {
 
   @OneToMany(() => SubspaceEntity, (subspace) => subspace.space, {
     nullable: true,
-    cascade: true,
   })
   subspaces?: SubspaceEntity[];
 
+  // Position columns
+  @Column({ type: 'float', nullable: false, default: 0 })
+  public x: number; // X coordinate for position
+
+  @Column({ type: 'float', nullable: false, default: 0 })
+  public y: number; // Y coordinate for position
+
   @OneToMany(
     () => DeviceEntity,
     (devicesSpaceEntity) => devicesSpaceEntity.spaceDevice,

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

@@ -22,11 +22,6 @@ export class SubspaceProductAllocationEntity extends AbstractEntity<SubspaceProd
   })
   public subspace: SubspaceEntity;
 
-  @Column({
-    name: 'subspace_uuid',
-  })
-  public subspaceUuid: string;
-
   @ManyToOne(() => SubspaceModelProductAllocationEntity, {
     nullable: true,
     onDelete: 'SET NULL',
@@ -36,19 +31,9 @@ export class SubspaceProductAllocationEntity extends AbstractEntity<SubspaceProd
   @ManyToOne(() => ProductEntity, { nullable: false, onDelete: 'CASCADE' })
   public product: ProductEntity;
 
-  @Column({
-    name: 'product_uuid',
-  })
-  public productUuid: string;
-
   @ManyToOne(() => NewTagEntity, { nullable: true, onDelete: 'CASCADE' })
   public tag: NewTagEntity;
 
-  @Column({
-    name: 'tag_uuid',
-  })
-  public tagUuid: string;
-
   constructor(partial: Partial<SubspaceProductAllocationEntity>) {
     super();
     Object.assign(this, partial);

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

@@ -26,11 +26,6 @@ export class SubspaceEntity extends AbstractEntity<SubspaceDto> {
   @JoinColumn({ name: 'space_uuid' })
   space: SpaceEntity;
 
-  @Column({
-    name: 'space_uuid',
-  })
-  public spaceUuid: string;
-
   @Column({
     nullable: false,
     default: false,

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

@@ -1,37 +0,0 @@
-import { TimerJobTypeEnum } from '@app/common/constants/timer-job-type.enum';
-import { Column, Entity } from 'typeorm';
-import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-
-@Entity({ name: 'timer' })
-export class TimerEntity extends AbstractEntity {
-  @Column({
-    type: 'uuid',
-    default: () => 'gen_random_uuid()',
-    nullable: false,
-  })
-  uuid: string;
-
-  @Column({
-    nullable: false,
-    enum: Object.values(TimerJobTypeEnum),
-    type: String,
-  })
-  type: TimerJobTypeEnum;
-
-  @Column({
-    nullable: false,
-    type: 'date',
-  })
-  triggerDate: Date;
-
-  @Column({
-    type: 'jsonb',
-    nullable: true,
-  })
-  metadata?: Record<string, any>;
-
-  constructor(partial: Partial<TimerEntity>) {
-    super();
-    Object.assign(this, partial);
-  }
-}

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

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

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

@@ -1,12 +0,0 @@
-import { Global, Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { TimerEntity } from './entities/timer.entity';
-import { TimerRepository } from './repositories/timer.repository';
-
-@Global()
-@Module({
-  imports: [TypeOrmModule.forFeature([TimerEntity])],
-  providers: [TimerRepository],
-  exports: [TimerRepository],
-})
-export class TimerRepositoryModule {}

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

@@ -11,7 +11,6 @@ import {
 } from 'typeorm';
 import { OtpType } from '../../../../src/constants/otp-type.enum';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { BookingEntity } from '../../booking/entities/booking.entity';
 import { ClientEntity } from '../../client/entities';
 import {
   DeviceNotificationEntity,
@@ -30,6 +29,7 @@ import {
   UserOtpDto,
   UserSpaceDto,
 } from '../dtos';
+import { BookingEntity } from '../../booking/entities/booking.entity';
 
 @Entity({ name: 'user' })
 export class UserEntity extends AbstractEntity<UserDto> {
@@ -101,9 +101,6 @@ export class UserEntity extends AbstractEntity<UserDto> {
   @Column({ type: 'timestamp', nullable: true })
   appAgreementAcceptedAt: Date;
 
-  @Column({ type: Boolean, default: false })
-  bookingEnabled: boolean;
-
   @OneToMany(() => UserSpaceEntity, (userSpace) => userSpace.user, {
     onDelete: 'CASCADE',
   })

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

@@ -0,0 +1,91 @@
+WITH total_energy AS (
+    SELECT 
+        log.device_id,
+        log.event_time::date AS date,
+        EXTRACT(HOUR FROM log.event_time) AS hour,
+        TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
+        EXTRACT(YEAR FROM log.event_time)::int AS event_year,
+        MIN(log.value)::integer/100 AS min_value,
+        MAX(log.value)::integer/100 AS max_value
+    FROM "device-status-log" log
+    WHERE log.code = 'EnergyConsumed'
+    GROUP BY 1,2,3,4,5
+),
+
+energy_phase_A AS (
+    SELECT 
+        log.device_id,
+        log.event_time::date AS date,
+        EXTRACT(HOUR FROM log.event_time) AS hour,
+        TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
+        EXTRACT(YEAR FROM log.event_time)::int AS event_year,
+        MIN(log.value)::integer/100 AS min_value,
+        MAX(log.value)::integer/100 AS max_value
+    FROM "device-status-log" log
+    WHERE log.code = 'EnergyConsumedA'
+    GROUP BY 1,2,3,4,5
+),
+
+energy_phase_B AS (
+    SELECT 
+        log.device_id,
+        log.event_time::date AS date,
+        EXTRACT(HOUR FROM log.event_time) AS hour,
+        TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
+        EXTRACT(YEAR FROM log.event_time)::int AS event_year,
+        MIN(log.value)::integer/100 AS min_value,
+        MAX(log.value)::integer/100 AS max_value
+    FROM "device-status-log" log
+    WHERE log.code = 'EnergyConsumedB'
+    GROUP BY 1,2,3,4,5
+),
+
+energy_phase_C AS (
+    SELECT 
+        log.device_id,
+        log.event_time::date AS date,
+        EXTRACT(HOUR FROM log.event_time) AS hour,
+        TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
+        EXTRACT(YEAR FROM log.event_time)::int AS event_year,
+        MIN(log.value)::integer/100 AS min_value,
+        MAX(log.value)::integer/100 AS max_value
+    FROM "device-status-log" log
+    WHERE log.code = 'EnergyConsumedC'
+    GROUP BY 1,2,3,4,5
+)
+, final_data as (
+SELECT 
+    t.device_id,
+    t.date,
+    t.event_year::text,
+    t.event_month,
+    t.hour,
+    (t.max_value - t.min_value) AS energy_consumed_kW,
+    (a.max_value - a.min_value) AS energy_consumed_A,
+    (b.max_value - b.min_value) AS energy_consumed_B,
+    (c.max_value - c.min_value) AS energy_consumed_C
+FROM total_energy t
+JOIN energy_phase_A a ON t.device_id = a.device_id AND t.date = a.date AND t.hour = a.hour
+JOIN energy_phase_B b ON t.device_id = b.device_id AND t.date = b.date AND t.hour = b.hour
+JOIN energy_phase_C c ON t.device_id = c.device_id AND t.date = c.date AND t.hour = c.hour
+ORDER BY 1,2)
+
+
+INSERT INTO public."power-clamp-energy-consumed-daily"(
+    device_uuid,
+    energy_consumed_kw,
+    energy_consumed_a,
+    energy_consumed_b,
+    energy_consumed_c,
+    date
+)
+
+SELECT                                
+    device_id,
+    SUM(CAST(energy_consumed_kw AS NUMERIC))::VARCHAR,
+    SUM(CAST(energy_consumed_a AS NUMERIC))::VARCHAR,
+    SUM(CAST(energy_consumed_b AS NUMERIC))::VARCHAR,
+    SUM(CAST(energy_consumed_c AS NUMERIC))::VARCHAR,
+    date
+FROM final_data
+GROUP BY device_id, date;

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

@@ -0,0 +1,94 @@
+WITH total_energy AS (
+    SELECT 
+        log.device_id,
+        log.event_time::date AS date,
+        EXTRACT(HOUR FROM log.event_time) AS hour,
+        TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
+        EXTRACT(YEAR FROM log.event_time)::int AS event_year,
+        MIN(log.value)::integer/100 AS min_value,
+        MAX(log.value)::integer/100 AS max_value
+    FROM "device-status-log" log
+    WHERE log.code = 'EnergyConsumed'
+    GROUP BY 1,2,3,4,5
+),
+
+energy_phase_A AS (
+    SELECT 
+        log.device_id,
+        log.event_time::date AS date,
+        EXTRACT(HOUR FROM log.event_time) AS hour,
+        TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
+        EXTRACT(YEAR FROM log.event_time)::int AS event_year,
+        MIN(log.value)::integer/100 AS min_value,
+        MAX(log.value)::integer/100 AS max_value
+    FROM "device-status-log" log
+    WHERE log.code = 'EnergyConsumedA'
+    GROUP BY 1,2,3,4,5
+),
+
+
+energy_phase_B AS (
+    SELECT 
+        log.device_id,
+        log.event_time::date AS date,
+        EXTRACT(HOUR FROM log.event_time) AS hour,
+        TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
+        EXTRACT(YEAR FROM log.event_time)::int AS event_year,
+        MIN(log.value)::integer/100 AS min_value,
+        MAX(log.value)::integer/100 AS max_value
+    FROM "device-status-log" log
+    WHERE log.code = 'EnergyConsumedB'
+    GROUP BY 1,2,3,4,5
+),
+
+energy_phase_C AS (
+    SELECT 
+        log.device_id,
+        log.event_time::date AS date,
+        EXTRACT(HOUR FROM log.event_time) AS hour,
+        TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
+        EXTRACT(YEAR FROM log.event_time)::int AS event_year,
+        MIN(log.value)::integer/100 AS min_value,
+        MAX(log.value)::integer/100 AS max_value
+    FROM "device-status-log" log
+    WHERE log.code = 'EnergyConsumedC'
+    GROUP BY 1,2,3,4,5
+)
+, final_data as (
+SELECT 
+    t.device_id,
+    t.date,
+    t.event_year::text,
+    t.event_month,
+    t.hour,
+    (t.max_value - t.min_value) AS energy_consumed_kW,
+    (a.max_value - a.min_value) AS energy_consumed_A,
+    (b.max_value - b.min_value) AS energy_consumed_B,
+    (c.max_value - c.min_value) AS energy_consumed_C
+FROM total_energy t
+JOIN energy_phase_A a ON t.device_id = a.device_id AND t.date = a.date AND t.hour = a.hour
+JOIN energy_phase_B b ON t.device_id = b.device_id AND t.date = b.date AND t.hour = b.hour
+JOIN energy_phase_C c ON t.device_id = c.device_id AND t.date = c.date AND t.hour = c.hour
+ORDER BY 1,2)
+
+
+INSERT INTO public."power-clamp-energy-consumed-hourly"(
+    device_uuid,
+    energy_consumed_kw,
+    energy_consumed_a,
+    energy_consumed_b,
+    energy_consumed_c,
+    date,
+    hour
+)
+
+SELECT                                
+    device_id,
+    SUM(CAST(energy_consumed_kw AS NUMERIC))::VARCHAR,
+    SUM(CAST(energy_consumed_a AS NUMERIC))::VARCHAR,
+    SUM(CAST(energy_consumed_b AS NUMERIC))::VARCHAR,
+    SUM(CAST(energy_consumed_c AS NUMERIC))::VARCHAR,
+    date,
+    hour
+FROM final_data
+GROUP BY 1,6,7

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

@@ -5,8 +5,8 @@ WITH total_energy AS (
         EXTRACT(HOUR FROM log.event_time) AS hour,
         TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
         EXTRACT(YEAR FROM log.event_time)::int AS event_year,
-        MIN(log.value)::integer AS min_value,
+        MIN(log.value)::integer/100 AS min_value,
-        MAX(log.value)::integer AS max_value
+        MAX(log.value)::integer/100 AS max_value
     FROM "device-status-log" log
     WHERE log.code = 'EnergyConsumed'
     GROUP BY 1,2,3,4,5
@@ -19,8 +19,8 @@ energy_phase_A AS (
         EXTRACT(HOUR FROM log.event_time) AS hour,
         TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
         EXTRACT(YEAR FROM log.event_time)::int AS event_year,
-        MIN(log.value)::integer AS min_value,
+        MIN(log.value)::integer/100 AS min_value,
-        MAX(log.value)::integer AS max_value
+        MAX(log.value)::integer/100 AS max_value
     FROM "device-status-log" log
     WHERE log.code = 'EnergyConsumedA'
     GROUP BY 1,2,3,4,5
@@ -33,8 +33,8 @@ energy_phase_B AS (
         EXTRACT(HOUR FROM log.event_time) AS hour,
         TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
         EXTRACT(YEAR FROM log.event_time)::int AS event_year,
-        MIN(log.value)::integer AS min_value,
+        MIN(log.value)::integer/100 AS min_value,
-        MAX(log.value)::integer AS max_value
+        MAX(log.value)::integer/100 AS max_value
     FROM "device-status-log" log
     WHERE log.code = 'EnergyConsumedB'
     GROUP BY 1,2,3,4,5
@@ -47,8 +47,8 @@ energy_phase_C AS (
         EXTRACT(HOUR FROM log.event_time) AS hour,
         TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
         EXTRACT(YEAR FROM log.event_time)::int AS event_year,
-        MIN(log.value)::integer AS min_value,
+        MIN(log.value)::integer/100 AS min_value,
-        MAX(log.value)::integer AS max_value
+        MAX(log.value)::integer/100 AS max_value
     FROM "device-status-log" log
     WHERE log.code = 'EnergyConsumedC'
     GROUP BY 1,2,3,4,5
@@ -71,49 +71,6 @@ JOIN energy_phase_C c ON t.device_id = c.device_id AND t.date = c.date AND t.hou
 ORDER BY 1,2)
 
 
-INSERT INTO public."power-clamp-energy-consumed-daily"(
-    device_uuid,
-    energy_consumed_kw,
-    energy_consumed_a,
-    energy_consumed_b,
-    energy_consumed_c,
-    date
-)
-
-SELECT                                
-    device_id,
-    SUM(CAST(energy_consumed_kw AS NUMERIC))::VARCHAR,
-    SUM(CAST(energy_consumed_a AS NUMERIC))::VARCHAR,
-    SUM(CAST(energy_consumed_b AS NUMERIC))::VARCHAR,
-    SUM(CAST(energy_consumed_c AS NUMERIC))::VARCHAR,
-    date
-FROM final_data
-GROUP BY device_id, date;
-
-
-
-INSERT INTO public."power-clamp-energy-consumed-hourly"(
-    device_uuid,
-    energy_consumed_kw,
-    energy_consumed_a,
-    energy_consumed_b,
-    energy_consumed_c,
-    date,
-    hour
-)
-
-SELECT                                
-    device_id,
-    SUM(CAST(energy_consumed_kw AS NUMERIC))::VARCHAR,
-    SUM(CAST(energy_consumed_a AS NUMERIC))::VARCHAR,
-    SUM(CAST(energy_consumed_b AS NUMERIC))::VARCHAR,
-    SUM(CAST(energy_consumed_c AS NUMERIC))::VARCHAR,
-    date,
-    hour
-FROM final_data
-GROUP BY 1,6,7
-
-
 INSERT INTO public."power-clamp-energy-consumed-monthly"(
     device_uuid,
     energy_consumed_kw,
@@ -132,4 +89,3 @@ SELECT
     TO_CHAR(date, 'MM-YYYY')
     FROM final_data
 GROUP BY 1,6;
-

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

@@ -9,8 +9,8 @@ total_energy AS (
         EXTRACT(HOUR FROM log.event_time) AS hour,
         TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
         EXTRACT(YEAR FROM log.event_time)::int AS event_year,
-        MIN(log.value)::integer AS min_value,
+        MIN(log.value)::integer/100 AS min_value,
-        MAX(log.value)::integer AS max_value
+        MAX(log.value)::integer/100 AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumed'
     AND log.event_time::date = params.target_date
@@ -23,8 +23,8 @@ energy_phase_A AS (
         EXTRACT(HOUR FROM log.event_time) AS hour,
         TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
         EXTRACT(YEAR FROM log.event_time)::int AS event_year,
-        MIN(log.value)::integer AS min_value,
+        MIN(log.value)::integer/100 AS min_value,
-        MAX(log.value)::integer AS max_value
+        MAX(log.value)::integer/100 AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedA'
     AND log.event_time::date = params.target_date
@@ -37,8 +37,8 @@ energy_phase_B AS (
         EXTRACT(HOUR FROM log.event_time) AS hour,
         TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
         EXTRACT(YEAR FROM log.event_time)::int AS event_year,
-        MIN(log.value)::integer AS min_value,
+        MIN(log.value)::integer/100 AS min_value,
-        MAX(log.value)::integer AS max_value
+        MAX(log.value)::integer/100 AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedB'
     AND log.event_time::date = params.target_date
@@ -51,8 +51,8 @@ energy_phase_C AS (
         EXTRACT(HOUR FROM log.event_time) AS hour,
         TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
         EXTRACT(YEAR FROM log.event_time)::int AS event_year,
-        MIN(log.value)::integer AS min_value,
+        MIN(log.value)::integer/100 AS min_value,
-        MAX(log.value)::integer AS max_value
+        MAX(log.value)::integer/100 AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedC'
     AND log.event_time::date = params.target_date

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

@@ -9,8 +9,8 @@ total_energy AS (
         EXTRACT(HOUR FROM log.event_time)::text AS hour,
         TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
         EXTRACT(YEAR FROM log.event_time)::int AS event_year,
-        MIN(log.value)::integer AS min_value,
+        MIN(log.value)::integer/100 AS min_value,
-        MAX(log.value)::integer AS max_value
+        MAX(log.value)::integer/100 AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumed'
       AND log.event_time::date = params.target_date
@@ -23,8 +23,8 @@ energy_phase_A AS (
         EXTRACT(HOUR FROM log.event_time)::text AS hour,
         TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
         EXTRACT(YEAR FROM log.event_time)::int AS event_year,
-        MIN(log.value)::integer AS min_value,
+        MIN(log.value)::integer/100 AS min_value,
-        MAX(log.value)::integer AS max_value
+        MAX(log.value)::integer/100 AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedA'
       AND log.event_time::date = params.target_date
@@ -37,8 +37,8 @@ energy_phase_B AS (
         EXTRACT(HOUR FROM log.event_time)::text AS hour,
         TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
         EXTRACT(YEAR FROM log.event_time)::int AS event_year,
-        MIN(log.value)::integer AS min_value,
+        MIN(log.value)::integer/100 AS min_value,
-        MAX(log.value)::integer AS max_value
+        MAX(log.value)::integer/100 AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedB'
       AND log.event_time::date = params.target_date
@@ -51,8 +51,8 @@ energy_phase_C AS (
         EXTRACT(HOUR FROM log.event_time)::text AS hour,
         TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
         EXTRACT(YEAR FROM log.event_time)::int AS event_year,
-        MIN(log.value)::integer AS min_value,
+        MIN(log.value)::integer/100 AS min_value,
-        MAX(log.value)::integer AS max_value
+        MAX(log.value)::integer/100 AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedC'
       AND log.event_time::date = params.target_date

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

@@ -9,8 +9,8 @@ total_energy AS (
         EXTRACT(HOUR FROM log.event_time) AS hour,
         TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
         EXTRACT(YEAR FROM log.event_time)::int AS event_year,
-        MIN(log.value)::integer AS min_value,
+        MIN(log.value)::integer/100 AS min_value,
-        MAX(log.value)::integer AS max_value
+        MAX(log.value)::integer/100 AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumed'
       AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month
@@ -23,8 +23,8 @@ energy_phase_A AS (
         EXTRACT(HOUR FROM log.event_time) AS hour,
         TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
         EXTRACT(YEAR FROM log.event_time)::int AS event_year,
-        MIN(log.value)::integer AS min_value,
+        MIN(log.value)::integer/100 AS min_value,
-        MAX(log.value)::integer AS max_value
+        MAX(log.value)::integer/100 AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedA'
       AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month
@@ -37,8 +37,8 @@ energy_phase_B AS (
         EXTRACT(HOUR FROM log.event_time) AS hour,
         TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
         EXTRACT(YEAR FROM log.event_time)::int AS event_year,
-        MIN(log.value)::integer AS min_value,
+        MIN(log.value)::integer/100 AS min_value,
-        MAX(log.value)::integer AS max_value
+        MAX(log.value)::integer/100 AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedB'
       AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month
@@ -51,8 +51,8 @@ energy_phase_C AS (
         EXTRACT(HOUR FROM log.event_time) AS hour,
         TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
         EXTRACT(YEAR FROM log.event_time)::int AS event_year,
-        MIN(log.value)::integer AS min_value,
+        MIN(log.value)::integer/100 AS min_value,
-        MAX(log.value)::integer AS max_value
+        MAX(log.value)::integer/100 AS max_value
     FROM "device-status-log" log, params
     WHERE log.code = 'EnergyConsumedC'
       AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month

libs/common/src/sql/queries/fact_daily_device_energy_consumed/fact_daily_device_energy_consumed.sql

@@ -4,8 +4,8 @@ WITH total_energy AS (
     SELECT 
         device_id,
         event_time::date AS date,
-        MIN(value)::integer AS min_value,
+        MIN(value)::integer/100 AS min_value,
-        MAX(value)::integer AS max_value
+        MAX(value)::integer/100 AS max_value
     FROM "device-status-log"
     where code='EnergyConsumed'
     GROUP BY device_id, date
@@ -15,8 +15,8 @@ WITH total_energy AS (
     SELECT 
         device_id,
         event_time::date AS date,
-        MIN(value)::integer AS min_value,
+        MIN(value)::integer/100 AS min_value,
-        MAX(value)::integer AS max_value
+        MAX(value)::integer/100 AS max_value
     FROM "device-status-log"
     where code='EnergyConsumedA'
     GROUP BY device_id, date
@@ -26,8 +26,8 @@ WITH total_energy AS (
     SELECT 
         device_id,
         event_time::date AS date,
-        MIN(value)::integer AS min_value,
+        MIN(value)::integer/100 AS min_value,
-        MAX(value)::integer AS max_value
+        MAX(value)::integer/100 AS max_value
     FROM "device-status-log"
     where code='EnergyConsumedB'
     GROUP BY device_id, date
@@ -37,8 +37,8 @@ WITH total_energy AS (
     SELECT 
         device_id,
         event_time::date AS date,
-        MIN(value)::integer AS min_value,
+        MIN(value)::integer/100 AS min_value,
-        MAX(value)::integer AS max_value
+        MAX(value)::integer/100 AS max_value
     FROM "device-status-log"
     where code='EnergyConsumedC'
     GROUP BY device_id, date

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

@@ -1,7 +1,7 @@
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import axios from 'axios';
-import * as nodemailer from 'nodemailer';
+import nodemailer from 'nodemailer';
 import Mail from 'nodemailer/lib/mailer';
 import { BatchEmailData } from './batch-email.interface';
 import { SingleEmailData } from './single-email.interface';

package-lock.json

@@ -48,7 +48,6 @@
         "reflect-metadata": "^0.2.2",
         "rxjs": "^7.8.1",
         "typeorm": "^0.3.20",
-        "uuid": "^11.1.0",
         "winston": "^3.17.0",
         "ws": "^8.17.0"
       },
@@ -2366,18 +2365,6 @@
         "rxjs": "^7.2.0"
       }
     },
-    "node_modules/@nestjs/cqrs/node_modules/uuid": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.2.tgz",
-      "integrity": "sha512-14FfcOJmqdjbBPdDjFQyk/SdT4NySW4eM0zcG+HqbHP5jzuH56xO3J1DGhgs/cEMCfwYi3HQI1gnTO62iaG+tQ==",
-      "funding": [
-        "https://github.com/sponsors/broofa",
-        "https://github.com/sponsors/ctavan"
-      ],
-      "bin": {
-        "uuid": "dist/esm/bin/uuid"
-      }
-    },
     "node_modules/@nestjs/jwt": {
       "version": "10.2.0",
       "resolved": "https://registry.npmjs.org/@nestjs/jwt/-/jwt-10.2.0.tgz",
@@ -12762,6 +12749,18 @@
         "url": "https://dotenvx.com"
       }
     },
+    "node_modules/typeorm/node_modules/uuid": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
+      "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "bin": {
+        "uuid": "dist/esm/bin/uuid"
+      }
+    },
     "node_modules/typescript": {
       "version": "5.8.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
@@ -12897,9 +12896,9 @@
       }
     },
     "node_modules/uuid": {
-      "version": "11.1.0",
+      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.2.tgz",
-      "integrity": "sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==",
+      "integrity": "sha512-14FfcOJmqdjbBPdDjFQyk/SdT4NySW4eM0zcG+HqbHP5jzuH56xO3J1DGhgs/cEMCfwYi3HQI1gnTO62iaG+tQ==",
       "funding": [
         "https://github.com/sponsors/broofa",
         "https://github.com/sponsors/ctavan"

package.json

@@ -60,7 +60,6 @@
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
     "typeorm": "^0.3.20",
-    "uuid": "^11.1.0",
     "winston": "^3.17.0",
     "ws": "^8.17.0"
   },

src/app.module.ts

@@ -35,18 +35,16 @@ import { UserNotificationModule } from './user-notification/user-notification.mo
 import { UserModule } from './users/user.module';
 import { VisitorPasswordModule } from './vistor-password/visitor-password.module';
 
-import { TimerRepositoryModule } from '@app/common/modules/timer/timer.repository.module';
-import { ScheduleModule as NestScheduleModule } from '@nestjs/schedule';
 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 { BookingModule } from './booking';
 import { OccupancyModule } from './occupancy/occupancy.module';
-import { SchedulerModule } from './scheduler/scheduler.module';
-import { TimerModule } from './timer/timer.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({
@@ -65,8 +63,6 @@ import { WeatherModule } from './weather/weather.module';
       },
     }),
     WinstonModule.forRoot(winstonLoggerOptions),
-    TimerModule,
-    TimerRepositoryModule,
     ClientModule,
     AuthenticationModule,
     UserModule,

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

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

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

@@ -1,12 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import {
+import { IsDate, IsNotEmpty, IsString, IsUUID, Matches } from 'class-validator';
-  IsDate,
-  IsNotEmpty,
-  IsString,
-  IsUUID,
-  Matches,
-  MinDate,
-} from 'class-validator';
 
 export class CreateBookingDto {
   @ApiProperty({
@@ -22,7 +15,6 @@ export class CreateBookingDto {
   })
   @IsNotEmpty()
   @IsDate()
-  @MinDate(new Date())
   date: Date;
 
   @ApiProperty({ example: '09:00' })

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

@@ -54,8 +54,7 @@ export class BookableSpaceService {
       .createQueryBuilder('space')
       .leftJoinAndSelect('space.parent', 'parentSpace')
       .leftJoinAndSelect('space.community', 'community')
-      .where('space.disabled = :disabled', { disabled: false })
+      .where('community.project = :project', { project });
-      .andWhere('community.project = :project', { project });
 
     if (search) {
       qb = qb.andWhere(

src/booking/services/booking.service.ts

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

src/community/services/community.service.ts

@@ -25,7 +25,7 @@ import {
   NotFoundException,
 } from '@nestjs/common';
 import { SpaceService } from 'src/space/services';
-import { Brackets, QueryRunner, SelectQueryBuilder } from 'typeorm';
+import { QueryRunner, SelectQueryBuilder } from 'typeorm';
 import { AddCommunityDto, GetCommunityParams, ProjectParam } from '../dtos';
 import { UpdateCommunityNameDto } from '../dtos/update.community.dto';
 
@@ -184,46 +184,18 @@ export class CommunityService {
 
       let qb: undefined | SelectQueryBuilder<CommunityEntity> = undefined;
 
-      const matchingCommunityIdsQb = this.communityRepository
-        .createQueryBuilder('c')
-        .select('c.uuid')
-        .where('c.project = :projectUuid', { projectUuid })
-        .andWhere('c.name != :orphanCommunityName', {
-          orphanCommunityName: `${ORPHAN_COMMUNITY_NAME}-${project.name}`,
-        })
-        .distinct(true);
-      if (includeSpaces) {
-        matchingCommunityIdsQb.leftJoin('c.spaces', 'space');
-      }
-
-      if (search) {
-        matchingCommunityIdsQb
-          .andWhere(
-            new Brackets((qb) => {
-              qb.where('c.name ILIKE :search');
-              if (includeSpaces) qb.orWhere('space.spaceName ILIKE :search');
-            }),
-          )
-          .setParameter('search', `%${search}%`);
-      }
-
       qb = this.communityRepository
         .createQueryBuilder('c')
         .where('c.project = :projectUuid', { projectUuid })
-        .andWhere('c.name != :orphanCommunityName', {
+        .andWhere(`c.name != '${ORPHAN_COMMUNITY_NAME}-${project.name}'`)
-          orphanCommunityName: `${ORPHAN_COMMUNITY_NAME}-${project.name}`,
+        .distinct(true);
-        })
+
-        .andWhere(`c.uuid IN (${matchingCommunityIdsQb.getQuery()})`)
-        .setParameters(matchingCommunityIdsQb.getParameters());
       if (includeSpaces) {
         qb.leftJoinAndSelect(
           'c.spaces',
           'space',
           'space.disabled = :disabled AND space.spaceName != :orphanSpaceName',
-          {
+          { disabled: false, orphanSpaceName: ORPHAN_SPACE_NAME },
-            disabled: false,
-            orphanSpaceName: ORPHAN_SPACE_NAME,
-          },
         )
           .leftJoinAndSelect('space.parent', 'parent')
           .leftJoinAndSelect(
@@ -232,7 +204,16 @@ export class CommunityService {
             '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 } =

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

@@ -2,12 +2,10 @@ import { ApiProperty } from '@nestjs/swagger';
 import {
   ArrayMinSize,
   IsArray,
-  IsDate,
   IsNotEmpty,
   IsOptional,
   IsString,
   IsUUID,
-  MinDate,
 } from 'class-validator';
 
 export class AddUserInvitationDto {
@@ -18,7 +16,7 @@ export class AddUserInvitationDto {
   })
   @IsString()
   @IsNotEmpty()
-  firstName: string;
+  public firstName: string;
 
   @ApiProperty({
     description: 'The last name of the user',
@@ -27,7 +25,7 @@ export class AddUserInvitationDto {
   })
   @IsString()
   @IsNotEmpty()
-  lastName: string;
+  public lastName: string;
 
   @ApiProperty({
     description: 'The email of the user',
@@ -36,7 +34,7 @@ export class AddUserInvitationDto {
   })
   @IsString()
   @IsNotEmpty()
-  email: string;
+  public email: string;
 
   @ApiProperty({
     description: 'The job title of the user',
@@ -45,7 +43,7 @@ export class AddUserInvitationDto {
   })
   @IsString()
   @IsOptional()
-  jobTitle?: string;
+  public jobTitle?: string;
 
   @ApiProperty({
     description: 'The company name of the user',
@@ -54,27 +52,7 @@ export class AddUserInvitationDto {
   })
   @IsString()
   @IsOptional()
-  companyName?: string;
+  public companyName?: string;
-
-  @ApiProperty({
-    description: 'Access start date',
-    example: new Date(),
-    required: false,
-  })
-  @IsDate()
-  @MinDate(new Date())
-  @IsOptional()
-  accessStartDate?: Date;
-
-  @ApiProperty({
-    description: 'Access start date',
-    example: new Date(),
-    required: false,
-  })
-  @IsDate()
-  @MinDate(new Date())
-  @IsOptional()
-  accessEndDate?: Date;
 
   @ApiProperty({
     description: 'The phone number of the user',
@@ -83,7 +61,7 @@ export class AddUserInvitationDto {
   })
   @IsString()
   @IsOptional()
-  phoneNumber?: string;
+  public phoneNumber?: string;
 
   @ApiProperty({
     description: 'The role uuid of the user',
@@ -92,7 +70,7 @@ export class AddUserInvitationDto {
   })
   @IsUUID('4')
   @IsNotEmpty()
-  roleUuid: string;
+  public roleUuid: string;
   @ApiProperty({
     description: 'The project uuid of the user',
     example: 'd290f1ee-6c54-4b01-90e6-d701748f0851',
@@ -100,7 +78,7 @@ export class AddUserInvitationDto {
   })
   @IsUUID('4')
   @IsNotEmpty()
-  projectUuid: string;
+  public projectUuid: string;
 
   @ApiProperty({
     description: 'The array of space UUIDs (at least one required)',
@@ -110,7 +88,7 @@ export class AddUserInvitationDto {
   @IsArray()
   @IsUUID('4', { each: true })
   @ArrayMinSize(1)
-  spaceUuids: string[];
+  public spaceUuids: string[];
   constructor(dto: Partial<AddUserInvitationDto>) {
     Object.assign(this, dto);
   }

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

@@ -1,5 +1,4 @@
 import { RoleType } from '@app/common/constants/role.type.enum';
-import { TimerJobTypeEnum } from '@app/common/constants/timer-job-type.enum';
 import { UserStatusEnum } from '@app/common/constants/user-status.enum';
 import { BaseResponseDto } from '@app/common/dto/base.response.dto';
 import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
@@ -24,7 +23,6 @@ import {
   Injectable,
 } from '@nestjs/common';
 import { SpaceUserService } from 'src/space/services';
-import { TimerService } from 'src/timer/timer.service';
 import { UserSpaceService } from 'src/users/services';
 import {
   DataSource,
@@ -54,7 +52,6 @@ export class InviteUserService {
     private readonly spaceRepository: SpaceRepository,
     private readonly roleTypeRepository: RoleTypeRepository,
     private readonly dataSource: DataSource,
-    private readonly timerService: TimerService,
   ) {}
 
   async createUserInvitation(
@@ -71,14 +68,8 @@ export class InviteUserService {
       roleUuid,
       spaceUuids,
       projectUuid,
-      accessStartDate,
-      accessEndDate,
     } = dto;
-    if (accessStartDate && accessEndDate && accessEndDate <= accessStartDate) {
+
-      throw new BadRequestException(
-        'accessEndDate must be after accessStartDate',
-      );
-    }
     const invitationCode = generateRandomString(6);
     const queryRunner = this.dataSource.createQueryRunner();
 
@@ -123,8 +114,6 @@ export class InviteUserService {
         invitationCode,
         invitedBy: roleType,
         project: { uuid: projectUuid },
-        accessEndDate,
-        accessStartDate,
       });
 
       const invitedUser = await queryRunner.manager.save(inviteUser);
@@ -143,26 +132,12 @@ export class InviteUserService {
 
       // Send invitation email
       const spaceNames = validSpaces.map((space) => space.spaceName).join(', ');
-      if (accessStartDate) {
+      await this.emailService.sendEmailWithInvitationTemplate(email, {
-        await this.timerService.createJob({
+        name: firstName,
-          type: TimerJobTypeEnum.INVITE_USER_EMAIL,
+        invitationCode,
-          triggerDate: accessStartDate,
+        role: invitedRoleType.replace(/_/g, ' '),
-          metadata: {
+        spacesList: spaceNames,
-            email,
+      });
-            name: firstName,
-            invitationCode,
-            role: invitedRoleType.replace(/_/g, ' '),
-            spacesList: spaceNames,
-          },
-        });
-      } else {
-        await this.emailService.sendEmailWithInvitationTemplate(email, {
-          name: firstName,
-          invitationCode,
-          role: invitedRoleType.replace(/_/g, ' '),
-          spacesList: spaceNames,
-        });
-      }
 
       await queryRunner.commitTransaction();
 

src/space/controllers/space.controller.ts

@@ -17,7 +17,6 @@ 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 { DuplicateSpaceDto } from '../dtos/duplicate-space.dto';
 import { GetSpaceDto } from '../dtos/get.space.dto';
 import { GetSpaceParam } from '../dtos/get.space.param';
 import { OrderSpacesDto } from '../dtos/order.spaces.dto';
@@ -49,26 +48,6 @@ export class SpaceController {
     );
   }
 
-  @ApiBearerAuth()
-  @UseGuards(PermissionsGuard)
-  @Permissions('SPACE_ADD')
-  @ApiOperation({
-    summary: ControllerRoute.SPACE.ACTIONS.DUPLICATE_SPACE_SUMMARY,
-    description: ControllerRoute.SPACE.ACTIONS.DUPLICATE_SPACE_DESCRIPTION,
-  })
-  @Post(':spaceUuid/duplicate')
-  async duplicateSpace(
-    @Param('spaceUuid', ParseUUIDPipe) spaceUuid: string,
-    @Body() dto: DuplicateSpaceDto,
-    @Param() communitySpaceParam: CommunitySpaceParam,
-  ): Promise<BaseResponseDto> {
-    return await this.spaceService.duplicateSpace(
-      spaceUuid,
-      communitySpaceParam,
-      dto,
-    );
-  }
-
   @ApiBearerAuth()
   @UseGuards(PermissionsGuard)
   @Permissions('SPACE_VIEW')

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

@@ -6,6 +6,7 @@ import {
   IsArray,
   IsMongoId,
   IsNotEmpty,
+  IsNumber,
   IsOptional,
   IsString,
   IsUUID,
@@ -47,6 +48,14 @@ export class AddSpaceDto {
   @IsOptional()
   public icon?: string;
 
+  @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 Model',
     example: 'd290f1ee-6c54-4b01-90e6-d701748f0851',

src/space/dtos/duplicate-space.dto.ts

@@ -1,18 +0,0 @@
-import { ORPHAN_SPACE_NAME } from '@app/common/constants/orphan-constant';
-import { ApiProperty } from '@nestjs/swagger';
-import { IsNotEmpty, IsString, NotEquals } from 'class-validator';
-
-export class DuplicateSpaceDto {
-  @ApiProperty({
-    description: 'Name of the space (e.g., Floor 1, Unit 101)',
-    example: 'Unit 101',
-  })
-  @IsString()
-  @IsNotEmpty()
-  @NotEquals(ORPHAN_SPACE_NAME, {
-    message() {
-      return `Space name cannot be "${ORPHAN_SPACE_NAME}". Please choose a different name.`;
-    },
-  })
-  spaceName: string;
-}

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

@@ -4,6 +4,7 @@ import { Type } from 'class-transformer';
 import {
   ArrayUnique,
   IsArray,
+  IsNumber,
   IsOptional,
   IsString,
   NotEquals,
@@ -35,6 +36,16 @@ export class UpdateSpaceDto {
   @IsOptional()
   public icon?: string;
 
+  @ApiProperty({ description: 'X position on canvas', example: 120 })
+  @IsNumber()
+  @IsOptional()
+  x?: number;
+
+  @ApiProperty({ description: 'Y position on canvas', example: 200 })
+  @IsNumber()
+  @IsOptional()
+  y?: number;
+
   @ApiPropertyOptional({
     description: 'List of subspace modifications',
     type: [UpdateSubspaceDto],

src/space/services/space-validation.service.ts

@@ -133,7 +133,7 @@ export class ValidationService {
         'subspaces.productAllocations',
         'subspaces.productAllocations.product',
         'subspaces.devices',
-        // 'spaceModel',
+        'spaceModel',
       ],
     });
 

src/space/services/space.service.ts

@@ -8,7 +8,6 @@ import { generateRandomString } from '@app/common/helper/randomString';
 import { removeCircularReferences } from '@app/common/helper/removeCircularReferences';
 import { SpaceProductAllocationEntity } from '@app/common/modules/space/entities/space-product-allocation.entity';
 import { SpaceEntity } from '@app/common/modules/space/entities/space.entity';
-import { SubspaceProductAllocationEntity } from '@app/common/modules/space/entities/subspace/subspace-product-allocation.entity';
 import { SubspaceEntity } from '@app/common/modules/space/entities/subspace/subspace.entity';
 import {
   InviteSpaceRepository,
@@ -25,7 +24,6 @@ import { DeviceService } from 'src/device/services';
 import { SpaceModelService } from 'src/space-model/services';
 import { TagService } from 'src/tags/services/tags.service';
 import { DataSource, In, Not, QueryRunner } from 'typeorm';
-import { v4 as uuidV4 } from 'uuid';
 import { DisableSpaceCommand } from '../commands';
 import {
   AddSpaceDto,
@@ -34,7 +32,6 @@ import {
   UpdateSpaceDto,
 } from '../dtos';
 import { CreateProductAllocationDto } from '../dtos/create-product-allocation.dto';
-import { DuplicateSpaceDto } from '../dtos/duplicate-space.dto';
 import { GetSpaceDto } from '../dtos/get.space.dto';
 import { OrderSpacesDto } from '../dtos/order.spaces.dto';
 import { SpaceWithParentsDto } from '../dtos/space.parents.dto';
@@ -96,9 +93,6 @@ export class SpaceService {
       parentUuid && !isRecursiveCall
         ? await this.validationService.validateSpace(parentUuid)
         : null;
-    if (parent) {
-      await this.validateNamingConflict(addSpaceDto.spaceName, parent);
-    }
 
     const spaceModel = spaceModelUuid
       ? await this.validationService.validateSpaceModel(spaceModelUuid)
@@ -108,6 +102,8 @@ export class SpaceService {
         // todo: find a better way to handle this instead of naming every key
         spaceName: addSpaceDto.spaceName,
         icon: addSpaceDto.icon,
+        x: addSpaceDto.x,
+        y: addSpaceDto.y,
         spaceModel,
         parent: isRecursiveCall
           ? recursiveCallParentEntity
@@ -185,154 +181,6 @@ export class SpaceService {
       !isRecursiveCall ? await queryRunner.release() : null;
     }
   }
-
-  async duplicateSpace(
-    spaceUuid: string,
-    { communityUuid, projectUuid }: CommunitySpaceParam,
-    dto: DuplicateSpaceDto,
-    queryRunner?: QueryRunner,
-  ): Promise<BaseResponseDto> {
-    if (!queryRunner) {
-      queryRunner = this.dataSource.createQueryRunner();
-      await queryRunner.connect();
-      await queryRunner.startTransaction();
-    }
-
-    try {
-      await this.validationService.validateCommunityAndProject(
-        communityUuid,
-        projectUuid,
-        queryRunner,
-      );
-      await this.handleSpaceDuplication(spaceUuid, dto.spaceName, queryRunner);
-
-      await queryRunner.commitTransaction();
-      const { data } = await this.getSpacesHierarchyForCommunity(
-        {
-          projectUuid,
-          communityUuid,
-        },
-        { onlyWithDevices: false },
-      );
-      return new SuccessResponseDto({
-        message: `Space with ID ${spaceUuid} successfully duplicated`,
-        data,
-      });
-    } catch (error) {
-      await queryRunner.rollbackTransaction();
-      console.log((error as Error).stack);
-      throw new HttpException(error.message, HttpStatus.INTERNAL_SERVER_ERROR);
-    } finally {
-      await queryRunner.release();
-    }
-  }
-  private async handleSpaceDuplication(
-    spaceUuid: string,
-    newSpaceName: string | null,
-    queryRunner: QueryRunner,
-    parent?: SpaceEntity,
-  ) {
-    const space = await this.spaceRepository.findOne({
-      where: { uuid: spaceUuid },
-      relations: [
-        'children',
-        'productAllocations',
-        'subspaces',
-        'subspaces.productAllocations',
-      ],
-    });
-    const clonedSpace = structuredClone(space);
-    const newSpace = queryRunner.manager.create(SpaceEntity, {
-      ...clonedSpace,
-      spaceName: newSpaceName || clonedSpace.spaceName,
-      parent,
-      children: undefined,
-      subspaces: undefined,
-      productAllocations: undefined,
-      uuid: uuidV4(),
-    });
-
-    if (clonedSpace.productAllocations?.length) {
-      newSpace.productAllocations = this.copySpaceAllocations(
-        newSpace,
-        clonedSpace.productAllocations,
-        queryRunner,
-      );
-    }
-    if (clonedSpace.subspaces?.length) {
-      newSpace.subspaces = this.copySpaceSubspaces(
-        newSpace,
-        clonedSpace.subspaces,
-        queryRunner,
-      );
-    }
-    const savedSpace = await queryRunner.manager.save(newSpace);
-
-    if (clonedSpace.children?.length) {
-      for (const child of clonedSpace.children) {
-        if (child.disabled) continue;
-        await this.handleSpaceDuplication(
-          child.uuid,
-          child.spaceName,
-          queryRunner,
-          savedSpace,
-        );
-      }
-    }
-    return savedSpace;
-  }
-  private copySpaceSubspaces(
-    newSpace: SpaceEntity,
-    subspaces: SubspaceEntity[],
-    queryRunner: QueryRunner,
-  ) {
-    const newSubspaces = [];
-    for (const sub of subspaces) {
-      if (sub.disabled) continue;
-      const clonedSub = structuredClone(sub);
-      delete clonedSub.uuid;
-      const newSubspace = queryRunner.manager.create(SubspaceEntity, {
-        ...clonedSub,
-        space: newSpace,
-        productAllocations: [],
-        uuid: uuidV4(),
-      });
-      if (sub.productAllocations?.length) {
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        for (const { uuid, ...allocation } of sub.productAllocations) {
-          newSubspace.productAllocations.push(
-            queryRunner.manager.create(SubspaceProductAllocationEntity, {
-              ...allocation,
-              subspace: newSubspace,
-              uuid: uuidV4(),
-            }),
-          );
-        }
-      }
-
-      newSubspaces.push(newSubspace);
-    }
-    return newSubspaces;
-  }
-  private copySpaceAllocations(
-    newSpace: SpaceEntity,
-    allocations: SpaceProductAllocationEntity[],
-    queryRunner: QueryRunner,
-  ) {
-    const newAllocations = [];
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    for (const { uuid, ...allocation } of allocations) {
-      newAllocations.push(
-        queryRunner.manager.create(SpaceProductAllocationEntity, {
-          ...allocation,
-          space: newSpace,
-          uuid: uuidV4(),
-        }),
-      );
-    }
-    return newAllocations;
-  }
-
   private checkDuplicateTags(allocations: CreateProductAllocationDto[]) {
     const tagUuidSet = new Set<string>();
     const tagNameProductSet = new Set<string>();
@@ -657,8 +505,6 @@ export class SpaceService {
           spaceUuid,
         );
 
-      await this.validateNamingConflict(updateSpaceDto.spaceName, space, true);
-
       if (space.spaceModel && !updateSpaceDto.spaceModelUuid) {
         await queryRunner.manager.update(SpaceEntity, space.uuid, {
           spaceModel: null,
@@ -809,11 +655,13 @@ export class SpaceService {
     updateSpaceDto: UpdateSpaceDto,
     queryRunner: QueryRunner,
   ): Promise<void> {
-    const { spaceName, icon } = updateSpaceDto;
+    const { spaceName, x, y, icon } = updateSpaceDto;
 
     const updateFields: Partial<SpaceEntity> = {};
 
     if (spaceName) updateFields.spaceName = spaceName;
+    if (x !== undefined) updateFields.x = x;
+    if (y !== undefined) updateFields.y = y;
     if (icon) updateFields.icon = icon;
 
     if (Object.keys(updateFields).length > 0) {
@@ -980,34 +828,4 @@ export class SpaceService {
       queryRunner,
     );
   }
-
-  async validateNamingConflict(
-    newSpaceName: string,
-    parent: SpaceEntity,
-    isUpdate: boolean = false,
-  ): Promise<void> {
-    if (!isUpdate && parent.spaceName === newSpaceName) {
-      throw new HttpException(
-        `Space can't be created with the same name as its parent space`,
-        HttpStatus.BAD_REQUEST,
-      );
-    }
-    if (parent.children?.some((child) => child.spaceName === newSpaceName)) {
-      throw new HttpException(
-        `Space name cannot be the same as one of its siblings/children`,
-        HttpStatus.BAD_REQUEST,
-      );
-    }
-    if (isUpdate) {
-      const sibling = await this.spaceRepository.exists({
-        where: { spaceName: newSpaceName, parent: { uuid: parent.uuid } },
-      });
-      if (sibling) {
-        throw new HttpException(
-          `Space name cannot be the same as one of its siblings/children`,
-          HttpStatus.BAD_REQUEST,
-        );
-      }
-    }
-  }
 }

src/timer/create-job.dto.ts

@@ -1,20 +0,0 @@
-import { TimerJobTypeEnum } from '@app/common/constants/timer-job-type.enum';
-
-export class BaseCreateJobDto {
-  type: TimerJobTypeEnum;
-  triggerDate: Date;
-  metadata: Record<string, any>;
-}
-// validate based on jobType
-export class CreateUserInvitationJobDto extends BaseCreateJobDto {
-  type: TimerJobTypeEnum.INVITE_USER_EMAIL;
-  metadata: {
-    email: string;
-    name: string;
-    invitationCode: string;
-    role: string;
-    spacesList: string;
-  };
-}
-
-export type CreateJobDto = CreateUserInvitationJobDto;

src/timer/timer.module.ts

@@ -1,10 +0,0 @@
-import { EmailService } from '@app/common/util/email/email.service';
-import { Global, Module } from '@nestjs/common';
-import { TimerService } from './timer.service';
-
-@Global()
-@Module({
-  providers: [TimerService, EmailService],
-  exports: [TimerService],
-})
-export class TimerModule {}

src/timer/timer.service.ts

@@ -1,53 +0,0 @@
-import { TimerJobTypeEnum } from '@app/common/constants/timer-job-type.enum';
-import { TimerEntity } from '@app/common/modules/timer/entities/timer.entity';
-import { TimerRepository } from '@app/common/modules/timer/repositories/timer.repository';
-import { EmailService } from '@app/common/util/email/email.service';
-import { Injectable } from '@nestjs/common';
-import { Cron, CronExpression } from '@nestjs/schedule';
-import { In, LessThanOrEqual } from 'typeorm';
-import { CreateJobDto } from './create-job.dto';
-
-@Injectable()
-export class TimerService {
-  constructor(
-    private readonly timerRepository: TimerRepository,
-    private readonly emailService: EmailService,
-  ) {}
-
-  createJob(job: CreateJobDto): Promise<TimerEntity> {
-    const timerEntity = this.timerRepository.create(job);
-    return this.timerRepository.save(timerEntity);
-  }
-
-  @Cron(CronExpression.EVERY_DAY_AT_MIDNIGHT)
-  async handleCron() {
-    const jobsToRun = await this.timerRepository.find({
-      where: { triggerDate: LessThanOrEqual(new Date()) },
-    });
-    const successfulJobs = [];
-    for (const job of jobsToRun) {
-      try {
-        await this.handleJob(job);
-
-        successfulJobs.push(job.uuid);
-      } catch (error) {
-        console.error(`Job ${job.uuid} failed:`, error);
-      }
-    }
-    await this.timerRepository.delete({ uuid: In(successfulJobs) });
-  }
-
-  handleJob(job: TimerEntity) {
-    switch (job.type) {
-      case TimerJobTypeEnum.INVITE_USER_EMAIL:
-        return this.emailService.sendEmailWithInvitationTemplate(
-          job.metadata.email,
-          job.metadata,
-        );
-        break;
-      // Handle other job types as needed
-      default:
-        console.warn(`Unhandled job type: ${job.type}`);
-    }
-  }
-}

src/users/services/user.service.ts

@@ -30,7 +30,7 @@ export class UserService {
         where: {
           uuid: userUuid,
         },
-        relations: ['region', 'timezone', 'roleType', 'project', 'inviteUser'],
+        relations: ['region', 'timezone', 'roleType', 'project'],
       });
       if (!user) {
         throw new BadRequestException('Invalid room UUID');
@@ -53,10 +53,6 @@ export class UserService {
         appAgreementAcceptedAt: user?.appAgreementAcceptedAt,
         role: user?.roleType,
         project: user?.project,
-        bookingPoints: user?.bookingPoints ?? 0,
-        accessStartDate: user?.inviteUser.accessStartDate,
-        accessEndDate: user?.inviteUser.accessEndDate,
-        bookingEnabled: user?.bookingEnabled,
       };
     } catch (err) {
       if (err instanceof BadRequestException) {