Merge pull request #482 from SyncrowIOT/task/add-spaces-and-communities-filters-to-automations-and-scenes

SP-1883, SP-1884: Task/add spaces and communities filters to automations and scenes

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

@@ -188,6 +188,11 @@ export class ControllerRoute {
   static SCENE = class {
     public static readonly ROUTE = 'scene';
     static ACTIONS = class {
+      public static readonly GET_TAP_TO_RUN_SCENES_SUMMARY =
+        'Get Tap-to-Run Scenes by spaces';
+      public static readonly GET_TAP_TO_RUN_SCENES_DESCRIPTION =
+        'Gets Tap-to-Run scenes by spaces';
+
       public static readonly CREATE_TAP_TO_RUN_SCENE_SUMMARY =
         'Create a Tap-to-Run Scene';
       public static readonly CREATE_TAP_TO_RUN_SCENE_DESCRIPTION =
@@ -772,6 +777,10 @@ export class ControllerRoute {
       public static readonly ADD_AUTOMATION_DESCRIPTION =
         'This endpoint creates a new automation based on the provided details.';
 
+      public static readonly GET_AUTOMATION_SUMMARY = 'Get all automations';
+      public static readonly GET_AUTOMATION_DESCRIPTION =
+        'This endpoint retrieves automations data';
+
       public static readonly GET_AUTOMATION_DETAILS_SUMMARY =
         'Get automation details';
       public static readonly GET_AUTOMATION_DETAILS_DESCRIPTION =

libs/common/src/constants/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/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;
-
-  @Column({
-    default: new Date(),
-    type: 'date',
-  })
-  accessStartDate: Date;
-
-  @Column({
-    type: 'date',
-    nullable: true,
-  })
-  accessEndDate?: Date;
+  public invitationCode: string;
 
   @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/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',
   })

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/automation/controllers/automation.controller.ts

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

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

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

src/automation/services/automation.service.ts

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

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;
-
-  @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;
+  public companyName?: string;
 
   @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.timerService.createJob({
-          type: TimerJobTypeEnum.INVITE_USER_EMAIL,
-          triggerDate: accessStartDate,
-          metadata: {
-            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 this.emailService.sendEmailWithInvitationTemplate(email, {
+        name: firstName,
+        invitationCode,
+        role: invitedRoleType.replace(/_/g, ' '),
+        spacesList: spaceNames,
+      });
 
       await queryRunner.commitTransaction();
 

src/scene/controllers/scene.controller.ts

@@ -1,4 +1,7 @@
-import { SceneService } from '../services/scene.service';
+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 { SuccessResponseDto } from '@app/common/dto/success.response.dto';
 import {
   Body,
   Controller,
@@ -8,21 +11,21 @@ import {
   Param,
   Post,
   Put,
+  Query,
   Req,
   UseGuards,
 } from '@nestjs/common';
-import { ApiTags, ApiBearerAuth, ApiOperation } from '@nestjs/swagger';
+import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
+import { Permissions } from 'src/decorators/permissions.decorator';
+import { PermissionsGuard } from 'src/guards/permissions.guard';
+import { SceneParamDto } from '../dtos';
 import {
   AddSceneIconDto,
   AddSceneTapToRunDto,
+  GetSceneDto,
   UpdateSceneTapToRunDto,
 } from '../dtos/scene.dto';
-import { EnableDisableStatusEnum } from '@app/common/constants/days.enum';
-import { SceneParamDto } from '../dtos';
-import { BaseResponseDto } from '@app/common/dto/base.response.dto';
-import { ControllerRoute } from '@app/common/constants/controller-route';
-import { PermissionsGuard } from 'src/guards/permissions.guard';
-import { Permissions } from 'src/decorators/permissions.decorator';
+import { SceneService } from '../services/scene.service';
 
 @ApiTags('Scene Module')
 @Controller({
@@ -52,6 +55,27 @@ export class SceneController {
     );
   }
 
+  @ApiBearerAuth()
+  @UseGuards(PermissionsGuard)
+  @Permissions('SCENES_VIEW')
+  @Get('tap-to-run')
+  @ApiOperation({
+    summary: ControllerRoute.SCENE.ACTIONS.GET_TAP_TO_RUN_SCENES_SUMMARY,
+    description:
+      ControllerRoute.SCENE.ACTIONS.GET_TAP_TO_RUN_SCENES_DESCRIPTION,
+  })
+  async getTapToRunSceneBySpaces(
+    @Query() dto: GetSceneDto,
+    @Req() req: any,
+  ): Promise<BaseResponseDto> {
+    const projectUuid = req.user.project.uuid;
+    const data = await this.sceneService.findScenesBySpaces(dto, projectUuid);
+    return new SuccessResponseDto({
+      message: 'Scenes Retrieved Successfully',
+      data,
+    });
+  }
+
   @ApiBearerAuth()
   @UseGuards(PermissionsGuard)
   @Permissions('SCENES_DELETE')

src/scene/dtos/scene.dto.ts

@@ -1,15 +1,16 @@
-import { ApiProperty } from '@nestjs/swagger';
-import {
-  IsNotEmpty,
-  IsString,
-  IsArray,
-  ValidateNested,
-  IsOptional,
-  IsNumber,
-  IsBoolean,
-} from 'class-validator';
-import { Transform, Type } from 'class-transformer';
 import { BooleanValues } from '@app/common/constants/boolean-values.enum';
+import { ApiProperty } from '@nestjs/swagger';
+import { Transform, Type } from 'class-transformer';
+import {
+  IsArray,
+  IsBoolean,
+  IsNotEmpty,
+  IsNumber,
+  IsOptional,
+  IsString,
+  IsUUID,
+  ValidateNested,
+} from 'class-validator';
 
 class ExecutorProperty {
   @ApiProperty({
@@ -187,4 +188,19 @@ export class GetSceneDto {
     return value.obj.showInHomePage === BooleanValues.TRUE;
   })
   public showInHomePage: boolean = false;
+
+  @ApiProperty({
+    description: 'List of Space IDs to filter automation',
+    required: false,
+    example: ['60d21b4667d0d8992e610c85', '60d21b4967d0d8992e610c86'],
+  })
+  @IsOptional()
+  @Transform(({ value }) => {
+    if (!Array.isArray(value)) {
+      return [value];
+    }
+    return value;
+  })
+  @IsUUID('4', { each: true })
+  public spaces?: string[];
 }

src/scene/services/scene.service.ts

@@ -1,12 +1,36 @@
 import {
-  Injectable,
-  HttpException,
-  HttpStatus,
+  ActionExecutorEnum,
+  ActionTypeEnum,
+} from '@app/common/constants/automation.enum';
+import { SceneIconType } from '@app/common/constants/secne-icon-type.enum';
+import { BaseResponseDto } from '@app/common/dto/base.response.dto';
+import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
+import { convertKeysToCamelCase } from '@app/common/helper/camelCaseConverter';
+import { convertKeysToSnakeCase } from '@app/common/helper/snakeCaseConverter';
+import { ConvertedAction } from '@app/common/integrations/tuya/interfaces';
+import { TuyaService } from '@app/common/integrations/tuya/services/tuya.service';
+import { AutomationRepository } from '@app/common/modules/automation/repositories';
+import { SceneDeviceRepository } from '@app/common/modules/scene-device/repositories';
+import {
+  SceneEntity,
+  SceneIconEntity,
+} from '@app/common/modules/scene/entities';
+import {
+  SceneIconRepository,
+  SceneRepository,
+} from '@app/common/modules/scene/repositories';
+import { SpaceRepository } from '@app/common/modules/space/repositories';
+import {
   BadRequestException,
   forwardRef,
+  HttpException,
+  HttpStatus,
   Inject,
+  Injectable,
 } from '@nestjs/common';
-import { SpaceRepository } from '@app/common/modules/space/repositories';
+import { HttpStatusCode } from 'axios';
+import { DeviceService } from 'src/device/services';
+import { In } from 'typeorm';
 import {
   Action,
   AddSceneIconDto,
@@ -15,35 +39,12 @@ import {
   SceneParamDto,
   UpdateSceneTapToRunDto,
 } from '../dtos';
-import { convertKeysToSnakeCase } from '@app/common/helper/snakeCaseConverter';
 import {
   AddTapToRunSceneInterface,
   DeleteTapToRunSceneInterface,
   SceneDetails,
   SceneDetailsResult,
 } from '../interface/scene.interface';
-import { convertKeysToCamelCase } from '@app/common/helper/camelCaseConverter';
-import {
-  ActionExecutorEnum,
-  ActionTypeEnum,
-} from '@app/common/constants/automation.enum';
-import {
-  SceneIconRepository,
-  SceneRepository,
-} from '@app/common/modules/scene/repositories';
-import { SceneIconType } from '@app/common/constants/secne-icon-type.enum';
-import {
-  SceneEntity,
-  SceneIconEntity,
-} from '@app/common/modules/scene/entities';
-import { TuyaService } from '@app/common/integrations/tuya/services/tuya.service';
-import { BaseResponseDto } from '@app/common/dto/base.response.dto';
-import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
-import { HttpStatusCode } from 'axios';
-import { ConvertedAction } from '@app/common/integrations/tuya/interfaces';
-import { DeviceService } from 'src/device/services';
-import { SceneDeviceRepository } from '@app/common/modules/scene-device/repositories';
-import { AutomationRepository } from '@app/common/modules/automation/repositories';
 
 @Injectable()
 export class SceneService {
@@ -92,158 +93,48 @@ export class SceneService {
     }
   }
 
-  async create(
-    spaceTuyaUuid: string,
-    addSceneTapToRunDto: AddSceneTapToRunDto,
-    projectUuid: string,
-  ): Promise<SceneEntity> {
-    const { iconUuid, showInHomePage, spaceUuid } = addSceneTapToRunDto;
-
-    try {
-      const [defaultSceneIcon] = await Promise.all([
-        this.getDefaultSceneIcon(),
-      ]);
-      if (!defaultSceneIcon) {
-        throw new HttpException(
-          'Default scene icon not found',
-          HttpStatus.INTERNAL_SERVER_ERROR,
-        );
-      }
-
-      const response = await this.createSceneExternalService(
-        spaceTuyaUuid,
-        addSceneTapToRunDto,
-        projectUuid,
-      );
-
-      const scene = await this.sceneRepository.save({
-        sceneTuyaUuid: response.result.id,
-        sceneIcon: { uuid: iconUuid || defaultSceneIcon.uuid },
-        showInHomePage,
-        space: { uuid: spaceUuid },
-      });
-
-      return scene;
-    } catch (err) {
-      if (err instanceof HttpException) {
-        throw err;
-      } else if (err.message?.includes('tuya')) {
-        throw new HttpException(
-          'API error: Failed to create scene',
-          HttpStatus.BAD_GATEWAY,
-        );
-      } else {
-        throw new HttpException(
-          'Database error: Failed to save scene',
-          HttpStatus.INTERNAL_SERVER_ERROR,
-        );
-      }
-    }
-  }
-  async updateSceneExternalService(
-    spaceTuyaUuid: string,
-    sceneTuyaUuid: string,
-    updateSceneTapToRunDto: UpdateSceneTapToRunDto,
-    projectUuid: string,
-  ) {
-    const { sceneName, decisionExpr, actions } = updateSceneTapToRunDto;
-    try {
-      const formattedActions = await this.prepareActions(actions, projectUuid);
-
-      const response = (await this.tuyaService.updateTapToRunScene(
-        sceneTuyaUuid,
-        spaceTuyaUuid,
-        sceneName,
-        formattedActions,
-        decisionExpr,
-      )) as AddTapToRunSceneInterface;
-
-      if (!response.success) {
-        throw new HttpException(
-          'Failed to update scene in Tuya',
-          HttpStatus.INTERNAL_SERVER_ERROR,
-        );
-      }
-
-      return response;
-    } catch (err) {
-      if (err instanceof HttpException) {
-        throw err;
-      } else if (err.message?.includes('tuya')) {
-        throw new HttpException(
-          'API error: Failed to update scene',
-          HttpStatus.BAD_GATEWAY,
-        );
-      } else {
-        throw new HttpException(
-          `An Internal error has been occured ${err}`,
-          HttpStatus.INTERNAL_SERVER_ERROR,
-        );
-      }
-    }
-  }
-
-  async createSceneExternalService(
-    spaceTuyaUuid: string,
-    addSceneTapToRunDto: AddSceneTapToRunDto,
-    projectUuid: string,
-  ) {
-    const { sceneName, decisionExpr, actions } = addSceneTapToRunDto;
-    try {
-      const formattedActions = await this.prepareActions(actions, projectUuid);
-
-      const response = (await this.tuyaService.addTapToRunScene(
-        spaceTuyaUuid,
-        sceneName,
-        formattedActions,
-        decisionExpr,
-      )) as AddTapToRunSceneInterface;
-
-      if (!response.result?.id) {
-        throw new HttpException(
-          'Failed to create scene in Tuya',
-          HttpStatus.INTERNAL_SERVER_ERROR,
-        );
-      }
-
-      return response;
-    } catch (err) {
-      if (err instanceof HttpException) {
-        throw err;
-      } else if (err.message?.includes('tuya')) {
-        throw new HttpException(
-          'API error: Failed to create scene',
-          HttpStatus.BAD_GATEWAY,
-        );
-      } else {
-        throw new HttpException(
-          `An Internal error has been occured ${err}`,
-          HttpStatus.INTERNAL_SERVER_ERROR,
-        );
-      }
-    }
-  }
-
-  async findScenesBySpace(spaceUuid: string, filter: GetSceneDto) {
+  async findScenesBySpace(spaceUuid: string, { showInHomePage }: GetSceneDto) {
     try {
       await this.getSpaceByUuid(spaceUuid);
-      const showInHomePage = filter?.showInHomePage;
+      return this.findScenesBySpaces({ showInHomePage, spaces: [spaceUuid] });
+    } catch (error) {
+      console.error(
+        `Error fetching Tap-to-Run scenes for space UUID ${spaceUuid}:`,
+        error.message,
+      );
 
+      throw error instanceof HttpException
+        ? error
+        : new HttpException(
+            'An error occurred while retrieving scenes',
+            HttpStatus.INTERNAL_SERVER_ERROR,
+          );
+    }
+  }
+
+  async findScenesBySpaces(
+    { showInHomePage, spaces }: GetSceneDto,
+    projectUuid?: string,
+  ) {
+    try {
       const scenesData = await this.sceneRepository.find({
         where: {
-          space: { uuid: spaceUuid },
+          space: {
+            uuid: In(spaces ?? []),
+            community: projectUuid ? { project: { uuid: projectUuid } } : null,
+          },
           disabled: false,
           ...(showInHomePage ? { showInHomePage } : {}),
         },
         relations: ['sceneIcon', 'space', 'space.community'],
       });
 
-      const safeFetch = async (scene: any) => {
+      const safeFetch = async (scene: SceneEntity) => {
         try {
           // eslint-disable-next-line @typescript-eslint/no-unused-vars
           const { actions, ...sceneDetails } = await this.getScene(
             scene,
-            spaceUuid,
+            scene.space.uuid,
           );
           return sceneDetails;
         } catch (error) {
@@ -259,7 +150,7 @@ export class SceneService {
       return scenes.filter(Boolean); // Remove null values
     } catch (error) {
       console.error(
-        `Error fetching Tap-to-Run scenes for space UUID ${spaceUuid}:`,
+        `Error fetching Tap-to-Run scenes for specified spaces:`,
         error.message,
       );
 
@@ -291,45 +182,6 @@ export class SceneService {
     }
   }
 
-  async fetchSceneDetailsFromTuya(
-    sceneId: string,
-  ): Promise<SceneDetailsResult> {
-    try {
-      const response = await this.tuyaService.getSceneRule(sceneId);
-      const camelCaseResponse = convertKeysToCamelCase(response);
-      const {
-        id,
-        name,
-        type,
-        status,
-        actions: tuyaActions = [],
-      } = camelCaseResponse.result;
-
-      const actions = tuyaActions.map((action) => ({ ...action }));
-
-      return {
-        id,
-        name,
-        type,
-        status,
-        actions,
-      } as SceneDetailsResult;
-    } catch (err) {
-      console.error(
-        `Error fetching scene details for scene ID ${sceneId}:`,
-        err,
-      );
-      if (err instanceof HttpException) {
-        throw err;
-      } else {
-        throw new HttpException(
-          'An error occurred while fetching scene details from Tuya',
-          HttpStatus.INTERNAL_SERVER_ERROR,
-        );
-      }
-    }
-  }
-
   async updateTapToRunScene(
     updateSceneTapToRunDto: UpdateSceneTapToRunDto,
     sceneUuid: string,
@@ -386,6 +238,38 @@ export class SceneService {
     }
   }
 
+  async deleteScene(params: SceneParamDto): Promise<BaseResponseDto> {
+    const { sceneUuid } = params;
+    try {
+      const scene = await this.findScene(sceneUuid);
+      const space = await this.getSpaceByUuid(scene.space.uuid);
+
+      await this.delete(scene.sceneTuyaUuid, space.spaceTuyaUuid);
+      await this.sceneDeviceRepository.update(
+        { uuid: sceneUuid },
+        { disabled: true },
+      );
+      await this.sceneRepository.update(
+        {
+          uuid: sceneUuid,
+        },
+        { disabled: true },
+      );
+      return new SuccessResponseDto({
+        message: `Scene with ID ${sceneUuid} deleted successfully`,
+      });
+    } catch (err) {
+      if (err instanceof HttpException) {
+        throw err;
+      } else {
+        throw new HttpException(
+          err.message || `Scene not found for id ${params.sceneUuid}`,
+          err.status || HttpStatus.NOT_FOUND,
+        );
+      }
+    }
+  }
+
   async addSceneIcon(addSceneIconDto: AddSceneIconDto) {
     try {
       const icon = await this.sceneIconRepository.save({
@@ -454,7 +338,237 @@ export class SceneService {
     }
   }
 
-  async getScene(scene: SceneEntity, spaceUuid: string): Promise<SceneDetails> {
+  async findScene(sceneUuid: string): Promise<SceneEntity> {
+    const scene = await this.sceneRepository.findOne({
+      where: { uuid: sceneUuid },
+      relations: ['sceneIcon', 'space', 'space.community'],
+    });
+
+    if (!scene) {
+      throw new HttpException(
+        `Invalid scene with id ${sceneUuid}`,
+        HttpStatus.NOT_FOUND,
+      );
+    }
+    return scene;
+  }
+
+  async getSpaceByUuid(spaceUuid: string) {
+    try {
+      const space = await this.spaceRepository.findOne({
+        where: {
+          uuid: spaceUuid,
+        },
+        relations: ['community'],
+      });
+
+      if (!space) {
+        throw new HttpException(
+          `Invalid space UUID ${spaceUuid}`,
+          HttpStatusCode.BadRequest,
+        );
+      }
+
+      if (!space.community.externalId) {
+        throw new HttpException(
+          `Space doesn't have any association with tuya${spaceUuid}`,
+          HttpStatusCode.BadRequest,
+        );
+      }
+      return {
+        uuid: space.uuid,
+        createdAt: space.createdAt,
+        updatedAt: space.updatedAt,
+        name: space.spaceName,
+        spaceTuyaUuid: space.community.externalId,
+      };
+    } catch (err) {
+      if (err instanceof BadRequestException) {
+        throw err;
+      } else {
+        throw new HttpException(
+          `Space with id ${spaceUuid} not found`,
+          HttpStatus.NOT_FOUND,
+        );
+      }
+    }
+  }
+
+  private async create(
+    spaceTuyaUuid: string,
+    addSceneTapToRunDto: AddSceneTapToRunDto,
+    projectUuid: string,
+  ): Promise<SceneEntity> {
+    const { iconUuid, showInHomePage, spaceUuid } = addSceneTapToRunDto;
+
+    try {
+      const [defaultSceneIcon] = await Promise.all([
+        this.getDefaultSceneIcon(),
+      ]);
+      if (!defaultSceneIcon) {
+        throw new HttpException(
+          'Default scene icon not found',
+          HttpStatus.INTERNAL_SERVER_ERROR,
+        );
+      }
+
+      const response = await this.createSceneExternalService(
+        spaceTuyaUuid,
+        addSceneTapToRunDto,
+        projectUuid,
+      );
+
+      const scene = await this.sceneRepository.save({
+        sceneTuyaUuid: response.result.id,
+        sceneIcon: { uuid: iconUuid || defaultSceneIcon.uuid },
+        showInHomePage,
+        space: { uuid: spaceUuid },
+      });
+
+      return scene;
+    } catch (err) {
+      if (err instanceof HttpException) {
+        throw err;
+      } else if (err.message?.includes('tuya')) {
+        throw new HttpException(
+          'API error: Failed to create scene',
+          HttpStatus.BAD_GATEWAY,
+        );
+      } else {
+        throw new HttpException(
+          'Database error: Failed to save scene',
+          HttpStatus.INTERNAL_SERVER_ERROR,
+        );
+      }
+    }
+  }
+  private async updateSceneExternalService(
+    spaceTuyaUuid: string,
+    sceneTuyaUuid: string,
+    updateSceneTapToRunDto: UpdateSceneTapToRunDto,
+    projectUuid: string,
+  ) {
+    const { sceneName, decisionExpr, actions } = updateSceneTapToRunDto;
+    try {
+      const formattedActions = await this.prepareActions(actions, projectUuid);
+
+      const response = (await this.tuyaService.updateTapToRunScene(
+        sceneTuyaUuid,
+        spaceTuyaUuid,
+        sceneName,
+        formattedActions,
+        decisionExpr,
+      )) as AddTapToRunSceneInterface;
+
+      if (!response.success) {
+        throw new HttpException(
+          'Failed to update scene in Tuya',
+          HttpStatus.INTERNAL_SERVER_ERROR,
+        );
+      }
+
+      return response;
+    } catch (err) {
+      if (err instanceof HttpException) {
+        throw err;
+      } else if (err.message?.includes('tuya')) {
+        throw new HttpException(
+          'API error: Failed to update scene',
+          HttpStatus.BAD_GATEWAY,
+        );
+      } else {
+        throw new HttpException(
+          `An Internal error has been occured ${err}`,
+          HttpStatus.INTERNAL_SERVER_ERROR,
+        );
+      }
+    }
+  }
+
+  private async createSceneExternalService(
+    spaceTuyaUuid: string,
+    addSceneTapToRunDto: AddSceneTapToRunDto,
+    projectUuid: string,
+  ) {
+    const { sceneName, decisionExpr, actions } = addSceneTapToRunDto;
+    try {
+      const formattedActions = await this.prepareActions(actions, projectUuid);
+
+      const response = (await this.tuyaService.addTapToRunScene(
+        spaceTuyaUuid,
+        sceneName,
+        formattedActions,
+        decisionExpr,
+      )) as AddTapToRunSceneInterface;
+
+      if (!response.result?.id) {
+        throw new HttpException(
+          'Failed to create scene in Tuya',
+          HttpStatus.INTERNAL_SERVER_ERROR,
+        );
+      }
+
+      return response;
+    } catch (err) {
+      if (err instanceof HttpException) {
+        throw err;
+      } else if (err.message?.includes('tuya')) {
+        throw new HttpException(
+          'API error: Failed to create scene',
+          HttpStatus.BAD_GATEWAY,
+        );
+      } else {
+        throw new HttpException(
+          `An Internal error has been occured ${err}`,
+          HttpStatus.INTERNAL_SERVER_ERROR,
+        );
+      }
+    }
+  }
+
+  private async fetchSceneDetailsFromTuya(
+    sceneId: string,
+  ): Promise<SceneDetailsResult> {
+    try {
+      const response = await this.tuyaService.getSceneRule(sceneId);
+      const camelCaseResponse = convertKeysToCamelCase(response);
+      const {
+        id,
+        name,
+        type,
+        status,
+        actions: tuyaActions = [],
+      } = camelCaseResponse.result;
+
+      const actions = tuyaActions.map((action) => ({ ...action }));
+
+      return {
+        id,
+        name,
+        type,
+        status,
+        actions,
+      } as SceneDetailsResult;
+    } catch (err) {
+      console.error(
+        `Error fetching scene details for scene ID ${sceneId}:`,
+        err,
+      );
+      if (err instanceof HttpException) {
+        throw err;
+      } else {
+        throw new HttpException(
+          'An error occurred while fetching scene details from Tuya',
+          HttpStatus.INTERNAL_SERVER_ERROR,
+        );
+      }
+    }
+  }
+
+  private async getScene(
+    scene: SceneEntity,
+    spaceUuid: string,
+  ): Promise<SceneDetails> {
     try {
       const { actions, name, status } = await this.fetchSceneDetailsFromTuya(
         scene.sceneTuyaUuid,
@@ -519,54 +633,7 @@ export class SceneService {
     }
   }
 
-  async deleteScene(params: SceneParamDto): Promise<BaseResponseDto> {
-    const { sceneUuid } = params;
-    try {
-      const scene = await this.findScene(sceneUuid);
-      const space = await this.getSpaceByUuid(scene.space.uuid);
-
-      await this.delete(scene.sceneTuyaUuid, space.spaceTuyaUuid);
-      await this.sceneDeviceRepository.update(
-        { uuid: sceneUuid },
-        { disabled: true },
-      );
-      await this.sceneRepository.update(
-        {
-          uuid: sceneUuid,
-        },
-        { disabled: true },
-      );
-      return new SuccessResponseDto({
-        message: `Scene with ID ${sceneUuid} deleted successfully`,
-      });
-    } catch (err) {
-      if (err instanceof HttpException) {
-        throw err;
-      } else {
-        throw new HttpException(
-          err.message || `Scene not found for id ${params.sceneUuid}`,
-          err.status || HttpStatus.NOT_FOUND,
-        );
-      }
-    }
-  }
-
-  async findScene(sceneUuid: string): Promise<SceneEntity> {
-    const scene = await this.sceneRepository.findOne({
-      where: { uuid: sceneUuid },
-      relations: ['sceneIcon', 'space', 'space.community'],
-    });
-
-    if (!scene) {
-      throw new HttpException(
-        `Invalid scene with id ${sceneUuid}`,
-        HttpStatus.NOT_FOUND,
-      );
-    }
-    return scene;
-  }
-
-  async delete(tuyaSceneId: string, tuyaSpaceId: string) {
+  private async delete(tuyaSceneId: string, tuyaSpaceId: string) {
     try {
       const response = (await this.tuyaService.deleteSceneRule(
         tuyaSceneId,
@@ -626,45 +693,4 @@ export class SceneService {
     });
     return defaultIcon;
   }
-
-  async getSpaceByUuid(spaceUuid: string) {
-    try {
-      const space = await this.spaceRepository.findOne({
-        where: {
-          uuid: spaceUuid,
-        },
-        relations: ['community'],
-      });
-
-      if (!space) {
-        throw new HttpException(
-          `Invalid space UUID ${spaceUuid}`,
-          HttpStatusCode.BadRequest,
-        );
-      }
-
-      if (!space.community.externalId) {
-        throw new HttpException(
-          `Space doesn't have any association with tuya${spaceUuid}`,
-          HttpStatusCode.BadRequest,
-        );
-      }
-      return {
-        uuid: space.uuid,
-        createdAt: space.createdAt,
-        updatedAt: space.updatedAt,
-        name: space.spaceName,
-        spaceTuyaUuid: space.community.externalId,
-      };
-    } catch (err) {
-      if (err instanceof BadRequestException) {
-        throw err;
-      } else {
-        throw new HttpException(
-          `Space with id ${spaceUuid} not found`,
-          HttpStatus.NOT_FOUND,
-        );
-      }
-    }
-  }
 }

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) {