Merge branch 'feat/add-product-space' into feat/add-space-position

libs/common/src/common.module.ts

@@ -8,8 +8,15 @@ import config from './config';
 import { EmailService } from './util/email.service';
 import { ErrorMessageService } from 'src/error-message/error-message.service';
 import { TuyaService } from './integrations/tuya/services/tuya.service';
+import { SceneDeviceRepository } from './modules/scene-device/repositories';
 @Module({
-  providers: [CommonService, EmailService, ErrorMessageService, TuyaService],
+  providers: [
+    CommonService,
+    EmailService,
+    ErrorMessageService,
+    TuyaService,
+    SceneDeviceRepository,
+  ],
   exports: [
     CommonService,
     TuyaService,
@@ -17,6 +24,7 @@ import { TuyaService } from './integrations/tuya/services/tuya.service';
     AuthModule,
     EmailService,
     ErrorMessageService,
+    SceneDeviceRepository,
   ],
   imports: [
     ConfigModule.forRoot({

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

@@ -7,3 +7,13 @@ export enum ActionExecutorEnum {
 export enum EntityTypeEnum {
   DEVICE_REPORT = 'device_report',
 }
+export const AUTOMATION_CONFIG = {
+  DEFAULT_START_TIME: '00:00',
+  DEFAULT_END_TIME: '23:59',
+  DEFAULT_LOOPS: '1111111',
+  DECISION_EXPR: 'and',
+  CONDITION_TYPE: 'device_report',
+  ACTION_EXECUTOR: 'rule_trigger',
+  COMPARATOR: '==',
+  SCENE_STATUS_VALUE: 'scene',
+};

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

@@ -16,4 +16,6 @@ export enum ProductType {
   GD = 'GD',
   CUR = 'CUR',
   PC = 'PC',
+  FOUR_S = '4S',
+  SIX_S = '6S',
 }

libs/common/src/constants/scene-switch-type.enum.ts

@@ -0,0 +1,8 @@
+export enum SceneSwitchesTypeEnum {
+  SCENE_1 = 'scene_1',
+  SCENE_2 = 'scene_2',
+  SCENE_3 = 'scene_3',
+  SCENE_4 = 'scene_4',
+  SCENE_5 = 'scene_5',
+  SCENE_6 = 'scene_6',
+}

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

@@ -8,7 +8,11 @@ import { UserOtpEntity } from '../modules/user/entities';
 import { ProductEntity } from '../modules/product/entities';
 import { DeviceEntity } from '../modules/device/entities';
 import { PermissionTypeEntity } from '../modules/permission/entities';
-import { SpaceEntity, SpaceLinkEntity, SubspaceEntity } from '../modules/space/entities';
+import {
+  SpaceEntity,
+  SpaceLinkEntity,
+  SubspaceEntity,
+} from '../modules/space/entities';
 import { UserSpaceEntity } from '../modules/user/entities';
 import { DeviceUserPermissionEntity } from '../modules/device/entities';
 import { UserRoleEntity } from '../modules/user/entities';
@@ -21,6 +25,8 @@ import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
 import { CommunityEntity } from '../modules/community/entities';
 import { DeviceStatusLogEntity } from '../modules/device-status-log/entities';
 import { SceneEntity, SceneIconEntity } from '../modules/scene/entities';
+import { SceneDeviceEntity } from '../modules/scene-device/entities';
+import { SpaceProductEntity } from '../modules/space/entities/space-product.entity';
 
 @Module({
   imports: [
@@ -47,6 +53,7 @@ import { SceneEntity, SceneIconEntity } from '../modules/scene/entities';
           SpaceEntity,
           SpaceLinkEntity,
           SubspaceEntity,
+          SpaceProductEntity,
           UserSpaceEntity,
           DeviceUserPermissionEntity,
           UserRoleEntity,
@@ -59,6 +66,7 @@ import { SceneEntity, SceneIconEntity } from '../modules/scene/entities';
           DeviceStatusLogEntity,
           SceneEntity,
           SceneIconEntity,
+          SceneDeviceEntity,
         ],
         namingStrategy: new SnakeNamingStrategy(),
         synchronize: Boolean(JSON.parse(configService.get('DB_SYNC'))),

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

@@ -1,4 +1,12 @@
-import { Column, Entity, ManyToOne, OneToMany, Unique, Index, JoinColumn } from 'typeorm';
+import {
+  Column,
+  Entity,
+  ManyToOne,
+  OneToMany,
+  Unique,
+  Index,
+  JoinColumn,
+} from 'typeorm';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
 import { DeviceDto, DeviceUserPermissionDto } from '../dtos/device.dto';
 import { SpaceEntity, SubspaceEntity } from '../../space/entities';
@@ -6,6 +14,7 @@ import { ProductEntity } from '../../product/entities';
 import { UserEntity } from '../../user/entities';
 import { DeviceNotificationDto } from '../dtos';
 import { PermissionTypeEntity } from '../../permission/entities';
+import { SceneDeviceEntity } from '../../scene-device/entities';
 
 @Entity({ name: 'device' })
 @Unique(['deviceTuyaUuid'])
@@ -62,6 +71,9 @@ export class DeviceEntity extends AbstractEntity<DeviceDto> {
   @Column({ nullable: false })
   uuid: string;
 
+  @OneToMany(() => SceneDeviceEntity, (sceneDevice) => sceneDevice.device, {})
+  sceneDevices: SceneDeviceEntity[];
+
   constructor(partial: Partial<DeviceEntity>) {
     super();
     Object.assign(this, partial);

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

@@ -2,6 +2,7 @@ import { Column, Entity, OneToMany } from 'typeorm';
 import { ProductDto } from '../dtos';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
 import { DeviceEntity } from '../../device/entities';
+import { SpaceProductEntity } from '../../space/entities/space-product.entity';
 
 @Entity({ name: 'product' })
 export class ProductEntity extends AbstractEntity<ProductDto> {
@@ -26,6 +27,9 @@ export class ProductEntity extends AbstractEntity<ProductDto> {
   })
   public prodType: string;
 
+  @OneToMany(() => SpaceProductEntity, (spaceProduct) => spaceProduct.product)
+  spaceProducts: SpaceProductEntity[];
+
   @OneToMany(
     () => DeviceEntity,
     (devicesProductEntity) => devicesProductEntity.productDevice,

libs/common/src/modules/scene-device/dtos/index.ts

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

libs/common/src/modules/scene-device/dtos/scene-device.dto.ts

@@ -0,0 +1,20 @@
+import { IsNotEmpty, IsString } from 'class-validator';
+
+export class SceneDeviceDto {
+  @IsString()
+  @IsNotEmpty()
+  public uuid: string;
+
+  @IsString()
+  @IsNotEmpty()
+  public deviceUuid: string;
+  @IsString()
+  @IsNotEmpty()
+  public sceneUuid: string;
+  @IsString()
+  @IsNotEmpty()
+  public switchName: string;
+  @IsString()
+  @IsNotEmpty()
+  public automationTuyaUuid: string;
+}

libs/common/src/modules/scene-device/entities/index.ts

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

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

@@ -0,0 +1,51 @@
+import { Column, Entity, JoinColumn, ManyToOne, Unique } from 'typeorm';
+import { SceneDeviceDto } from '../dtos';
+import { AbstractEntity } from '../../abstract/entities/abstract.entity';
+import { SceneSwitchesTypeEnum } from '@app/common/constants/scene-switch-type.enum';
+import { DeviceEntity } from '../../device/entities';
+import { SceneEntity } from '../../scene/entities';
+
+@Entity({ name: 'scene-device' })
+@Unique(['device', 'switchName'])
+export class SceneDeviceEntity extends AbstractEntity<SceneDeviceDto> {
+  @Column({
+    type: 'uuid',
+    default: () => 'gen_random_uuid()',
+    nullable: false,
+  })
+  public uuid: string;
+
+  @ManyToOne(() => DeviceEntity, (device) => device.sceneDevices, {
+    nullable: false,
+  })
+  @JoinColumn({ name: 'device_uuid' })
+  device: DeviceEntity;
+
+  @Column({
+    nullable: false,
+  })
+  sceneUuid: string;
+
+  @Column({
+    nullable: false,
+    type: 'enum',
+    enum: SceneSwitchesTypeEnum,
+  })
+  switchName: SceneSwitchesTypeEnum;
+
+  @Column({
+    nullable: false,
+  })
+  automationTuyaUuid: string;
+
+  @ManyToOne(() => SceneEntity, (scene) => scene.sceneDevices, {
+    nullable: false,
+  })
+  @JoinColumn({ name: 'scene_uuid' })
+  scene: SceneEntity;
+
+  constructor(partial: Partial<SceneDeviceEntity>) {
+    super();
+    Object.assign(this, partial);
+  }
+}

libs/common/src/modules/scene-device/repositories/index.ts

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

libs/common/src/modules/scene-device/repositories/scene-device.repository.ts

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

libs/common/src/modules/scene-device/scene-device.repository.module.ts

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

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

@@ -2,6 +2,7 @@ import { Column, Entity, ManyToOne, OneToMany } from 'typeorm';
 import { SceneDto, SceneIconDto } from '../dtos';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
 import { SceneIconType } from '@app/common/constants/secne-icon-type.enum';
+import { SceneDeviceEntity } from '../../scene-device/entities';
 
 // Define SceneIconEntity before SceneEntity
 @Entity({ name: 'scene-icon' })
@@ -59,6 +60,9 @@ export class SceneEntity extends AbstractEntity<SceneDto> {
   })
   sceneIcon: SceneIconEntity;
 
+  @OneToMany(() => SceneDeviceEntity, (sceneDevice) => sceneDevice.scene)
+  sceneDevices: SceneDeviceEntity[];
+
   constructor(partial: Partial<SceneEntity>) {
     super();
     Object.assign(this, partial);

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

@@ -0,0 +1,32 @@
+import { Column, Entity, ManyToOne, JoinColumn } from 'typeorm';
+import { SpaceEntity } from './space.entity';
+import { AbstractEntity } from '../../abstract/entities/abstract.entity';
+import { ProductEntity } from '../../product/entities';
+
+@Entity({ name: 'space-product' })
+export class SpaceProductEntity extends AbstractEntity<SpaceProductEntity> {
+  @ManyToOne(() => SpaceEntity, (space) => space.spaceProducts, {
+    nullable: false,
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn({ name: 'space_uuid' })
+  space: SpaceEntity;
+
+  @ManyToOne(() => ProductEntity, (product) => product.spaceProducts, {
+    nullable: false,
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn({ name: 'product_uuid' })
+  product: ProductEntity;
+
+  @Column({
+    nullable: false,
+    type: 'int',
+  })
+  productCount: number;
+
+  constructor(partial: Partial<SpaceProductEntity>) {
+    super();
+    Object.assign(this, partial);
+  }
+}

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

@@ -13,6 +13,7 @@ import { DeviceEntity } from '../../device/entities';
 import { CommunityEntity } from '../../community/entities';
 import { SubspaceEntity } from './subspace.entity';
 import { SpaceLinkEntity } from './space-link.entity';
+import { SpaceProductEntity } from './space-product.entity';
 
 @Entity({ name: 'space' })
 @Unique(['invitationCode'])
@@ -86,6 +87,8 @@ export class SpaceEntity extends AbstractEntity<SpaceDto> {
     type: 'text',
   })
   public icon: string;
+  @OneToMany(() => SpaceProductEntity, (spaceProduct) => spaceProduct.space)
+  spaceProducts: SpaceProductEntity[];
 
   constructor(partial: Partial<SpaceEntity>) {
     super();

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

@@ -1,5 +1,6 @@
 import { DataSource, Repository } from 'typeorm';
 import { Injectable } from '@nestjs/common';
+import { SpaceProductEntity } from '../entities/space-product.entity';
 import { SpaceEntity, SpaceLinkEntity, SubspaceEntity } from '../entities';
 
 @Injectable()
@@ -21,3 +22,9 @@ export class SpaceLinkRepository extends Repository<SpaceLinkEntity> {
     super(SpaceLinkEntity, dataSource.createEntityManager());
   }
 }
+@Injectable()
+export class SpaceProductRepository extends Repository<SpaceProductEntity> {
+  constructor(private dataSource: DataSource) {
+    super(SpaceProductEntity, dataSource.createEntityManager());
+  }
+}