added validation for subspaces

This commit is contained in:
hannathkadher
2025-03-10 21:12:47 +04:00
parent 7dc2a8d0c9
commit cacaa105ed
3 changed files with 164 additions and 167 deletions

View File

@ -530,7 +530,7 @@ export class SpaceService {
} }
throw new HttpException( throw new HttpException(
'An error occurred while updating the space', `An error occurred while updating the space: error ${error}`,
HttpStatus.INTERNAL_SERVER_ERROR, HttpStatus.INTERNAL_SERVER_ERROR,
); );
} finally { } finally {

View File

@ -79,10 +79,9 @@ export class SubspaceProductAllocationService {
spaceTagUpdateDtos?: ModifyTagDto[], spaceTagUpdateDtos?: ModifyTagDto[],
) { ) {
const spaceAllocationToExclude: SpaceProductAllocationEntity[] = []; const spaceAllocationToExclude: SpaceProductAllocationEntity[] = [];
for (const subspace of subspaces) { for (const subspace of subspaces) {
if (!subspace.tags || subspace.tags.length === 0) continue;
const tagDtos = subspace.tags; const tagDtos = subspace.tags;
if (tagDtos.length > 0) {
const tagsToAddDto: ProcessTagDto[] = tagDtos const tagsToAddDto: ProcessTagDto[] = tagDtos
.filter((dto) => dto.action === ModifyAction.ADD) .filter((dto) => dto.action === ModifyAction.ADD)
.map((dto) => ({ .map((dto) => ({
@ -293,7 +292,6 @@ export class SubspaceProductAllocationService {
} }
} }
} }
}
async processDeleteActions( async processDeleteActions(
dtos: ModifyTagDto[], dtos: ModifyTagDto[],

View File

@ -324,6 +324,9 @@ export class SubSpaceService {
projectUuid?: string, projectUuid?: string,
spaceTagUpdateDtos?: ModifyTagDto[], spaceTagUpdateDtos?: ModifyTagDto[],
) { ) {
if (!subspaceDtos || subspaceDtos.length === 0) {
return;
}
const addedSubspaces = []; const addedSubspaces = [];
const updatedSubspaces = []; const updatedSubspaces = [];
@ -335,14 +338,17 @@ export class SubSpaceService {
space, space,
queryRunner, queryRunner,
); );
addedSubspaces.push(addedSubspace); if (addedSubspace) addedSubspaces.push(addedSubspace);
break; break;
case ModifyAction.UPDATE: case ModifyAction.UPDATE:
const updatedSubspace = await this.handleUpdateAction( const updatedSubspace = await this.handleUpdateAction(
subspace, subspace,
queryRunner, queryRunner,
); );
if (updatedSubspace) {
updatedSubspaces.push(updatedSubspace); updatedSubspaces.push(updatedSubspace);
}
break; break;
case ModifyAction.DELETE: case ModifyAction.DELETE:
await this.handleDeleteAction(subspace, queryRunner); await this.handleDeleteAction(subspace, queryRunner);
@ -355,7 +361,9 @@ export class SubSpaceService {
} }
} }
const combinedSubspaces = [...addedSubspaces, ...updatedSubspaces]; const combinedSubspaces = [...addedSubspaces, ...updatedSubspaces].filter(
(subspace) => subspace !== undefined,
);
if (combinedSubspaces.length > 0) { if (combinedSubspaces.length > 0) {
await this.subspaceProductAllocationService.updateSubspaceProductAllocations( await this.subspaceProductAllocationService.updateSubspaceProductAllocations(
@ -436,32 +444,22 @@ export class SubSpaceService {
private async handleUpdateAction( private async handleUpdateAction(
modifyDto: ModifySubspaceDto, modifyDto: ModifySubspaceDto,
queryRunner: QueryRunner, queryRunner: QueryRunner,
): Promise<void> { ): Promise<SubspaceEntity> {
const subspace = await this.findOne(modifyDto.uuid); const subspace = await this.findOne(modifyDto.uuid);
await this.update( const updatedSubspace = await this.update(
queryRunner, queryRunner,
subspace, subspace,
modifyDto.subspaceName, modifyDto.subspaceName,
modifyDto.tags,
); );
return updatedSubspace;
} }
async update( async update(
queryRunner: QueryRunner, queryRunner: QueryRunner,
subspace: SubspaceEntity, subspace: SubspaceEntity,
subspaceName?: string, subspaceName?: string,
modifyTagDto?: ModifyTagDto[],
) { ) {
await this.updateSubspaceName(queryRunner, subspace, subspaceName); return await this.updateSubspaceName(queryRunner, subspace, subspaceName);
if (modifyTagDto?.length) {
await this.tagService.modifyTags(
modifyTagDto,
queryRunner,
null,
subspace,
);
}
} }
async handleDeleteAction( async handleDeleteAction(
@ -517,11 +515,12 @@ export class SubSpaceService {
queryRunner: QueryRunner, queryRunner: QueryRunner,
subSpace: SubspaceEntity, subSpace: SubspaceEntity,
subspaceName?: string, subspaceName?: string,
): Promise<void> { ): Promise<SubspaceEntity> {
if (subspaceName) { if (subspaceName) {
subSpace.subspaceName = subspaceName; subSpace.subspaceName = subspaceName;
await queryRunner.manager.save(subSpace); return await queryRunner.manager.save(subSpace);
} }
return subSpace;
} }
private async checkForDuplicateNames(names: string[]): Promise<void> { private async checkForDuplicateNames(names: string[]): Promise<void> {