From a1f74938fccf929c6edd6e468f320fe60da4d637 Mon Sep 17 00:00:00 2001 From: hannathkadher Date: Fri, 15 Nov 2024 13:27:20 +0400 Subject: [PATCH] removed unused entity --- libs/common/src/database/database.module.ts | 2 - .../src/modules/space/dtos/space.dto.ts | 10 ---- .../modules/space/entities/space.entity.ts | 29 +++-------- .../space/repositories/space.repository.ts | 10 +--- .../modules/space/space.repository.module.ts | 6 +-- libs/common/src/seed/seeder.module.ts | 4 -- .../src/seed/services/seeder.service.ts | 3 -- .../src/seed/services/space.type.seeder.ts | 52 ------------------- 8 files changed, 11 insertions(+), 105 deletions(-) delete mode 100644 libs/common/src/seed/services/space.type.seeder.ts diff --git a/libs/common/src/database/database.module.ts b/libs/common/src/database/database.module.ts index 44e69c9..1f30866 100644 --- a/libs/common/src/database/database.module.ts +++ b/libs/common/src/database/database.module.ts @@ -9,7 +9,6 @@ import { ProductEntity } from '../modules/product/entities'; import { DeviceEntity } from '../modules/device/entities'; import { PermissionTypeEntity } from '../modules/permission/entities'; import { SpaceEntity, SubspaceEntity } from '../modules/space/entities'; -import { SpaceTypeEntity } from '../modules/space/entities'; import { UserSpaceEntity } from '../modules/user/entities'; import { DeviceUserPermissionEntity } from '../modules/device/entities'; import { UserRoleEntity } from '../modules/user/entities'; @@ -47,7 +46,6 @@ import { SceneEntity, SceneIconEntity } from '../modules/scene/entities'; CommunityEntity, SpaceEntity, SubspaceEntity, - SpaceTypeEntity, UserSpaceEntity, DeviceUserPermissionEntity, UserRoleEntity, diff --git a/libs/common/src/modules/space/dtos/space.dto.ts b/libs/common/src/modules/space/dtos/space.dto.ts index 04072fd..98706d0 100644 --- a/libs/common/src/modules/space/dtos/space.dto.ts +++ b/libs/common/src/modules/space/dtos/space.dto.ts @@ -21,13 +21,3 @@ export class SpaceDto { @IsNotEmpty() public invitationCode: string; } - -export class SpaceTypeDto { - @IsString() - @IsNotEmpty() - public uuid: string; - - @IsString() - @IsNotEmpty() - public type: string; -} diff --git a/libs/common/src/modules/space/entities/space.entity.ts b/libs/common/src/modules/space/entities/space.entity.ts index 196a522..04ebf83 100644 --- a/libs/common/src/modules/space/entities/space.entity.ts +++ b/libs/common/src/modules/space/entities/space.entity.ts @@ -6,33 +6,13 @@ import { OneToMany, Unique, } from 'typeorm'; -import { SpaceDto, SpaceTypeDto } from '../dtos'; +import { SpaceDto } from '../dtos'; import { AbstractEntity } from '../../abstract/entities/abstract.entity'; import { UserSpaceEntity } from '../../user/entities'; import { DeviceEntity } from '../../device/entities'; import { CommunityEntity } from '../../community/entities'; import { SubspaceEntity } from './subspace.entity'; -@Entity({ name: 'space-type' }) -export class SpaceTypeEntity extends AbstractEntity { - @Column({ - type: 'uuid', - default: () => 'gen_random_uuid()', - nullable: false, - }) - public uuid: string; - - @Column({ - nullable: false, - }) - type: string; - - constructor(partial: Partial) { - super(); - Object.assign(this, partial); - } -} - @Entity({ name: 'space' }) @Unique(['invitationCode']) export class SpaceEntity extends AbstractEntity { @@ -77,6 +57,13 @@ export class SpaceEntity extends AbstractEntity { }) 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, diff --git a/libs/common/src/modules/space/repositories/space.repository.ts b/libs/common/src/modules/space/repositories/space.repository.ts index 5e0962c..2806c0e 100644 --- a/libs/common/src/modules/space/repositories/space.repository.ts +++ b/libs/common/src/modules/space/repositories/space.repository.ts @@ -1,6 +1,6 @@ import { DataSource, Repository } from 'typeorm'; import { Injectable } from '@nestjs/common'; -import { SpaceEntity, SpaceTypeEntity, SubspaceEntity } from '../entities'; +import { SpaceEntity, SubspaceEntity } from '../entities'; @Injectable() export class SpaceRepository extends Repository { @@ -8,14 +8,6 @@ export class SpaceRepository extends Repository { super(SpaceEntity, dataSource.createEntityManager()); } } - -@Injectable() -export class SpaceTypeRepository extends Repository { - constructor(private dataSource: DataSource) { - super(SpaceTypeEntity, dataSource.createEntityManager()); - } -} - @Injectable() export class SubspaceRepository extends Repository { constructor(private dataSource: DataSource) { diff --git a/libs/common/src/modules/space/space.repository.module.ts b/libs/common/src/modules/space/space.repository.module.ts index ea3c606..90916c2 100644 --- a/libs/common/src/modules/space/space.repository.module.ts +++ b/libs/common/src/modules/space/space.repository.module.ts @@ -1,13 +1,11 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { SpaceEntity, SpaceTypeEntity, SubspaceEntity } from './entities'; +import { SpaceEntity, SubspaceEntity } from './entities'; @Module({ providers: [], exports: [], controllers: [], - imports: [ - TypeOrmModule.forFeature([SpaceEntity, SpaceTypeEntity, SubspaceEntity]), - ], + imports: [TypeOrmModule.forFeature([SpaceEntity, SubspaceEntity])], }) export class SpaceRepositoryModule {} diff --git a/libs/common/src/seed/seeder.module.ts b/libs/common/src/seed/seeder.module.ts index 0c89c5c..eeb245b 100644 --- a/libs/common/src/seed/seeder.module.ts +++ b/libs/common/src/seed/seeder.module.ts @@ -7,8 +7,6 @@ import { ConfigModule } from '@nestjs/config'; import { RoleTypeRepositoryModule } from '../modules/role-type/role.type.repository.module'; import { RoleTypeRepository } from '../modules/role-type/repositories'; import { RoleTypeSeeder } from './services/role.type.seeder'; -import { SpaceTypeRepository } from '../modules/space/repositories'; -import { SpaceTypeSeeder } from './services/space.type.seeder'; import { SpaceRepositoryModule } from '../modules/space/space.repository.module'; import { SuperAdminSeeder } from './services/supper.admin.seeder'; import { UserRepository } from '../modules/user/repositories'; @@ -25,11 +23,9 @@ import { SceneIconRepository } from '../modules/scene/repositories'; providers: [ PermissionTypeSeeder, RoleTypeSeeder, - SpaceTypeSeeder, SeederService, PermissionTypeRepository, RoleTypeRepository, - SpaceTypeRepository, SuperAdminSeeder, UserRepository, UserRoleRepository, diff --git a/libs/common/src/seed/services/seeder.service.ts b/libs/common/src/seed/services/seeder.service.ts index e627e44..09fb91d 100644 --- a/libs/common/src/seed/services/seeder.service.ts +++ b/libs/common/src/seed/services/seeder.service.ts @@ -1,7 +1,6 @@ import { Injectable } from '@nestjs/common'; import { PermissionTypeSeeder } from './permission.type.seeder'; import { RoleTypeSeeder } from './role.type.seeder'; -import { SpaceTypeSeeder } from './space.type.seeder'; import { SuperAdminSeeder } from './supper.admin.seeder'; import { RegionSeeder } from './regions.seeder'; import { TimeZoneSeeder } from './timezone.seeder'; @@ -11,7 +10,6 @@ export class SeederService { constructor( private readonly permissionTypeSeeder: PermissionTypeSeeder, private readonly roleTypeSeeder: RoleTypeSeeder, - private readonly spaceTypeSeeder: SpaceTypeSeeder, private readonly regionSeeder: RegionSeeder, private readonly timeZoneSeeder: TimeZoneSeeder, private readonly superAdminSeeder: SuperAdminSeeder, @@ -21,7 +19,6 @@ export class SeederService { async seed() { await this.permissionTypeSeeder.addPermissionTypeDataIfNotFound(); await this.roleTypeSeeder.addRoleTypeDataIfNotFound(); - await this.spaceTypeSeeder.addSpaceTypeDataIfNotFound(); await this.regionSeeder.addRegionDataIfNotFound(); await this.timeZoneSeeder.addTimeZoneDataIfNotFound(); await this.superAdminSeeder.createSuperAdminIfNotFound(); diff --git a/libs/common/src/seed/services/space.type.seeder.ts b/libs/common/src/seed/services/space.type.seeder.ts deleted file mode 100644 index 56c2ee8..0000000 --- a/libs/common/src/seed/services/space.type.seeder.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { Injectable } from '@nestjs/common'; -import { SpaceType } from '../../constants/space-type.enum'; -import { SpaceTypeRepository } from '../../modules/space/repositories'; - -@Injectable() -export class SpaceTypeSeeder { - constructor(private readonly spaceTypeRepository: SpaceTypeRepository) {} - - async addSpaceTypeDataIfNotFound(): Promise { - try { - const existingSpaceTypes = await this.spaceTypeRepository.find(); - - const spaceTypeNames = existingSpaceTypes.map((pt) => pt.type); - - const missingSpaceTypes = []; - if (!spaceTypeNames.includes(SpaceType.COMMUNITY)) { - missingSpaceTypes.push(SpaceType.COMMUNITY); - } - if (!spaceTypeNames.includes(SpaceType.BUILDING)) { - missingSpaceTypes.push(SpaceType.BUILDING); - } - if (!spaceTypeNames.includes(SpaceType.FLOOR)) { - missingSpaceTypes.push(SpaceType.FLOOR); - } - if (!spaceTypeNames.includes(SpaceType.UNIT)) { - missingSpaceTypes.push(SpaceType.UNIT); - } - if (!spaceTypeNames.includes(SpaceType.ROOM)) { - missingSpaceTypes.push(SpaceType.ROOM); - } - if (missingSpaceTypes.length > 0) { - await this.addSpaceTypeData(missingSpaceTypes); - } - } catch (err) { - console.error('Error while checking space type data:', err); - throw err; - } - } - - private async addSpaceTypeData(spaceTypes: string[]): Promise { - try { - const spaceTypeEntities = spaceTypes.map((type) => ({ - type, - })); - - await this.spaceTypeRepository.save(spaceTypeEntities); - } catch (err) { - console.error('Error while adding space type data:', err); - throw err; - } - } -}