From f77d52b6be0647f9e4cb09c0f27aa46bd726d925 Mon Sep 17 00:00:00 2001 From: hannathkadher Date: Thu, 30 Jan 2025 21:52:59 +0400 Subject: [PATCH] fixed deleting subspace --- .../services/space-model.service.ts | 1 + .../subspace/subspace-model.service.ts | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/space-model/services/space-model.service.ts b/src/space-model/services/space-model.service.ts index 2162c38..3071b16 100644 --- a/src/space-model/services/space-model.service.ts +++ b/src/space-model/services/space-model.service.ts @@ -211,6 +211,7 @@ export class SpaceModelService { ); if (dto.subspaceModels) { + console.log(JSON.stringify(modifiedSubspaces)); modifiedSubspaceModels = await this.subSpaceModelService.modifySubSpaceModels( modifiedSubspaces, diff --git a/src/space-model/services/subspace/subspace-model.service.ts b/src/space-model/services/subspace/subspace-model.service.ts index dd3fe91..bd76a9c 100644 --- a/src/space-model/services/subspace/subspace-model.service.ts +++ b/src/space-model/services/subspace/subspace-model.service.ts @@ -243,15 +243,19 @@ export class SubSpaceModelService { ); if (subspaceModel.tags?.length) { - const modifyTagDtos = subspaceModel.tags.map((tag) => ({ - uuid: tag.uuid, - action: ModifyAction.DELETE, - })); - await this.tagModelService.modifyTags( + const modifyTagDtos: CreateTagModelDto[] = subspaceModel.tags.map( + (tag) => ({ + uuid: tag.uuid, + action: ModifyAction.ADD, + tag: tag.tag, + productUuid: tag.product.uuid, + }), + ); + await this.tagModelService.moveTags( modifyTagDtos, queryRunner, + subspaceModel.spaceModel, null, - subspaceModel, ); } } @@ -259,7 +263,7 @@ export class SubSpaceModelService { private async findOne(subspaceUuid: string): Promise { const subspace = await this.subspaceModelRepository.findOne({ where: { uuid: subspaceUuid, disabled: false }, - relations: ['tags', 'spaceModel'], + relations: ['tags', 'spaceModel', 'tags.product'], }); if (!subspace) { throw new HttpException(