updated delete action

src/space-model/services/subspace/subspace-model-product-allocation.service.ts

@@ -401,7 +401,7 @@ export class SubspaceModelProductAllocationService {
   async processDeleteActions(
     dtos: ModifyTagModelDto[],
     queryRunner: QueryRunner,
-  ): Promise<void> {
+  ): Promise<SubspaceModelProductAllocationEntity[]> {
     try {
       if (!dtos || dtos.length === 0) {
         throw new Error('No DTOs provided for deletion.');
@@ -411,7 +411,7 @@ export class SubspaceModelProductAllocationService {
         .filter((dto) => dto.action === ModifyAction.DELETE && dto.tagUuid)
         .map((dto) => dto.tagUuid);
 
-      if (tagUuidsToDelete.length === 0) return;
+      if (tagUuidsToDelete.length === 0) return [];
 
       const allocationsToUpdate = await queryRunner.manager.find(
         SubspaceModelProductAllocationEntity,
@@ -421,9 +421,11 @@ export class SubspaceModelProductAllocationService {
         },
       );
 
-      if (!allocationsToUpdate || allocationsToUpdate.length === 0) return;
+      if (!allocationsToUpdate || allocationsToUpdate.length === 0) return [];
 
+      const deletedAllocations: SubspaceModelProductAllocationEntity[] = [];
       const allocationUpdates: SubspaceModelProductAllocationEntity[] = [];
+
       for (const allocation of allocationsToUpdate) {
         const updatedTags = allocation.tags.filter(
           (tag) => !tagUuidsToDelete.includes(tag.uuid),
@@ -433,9 +435,13 @@ export class SubspaceModelProductAllocationService {
           continue;
         }
 
+        if (updatedTags.length === 0) {
+          deletedAllocations.push(allocation);
+        } else {
           allocation.tags = updatedTags;
           allocationUpdates.push(allocation);
         }
+      }
 
       if (allocationUpdates.length > 0) {
         await queryRunner.manager.save(
@@ -444,6 +450,13 @@ export class SubspaceModelProductAllocationService {
         );
       }
 
+      if (deletedAllocations.length > 0) {
+        await queryRunner.manager.remove(
+          SubspaceModelProductAllocationEntity,
+          deletedAllocations,
+        );
+      }
+
       await queryRunner.manager
         .createQueryBuilder()
         .delete()
@@ -457,6 +470,8 @@ export class SubspaceModelProductAllocationService {
               .getQuery(),
         )
         .execute();
+
+      return deletedAllocations;
     } catch (error) {
       throw this.handleError(error, `Failed to delete tags in subspace model`);
     }
@@ -470,10 +485,13 @@ export class SubspaceModelProductAllocationService {
     spaceModel: SpaceModelEntity,
     queryRunner: QueryRunner,
     spaceTagUpdateDtos?: ModifyTagModelDto[],
-  ): Promise<void> {
+  ): Promise<{
+    addedAllocations: SubspaceModelProductAllocationEntity[];
+    deletedAllocations: SubspaceModelProductAllocationEntity[];
+    updatedSubspaceDtos: ModifySubspaceModelDto[];
+  }> {
     try {
-      await Promise.all([
+      const addedSubspaceTags = await this.processAddActions(
-        this.processAddActions(
         dtos,
         projectUuid,
         subspaceModel,
@@ -481,9 +499,18 @@ export class SubspaceModelProductAllocationService {
         queryRunner,
         spaceModel,
         spaceTagUpdateDtos,
-        ),
+      );
-        this.processDeleteActions(dtos, queryRunner),
+
-      ]);
+      const deletedTagAllocations = await this.processDeleteActions(
+        dtos,
+        queryRunner,
+      );
+
+      return {
+        addedAllocations: addedSubspaceTags.addedAllocations,
+        deletedAllocations: deletedTagAllocations,
+        updatedSubspaceDtos: addedSubspaceTags.updatedSubspaceDtos,
+      };
     } catch (error) {
       throw this.handleError(error, 'Error while updating product allocations');
     }

src/space-model/services/subspace/subspace-model.service.ts

@@ -2,12 +2,12 @@ import {
   SpaceModelEntity,
   SpaceModelProductAllocationEntity,
   SubspaceModelEntity,
+  SubspaceModelProductAllocationEntity,
   SubspaceModelRepository,
 } from '@app/common/modules/space-model';
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { CreateSubspaceModelDto, ModifyTagModelDto } from '../../dtos';
-import { Not, QueryRunner } from 'typeorm';
+import { In, Not, QueryFailedError, QueryRunner } from 'typeorm';
-import { IDeletedSubsaceModelInterface } from 'src/space-model/interfaces';
 import { ModifySubspaceModelDto } from 'src/space-model/dtos/subspaces-model-dtos';
 import { TagModelService } from '../tag-model.service';
 import { ModifyAction } from '@app/common/constants/modify-action.enum';
@@ -89,6 +89,8 @@ export class SubSpaceModelService {
           },
         );
         const savedSubspace = await queryRunner.manager.save(subspaceModel);
+
+        
         if (dto.tags) {
           await this.productAllocationService.updateProductAllocations(
             dto.tags,
@@ -111,61 +113,98 @@ export class SubSpaceModelService {
     projectUuid: string,
     spaceTagUpdateDtos?: ModifyTagModelDto[],
   ) {
+    if (!dtos || dtos.length === 0) {
+      return;
+    }
+
     const addDtos = dtos.filter((dto) => dto.action === ModifyAction.ADD);
-    const otherDtos = dtos.filter((dto) => dto.action !== ModifyAction.ADD);
+    const combinedDtos = dtos.filter((dto) => dto.action !== ModifyAction.ADD);
     const deleteDtos = dtos.filter((dto) => dto.action !== ModifyAction.DELETE);
 
+    await this.updateSubspaceModel(
+      combinedDtos,
+      spaceModel,
+      queryRunner,
+      projectUuid,
+      spaceTagUpdateDtos,
+    );
     await this.handleAddAction(
       addDtos,
       spaceModel,
       queryRunner,
       projectUuid,
-      otherDtos,
+      combinedDtos,
       spaceTagUpdateDtos,
     );
-
-    await this.updateSubspaceModel(
-      otherDtos,
-      spaceModel,
-      queryRunner,
-      projectUuid,
-      spaceTagUpdateDtos,
-    );
-
     await this.deleteSubspaceModels(deleteDtos, queryRunner);
   }
 
   async deleteSubspaceModels(
     deleteDtos: ModifySubspaceModelDto[],
     queryRunner: QueryRunner,
-  ): Promise<IDeletedSubsaceModelInterface[]> {
+  ) {
-    const deleteResults = [];
+    try {
+      if (!deleteDtos || deleteDtos.length === 0) {
+        throw new Error('No subspaces provided for deletion.');
+      }
 
-    for (const dto of deleteDtos) {
+      const deleteResults = [];
-      const subspaceModel = await this.findOne(dto.uuid);
+      const subspaceUuids = deleteDtos.map((dto) => dto.uuid).filter(Boolean);
+
+      if (subspaceUuids.length === 0) {
+        throw new Error('Invalid subspace UUIDs provided.');
+      }
+
+      const subspaces = await queryRunner.manager.find(SubspaceModelEntity, {
+        where: { uuid: In(subspaceUuids) },
+        relations: [
+          'productAllocations',
+          'productAllocations.tags',
+          'spaceModel',
+        ],
+      });
+
+      if (!subspaces.length) return deleteResults;
 
       await queryRunner.manager.update(
-        this.subspaceModelRepository.target,
+        SubspaceModelEntity,
-        { uuid: dto.uuid },
+        { uuid: In(subspaceUuids) },
         { disabled: true },
       );
 
-      if (subspaceModel.productAllocations?.length) {
+      const allocationsToRemove = subspaces.flatMap(
-        for (const allocation of subspaceModel.productAllocations) {
+        (subspace) => subspace.productAllocations,
+      );
+      if (allocationsToRemove.length > 0) {
+        const spaceAllocationsMap = new Map<
+          string,
+          SpaceModelProductAllocationEntity
+        >();
+
+        for (const allocation of allocationsToRemove) {
           const product = allocation.product;
           const tags = allocation.tags;
+          const spaceModel = allocation.subspaceModel.spaceModel;
 
+          const spaceAllocationKey = `${spaceModel.uuid}-${product.uuid}`;
+
+          if (!spaceAllocationsMap.has(spaceAllocationKey)) {
             const spaceAllocation = await queryRunner.manager.findOne(
               SpaceModelProductAllocationEntity,
               {
                 where: {
-                spaceModel: subspaceModel.spaceModel,
+                  spaceModel: { uuid: spaceModel.uuid },
                   product: { uuid: product.uuid },
                 },
                 relations: ['tags'],
               },
             );
+            if (spaceAllocation) {
+              spaceAllocationsMap.set(spaceAllocationKey, spaceAllocation);
+            }
+          }
 
+          const spaceAllocation = spaceAllocationsMap.get(spaceAllocationKey);
           if (spaceAllocation) {
             const existingTagUuids = new Set(
               spaceAllocation.tags.map((tag) => tag.uuid),
@@ -173,29 +212,65 @@ export class SubSpaceModelService {
             const newTags = tags.filter(
               (tag) => !existingTagUuids.has(tag.uuid),
             );
-            spaceAllocation.tags.push(...newTags);
 
+            if (newTags.length > 0) {
+              spaceAllocation.tags.push(...newTags);
               await queryRunner.manager.save(spaceAllocation);
+            }
           } else {
             const newSpaceAllocation = queryRunner.manager.create(
               SpaceModelProductAllocationEntity,
               {
-                spaceModel: subspaceModel.spaceModel,
+                spaceModel: spaceModel,
                 product: product,
                 tags: tags,
               },
             );
-
             await queryRunner.manager.save(newSpaceAllocation);
           }
-          await queryRunner.manager.remove(allocation);
-        }
         }
 
-      deleteResults.push({ uuid: dto.uuid });
+        await queryRunner.manager.remove(
+          SubspaceModelProductAllocationEntity,
+          allocationsToRemove,
+        );
       }
 
+      await queryRunner.manager
+        .createQueryBuilder()
+        .delete()
+        .from('subspace_model_product_tags')
+        .where(
+          'subspace_model_product_allocation_id NOT IN ' +
+            queryRunner.manager
+              .createQueryBuilder()
+              .select('uuid')
+              .from(SubspaceModelProductAllocationEntity, 'allocation')
+              .getQuery(),
+        )
+        .execute();
+
+      deleteResults.push(...subspaceUuids.map((uuid) => ({ uuid })));
+
       return deleteResults;
+    } catch (error) {
+      if (error instanceof QueryFailedError) {
+        throw new HttpException(
+          `Database query failed: ${error.message}`,
+          HttpStatus.INTERNAL_SERVER_ERROR,
+        );
+      } else if (error instanceof TypeError) {
+        throw new HttpException(
+          `Invalid data encountered: ${error.message}`,
+          HttpStatus.BAD_REQUEST,
+        );
+      } else {
+        throw new HttpException(
+          `Unexpected error during subspace deletion: ${error.message}`,
+          HttpStatus.INTERNAL_SERVER_ERROR,
+        );
+      }
+    }
   }
 
   async updateSubspaceModel(