diff --git a/libs/common/src/modules/space-model/entities/space-model.entity.ts b/libs/common/src/modules/space-model/entities/space-model.entity.ts index d0b471e..7ebed11 100644 --- a/libs/common/src/modules/space-model/entities/space-model.entity.ts +++ b/libs/common/src/modules/space-model/entities/space-model.entity.ts @@ -5,7 +5,7 @@ import { SubspaceModelEntity } from './subspace-model'; import { ProjectEntity } from '../../project/entities'; import { SpaceEntity } from '../../space/entities'; import { TagModel } from './tag-model.entity'; -import { SpaceModelProductAllocation } from './space-model-product-allocation.entity'; +import { SpaceModelProductAllocationEntity } from './space-model-product-allocation.entity'; @Entity({ name: 'space-model' }) export class SpaceModelEntity extends AbstractEntity { @@ -53,11 +53,11 @@ export class SpaceModelEntity extends AbstractEntity { tags: TagModel[]; @OneToMany( - () => SpaceModelProductAllocation, + () => SpaceModelProductAllocationEntity, (allocation) => allocation.spaceModel, { cascade: true }, ) - public productAllocations: SpaceModelProductAllocation[]; + public productAllocations: SpaceModelProductAllocationEntity[]; constructor(partial: Partial) { super(); diff --git a/libs/common/src/modules/space-model/entities/subspace-model/subspace-model.entity.ts b/libs/common/src/modules/space-model/entities/subspace-model/subspace-model.entity.ts index 41dd75a..c56a062 100644 --- a/libs/common/src/modules/space-model/entities/subspace-model/subspace-model.entity.ts +++ b/libs/common/src/modules/space-model/entities/subspace-model/subspace-model.entity.ts @@ -4,7 +4,7 @@ import { SubSpaceModelDto } from '../../dtos'; import { SpaceModelEntity } from '../space-model.entity'; import { SubspaceEntity } from '@app/common/modules/space/entities'; import { TagModel } from '../tag-model.entity'; -import { SubspaceModelProductAllocation } from './subspace-model-product-allocation.entity'; +import { SubspaceModelProductAllocationEntity } from './subspace-model-product-allocation.entity'; @Entity({ name: 'subspace-model' }) export class SubspaceModelEntity extends AbstractEntity { @@ -45,9 +45,9 @@ export class SubspaceModelEntity extends AbstractEntity { tags: TagModel[]; @OneToMany( - () => SubspaceModelProductAllocation, + () => SubspaceModelProductAllocationEntity, (allocation) => allocation.subspaceModel, { cascade: true }, ) - public productAllocations: SubspaceModelProductAllocation[]; + public productAllocations: SubspaceModelProductAllocationEntity[]; } diff --git a/libs/common/src/modules/space-model/repositories/space-model.repository.ts b/libs/common/src/modules/space-model/repositories/space-model.repository.ts index d425946..5523e7c 100644 --- a/libs/common/src/modules/space-model/repositories/space-model.repository.ts +++ b/libs/common/src/modules/space-model/repositories/space-model.repository.ts @@ -2,9 +2,9 @@ import { DataSource, Repository } from 'typeorm'; import { Injectable } from '@nestjs/common'; import { SpaceModelEntity, - SpaceModelProductAllocation, + SpaceModelProductAllocationEntity, SubspaceModelEntity, - SubspaceModelProductAllocation, + SubspaceModelProductAllocationEntity, TagModel, } from '../entities'; @@ -29,15 +29,18 @@ export class TagModelRepository extends Repository { } @Injectable() -export class SpaceModelProductAllocationRepoitory extends Repository { +export class SpaceModelProductAllocationRepoitory extends Repository { constructor(private dataSource: DataSource) { - super(SpaceModelProductAllocation, dataSource.createEntityManager()); + super(SpaceModelProductAllocationEntity, dataSource.createEntityManager()); } } @Injectable() -export class SubspaceModelProductAllocationRepoitory extends Repository { +export class SubspaceModelProductAllocationRepoitory extends Repository { constructor(private dataSource: DataSource) { - super(SubspaceModelProductAllocation, dataSource.createEntityManager()); + super( + SubspaceModelProductAllocationEntity, + dataSource.createEntityManager(), + ); } } diff --git a/libs/common/src/modules/tag/entities/tag.entity.ts b/libs/common/src/modules/tag/entities/tag.entity.ts index 5fbd9e5..fe6725c 100644 --- a/libs/common/src/modules/tag/entities/tag.entity.ts +++ b/libs/common/src/modules/tag/entities/tag.entity.ts @@ -19,7 +19,7 @@ export class NewTagEntity extends AbstractEntity { @Column() name: string; - @ManyToOne(() => ProductEntity, (product) => product.tags, { + @ManyToOne(() => ProductEntity, (product) => product.newTags, { nullable: false, onDelete: 'CASCADE', })