diff --git a/libs/common/src/constants/default.scene.icon.ts b/libs/common/src/constants/default.scene.icon.ts new file mode 100644 index 0000000..637ca8c --- /dev/null +++ b/libs/common/src/constants/default.scene.icon.ts @@ -0,0 +1,2 @@ +export const defaultSceneIcon = + 'data:image/png;base64,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'; diff --git a/libs/common/src/constants/secne-icon-type.enum.ts b/libs/common/src/constants/secne-icon-type.enum.ts new file mode 100644 index 0000000..1cbb693 --- /dev/null +++ b/libs/common/src/constants/secne-icon-type.enum.ts @@ -0,0 +1,4 @@ +export enum SceneIconType { + Default = 'default', + Other = 'other', +} diff --git a/libs/common/src/modules/scene/entities/scene.entity.ts b/libs/common/src/modules/scene/entities/scene.entity.ts index d94d172..2ade9ad 100644 --- a/libs/common/src/modules/scene/entities/scene.entity.ts +++ b/libs/common/src/modules/scene/entities/scene.entity.ts @@ -1,6 +1,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'; // Define SceneIconEntity before SceneEntity @Entity({ name: 'scene-icon' }) @@ -11,6 +12,13 @@ export class SceneIconEntity extends AbstractEntity { }) public icon: string; + @Column({ + type: 'enum', + enum: SceneIconType, + default: SceneIconType.Other, + }) + iconType: SceneIconType; + @OneToMany( () => SceneEntity, (scenesIconEntity) => scenesIconEntity.sceneIcon, diff --git a/libs/common/src/seed/seeder.module.ts b/libs/common/src/seed/seeder.module.ts index f63c05d..0c89c5c 100644 --- a/libs/common/src/seed/seeder.module.ts +++ b/libs/common/src/seed/seeder.module.ts @@ -18,6 +18,8 @@ import { RegionSeeder } from './services/regions.seeder'; import { RegionRepository } from '../modules/region/repositories'; import { TimeZoneSeeder } from './services/timezone.seeder'; import { TimeZoneRepository } from '../modules/timezone/repositories'; +import { SceneIconSeeder } from './services/scene.icon.seeder'; +import { SceneIconRepository } from '../modules/scene/repositories'; @Global() @Module({ providers: [ @@ -35,6 +37,8 @@ import { TimeZoneRepository } from '../modules/timezone/repositories'; RegionRepository, TimeZoneSeeder, TimeZoneRepository, + SceneIconSeeder, + SceneIconRepository, ], exports: [SeederService], controllers: [], diff --git a/libs/common/src/seed/services/scene.icon.seeder.ts b/libs/common/src/seed/services/scene.icon.seeder.ts new file mode 100644 index 0000000..3f363ce --- /dev/null +++ b/libs/common/src/seed/services/scene.icon.seeder.ts @@ -0,0 +1,38 @@ +import { Injectable } from '@nestjs/common'; +import { SceneIconRepository } from '@app/common/modules/scene/repositories'; +import { SceneIconType } from '@app/common/constants/secne-icon-type.enum'; +import { defaultSceneIcon } from '@app/common/constants/default.scene.icon'; + +@Injectable() +export class SceneIconSeeder { + constructor(private readonly sceneIconRepository: SceneIconRepository) {} + + async createSceneDefaultIconIfNotFound(): Promise { + try { + const defaultSceneIconData = await this.sceneIconRepository.find({ + where: { iconType: SceneIconType.Default }, + }); + + if (defaultSceneIconData.length <= 0) { + console.log('Creating default scene icon...'); + + await this.createDefaultSceneIcon(); + } + } catch (err) { + console.error('Error while checking default scene icon:', err); + throw err; + } + } + + private async createDefaultSceneIcon(): Promise { + try { + await this.sceneIconRepository.save({ + icon: defaultSceneIcon, + iconType: SceneIconType.Default, + }); + } catch (err) { + console.error('Error while creating default scene icon:', err); + throw err; + } + } +} diff --git a/libs/common/src/seed/services/seeder.service.ts b/libs/common/src/seed/services/seeder.service.ts index 47d899d..e627e44 100644 --- a/libs/common/src/seed/services/seeder.service.ts +++ b/libs/common/src/seed/services/seeder.service.ts @@ -5,6 +5,7 @@ import { SpaceTypeSeeder } from './space.type.seeder'; import { SuperAdminSeeder } from './supper.admin.seeder'; import { RegionSeeder } from './regions.seeder'; import { TimeZoneSeeder } from './timezone.seeder'; +import { SceneIconSeeder } from './scene.icon.seeder'; @Injectable() export class SeederService { constructor( @@ -14,6 +15,7 @@ export class SeederService { private readonly regionSeeder: RegionSeeder, private readonly timeZoneSeeder: TimeZoneSeeder, private readonly superAdminSeeder: SuperAdminSeeder, + private readonly sceneIconSeeder: SceneIconSeeder, ) {} async seed() { @@ -23,5 +25,6 @@ export class SeederService { await this.regionSeeder.addRegionDataIfNotFound(); await this.timeZoneSeeder.addTimeZoneDataIfNotFound(); await this.superAdminSeeder.createSuperAdminIfNotFound(); + await this.sceneIconSeeder.createSceneDefaultIconIfNotFound(); } } diff --git a/src/scene/dtos/scene.dto.ts b/src/scene/dtos/scene.dto.ts index 62690bd..24334e9 100644 --- a/src/scene/dtos/scene.dto.ts +++ b/src/scene/dtos/scene.dto.ts @@ -74,10 +74,10 @@ export class AddSceneTapToRunDto { public unitUuid: string; @ApiProperty({ description: 'Icon UUID', - required: true, + required: false, }) @IsString() - @IsNotEmpty() + @IsOptional() public iconUuid: string; @ApiProperty({ description: 'show in home page', diff --git a/src/scene/services/scene.service.ts b/src/scene/services/scene.service.ts index ea2237a..3278970 100644 --- a/src/scene/services/scene.service.ts +++ b/src/scene/services/scene.service.ts @@ -28,6 +28,7 @@ import { SceneIconRepository, SceneRepository, } from '@app/common/modules/scene/repositories'; +import { SceneIconType } from '@app/common/constants/secne-icon-type.enum'; @Injectable() export class SceneService { @@ -101,10 +102,16 @@ export class SceneService { if (!response.success) { throw new HttpException(response.msg, HttpStatus.BAD_REQUEST); } else { + const defaultSceneIcon = await this.sceneIconRepository.findOne({ + where: { iconType: SceneIconType.Default }, + }); + await this.sceneRepository.save({ sceneTuyaUuid: response.result.id, sceneIcon: { - uuid: addSceneTapToRunDto.iconUuid, + uuid: addSceneTapToRunDto.iconUuid + ? addSceneTapToRunDto.iconUuid + : defaultSceneIcon.uuid, }, showInHomePage: addSceneTapToRunDto.showInHomePage, unitUuid: unitUuid ? unitUuid : addSceneTapToRunDto.unitUuid,