fixed delete space

libs/common/src/modules/space/entities/tag.entity.ts

@@ -48,5 +48,6 @@ export class TagEntity extends AbstractEntity<TagDto> {
   @OneToOne(() => DeviceEntity, (device) => device.tag, {
     nullable: true,
   })
+  @JoinColumn({ name: 'device_id' })
   device: DeviceEntity;
 }

src/space/services/space.service.ts

@@ -19,7 +19,7 @@ import { SpaceEntity } from '@app/common/modules/space/entities';
 import { generateRandomString } from '@app/common/helper/randomString';
 import { SpaceLinkService } from './space-link';
 import { SubSpaceService } from './subspace';
-import { DataSource, Not, QueryRunner } from 'typeorm';
+import { DataSource, QueryRunner } from 'typeorm';
 import { ValidationService } from './space-validation.service';
 import {
   ORPHAN_COMMUNITY_NAME,
@@ -171,25 +171,28 @@ export class SpaceService {
     );
     try {
       // Get all spaces related to the community, including the parent-child relations
-      const spaces = await this.spaceRepository.find({
+      const spaces = await this.spaceRepository
-        where: {
+        .createQueryBuilder('space')
-          community: { uuid: communityUuid },
+        .leftJoinAndSelect('space.parent', 'parent')
-          spaceName: Not(`${ORPHAN_SPACE_NAME}`),
+        .leftJoinAndSelect(
-          disabled: false,
+          'space.children',
-        },
-        relations: [
-          'parent',
           'children',
-          'incomingConnections',
+          'children.disabled = :disabled',
-          'tags',
+          { disabled: false },
-          'tags.product',
+        )
-          'subspaces',
+        .leftJoinAndSelect('space.incomingConnections', 'incomingConnections')
-          'subspaces.tags',
+        .leftJoinAndSelect('space.tags', 'tags')
-          'subspaces.tags.product',
+        .leftJoinAndSelect('tags.product', 'tagProduct')
-        ],
+        .leftJoinAndSelect('space.subspaces', 'subspaces')
-      });
+        .leftJoinAndSelect('subspaces.tags', 'subspaceTags')
+        .leftJoinAndSelect('subspaceTags.product', 'subspaceTagProduct')
+        .where('space.community_id = :communityUuid', { communityUuid })
+        .andWhere('space.spaceName != :orphanSpaceName', {
+          orphanSpaceName: ORPHAN_SPACE_NAME,
+        })
+        .andWhere('space.disabled = :disabled', { disabled: false })
+        .getMany();
 
-      // Organize spaces into a hierarchical structure
       const spaceHierarchy = this.buildSpaceHierarchy(spaces);
 
       return new SuccessResponseDto({

src/space/services/tag/tag.service.ts

@@ -138,7 +138,7 @@ export class TagService {
       );
       return { message: 'Tags deleted successfully', tagUuids };
     } catch (error) {
-      throw this.handleUnexpectedError('Failed to update tags', error);
+      throw this.handleUnexpectedError('Failed to delete tags', error);
     }
   }
 

src/users/services/user-space.service.ts

@@ -152,9 +152,10 @@ export class UserSpaceService {
   async deleteUserSpace(spaceUuid: string) {
     try {
       await this.userSpaceRepository
-        .createQueryBuilder()
+        .createQueryBuilder('userSpace')
+        .leftJoin('userSpace.space', 'space')
         .delete()
-        .where('spaceUuid = :spaceUuid', { spaceUuid })
+        .where('space.uuid = :spaceUuid', { spaceUuid })
         .execute();
     } catch (error) {
       console.error(`Error deleting user-space associations: ${error.message}`);