From 17124b9d34842e20192a493f1aaf152fd03695a1 Mon Sep 17 00:00:00 2001 From: hannathkadher Date: Thu, 2 Jan 2025 11:22:54 +0400 Subject: [PATCH] list space model should list tags --- libs/common/src/util/buildTypeORMIncludeQuery.ts | 12 +++++------- src/space-model/services/space-model.service.ts | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libs/common/src/util/buildTypeORMIncludeQuery.ts b/libs/common/src/util/buildTypeORMIncludeQuery.ts index bffd5be..a8d4e20 100644 --- a/libs/common/src/util/buildTypeORMIncludeQuery.ts +++ b/libs/common/src/util/buildTypeORMIncludeQuery.ts @@ -21,16 +21,14 @@ const mappingInclude: { [key: string]: any } = { }, 'space-model': { subspaceModels: 'subspace-model', - spaceProductModels: 'space-product-model', + tags: 'tag_model', }, 'subspace-model': { - productModels: 'subspace-product-model', + tags: 'tag_model', }, - 'subspace-product-model': { - itemModels: true, - }, - 'space-product-model': { - items: true, + tag_model: { + tag_model: true, + product: true, }, }; diff --git a/src/space-model/services/space-model.service.ts b/src/space-model/services/space-model.service.ts index 89e9edb..747ea39 100644 --- a/src/space-model/services/space-model.service.ts +++ b/src/space-model/services/space-model.service.ts @@ -113,7 +113,7 @@ export class SpaceModelService { pageable.where = { project: { uuid: param.projectUuid }, }; - pageable.include = 'subspaceModels,tags,subspaceModels.tags'; + pageable.include = 'subspaceModels,tags,subspaceModels.tags,tags.product,subspaceModels.tags.product'; const customModel = TypeORMCustomModel(this.spaceModelRepository);