mirror of
https://github.com/SyncrowIOT/backend.git
synced 2025-07-10 15:17:41 +00:00
Compare commits
8 Commits
ef21b589c0
...
fix/commun
Author | SHA1 | Date | |
---|---|---|---|
85d9a59848 | |||
aa9e90bf08 | |||
c5dd5e28fd | |||
603e74af09 | |||
0e36f32ed6 | |||
705ceeba29 | |||
a37d5bb299 | |||
689a38ee0c |
@ -21,6 +21,7 @@ module.exports = {
|
|||||||
'@typescript-eslint/explicit-function-return-type': 'off',
|
'@typescript-eslint/explicit-function-return-type': 'off',
|
||||||
'@typescript-eslint/explicit-module-boundary-types': 'off',
|
'@typescript-eslint/explicit-module-boundary-types': 'off',
|
||||||
'@typescript-eslint/no-explicit-any': 'off',
|
'@typescript-eslint/no-explicit-any': 'off',
|
||||||
|
"@typescript-eslint/no-unused-vars": 'warn',
|
||||||
},
|
},
|
||||||
settings: {
|
settings: {
|
||||||
'import/resolver': {
|
'import/resolver': {
|
||||||
|
@ -25,6 +25,7 @@ import {
|
|||||||
InviteUserEntity,
|
InviteUserEntity,
|
||||||
InviteUserSpaceEntity,
|
InviteUserSpaceEntity,
|
||||||
} from '../modules/Invite-user/entities';
|
} from '../modules/Invite-user/entities';
|
||||||
|
import { SpaceDailyOccupancyDurationEntity } from '../modules/occupancy/entities';
|
||||||
import {
|
import {
|
||||||
PowerClampDailyEntity,
|
PowerClampDailyEntity,
|
||||||
PowerClampHourlyEntity,
|
PowerClampHourlyEntity,
|
||||||
@ -46,7 +47,6 @@ import {
|
|||||||
SubspaceModelProductAllocationEntity,
|
SubspaceModelProductAllocationEntity,
|
||||||
} from '../modules/space-model/entities';
|
} from '../modules/space-model/entities';
|
||||||
import { InviteSpaceEntity } from '../modules/space/entities/invite-space.entity';
|
import { InviteSpaceEntity } from '../modules/space/entities/invite-space.entity';
|
||||||
import { SpaceLinkEntity } from '../modules/space/entities/space-link.entity';
|
|
||||||
import { SpaceProductAllocationEntity } from '../modules/space/entities/space-product-allocation.entity';
|
import { SpaceProductAllocationEntity } from '../modules/space/entities/space-product-allocation.entity';
|
||||||
import { SpaceEntity } from '../modules/space/entities/space.entity';
|
import { SpaceEntity } from '../modules/space/entities/space.entity';
|
||||||
import { SubspaceProductAllocationEntity } from '../modules/space/entities/subspace/subspace-product-allocation.entity';
|
import { SubspaceProductAllocationEntity } from '../modules/space/entities/subspace/subspace-product-allocation.entity';
|
||||||
@ -58,7 +58,6 @@ import {
|
|||||||
UserSpaceEntity,
|
UserSpaceEntity,
|
||||||
} from '../modules/user/entities';
|
} from '../modules/user/entities';
|
||||||
import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
|
import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
|
||||||
import { SpaceDailyOccupancyDurationEntity } from '../modules/occupancy/entities';
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
TypeOrmModule.forRootAsync({
|
TypeOrmModule.forRootAsync({
|
||||||
@ -87,7 +86,6 @@ import { SpaceDailyOccupancyDurationEntity } from '../modules/occupancy/entities
|
|||||||
PermissionTypeEntity,
|
PermissionTypeEntity,
|
||||||
CommunityEntity,
|
CommunityEntity,
|
||||||
SpaceEntity,
|
SpaceEntity,
|
||||||
SpaceLinkEntity,
|
|
||||||
SubspaceEntity,
|
SubspaceEntity,
|
||||||
UserSpaceEntity,
|
UserSpaceEntity,
|
||||||
DeviceUserPermissionEntity,
|
DeviceUserPermissionEntity,
|
||||||
@ -127,7 +125,7 @@ import { SpaceDailyOccupancyDurationEntity } from '../modules/occupancy/entities
|
|||||||
logger: typeOrmLogger,
|
logger: typeOrmLogger,
|
||||||
extra: {
|
extra: {
|
||||||
charset: 'utf8mb4',
|
charset: 'utf8mb4',
|
||||||
max: 20, // set pool max size
|
max: 50, // set pool max size
|
||||||
idleTimeoutMillis: 5000, // close idle clients after 5 second
|
idleTimeoutMillis: 5000, // close idle clients after 5 second
|
||||||
connectionTimeoutMillis: 12_000, // return an error after 11 second if connection could not be established
|
connectionTimeoutMillis: 12_000, // return an error after 11 second if connection could not be established
|
||||||
maxUses: 7500, // close (and replace) a connection after it has been used 7500 times (see below for discussion)
|
maxUses: 7500, // close (and replace) a connection after it has been used 7500 times (see below for discussion)
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
import { IsBoolean, IsDate, IsOptional } from 'class-validator';
|
|
||||||
import { IsPageRequestParam } from '../validators/is-page-request-param.validator';
|
|
||||||
import { ApiProperty } from '@nestjs/swagger';
|
import { ApiProperty } from '@nestjs/swagger';
|
||||||
import { IsSizeRequestParam } from '../validators/is-size-request-param.validator';
|
|
||||||
import { Transform } from 'class-transformer';
|
import { Transform } from 'class-transformer';
|
||||||
import { parseToDate } from '../util/parseToDate';
|
import { IsBoolean, IsOptional } from 'class-validator';
|
||||||
import { BooleanValues } from '../constants/boolean-values.enum';
|
import { BooleanValues } from '../constants/boolean-values.enum';
|
||||||
|
import { IsPageRequestParam } from '../validators/is-page-request-param.validator';
|
||||||
|
import { IsSizeRequestParam } from '../validators/is-size-request-param.validator';
|
||||||
|
|
||||||
export class PaginationRequestGetListDto {
|
export class PaginationRequestGetListDto {
|
||||||
@ApiProperty({
|
@ApiProperty({
|
||||||
@ -19,6 +18,7 @@ export class PaginationRequestGetListDto {
|
|||||||
return value.obj.includeSpaces === BooleanValues.TRUE;
|
return value.obj.includeSpaces === BooleanValues.TRUE;
|
||||||
})
|
})
|
||||||
public includeSpaces?: boolean = false;
|
public includeSpaces?: boolean = false;
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsPageRequestParam({
|
@IsPageRequestParam({
|
||||||
message: 'Page must be bigger than 0',
|
message: 'Page must be bigger than 0',
|
||||||
@ -40,40 +40,4 @@ export class PaginationRequestGetListDto {
|
|||||||
description: 'Size request',
|
description: 'Size request',
|
||||||
})
|
})
|
||||||
size?: number;
|
size?: number;
|
||||||
|
|
||||||
@IsOptional()
|
|
||||||
@ApiProperty({
|
|
||||||
name: 'name',
|
|
||||||
required: false,
|
|
||||||
description: 'Name to be filtered',
|
|
||||||
})
|
|
||||||
name?: string;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
name: 'from',
|
|
||||||
required: false,
|
|
||||||
type: Number,
|
|
||||||
description: `Start time in UNIX timestamp format to filter`,
|
|
||||||
example: 1674172800000,
|
|
||||||
})
|
|
||||||
@IsOptional()
|
|
||||||
@Transform(({ value }) => parseToDate(value))
|
|
||||||
@IsDate({
|
|
||||||
message: `From must be in UNIX timestamp format in order to parse to Date instance`,
|
|
||||||
})
|
|
||||||
from?: Date;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
name: 'to',
|
|
||||||
required: false,
|
|
||||||
type: Number,
|
|
||||||
description: `End time in UNIX timestamp format to filter`,
|
|
||||||
example: 1674259200000,
|
|
||||||
})
|
|
||||||
@IsOptional()
|
|
||||||
@Transform(({ value }) => parseToDate(value))
|
|
||||||
@IsDate({
|
|
||||||
message: `To must be in UNIX timestamp format in order to parse to Date instance`,
|
|
||||||
})
|
|
||||||
to?: Date;
|
|
||||||
}
|
}
|
||||||
|
@ -1,32 +1,3 @@
|
|||||||
import { Column, Entity, JoinColumn, ManyToOne } from 'typeorm';
|
|
||||||
import { AbstractEntity } from '../../abstract/entities/abstract.entity';
|
import { AbstractEntity } from '../../abstract/entities/abstract.entity';
|
||||||
import { SpaceEntity } from './space.entity';
|
|
||||||
import { Direction } from '@app/common/constants/direction.enum';
|
|
||||||
|
|
||||||
@Entity({ name: 'space-link' })
|
export class SpaceLinkEntity extends AbstractEntity {}
|
||||||
export class SpaceLinkEntity extends AbstractEntity {
|
|
||||||
@ManyToOne(() => SpaceEntity, { nullable: false, onDelete: 'CASCADE' })
|
|
||||||
@JoinColumn({ name: 'start_space_id' })
|
|
||||||
public startSpace: SpaceEntity;
|
|
||||||
|
|
||||||
@ManyToOne(() => SpaceEntity, { nullable: false, onDelete: 'CASCADE' })
|
|
||||||
@JoinColumn({ name: 'end_space_id' })
|
|
||||||
public endSpace: SpaceEntity;
|
|
||||||
|
|
||||||
@Column({
|
|
||||||
nullable: false,
|
|
||||||
default: false,
|
|
||||||
})
|
|
||||||
public disabled: boolean;
|
|
||||||
|
|
||||||
@Column({
|
|
||||||
nullable: false,
|
|
||||||
enum: Object.values(Direction),
|
|
||||||
})
|
|
||||||
direction: string;
|
|
||||||
|
|
||||||
constructor(partial: Partial<SpaceLinkEntity>) {
|
|
||||||
super();
|
|
||||||
Object.assign(this, partial);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -1,18 +1,17 @@
|
|||||||
import { Column, Entity, JoinColumn, ManyToOne, OneToMany } from 'typeorm';
|
import { Column, Entity, JoinColumn, ManyToOne, OneToMany } from 'typeorm';
|
||||||
import { SpaceDto } from '../dtos';
|
|
||||||
import { AbstractEntity } from '../../abstract/entities/abstract.entity';
|
import { AbstractEntity } from '../../abstract/entities/abstract.entity';
|
||||||
import { UserSpaceEntity } from '../../user/entities';
|
import { AqiSpaceDailyPollutantStatsEntity } from '../../aqi/entities';
|
||||||
import { DeviceEntity } from '../../device/entities';
|
|
||||||
import { CommunityEntity } from '../../community/entities';
|
import { CommunityEntity } from '../../community/entities';
|
||||||
import { SpaceLinkEntity } from './space-link.entity';
|
import { DeviceEntity } from '../../device/entities';
|
||||||
|
import { InviteUserSpaceEntity } from '../../Invite-user/entities';
|
||||||
|
import { SpaceDailyOccupancyDurationEntity } from '../../occupancy/entities';
|
||||||
|
import { PresenceSensorDailySpaceEntity } from '../../presence-sensor/entities';
|
||||||
import { SceneEntity } from '../../scene/entities';
|
import { SceneEntity } from '../../scene/entities';
|
||||||
import { SpaceModelEntity } from '../../space-model';
|
import { SpaceModelEntity } from '../../space-model';
|
||||||
import { InviteUserSpaceEntity } from '../../Invite-user/entities';
|
import { UserSpaceEntity } from '../../user/entities';
|
||||||
|
import { SpaceDto } from '../dtos';
|
||||||
import { SpaceProductAllocationEntity } from './space-product-allocation.entity';
|
import { SpaceProductAllocationEntity } from './space-product-allocation.entity';
|
||||||
import { SubspaceEntity } from './subspace/subspace.entity';
|
import { SubspaceEntity } from './subspace/subspace.entity';
|
||||||
import { PresenceSensorDailySpaceEntity } from '../../presence-sensor/entities';
|
|
||||||
import { AqiSpaceDailyPollutantStatsEntity } from '../../aqi/entities';
|
|
||||||
import { SpaceDailyOccupancyDurationEntity } from '../../occupancy/entities';
|
|
||||||
|
|
||||||
@Entity({ name: 'space' })
|
@Entity({ name: 'space' })
|
||||||
export class SpaceEntity extends AbstractEntity<SpaceDto> {
|
export class SpaceEntity extends AbstractEntity<SpaceDto> {
|
||||||
@ -75,16 +74,6 @@ export class SpaceEntity extends AbstractEntity<SpaceDto> {
|
|||||||
)
|
)
|
||||||
devices: DeviceEntity[];
|
devices: DeviceEntity[];
|
||||||
|
|
||||||
@OneToMany(() => SpaceLinkEntity, (connection) => connection.startSpace, {
|
|
||||||
nullable: true,
|
|
||||||
})
|
|
||||||
public outgoingConnections: SpaceLinkEntity[];
|
|
||||||
|
|
||||||
@OneToMany(() => SpaceLinkEntity, (connection) => connection.endSpace, {
|
|
||||||
nullable: true,
|
|
||||||
})
|
|
||||||
public incomingConnections: SpaceLinkEntity[];
|
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
nullable: true,
|
nullable: true,
|
||||||
type: 'text',
|
type: 'text',
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
import { Injectable } from '@nestjs/common';
|
import { Injectable } from '@nestjs/common';
|
||||||
import { DataSource, Repository } from 'typeorm';
|
import { DataSource, Repository } from 'typeorm';
|
||||||
import { InviteSpaceEntity } from '../entities/invite-space.entity';
|
import { InviteSpaceEntity } from '../entities/invite-space.entity';
|
||||||
import { SpaceLinkEntity } from '../entities/space-link.entity';
|
|
||||||
import { SpaceProductAllocationEntity } from '../entities/space-product-allocation.entity';
|
import { SpaceProductAllocationEntity } from '../entities/space-product-allocation.entity';
|
||||||
import { SpaceEntity } from '../entities/space.entity';
|
import { SpaceEntity } from '../entities/space.entity';
|
||||||
|
|
||||||
@ -13,11 +12,7 @@ export class SpaceRepository extends Repository<SpaceEntity> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class SpaceLinkRepository extends Repository<SpaceLinkEntity> {
|
export class SpaceLinkRepository {}
|
||||||
constructor(private dataSource: DataSource) {
|
|
||||||
super(SpaceLinkEntity, dataSource.createEntityManager());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class InviteSpaceRepository extends Repository<InviteSpaceEntity> {
|
export class InviteSpaceRepository extends Repository<InviteSpaceEntity> {
|
||||||
|
@ -78,6 +78,7 @@ import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
|
|||||||
ProjectRepository,
|
ProjectRepository,
|
||||||
SpaceService,
|
SpaceService,
|
||||||
InviteSpaceRepository,
|
InviteSpaceRepository,
|
||||||
|
// Todo: find out why this is needed
|
||||||
SpaceLinkService,
|
SpaceLinkService,
|
||||||
SubSpaceService,
|
SubSpaceService,
|
||||||
ValidationService,
|
ValidationService,
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
import { CommunityService } from '../services/community.service';
|
|
||||||
import {
|
import {
|
||||||
Body,
|
Body,
|
||||||
Controller,
|
Controller,
|
||||||
@ -10,17 +9,18 @@ import {
|
|||||||
Query,
|
Query,
|
||||||
UseGuards,
|
UseGuards,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { ApiTags, ApiBearerAuth, ApiOperation } from '@nestjs/swagger';
|
import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
|
||||||
import { AddCommunityDto } from '../dtos/add.community.dto';
|
import { AddCommunityDto } from '../dtos/add.community.dto';
|
||||||
import { GetCommunityParams } from '../dtos/get.community.dto';
|
import { GetCommunityParams } from '../dtos/get.community.dto';
|
||||||
import { UpdateCommunityNameDto } from '../dtos/update.community.dto';
|
import { UpdateCommunityNameDto } from '../dtos/update.community.dto';
|
||||||
|
import { CommunityService } from '../services/community.service';
|
||||||
// import { CheckUserCommunityGuard } from 'src/guards/user.community.guard';
|
// import { CheckUserCommunityGuard } from 'src/guards/user.community.guard';
|
||||||
import { ControllerRoute } from '@app/common/constants/controller-route';
|
import { ControllerRoute } from '@app/common/constants/controller-route';
|
||||||
import { BaseResponseDto } from '@app/common/dto/base.response.dto';
|
import { BaseResponseDto } from '@app/common/dto/base.response.dto';
|
||||||
import { ProjectParam } from '../dtos';
|
|
||||||
import { PermissionsGuard } from 'src/guards/permissions.guard';
|
|
||||||
import { Permissions } from 'src/decorators/permissions.decorator';
|
|
||||||
import { PaginationRequestWithSearchGetListDto } from '@app/common/dto/pagination-with-search.request.dto';
|
import { PaginationRequestWithSearchGetListDto } from '@app/common/dto/pagination-with-search.request.dto';
|
||||||
|
import { Permissions } from 'src/decorators/permissions.decorator';
|
||||||
|
import { PermissionsGuard } from 'src/guards/permissions.guard';
|
||||||
|
import { ProjectParam } from '../dtos';
|
||||||
|
|
||||||
@ApiTags('Community Module')
|
@ApiTags('Community Module')
|
||||||
@Controller({
|
@Controller({
|
||||||
@ -45,6 +45,21 @@ export class CommunityController {
|
|||||||
return await this.communityService.createCommunity(param, addCommunityDto);
|
return await this.communityService.createCommunity(param, addCommunityDto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiBearerAuth()
|
||||||
|
@UseGuards(PermissionsGuard)
|
||||||
|
@Permissions('COMMUNITY_VIEW')
|
||||||
|
@ApiOperation({
|
||||||
|
summary: ControllerRoute.COMMUNITY.ACTIONS.LIST_COMMUNITY_SUMMARY,
|
||||||
|
description: ControllerRoute.COMMUNITY.ACTIONS.LIST_COMMUNITY_DESCRIPTION,
|
||||||
|
})
|
||||||
|
@Get('v2')
|
||||||
|
async getCommunitiesV2(
|
||||||
|
@Param() param: ProjectParam,
|
||||||
|
@Query() query: PaginationRequestWithSearchGetListDto,
|
||||||
|
): Promise<any> {
|
||||||
|
return this.communityService.getCommunitiesV2(param, query);
|
||||||
|
}
|
||||||
|
|
||||||
@ApiBearerAuth()
|
@ApiBearerAuth()
|
||||||
@UseGuards(PermissionsGuard)
|
@UseGuards(PermissionsGuard)
|
||||||
@Permissions('COMMUNITY_VIEW')
|
@Permissions('COMMUNITY_VIEW')
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
import { ORPHAN_COMMUNITY_NAME } from '@app/common/constants/orphan-constant';
|
import {
|
||||||
|
ORPHAN_COMMUNITY_NAME,
|
||||||
|
ORPHAN_SPACE_NAME,
|
||||||
|
} from '@app/common/constants/orphan-constant';
|
||||||
import { BaseResponseDto } from '@app/common/dto/base.response.dto';
|
import { BaseResponseDto } from '@app/common/dto/base.response.dto';
|
||||||
import { PageResponse } from '@app/common/dto/pagination.response.dto';
|
import { PageResponse } from '@app/common/dto/pagination.response.dto';
|
||||||
import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
|
import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
|
||||||
@ -22,7 +25,7 @@ import {
|
|||||||
NotFoundException,
|
NotFoundException,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { SpaceService } from 'src/space/services';
|
import { SpaceService } from 'src/space/services';
|
||||||
import { SelectQueryBuilder } from 'typeorm';
|
import { QueryRunner, SelectQueryBuilder } from 'typeorm';
|
||||||
import { AddCommunityDto, GetCommunityParams, ProjectParam } from '../dtos';
|
import { AddCommunityDto, GetCommunityParams, ProjectParam } from '../dtos';
|
||||||
import { UpdateCommunityNameDto } from '../dtos/update.community.dto';
|
import { UpdateCommunityNameDto } from '../dtos/update.community.dto';
|
||||||
|
|
||||||
@ -69,12 +72,18 @@ export class CommunityService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async getCommunityById(params: GetCommunityParams): Promise<BaseResponseDto> {
|
async getCommunityById(
|
||||||
|
params: GetCommunityParams,
|
||||||
|
queryRunner?: QueryRunner,
|
||||||
|
): Promise<BaseResponseDto> {
|
||||||
const { communityUuid, projectUuid } = params;
|
const { communityUuid, projectUuid } = params;
|
||||||
|
|
||||||
await this.validateProject(projectUuid);
|
await this.validateProject(projectUuid);
|
||||||
|
|
||||||
const community = await this.communityRepository.findOneBy({
|
const communityRepository =
|
||||||
|
queryRunner?.manager.getRepository(CommunityEntity) ||
|
||||||
|
this.communityRepository;
|
||||||
|
const community = await communityRepository.findOneBy({
|
||||||
uuid: communityUuid,
|
uuid: communityUuid,
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -161,6 +170,75 @@ export class CommunityService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async getCommunitiesV2(
|
||||||
|
{ projectUuid }: ProjectParam,
|
||||||
|
{
|
||||||
|
search,
|
||||||
|
includeSpaces,
|
||||||
|
...pageable
|
||||||
|
}: Partial<ExtendedTypeORMCustomModelFindAllQuery>,
|
||||||
|
) {
|
||||||
|
try {
|
||||||
|
const project = await this.validateProject(projectUuid);
|
||||||
|
|
||||||
|
let qb: undefined | SelectQueryBuilder<CommunityEntity> = undefined;
|
||||||
|
|
||||||
|
qb = this.communityRepository
|
||||||
|
.createQueryBuilder('c')
|
||||||
|
.where('c.project = :projectUuid', { projectUuid })
|
||||||
|
.andWhere(`c.name != '${ORPHAN_COMMUNITY_NAME}-${project.name}'`)
|
||||||
|
.distinct(true);
|
||||||
|
|
||||||
|
if (includeSpaces) {
|
||||||
|
qb.leftJoinAndSelect('c.spaces', 'space', 'space.disabled = false')
|
||||||
|
.leftJoinAndSelect('space.parent', 'parent')
|
||||||
|
.leftJoinAndSelect(
|
||||||
|
'space.children',
|
||||||
|
'children',
|
||||||
|
'children.disabled = :disabled',
|
||||||
|
{ disabled: false },
|
||||||
|
)
|
||||||
|
// .leftJoinAndSelect('space.spaceModel', 'spaceModel')
|
||||||
|
.andWhere('space.spaceName != :orphanSpaceName', {
|
||||||
|
orphanSpaceName: ORPHAN_SPACE_NAME,
|
||||||
|
})
|
||||||
|
.andWhere('space.disabled = :disabled', { disabled: false });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (search) {
|
||||||
|
qb.andWhere(
|
||||||
|
`c.name ILIKE :search ${includeSpaces ? 'OR space.space_name ILIKE :search' : ''}`,
|
||||||
|
{ search: `%${search}%` },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const customModel = TypeORMCustomModel(this.communityRepository);
|
||||||
|
|
||||||
|
const { baseResponseDto, paginationResponseDto } =
|
||||||
|
await customModel.findAll({ ...pageable, modelName: 'community' }, qb);
|
||||||
|
|
||||||
|
if (includeSpaces) {
|
||||||
|
baseResponseDto.data = baseResponseDto.data.map((community) => ({
|
||||||
|
...community,
|
||||||
|
spaces: this.spaceService.buildSpaceHierarchy(community.spaces || []),
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
return new PageResponse<CommunityDto>(
|
||||||
|
baseResponseDto,
|
||||||
|
paginationResponseDto,
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
// Generic error handling
|
||||||
|
if (error instanceof HttpException) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
throw new HttpException(
|
||||||
|
error.message || 'An error occurred while fetching communities.',
|
||||||
|
HttpStatus.INTERNAL_SERVER_ERROR,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async updateCommunity(
|
async updateCommunity(
|
||||||
params: GetCommunityParams,
|
params: GetCommunityParams,
|
||||||
updateCommunityDto: UpdateCommunityNameDto,
|
updateCommunityDto: UpdateCommunityNameDto,
|
||||||
|
@ -71,7 +71,6 @@ import {
|
|||||||
import { SpaceModelProductAllocationService } from 'src/space-model/services/space-model-product-allocation.service';
|
import { SpaceModelProductAllocationService } from 'src/space-model/services/space-model-product-allocation.service';
|
||||||
import { SubspaceModelProductAllocationService } from 'src/space-model/services/subspace/subspace-model-product-allocation.service';
|
import { SubspaceModelProductAllocationService } from 'src/space-model/services/subspace/subspace-model-product-allocation.service';
|
||||||
import {
|
import {
|
||||||
SpaceLinkService,
|
|
||||||
SpaceService,
|
SpaceService,
|
||||||
SpaceUserService,
|
SpaceUserService,
|
||||||
SubspaceDeviceService,
|
SubspaceDeviceService,
|
||||||
@ -115,7 +114,6 @@ import { UserService, UserSpaceService } from 'src/users/services';
|
|||||||
TimeZoneRepository,
|
TimeZoneRepository,
|
||||||
SpaceService,
|
SpaceService,
|
||||||
InviteSpaceRepository,
|
InviteSpaceRepository,
|
||||||
SpaceLinkService,
|
|
||||||
SubSpaceService,
|
SubSpaceService,
|
||||||
ValidationService,
|
ValidationService,
|
||||||
NewTagService,
|
NewTagService,
|
||||||
|
22
src/main.ts
22
src/main.ts
@ -1,15 +1,14 @@
|
|||||||
|
import { RequestContextMiddleware } from '@app/common/middleware/request-context.middleware';
|
||||||
|
import { SeederService } from '@app/common/seed/services/seeder.service';
|
||||||
|
import { Logger, ValidationPipe } from '@nestjs/common';
|
||||||
import { NestFactory } from '@nestjs/core';
|
import { NestFactory } from '@nestjs/core';
|
||||||
import { AppModule } from './app.module';
|
import { json, urlencoded } from 'body-parser';
|
||||||
import rateLimit from 'express-rate-limit';
|
import rateLimit from 'express-rate-limit';
|
||||||
import helmet from 'helmet';
|
import helmet from 'helmet';
|
||||||
import { setupSwaggerAuthentication } from '../libs/common/src/util/user-auth.swagger.utils';
|
|
||||||
import { ValidationPipe } from '@nestjs/common';
|
|
||||||
import { json, urlencoded } from 'body-parser';
|
|
||||||
import { SeederService } from '@app/common/seed/services/seeder.service';
|
|
||||||
import { HttpExceptionFilter } from './common/filters/http-exception/http-exception.filter';
|
|
||||||
import { Logger } from '@nestjs/common';
|
|
||||||
import { WINSTON_MODULE_NEST_PROVIDER } from 'nest-winston';
|
import { WINSTON_MODULE_NEST_PROVIDER } from 'nest-winston';
|
||||||
import { RequestContextMiddleware } from '@app/common/middleware/request-context.middleware';
|
import { setupSwaggerAuthentication } from '../libs/common/src/util/user-auth.swagger.utils';
|
||||||
|
import { AppModule } from './app.module';
|
||||||
|
import { HttpExceptionFilter } from './common/filters/http-exception/http-exception.filter';
|
||||||
|
|
||||||
async function bootstrap() {
|
async function bootstrap() {
|
||||||
const app = await NestFactory.create(AppModule);
|
const app = await NestFactory.create(AppModule);
|
||||||
@ -30,6 +29,13 @@ async function bootstrap() {
|
|||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
app.use((req, res, next) => {
|
||||||
|
console.log('Real IP:', req.ip);
|
||||||
|
next();
|
||||||
|
});
|
||||||
|
|
||||||
|
// app.getHttpAdapter().getInstance().set('trust proxy', 1);
|
||||||
|
|
||||||
app.use(
|
app.use(
|
||||||
helmet({
|
helmet({
|
||||||
contentSecurityPolicy: false,
|
contentSecurityPolicy: false,
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
|
import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
|
||||||
|
import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
|
||||||
import { OccupancyService } from '@app/common/helper/services/occupancy.service';
|
import { OccupancyService } from '@app/common/helper/services/occupancy.service';
|
||||||
import { PowerClampService } from '@app/common/helper/services/power.clamp.service';
|
import { PowerClampService } from '@app/common/helper/services/power.clamp.service';
|
||||||
import { SqlLoaderService } from '@app/common/helper/services/sql-loader.service';
|
import { SqlLoaderService } from '@app/common/helper/services/sql-loader.service';
|
||||||
@ -49,7 +50,6 @@ import { SpaceModelProductAllocationService } from 'src/space-model/services/spa
|
|||||||
import { SubspaceModelProductAllocationService } from 'src/space-model/services/subspace/subspace-model-product-allocation.service';
|
import { SubspaceModelProductAllocationService } from 'src/space-model/services/subspace/subspace-model-product-allocation.service';
|
||||||
import {
|
import {
|
||||||
SpaceDeviceService,
|
SpaceDeviceService,
|
||||||
SpaceLinkService,
|
|
||||||
SpaceService,
|
SpaceService,
|
||||||
SubspaceDeviceService,
|
SubspaceDeviceService,
|
||||||
SubSpaceService,
|
SubSpaceService,
|
||||||
@ -60,7 +60,6 @@ import { SubspaceProductAllocationService } from 'src/space/services/subspace/su
|
|||||||
import { TagService } from 'src/tags/services';
|
import { TagService } from 'src/tags/services';
|
||||||
import { PowerClampController } from './controllers';
|
import { PowerClampController } from './controllers';
|
||||||
import { PowerClampService as PowerClamp } from './services/power-clamp.service';
|
import { PowerClampService as PowerClamp } from './services/power-clamp.service';
|
||||||
import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [ConfigModule],
|
imports: [ConfigModule],
|
||||||
controllers: [PowerClampController],
|
controllers: [PowerClampController],
|
||||||
@ -90,7 +89,6 @@ import { AqiDataService } from '@app/common/helper/services/aqi.data.service';
|
|||||||
SceneRepository,
|
SceneRepository,
|
||||||
AutomationRepository,
|
AutomationRepository,
|
||||||
InviteSpaceRepository,
|
InviteSpaceRepository,
|
||||||
SpaceLinkService,
|
|
||||||
SubSpaceService,
|
SubSpaceService,
|
||||||
TagService,
|
TagService,
|
||||||
SpaceModelService,
|
SpaceModelService,
|
||||||
|
@ -54,7 +54,6 @@ import {
|
|||||||
import { SpaceModelProductAllocationService } from 'src/space-model/services/space-model-product-allocation.service';
|
import { SpaceModelProductAllocationService } from 'src/space-model/services/space-model-product-allocation.service';
|
||||||
import { SubspaceModelProductAllocationService } from 'src/space-model/services/subspace/subspace-model-product-allocation.service';
|
import { SubspaceModelProductAllocationService } from 'src/space-model/services/subspace/subspace-model-product-allocation.service';
|
||||||
import {
|
import {
|
||||||
SpaceLinkService,
|
|
||||||
SpaceService,
|
SpaceService,
|
||||||
SubspaceDeviceService,
|
SubspaceDeviceService,
|
||||||
SubSpaceService,
|
SubSpaceService,
|
||||||
@ -87,7 +86,6 @@ const CommandHandlers = [CreateOrphanSpaceHandler];
|
|||||||
UserRepository,
|
UserRepository,
|
||||||
SpaceService,
|
SpaceService,
|
||||||
InviteSpaceRepository,
|
InviteSpaceRepository,
|
||||||
SpaceLinkService,
|
|
||||||
SubSpaceService,
|
SubSpaceService,
|
||||||
ValidationService,
|
ValidationService,
|
||||||
TagService,
|
TagService,
|
||||||
|
@ -24,6 +24,7 @@ import { SpaceService } from 'src/space/services';
|
|||||||
import { PassThrough } from 'stream';
|
import { PassThrough } from 'stream';
|
||||||
import { CreateOrphanSpaceCommand } from '../command/create-orphan-space-command';
|
import { CreateOrphanSpaceCommand } from '../command/create-orphan-space-command';
|
||||||
import { CreateProjectDto, GetProjectParam } from '../dto';
|
import { CreateProjectDto, GetProjectParam } from '../dto';
|
||||||
|
import { QueryRunner } from 'typeorm';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class ProjectService {
|
export class ProjectService {
|
||||||
@ -212,8 +213,14 @@ export class ProjectService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async findOne(uuid: string): Promise<ProjectEntity> {
|
async findOne(
|
||||||
const project = await this.projectRepository.findOne({ where: { uuid } });
|
uuid: string,
|
||||||
|
queryRunner?: QueryRunner,
|
||||||
|
): Promise<ProjectEntity> {
|
||||||
|
const projectRepository = queryRunner
|
||||||
|
? queryRunner.manager.getRepository(ProjectEntity)
|
||||||
|
: this.projectRepository;
|
||||||
|
const project = await projectRepository.findOne({ where: { uuid } });
|
||||||
if (!project) {
|
if (!project) {
|
||||||
throw new HttpException(
|
throw new HttpException(
|
||||||
`Invalid project with uuid ${uuid}`,
|
`Invalid project with uuid ${uuid}`,
|
||||||
|
@ -51,8 +51,12 @@ export class SubSpaceModelService {
|
|||||||
for (const [index, dto] of dtos.entries()) {
|
for (const [index, dto] of dtos.entries()) {
|
||||||
const subspaceModel = savedSubspaces[index];
|
const subspaceModel = savedSubspaces[index];
|
||||||
|
|
||||||
const processedTags = await this.tagService.processTags(
|
const processedTags = await this.tagService.upsertTags(
|
||||||
dto.tags,
|
dto.tags.map((tag) => ({
|
||||||
|
tagName: tag.name,
|
||||||
|
productUuid: tag.productUuid,
|
||||||
|
tagUuid: tag.uuid,
|
||||||
|
})),
|
||||||
spaceModel.project.uuid,
|
spaceModel.project.uuid,
|
||||||
queryRunner,
|
queryRunner,
|
||||||
);
|
);
|
||||||
|
@ -46,7 +46,6 @@ import { CommunityService } from 'src/community/services';
|
|||||||
import { DeviceService } from 'src/device/services';
|
import { DeviceService } from 'src/device/services';
|
||||||
import { SceneService } from 'src/scene/services';
|
import { SceneService } from 'src/scene/services';
|
||||||
import {
|
import {
|
||||||
SpaceLinkService,
|
|
||||||
SpaceService,
|
SpaceService,
|
||||||
SubspaceDeviceService,
|
SubspaceDeviceService,
|
||||||
SubSpaceService,
|
SubSpaceService,
|
||||||
@ -92,7 +91,6 @@ const CommandHandlers = [
|
|||||||
DeviceRepository,
|
DeviceRepository,
|
||||||
TuyaService,
|
TuyaService,
|
||||||
CommunityRepository,
|
CommunityRepository,
|
||||||
SpaceLinkService,
|
|
||||||
SpaceLinkRepository,
|
SpaceLinkRepository,
|
||||||
InviteSpaceRepository,
|
InviteSpaceRepository,
|
||||||
NewTagService,
|
NewTagService,
|
||||||
|
@ -3,7 +3,8 @@ import { ApiProperty } from '@nestjs/swagger';
|
|||||||
import { Type } from 'class-transformer';
|
import { Type } from 'class-transformer';
|
||||||
import {
|
import {
|
||||||
ArrayUnique,
|
ArrayUnique,
|
||||||
IsBoolean,
|
IsArray,
|
||||||
|
IsMongoId,
|
||||||
IsNotEmpty,
|
IsNotEmpty,
|
||||||
IsNumber,
|
IsNumber,
|
||||||
IsOptional,
|
IsOptional,
|
||||||
@ -12,7 +13,7 @@ import {
|
|||||||
NotEquals,
|
NotEquals,
|
||||||
ValidateNested,
|
ValidateNested,
|
||||||
} from 'class-validator';
|
} from 'class-validator';
|
||||||
import { ProcessTagDto } from 'src/tags/dtos';
|
import { CreateProductAllocationDto } from './create-product-allocation.dto';
|
||||||
import { AddSubspaceDto } from './subspace';
|
import { AddSubspaceDto } from './subspace';
|
||||||
|
|
||||||
export class AddSpaceDto {
|
export class AddSpaceDto {
|
||||||
@ -47,14 +48,6 @@ export class AddSpaceDto {
|
|||||||
@IsOptional()
|
@IsOptional()
|
||||||
public icon?: string;
|
public icon?: string;
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
description: 'Indicates whether the space is private or public',
|
|
||||||
example: false,
|
|
||||||
default: false,
|
|
||||||
})
|
|
||||||
@IsBoolean()
|
|
||||||
isPrivate: boolean;
|
|
||||||
|
|
||||||
@ApiProperty({ description: 'X position on canvas', example: 120 })
|
@ApiProperty({ description: 'X position on canvas', example: 120 })
|
||||||
@IsNumber()
|
@IsNumber()
|
||||||
x: number;
|
x: number;
|
||||||
@ -64,23 +57,19 @@ export class AddSpaceDto {
|
|||||||
y: number;
|
y: number;
|
||||||
|
|
||||||
@ApiProperty({
|
@ApiProperty({
|
||||||
description: 'UUID of the Space',
|
description: 'UUID of the Space Model',
|
||||||
example: 'd290f1ee-6c54-4b01-90e6-d701748f0851',
|
example: 'd290f1ee-6c54-4b01-90e6-d701748f0851',
|
||||||
})
|
})
|
||||||
@IsString()
|
@IsMongoId()
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
spaceModelUuid?: string;
|
spaceModelUuid?: string;
|
||||||
|
|
||||||
@ApiProperty({ description: 'Y position on canvas', example: 200 })
|
|
||||||
@IsString()
|
|
||||||
@IsOptional()
|
|
||||||
direction?: string;
|
|
||||||
|
|
||||||
@ApiProperty({
|
@ApiProperty({
|
||||||
description: 'List of subspaces included in the model',
|
description: 'List of subspaces included in the model',
|
||||||
type: [AddSubspaceDto],
|
type: [AddSubspaceDto],
|
||||||
})
|
})
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
|
@IsArray()
|
||||||
@ValidateNested({ each: true })
|
@ValidateNested({ each: true })
|
||||||
@ArrayUnique((subspace) => subspace.subspaceName, {
|
@ArrayUnique((subspace) => subspace.subspaceName, {
|
||||||
message(validationArguments) {
|
message(validationArguments) {
|
||||||
@ -100,51 +89,21 @@ export class AddSpaceDto {
|
|||||||
subspaces?: AddSubspaceDto[];
|
subspaces?: AddSubspaceDto[];
|
||||||
|
|
||||||
@ApiProperty({
|
@ApiProperty({
|
||||||
description: 'List of tags associated with the space model',
|
description: 'List of allocations associated with the space',
|
||||||
type: [ProcessTagDto],
|
type: [CreateProductAllocationDto],
|
||||||
})
|
})
|
||||||
|
@IsOptional()
|
||||||
|
@IsArray()
|
||||||
@ValidateNested({ each: true })
|
@ValidateNested({ each: true })
|
||||||
@Type(() => ProcessTagDto)
|
@Type(() => CreateProductAllocationDto)
|
||||||
tags?: ProcessTagDto[];
|
productAllocations?: CreateProductAllocationDto[];
|
||||||
}
|
|
||||||
|
|
||||||
export class AddUserSpaceDto {
|
|
||||||
@ApiProperty({
|
@ApiProperty({
|
||||||
description: 'spaceUuid',
|
description: 'List of children spaces associated with the space',
|
||||||
required: true,
|
type: [AddSpaceDto],
|
||||||
})
|
})
|
||||||
@IsString()
|
@IsOptional()
|
||||||
@IsNotEmpty()
|
@ValidateNested({ each: true })
|
||||||
public spaceUuid: string;
|
@Type(() => AddSpaceDto)
|
||||||
@ApiProperty({
|
children?: AddSpaceDto[];
|
||||||
description: 'userUuid',
|
|
||||||
required: true,
|
|
||||||
})
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
public userUuid: string;
|
|
||||||
constructor(dto: Partial<AddUserSpaceDto>) {
|
|
||||||
Object.assign(this, dto);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export class AddUserSpaceUsingCodeDto {
|
|
||||||
@ApiProperty({
|
|
||||||
description: 'userUuid',
|
|
||||||
required: true,
|
|
||||||
})
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
public userUuid: string;
|
|
||||||
@ApiProperty({
|
|
||||||
description: 'inviteCode',
|
|
||||||
required: true,
|
|
||||||
})
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
public inviteCode: string;
|
|
||||||
|
|
||||||
constructor(dto: Partial<AddUserSpaceDto>) {
|
|
||||||
Object.assign(this, dto);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
import { SpaceEntity } from '@app/common/modules/space/entities/space.entity';
|
import { SpaceEntity } from '@app/common/modules/space/entities/space.entity';
|
||||||
import { SubspaceEntity } from '@app/common/modules/space/entities/subspace/subspace.entity';
|
import { SubspaceEntity } from '@app/common/modules/space/entities/subspace/subspace.entity';
|
||||||
import { ProcessTagDto } from 'src/tags/dtos';
|
|
||||||
import { QueryRunner } from 'typeorm';
|
import { QueryRunner } from 'typeorm';
|
||||||
|
import { CreateProductAllocationDto } from './create-product-allocation.dto';
|
||||||
|
|
||||||
export enum AllocationsOwnerType {
|
export enum AllocationsOwnerType {
|
||||||
SPACE = 'space',
|
SPACE = 'space',
|
||||||
SUBSPACE = 'subspace',
|
SUBSPACE = 'subspace',
|
||||||
}
|
}
|
||||||
export class BaseCreateAllocationsDto {
|
export class BaseCreateAllocationsDto {
|
||||||
tags: ProcessTagDto[];
|
productAllocations: CreateProductAllocationDto[];
|
||||||
projectUuid: string;
|
projectUuid: string;
|
||||||
queryRunner: QueryRunner;
|
queryRunner: QueryRunner;
|
||||||
type: AllocationsOwnerType;
|
type: AllocationsOwnerType;
|
||||||
|
36
src/space/dtos/create-product-allocation.dto.ts
Normal file
36
src/space/dtos/create-product-allocation.dto.ts
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
import { ApiProperty } from '@nestjs/swagger';
|
||||||
|
import {
|
||||||
|
IsNotEmpty,
|
||||||
|
IsOptional,
|
||||||
|
IsString,
|
||||||
|
IsUUID,
|
||||||
|
ValidateIf,
|
||||||
|
} from 'class-validator';
|
||||||
|
|
||||||
|
export class CreateProductAllocationDto {
|
||||||
|
@ApiProperty({
|
||||||
|
description: 'The name of the tag (if creating a new tag)',
|
||||||
|
example: 'New Tag',
|
||||||
|
})
|
||||||
|
@IsString()
|
||||||
|
@IsNotEmpty()
|
||||||
|
@ValidateIf((o) => !o.tagUuid)
|
||||||
|
tagName: string;
|
||||||
|
|
||||||
|
@ApiProperty({
|
||||||
|
description: 'UUID of the tag (if selecting an existing tag)',
|
||||||
|
example: '123e4567-e89b-12d3-a456-426614174000',
|
||||||
|
})
|
||||||
|
@IsUUID()
|
||||||
|
@IsNotEmpty()
|
||||||
|
@ValidateIf((o) => !o.tagName)
|
||||||
|
tagUuid: string;
|
||||||
|
|
||||||
|
@ApiProperty({
|
||||||
|
description: 'UUID of the product',
|
||||||
|
example: '550e8400-e29b-41d4-a716-446655440000',
|
||||||
|
})
|
||||||
|
@IsUUID()
|
||||||
|
@IsOptional()
|
||||||
|
productUuid: string;
|
||||||
|
}
|
@ -1,8 +1,10 @@
|
|||||||
export * from './add.space.dto';
|
export * from './add.space.dto';
|
||||||
export * from './community-space.param';
|
export * from './community-space.param';
|
||||||
|
export * from './create-allocations.dto';
|
||||||
|
export * from './create-product-allocation.dto';
|
||||||
export * from './get.space.param';
|
export * from './get.space.param';
|
||||||
export * from './user-space.param';
|
|
||||||
export * from './subspace';
|
|
||||||
export * from './project.param.dto';
|
export * from './project.param.dto';
|
||||||
export * from './update.space.dto';
|
export * from './subspace';
|
||||||
export * from './tag';
|
export * from './tag';
|
||||||
|
export * from './update.space.dto';
|
||||||
|
export * from './user-space.param';
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
import { ApiProperty } from '@nestjs/swagger';
|
import { ApiProperty } from '@nestjs/swagger';
|
||||||
|
import { Type } from 'class-transformer';
|
||||||
import {
|
import {
|
||||||
IsArray,
|
IsArray,
|
||||||
IsNotEmpty,
|
IsNotEmpty,
|
||||||
@ -6,8 +7,8 @@ import {
|
|||||||
IsString,
|
IsString,
|
||||||
ValidateNested,
|
ValidateNested,
|
||||||
} from 'class-validator';
|
} from 'class-validator';
|
||||||
import { Type } from 'class-transformer';
|
|
||||||
import { ProcessTagDto } from 'src/tags/dtos';
|
import { ProcessTagDto } from 'src/tags/dtos';
|
||||||
|
import { CreateProductAllocationDto } from '../create-product-allocation.dto';
|
||||||
|
|
||||||
export class AddSubspaceDto {
|
export class AddSubspaceDto {
|
||||||
@ApiProperty({
|
@ApiProperty({
|
||||||
@ -24,7 +25,7 @@ export class AddSubspaceDto {
|
|||||||
})
|
})
|
||||||
@IsArray()
|
@IsArray()
|
||||||
@ValidateNested({ each: true })
|
@ValidateNested({ each: true })
|
||||||
@Type(() => ProcessTagDto)
|
@Type(() => CreateProductAllocationDto)
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
tags?: ProcessTagDto[];
|
productAllocations?: CreateProductAllocationDto[];
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
export * from './add.subspace.dto';
|
|
||||||
export * from './get.subspace.param';
|
|
||||||
export * from './add.subspace-device.param';
|
export * from './add.subspace-device.param';
|
||||||
export * from './update.subspace.dto';
|
export * from './add.subspace.dto';
|
||||||
export * from './delete.subspace.dto';
|
export * from './delete.subspace.dto';
|
||||||
export * from './modify.subspace.dto';
|
export * from './get.subspace.param';
|
||||||
|
export * from './update.subspace.dto';
|
||||||
|
@ -1,14 +0,0 @@
|
|||||||
import { ApiPropertyOptional, PartialType } from '@nestjs/swagger';
|
|
||||||
import { IsOptional, IsUUID } from 'class-validator';
|
|
||||||
import { AddSubspaceDto } from './add.subspace.dto';
|
|
||||||
|
|
||||||
export class ModifySubspaceDto extends PartialType(AddSubspaceDto) {
|
|
||||||
@ApiPropertyOptional({
|
|
||||||
description:
|
|
||||||
'UUID of the subspace (will present if updating an existing subspace)',
|
|
||||||
example: '123e4567-e89b-12d3-a456-426614174000',
|
|
||||||
})
|
|
||||||
@IsOptional()
|
|
||||||
@IsUUID()
|
|
||||||
uuid?: string;
|
|
||||||
}
|
|
@ -1,16 +1,14 @@
|
|||||||
import { ApiProperty } from '@nestjs/swagger';
|
import { ApiPropertyOptional, PartialType } from '@nestjs/swagger';
|
||||||
import { IsNotEmpty, IsString } from 'class-validator';
|
import { IsOptional, IsUUID } from 'class-validator';
|
||||||
|
import { AddSubspaceDto } from './add.subspace.dto';
|
||||||
|
|
||||||
export class UpdateSubspaceDto {
|
export class UpdateSubspaceDto extends PartialType(AddSubspaceDto) {
|
||||||
@ApiProperty({
|
@ApiPropertyOptional({
|
||||||
description: 'Name of the subspace',
|
description:
|
||||||
example: 'Living Room',
|
'UUID of the subspace (will present if updating an existing subspace)',
|
||||||
|
example: '123e4567-e89b-12d3-a456-426614174000',
|
||||||
})
|
})
|
||||||
@IsNotEmpty()
|
@IsOptional()
|
||||||
@IsString()
|
@IsUUID()
|
||||||
subspaceName?: string;
|
uuid?: string;
|
||||||
|
|
||||||
@IsNotEmpty()
|
|
||||||
@IsString()
|
|
||||||
subspaceUuid: string;
|
|
||||||
}
|
}
|
||||||
|
@ -9,8 +9,8 @@ import {
|
|||||||
NotEquals,
|
NotEquals,
|
||||||
ValidateNested,
|
ValidateNested,
|
||||||
} from 'class-validator';
|
} from 'class-validator';
|
||||||
import { ModifySubspaceDto } from './subspace';
|
import { CreateProductAllocationDto } from './create-product-allocation.dto';
|
||||||
import { ModifyTagDto } from './tag/modify-tag.dto';
|
import { UpdateSubspaceDto } from './subspace';
|
||||||
|
|
||||||
export class UpdateSpaceDto {
|
export class UpdateSpaceDto {
|
||||||
@ApiProperty({
|
@ApiProperty({
|
||||||
@ -46,25 +46,24 @@ export class UpdateSpaceDto {
|
|||||||
y?: number;
|
y?: number;
|
||||||
|
|
||||||
@ApiPropertyOptional({
|
@ApiPropertyOptional({
|
||||||
description: 'List of subspace modifications (add/update/delete)',
|
description: 'List of subspace modifications',
|
||||||
type: [ModifySubspaceDto],
|
type: [UpdateSubspaceDto],
|
||||||
})
|
})
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsArray()
|
@IsArray()
|
||||||
@ValidateNested({ each: true })
|
@ValidateNested({ each: true })
|
||||||
@Type(() => ModifySubspaceDto)
|
@Type(() => UpdateSubspaceDto)
|
||||||
subspaces?: ModifySubspaceDto[];
|
subspaces?: UpdateSubspaceDto[];
|
||||||
|
|
||||||
@ApiPropertyOptional({
|
@ApiPropertyOptional({
|
||||||
description:
|
description: 'List of allocations modifications',
|
||||||
'List of tag modifications (add/update/delete) for the space model',
|
type: [CreateProductAllocationDto],
|
||||||
type: [ModifyTagDto],
|
|
||||||
})
|
})
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsArray()
|
@IsArray()
|
||||||
@ValidateNested({ each: true })
|
@ValidateNested({ each: true })
|
||||||
@Type(() => ModifyTagDto)
|
@Type(() => CreateProductAllocationDto)
|
||||||
tags?: ModifyTagDto[];
|
productAllocations?: CreateProductAllocationDto[];
|
||||||
|
|
||||||
@ApiProperty({
|
@ApiProperty({
|
||||||
description: 'UUID of the Space',
|
description: 'UUID of the Space',
|
||||||
|
@ -5,11 +5,7 @@ import { DeviceService } from 'src/device/services';
|
|||||||
import { UserSpaceService } from 'src/users/services';
|
import { UserSpaceService } from 'src/users/services';
|
||||||
import { DataSource } from 'typeorm';
|
import { DataSource } from 'typeorm';
|
||||||
import { DisableSpaceCommand } from '../commands';
|
import { DisableSpaceCommand } from '../commands';
|
||||||
import {
|
import { SpaceSceneService, SubSpaceService } from '../services';
|
||||||
SpaceLinkService,
|
|
||||||
SpaceSceneService,
|
|
||||||
SubSpaceService,
|
|
||||||
} from '../services';
|
|
||||||
|
|
||||||
@CommandHandler(DisableSpaceCommand)
|
@CommandHandler(DisableSpaceCommand)
|
||||||
export class DisableSpaceHandler
|
export class DisableSpaceHandler
|
||||||
@ -19,7 +15,6 @@ export class DisableSpaceHandler
|
|||||||
private readonly subSpaceService: SubSpaceService,
|
private readonly subSpaceService: SubSpaceService,
|
||||||
private readonly userService: UserSpaceService,
|
private readonly userService: UserSpaceService,
|
||||||
private readonly deviceService: DeviceService,
|
private readonly deviceService: DeviceService,
|
||||||
private readonly spaceLinkService: SpaceLinkService,
|
|
||||||
private readonly sceneService: SpaceSceneService,
|
private readonly sceneService: SpaceSceneService,
|
||||||
private readonly dataSource: DataSource,
|
private readonly dataSource: DataSource,
|
||||||
) {}
|
) {}
|
||||||
@ -39,8 +34,6 @@ export class DisableSpaceHandler
|
|||||||
'subspaces',
|
'subspaces',
|
||||||
'parent',
|
'parent',
|
||||||
'devices',
|
'devices',
|
||||||
'outgoingConnections',
|
|
||||||
'incomingConnections',
|
|
||||||
'scenes',
|
'scenes',
|
||||||
'children',
|
'children',
|
||||||
'userSpaces',
|
'userSpaces',
|
||||||
@ -79,7 +72,6 @@ export class DisableSpaceHandler
|
|||||||
orphanSpace,
|
orphanSpace,
|
||||||
queryRunner,
|
queryRunner,
|
||||||
),
|
),
|
||||||
this.spaceLinkService.deleteSpaceLink(space, queryRunner),
|
|
||||||
this.sceneService.deleteScenes(space, queryRunner),
|
this.sceneService.deleteScenes(space, queryRunner),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -16,10 +16,10 @@ export class ProductAllocationService {
|
|||||||
) {}
|
) {}
|
||||||
|
|
||||||
async createAllocations(dto: CreateAllocationsDto): Promise<void> {
|
async createAllocations(dto: CreateAllocationsDto): Promise<void> {
|
||||||
const { projectUuid, queryRunner, tags, type } = dto;
|
const { projectUuid, queryRunner, productAllocations, type } = dto;
|
||||||
|
|
||||||
const allocationsData = await this.tagService.processTags(
|
const allocationsData = await this.tagService.upsertTags(
|
||||||
tags,
|
productAllocations,
|
||||||
projectUuid,
|
projectUuid,
|
||||||
queryRunner,
|
queryRunner,
|
||||||
);
|
);
|
||||||
@ -29,15 +29,17 @@ export class ProductAllocationService {
|
|||||||
const createdTagsByName = new Map(allocationsData.map((t) => [t.name, t]));
|
const createdTagsByName = new Map(allocationsData.map((t) => [t.name, t]));
|
||||||
|
|
||||||
// Create the product-tag mapping based on the processed tags
|
// Create the product-tag mapping based on the processed tags
|
||||||
const productTagMapping = tags.map(({ uuid, name, productUuid }) => {
|
const productTagMapping = productAllocations.map(
|
||||||
const inputTag = uuid
|
({ tagUuid, tagName, productUuid }) => {
|
||||||
? createdTagsByUUID.get(uuid)
|
const inputTag = tagUuid
|
||||||
: createdTagsByName.get(name);
|
? createdTagsByUUID.get(tagUuid)
|
||||||
return {
|
: createdTagsByName.get(tagName);
|
||||||
tag: inputTag?.uuid,
|
return {
|
||||||
product: productUuid,
|
tag: inputTag?.uuid,
|
||||||
};
|
product: productUuid,
|
||||||
});
|
};
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case AllocationsOwnerType.SPACE: {
|
case AllocationsOwnerType.SPACE: {
|
||||||
|
@ -1,121 +1,6 @@
|
|||||||
import { SpaceLinkEntity } from '@app/common/modules/space/entities/space-link.entity';
|
import { Injectable } from '@nestjs/common';
|
||||||
import { SpaceEntity } from '@app/common/modules/space/entities/space.entity';
|
|
||||||
import { SpaceLinkRepository } from '@app/common/modules/space/repositories';
|
|
||||||
import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
|
|
||||||
import { QueryRunner } from 'typeorm';
|
|
||||||
|
|
||||||
|
// todo: find out why we need to import this
|
||||||
|
// in community module in order for the whole system to work
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class SpaceLinkService {
|
export class SpaceLinkService {}
|
||||||
constructor(private readonly spaceLinkRepository: SpaceLinkRepository) {}
|
|
||||||
|
|
||||||
async saveSpaceLink(
|
|
||||||
startSpaceId: string,
|
|
||||||
endSpaceId: string,
|
|
||||||
direction: string,
|
|
||||||
queryRunner: QueryRunner,
|
|
||||||
): Promise<void> {
|
|
||||||
try {
|
|
||||||
// Check if a link between the startSpace and endSpace already exists
|
|
||||||
const existingLink = await queryRunner.manager.findOne(SpaceLinkEntity, {
|
|
||||||
where: {
|
|
||||||
startSpace: { uuid: startSpaceId },
|
|
||||||
endSpace: { uuid: endSpaceId },
|
|
||||||
disabled: false,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (existingLink) {
|
|
||||||
// Update the direction if the link exists
|
|
||||||
existingLink.direction = direction;
|
|
||||||
await queryRunner.manager.save(SpaceLinkEntity, existingLink);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const existingEndSpaceLink = await queryRunner.manager.findOne(
|
|
||||||
SpaceLinkEntity,
|
|
||||||
{
|
|
||||||
where: { endSpace: { uuid: endSpaceId } },
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
if (
|
|
||||||
existingEndSpaceLink &&
|
|
||||||
existingEndSpaceLink.startSpace.uuid !== startSpaceId
|
|
||||||
) {
|
|
||||||
throw new Error(
|
|
||||||
`Space with ID ${endSpaceId} is already an endSpace in another link and cannot be reused.`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find start space
|
|
||||||
const startSpace = await queryRunner.manager.findOne(SpaceEntity, {
|
|
||||||
where: { uuid: startSpaceId },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!startSpace) {
|
|
||||||
throw new HttpException(
|
|
||||||
`Start space with ID ${startSpaceId} not found.`,
|
|
||||||
HttpStatus.NOT_FOUND,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find end space
|
|
||||||
const endSpace = await queryRunner.manager.findOne(SpaceEntity, {
|
|
||||||
where: { uuid: endSpaceId },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!endSpace) {
|
|
||||||
throw new HttpException(
|
|
||||||
`End space with ID ${endSpaceId} not found.`,
|
|
||||||
HttpStatus.NOT_FOUND,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create and save the space link
|
|
||||||
const spaceLink = this.spaceLinkRepository.create({
|
|
||||||
startSpace,
|
|
||||||
endSpace,
|
|
||||||
direction,
|
|
||||||
});
|
|
||||||
|
|
||||||
await queryRunner.manager.save(SpaceLinkEntity, spaceLink);
|
|
||||||
} catch (error) {
|
|
||||||
throw new HttpException(
|
|
||||||
error.message ||
|
|
||||||
`Failed to save space link. Internal Server Error: ${error.message}`,
|
|
||||||
error.status || HttpStatus.INTERNAL_SERVER_ERROR,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
async deleteSpaceLink(
|
|
||||||
space: SpaceEntity,
|
|
||||||
queryRunner: QueryRunner,
|
|
||||||
): Promise<void> {
|
|
||||||
try {
|
|
||||||
const spaceLinks = await queryRunner.manager.find(SpaceLinkEntity, {
|
|
||||||
where: [
|
|
||||||
{ startSpace: space, disabled: false },
|
|
||||||
{ endSpace: space, disabled: false },
|
|
||||||
],
|
|
||||||
});
|
|
||||||
|
|
||||||
if (spaceLinks.length === 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const linkIds = spaceLinks.map((link) => link.uuid);
|
|
||||||
|
|
||||||
await queryRunner.manager
|
|
||||||
.createQueryBuilder()
|
|
||||||
.update(SpaceLinkEntity)
|
|
||||||
.set({ disabled: true })
|
|
||||||
.whereInIds(linkIds)
|
|
||||||
.execute();
|
|
||||||
} catch (error) {
|
|
||||||
throw new HttpException(
|
|
||||||
`Failed to disable space links for the given space: ${error.message}`,
|
|
||||||
HttpStatus.INTERNAL_SERVER_ERROR,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -16,7 +16,7 @@ import {
|
|||||||
Inject,
|
Inject,
|
||||||
Injectable,
|
Injectable,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { In } from 'typeorm';
|
import { In, QueryRunner } from 'typeorm';
|
||||||
import { CommunityService } from '../../community/services';
|
import { CommunityService } from '../../community/services';
|
||||||
import { ProjectService } from '../../project/services';
|
import { ProjectService } from '../../project/services';
|
||||||
import { ProjectParam } from '../dtos';
|
import { ProjectParam } from '../dtos';
|
||||||
@ -69,12 +69,17 @@ export class ValidationService {
|
|||||||
async validateCommunityAndProject(
|
async validateCommunityAndProject(
|
||||||
communityUuid: string,
|
communityUuid: string,
|
||||||
projectUuid: string,
|
projectUuid: string,
|
||||||
|
queryRunner?: QueryRunner,
|
||||||
) {
|
) {
|
||||||
const project = await this.projectService.findOne(projectUuid);
|
const project = await this.projectService.findOne(projectUuid, queryRunner);
|
||||||
const community = await this.communityService.getCommunityById({
|
|
||||||
communityUuid,
|
const community = await this.communityService.getCommunityById(
|
||||||
projectUuid,
|
{
|
||||||
});
|
communityUuid,
|
||||||
|
projectUuid,
|
||||||
|
},
|
||||||
|
queryRunner,
|
||||||
|
);
|
||||||
|
|
||||||
return { community: community.data, project: project };
|
return { community: community.data, project: project };
|
||||||
}
|
}
|
||||||
@ -170,8 +175,14 @@ export class ValidationService {
|
|||||||
return space;
|
return space;
|
||||||
}
|
}
|
||||||
|
|
||||||
async validateSpaceModel(spaceModelUuid: string): Promise<SpaceModelEntity> {
|
async validateSpaceModel(
|
||||||
const queryBuilder = this.spaceModelRepository
|
spaceModelUuid: string,
|
||||||
|
queryRunner?: QueryRunner,
|
||||||
|
): Promise<SpaceModelEntity> {
|
||||||
|
const queryBuilder = (
|
||||||
|
queryRunner.manager.getRepository(SpaceModelEntity) ||
|
||||||
|
this.spaceModelRepository
|
||||||
|
)
|
||||||
.createQueryBuilder('spaceModel')
|
.createQueryBuilder('spaceModel')
|
||||||
.leftJoinAndSelect(
|
.leftJoinAndSelect(
|
||||||
'spaceModel.subspaceModels',
|
'spaceModel.subspaceModels',
|
||||||
|
@ -22,7 +22,6 @@ import {
|
|||||||
import { CommandBus } from '@nestjs/cqrs';
|
import { CommandBus } from '@nestjs/cqrs';
|
||||||
import { DeviceService } from 'src/device/services';
|
import { DeviceService } from 'src/device/services';
|
||||||
import { SpaceModelService } from 'src/space-model/services';
|
import { SpaceModelService } from 'src/space-model/services';
|
||||||
import { ProcessTagDto } from 'src/tags/dtos';
|
|
||||||
import { TagService } from 'src/tags/services/tags.service';
|
import { TagService } from 'src/tags/services/tags.service';
|
||||||
import { DataSource, In, Not, QueryRunner } from 'typeorm';
|
import { DataSource, In, Not, QueryRunner } from 'typeorm';
|
||||||
import { DisableSpaceCommand } from '../commands';
|
import { DisableSpaceCommand } from '../commands';
|
||||||
@ -32,9 +31,9 @@ import {
|
|||||||
GetSpaceParam,
|
GetSpaceParam,
|
||||||
UpdateSpaceDto,
|
UpdateSpaceDto,
|
||||||
} from '../dtos';
|
} from '../dtos';
|
||||||
|
import { CreateProductAllocationDto } from '../dtos/create-product-allocation.dto';
|
||||||
import { GetSpaceDto } from '../dtos/get.space.dto';
|
import { GetSpaceDto } from '../dtos/get.space.dto';
|
||||||
import { SpaceWithParentsDto } from '../dtos/space.parents.dto';
|
import { SpaceWithParentsDto } from '../dtos/space.parents.dto';
|
||||||
import { SpaceLinkService } from './space-link';
|
|
||||||
import { SpaceProductAllocationService } from './space-product-allocation.service';
|
import { SpaceProductAllocationService } from './space-product-allocation.service';
|
||||||
import { ValidationService } from './space-validation.service';
|
import { ValidationService } from './space-validation.service';
|
||||||
import { SubSpaceService } from './subspace';
|
import { SubSpaceService } from './subspace';
|
||||||
@ -44,7 +43,6 @@ export class SpaceService {
|
|||||||
private readonly dataSource: DataSource,
|
private readonly dataSource: DataSource,
|
||||||
private readonly spaceRepository: SpaceRepository,
|
private readonly spaceRepository: SpaceRepository,
|
||||||
private readonly inviteSpaceRepository: InviteSpaceRepository,
|
private readonly inviteSpaceRepository: InviteSpaceRepository,
|
||||||
private readonly spaceLinkService: SpaceLinkService,
|
|
||||||
private readonly subSpaceService: SubSpaceService,
|
private readonly subSpaceService: SubSpaceService,
|
||||||
private readonly validationService: ValidationService,
|
private readonly validationService: ValidationService,
|
||||||
private readonly tagService: TagService,
|
private readonly tagService: TagService,
|
||||||
@ -57,50 +55,72 @@ export class SpaceService {
|
|||||||
async createSpace(
|
async createSpace(
|
||||||
addSpaceDto: AddSpaceDto,
|
addSpaceDto: AddSpaceDto,
|
||||||
params: CommunitySpaceParam,
|
params: CommunitySpaceParam,
|
||||||
|
queryRunner?: QueryRunner,
|
||||||
|
recursiveCallParentEntity?: SpaceEntity,
|
||||||
): Promise<BaseResponseDto> {
|
): Promise<BaseResponseDto> {
|
||||||
const { parentUuid, direction, spaceModelUuid, subspaces, tags } =
|
const isRecursiveCall = !!queryRunner;
|
||||||
addSpaceDto;
|
|
||||||
|
const {
|
||||||
|
parentUuid,
|
||||||
|
spaceModelUuid,
|
||||||
|
subspaces,
|
||||||
|
productAllocations,
|
||||||
|
children,
|
||||||
|
} = addSpaceDto;
|
||||||
const { communityUuid, projectUuid } = params;
|
const { communityUuid, projectUuid } = params;
|
||||||
|
|
||||||
const queryRunner = this.dataSource.createQueryRunner();
|
if (!queryRunner) {
|
||||||
|
queryRunner = this.dataSource.createQueryRunner();
|
||||||
await queryRunner.connect();
|
await queryRunner.connect();
|
||||||
await queryRunner.startTransaction();
|
await queryRunner.startTransaction();
|
||||||
|
}
|
||||||
|
|
||||||
const { community } =
|
const { community } =
|
||||||
await this.validationService.validateCommunityAndProject(
|
await this.validationService.validateCommunityAndProject(
|
||||||
communityUuid,
|
communityUuid,
|
||||||
projectUuid,
|
projectUuid,
|
||||||
|
queryRunner,
|
||||||
);
|
);
|
||||||
|
|
||||||
this.validateSpaceCreationCriteria({ spaceModelUuid, subspaces, tags });
|
this.validateSpaceCreationCriteria({
|
||||||
|
spaceModelUuid,
|
||||||
|
subspaces,
|
||||||
|
productAllocations,
|
||||||
|
});
|
||||||
|
|
||||||
const parent = parentUuid
|
const parent =
|
||||||
? await this.validationService.validateSpace(parentUuid)
|
parentUuid && !isRecursiveCall
|
||||||
: null;
|
? await this.validationService.validateSpace(parentUuid)
|
||||||
|
: null;
|
||||||
|
|
||||||
const spaceModel = spaceModelUuid
|
const spaceModel = spaceModelUuid
|
||||||
? await this.validationService.validateSpaceModel(spaceModelUuid)
|
? await this.validationService.validateSpaceModel(spaceModelUuid)
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const space = queryRunner.manager.create(SpaceEntity, {
|
const space = queryRunner.manager.create(SpaceEntity, {
|
||||||
...addSpaceDto,
|
// todo: find a better way to handle this instead of naming every key
|
||||||
|
spaceName: addSpaceDto.spaceName,
|
||||||
|
icon: addSpaceDto.icon,
|
||||||
|
x: addSpaceDto.x,
|
||||||
|
y: addSpaceDto.y,
|
||||||
spaceModel,
|
spaceModel,
|
||||||
parent: parentUuid ? parent : null,
|
parent: isRecursiveCall
|
||||||
|
? recursiveCallParentEntity
|
||||||
|
: parentUuid
|
||||||
|
? parent
|
||||||
|
: null,
|
||||||
community,
|
community,
|
||||||
});
|
});
|
||||||
|
|
||||||
const newSpace = await queryRunner.manager.save(space);
|
const newSpace = await queryRunner.manager.save(space);
|
||||||
|
this.checkDuplicateTags([
|
||||||
const subspaceTags =
|
...(productAllocations || []),
|
||||||
subspaces?.flatMap((subspace) => subspace.tags || []) || [];
|
...(subspaces?.flatMap(
|
||||||
|
(subspace) => subspace.productAllocations || [],
|
||||||
this.checkDuplicateTags([...tags, ...subspaceTags]);
|
) || []),
|
||||||
|
]);
|
||||||
|
|
||||||
if (spaceModelUuid) {
|
if (spaceModelUuid) {
|
||||||
// no need to check for existing dependencies here as validateSpaceCreationCriteria
|
|
||||||
// ensures no tags or subspaces are present along with spaceModelUuid
|
|
||||||
await this.spaceModelService.linkToSpace(
|
await this.spaceModelService.linkToSpace(
|
||||||
newSpace,
|
newSpace,
|
||||||
spaceModel,
|
spaceModel,
|
||||||
@ -109,15 +129,6 @@ export class SpaceService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await Promise.all([
|
await Promise.all([
|
||||||
// todo: remove this logic as we are not using space links anymore
|
|
||||||
direction && parent
|
|
||||||
? this.spaceLinkService.saveSpaceLink(
|
|
||||||
parent.uuid,
|
|
||||||
newSpace.uuid,
|
|
||||||
direction,
|
|
||||||
queryRunner,
|
|
||||||
)
|
|
||||||
: Promise.resolve(),
|
|
||||||
subspaces?.length
|
subspaces?.length
|
||||||
? this.subSpaceService.createSubspacesFromDto(
|
? this.subSpaceService.createSubspacesFromDto(
|
||||||
subspaces,
|
subspaces,
|
||||||
@ -126,12 +137,32 @@ export class SpaceService {
|
|||||||
projectUuid,
|
projectUuid,
|
||||||
)
|
)
|
||||||
: Promise.resolve(),
|
: Promise.resolve(),
|
||||||
tags?.length
|
productAllocations?.length
|
||||||
? this.createAllocations(tags, projectUuid, queryRunner, newSpace)
|
? this.createAllocations(
|
||||||
|
productAllocations,
|
||||||
|
projectUuid,
|
||||||
|
queryRunner,
|
||||||
|
newSpace,
|
||||||
|
)
|
||||||
: Promise.resolve(),
|
: Promise.resolve(),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
await queryRunner.commitTransaction();
|
if (children?.length) {
|
||||||
|
await Promise.all(
|
||||||
|
children.map((child) =>
|
||||||
|
this.createSpace(
|
||||||
|
{ ...child, parentUuid: newSpace.uuid },
|
||||||
|
{ communityUuid, projectUuid },
|
||||||
|
queryRunner,
|
||||||
|
newSpace,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isRecursiveCall) {
|
||||||
|
await queryRunner.commitTransaction();
|
||||||
|
}
|
||||||
|
|
||||||
return new SuccessResponseDto({
|
return new SuccessResponseDto({
|
||||||
statusCode: HttpStatus.CREATED,
|
statusCode: HttpStatus.CREATED,
|
||||||
@ -139,34 +170,34 @@ export class SpaceService {
|
|||||||
message: 'Space created successfully',
|
message: 'Space created successfully',
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
await queryRunner.rollbackTransaction();
|
!isRecursiveCall ? await queryRunner.rollbackTransaction() : null;
|
||||||
|
|
||||||
if (error instanceof HttpException) {
|
if (error instanceof HttpException) {
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
throw new HttpException(error.message, HttpStatus.INTERNAL_SERVER_ERROR);
|
throw new HttpException(error.message, HttpStatus.INTERNAL_SERVER_ERROR);
|
||||||
} finally {
|
} finally {
|
||||||
await queryRunner.release();
|
!isRecursiveCall ? await queryRunner.release() : null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private checkDuplicateTags(allTags: ProcessTagDto[]) {
|
private checkDuplicateTags(allocations: CreateProductAllocationDto[]) {
|
||||||
const tagUuidSet = new Set<string>();
|
const tagUuidSet = new Set<string>();
|
||||||
const tagNameProductSet = new Set<string>();
|
const tagNameProductSet = new Set<string>();
|
||||||
|
|
||||||
for (const tag of allTags) {
|
for (const allocation of allocations) {
|
||||||
if (tag.uuid) {
|
if (allocation.tagUuid) {
|
||||||
if (tagUuidSet.has(tag.uuid)) {
|
if (tagUuidSet.has(allocation.tagUuid)) {
|
||||||
throw new HttpException(
|
throw new HttpException(
|
||||||
`Duplicate tag UUID found: ${tag.uuid}`,
|
`Duplicate tag UUID found: ${allocation.tagUuid}`,
|
||||||
HttpStatus.BAD_REQUEST,
|
HttpStatus.BAD_REQUEST,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
tagUuidSet.add(tag.uuid);
|
tagUuidSet.add(allocation.tagUuid);
|
||||||
} else {
|
} else {
|
||||||
const tagKey = `${tag.name}-${tag.productUuid}`;
|
const tagKey = `${allocation.tagName}-${allocation.productUuid}`;
|
||||||
if (tagNameProductSet.has(tagKey)) {
|
if (tagNameProductSet.has(tagKey)) {
|
||||||
throw new HttpException(
|
throw new HttpException(
|
||||||
`Duplicate tag found with name "${tag.name}" and product "${tag.productUuid}".`,
|
`Duplicate tag found with name "${allocation.tagName}" and product "${allocation.productUuid}".`,
|
||||||
HttpStatus.BAD_REQUEST,
|
HttpStatus.BAD_REQUEST,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -195,12 +226,7 @@ export class SpaceService {
|
|||||||
'children.disabled = :disabled',
|
'children.disabled = :disabled',
|
||||||
{ disabled: false },
|
{ disabled: false },
|
||||||
)
|
)
|
||||||
.leftJoinAndSelect(
|
|
||||||
'space.incomingConnections',
|
|
||||||
'incomingConnections',
|
|
||||||
'incomingConnections.disabled = :incomingConnectionDisabled',
|
|
||||||
{ incomingConnectionDisabled: false },
|
|
||||||
)
|
|
||||||
.leftJoinAndSelect('space.productAllocations', 'productAllocations')
|
.leftJoinAndSelect('space.productAllocations', 'productAllocations')
|
||||||
.leftJoinAndSelect('productAllocations.tag', 'tag')
|
.leftJoinAndSelect('productAllocations.tag', 'tag')
|
||||||
.leftJoinAndSelect('productAllocations.product', 'product')
|
.leftJoinAndSelect('productAllocations.product', 'product')
|
||||||
@ -271,7 +297,6 @@ export class SpaceService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// todo refactor this method to eliminate wrong use of tags
|
|
||||||
async findOne(params: GetSpaceParam): Promise<BaseResponseDto> {
|
async findOne(params: GetSpaceParam): Promise<BaseResponseDto> {
|
||||||
const { communityUuid, spaceUuid, projectUuid } = params;
|
const { communityUuid, spaceUuid, projectUuid } = params;
|
||||||
try {
|
try {
|
||||||
@ -282,19 +307,6 @@ export class SpaceService {
|
|||||||
|
|
||||||
const queryBuilder = this.spaceRepository
|
const queryBuilder = this.spaceRepository
|
||||||
.createQueryBuilder('space')
|
.createQueryBuilder('space')
|
||||||
.leftJoinAndSelect('space.parent', 'parent')
|
|
||||||
.leftJoinAndSelect(
|
|
||||||
'space.children',
|
|
||||||
'children',
|
|
||||||
'children.disabled = :disabled',
|
|
||||||
{ disabled: false },
|
|
||||||
)
|
|
||||||
.leftJoinAndSelect(
|
|
||||||
'space.incomingConnections',
|
|
||||||
'incomingConnections',
|
|
||||||
'incomingConnections.disabled = :incomingConnectionDisabled',
|
|
||||||
{ incomingConnectionDisabled: false },
|
|
||||||
)
|
|
||||||
.leftJoinAndSelect('space.productAllocations', 'productAllocations')
|
.leftJoinAndSelect('space.productAllocations', 'productAllocations')
|
||||||
.leftJoinAndSelect('productAllocations.tag', 'spaceTag')
|
.leftJoinAndSelect('productAllocations.tag', 'spaceTag')
|
||||||
.leftJoinAndSelect('productAllocations.product', 'spaceProduct')
|
.leftJoinAndSelect('productAllocations.product', 'spaceProduct')
|
||||||
@ -423,7 +435,7 @@ export class SpaceService {
|
|||||||
|
|
||||||
const queryRunner = this.dataSource.createQueryRunner();
|
const queryRunner = this.dataSource.createQueryRunner();
|
||||||
const hasSubspace = updateSpaceDto.subspaces?.length > 0;
|
const hasSubspace = updateSpaceDto.subspaces?.length > 0;
|
||||||
const hasTags = updateSpaceDto.tags?.length > 0;
|
const hasAllocations = updateSpaceDto.productAllocations?.length > 0;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await queryRunner.connect();
|
await queryRunner.connect();
|
||||||
@ -448,7 +460,7 @@ export class SpaceService {
|
|||||||
|
|
||||||
await this.updateSpaceProperties(space, updateSpaceDto, queryRunner);
|
await this.updateSpaceProperties(space, updateSpaceDto, queryRunner);
|
||||||
|
|
||||||
if (hasSubspace || hasTags) {
|
if (hasSubspace || hasAllocations) {
|
||||||
await queryRunner.manager.update(SpaceEntity, space.uuid, {
|
await queryRunner.manager.update(SpaceEntity, space.uuid, {
|
||||||
spaceModel: null,
|
spaceModel: null,
|
||||||
});
|
});
|
||||||
@ -492,7 +504,7 @@ export class SpaceService {
|
|||||||
await this.subSpaceService.unlinkModels(space.subspaces, queryRunner);
|
await this.subSpaceService.unlinkModels(space.subspaces, queryRunner);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hasTags && space.productAllocations && space.spaceModel) {
|
if (hasAllocations && space.productAllocations && space.spaceModel) {
|
||||||
await this.spaceProductAllocationService.unlinkModels(
|
await this.spaceProductAllocationService.unlinkModels(
|
||||||
space,
|
space,
|
||||||
queryRunner,
|
queryRunner,
|
||||||
@ -508,13 +520,13 @@ export class SpaceService {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (updateSpaceDto.tags) {
|
if (updateSpaceDto.productAllocations) {
|
||||||
await queryRunner.manager.delete(SpaceProductAllocationEntity, {
|
await queryRunner.manager.delete(SpaceProductAllocationEntity, {
|
||||||
space: { uuid: space.uuid },
|
space: { uuid: space.uuid },
|
||||||
tag: {
|
tag: {
|
||||||
uuid: Not(
|
uuid: Not(
|
||||||
In(
|
In(
|
||||||
updateSpaceDto.tags
|
updateSpaceDto.productAllocations
|
||||||
.filter((tag) => tag.tagUuid)
|
.filter((tag) => tag.tagUuid)
|
||||||
.map((tag) => tag.tagUuid),
|
.map((tag) => tag.tagUuid),
|
||||||
),
|
),
|
||||||
@ -522,11 +534,7 @@ export class SpaceService {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
await this.createAllocations(
|
await this.createAllocations(
|
||||||
updateSpaceDto.tags.map((tag) => ({
|
updateSpaceDto.productAllocations,
|
||||||
name: tag.name,
|
|
||||||
uuid: tag.tagUuid,
|
|
||||||
productUuid: tag.productUuid,
|
|
||||||
})),
|
|
||||||
projectUuid,
|
projectUuid,
|
||||||
queryRunner,
|
queryRunner,
|
||||||
space,
|
space,
|
||||||
@ -673,7 +681,7 @@ export class SpaceService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private buildSpaceHierarchy(spaces: SpaceEntity[]): SpaceEntity[] {
|
buildSpaceHierarchy(spaces: SpaceEntity[]): SpaceEntity[] {
|
||||||
const map = new Map<string, SpaceEntity>();
|
const map = new Map<string, SpaceEntity>();
|
||||||
|
|
||||||
// Step 1: Create a map of spaces by UUID
|
// Step 1: Create a map of spaces by UUID
|
||||||
@ -702,13 +710,17 @@ export class SpaceService {
|
|||||||
|
|
||||||
private validateSpaceCreationCriteria({
|
private validateSpaceCreationCriteria({
|
||||||
spaceModelUuid,
|
spaceModelUuid,
|
||||||
tags,
|
productAllocations,
|
||||||
subspaces,
|
subspaces,
|
||||||
}: Pick<AddSpaceDto, 'spaceModelUuid' | 'tags' | 'subspaces'>): void {
|
}: Pick<
|
||||||
const hasTagsOrSubspaces =
|
AddSpaceDto,
|
||||||
(tags && tags.length > 0) || (subspaces && subspaces.length > 0);
|
'spaceModelUuid' | 'productAllocations' | 'subspaces'
|
||||||
|
>): void {
|
||||||
|
const hasProductsOrSubspaces =
|
||||||
|
(productAllocations && productAllocations.length > 0) ||
|
||||||
|
(subspaces && subspaces.length > 0);
|
||||||
|
|
||||||
if (spaceModelUuid && hasTagsOrSubspaces) {
|
if (spaceModelUuid && hasProductsOrSubspaces) {
|
||||||
throw new HttpException(
|
throw new HttpException(
|
||||||
'For space creation choose either space model or products and subspace',
|
'For space creation choose either space model or products and subspace',
|
||||||
HttpStatus.CONFLICT,
|
HttpStatus.CONFLICT,
|
||||||
@ -717,13 +729,13 @@ export class SpaceService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async createAllocations(
|
private async createAllocations(
|
||||||
tags: ProcessTagDto[],
|
productAllocations: CreateProductAllocationDto[],
|
||||||
projectUuid: string,
|
projectUuid: string,
|
||||||
queryRunner: QueryRunner,
|
queryRunner: QueryRunner,
|
||||||
space: SpaceEntity,
|
space: SpaceEntity,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const allocationsData = await this.tagService.processTags(
|
const allocationsData = await this.tagService.upsertTags(
|
||||||
tags,
|
productAllocations,
|
||||||
projectUuid,
|
projectUuid,
|
||||||
queryRunner,
|
queryRunner,
|
||||||
);
|
);
|
||||||
@ -733,15 +745,17 @@ export class SpaceService {
|
|||||||
const createdTagsByName = new Map(allocationsData.map((t) => [t.name, t]));
|
const createdTagsByName = new Map(allocationsData.map((t) => [t.name, t]));
|
||||||
|
|
||||||
// Create the product-tag mapping based on the processed tags
|
// Create the product-tag mapping based on the processed tags
|
||||||
const productTagMapping = tags.map(({ uuid, name, productUuid }) => {
|
const productTagMapping = productAllocations.map(
|
||||||
const inputTag = uuid
|
({ tagUuid, tagName, productUuid }) => {
|
||||||
? createdTagsByUUID.get(uuid)
|
const inputTag = tagUuid
|
||||||
: createdTagsByName.get(name);
|
? createdTagsByUUID.get(tagUuid)
|
||||||
return {
|
: createdTagsByName.get(tagName);
|
||||||
tag: inputTag?.uuid,
|
return {
|
||||||
product: productUuid,
|
tag: inputTag?.uuid,
|
||||||
};
|
product: productUuid,
|
||||||
});
|
};
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
await this.spaceProductAllocationService.createProductAllocations(
|
await this.spaceProductAllocationService.createProductAllocations(
|
||||||
space,
|
space,
|
||||||
|
@ -3,7 +3,7 @@ import { SubspaceProductAllocationEntity } from '@app/common/modules/space/entit
|
|||||||
import { SubspaceEntity } from '@app/common/modules/space/entities/subspace/subspace.entity';
|
import { SubspaceEntity } from '@app/common/modules/space/entities/subspace/subspace.entity';
|
||||||
import { SubspaceProductAllocationRepository } from '@app/common/modules/space/repositories/subspace.repository';
|
import { SubspaceProductAllocationRepository } from '@app/common/modules/space/repositories/subspace.repository';
|
||||||
import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
|
import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
|
||||||
import { UpdateSpaceAllocationDto } from 'src/space/interfaces/update-subspace-allocation.dto';
|
import { UpdateSubspaceDto } from 'src/space/dtos';
|
||||||
import { TagService as NewTagService } from 'src/tags/services';
|
import { TagService as NewTagService } from 'src/tags/services';
|
||||||
import { In, Not, QueryRunner } from 'typeorm';
|
import { In, Not, QueryRunner } from 'typeorm';
|
||||||
|
|
||||||
@ -60,31 +60,46 @@ export class SubspaceProductAllocationService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async updateSubspaceProductAllocationsV2(
|
async updateSubspaceProductAllocationsV2(
|
||||||
subSpaces: UpdateSpaceAllocationDto[],
|
subSpaces: UpdateSubspaceDto[],
|
||||||
projectUuid: string,
|
projectUuid: string,
|
||||||
queryRunner: QueryRunner,
|
queryRunner: QueryRunner,
|
||||||
) {
|
) {
|
||||||
await Promise.all(
|
await Promise.all(
|
||||||
subSpaces.map(async (subspace) => {
|
subSpaces.map(async (subspace) => {
|
||||||
await queryRunner.manager.delete(SubspaceProductAllocationEntity, {
|
await queryRunner.manager.delete(SubspaceProductAllocationEntity, {
|
||||||
subspace: { uuid: subspace.uuid },
|
subspace: subspace.uuid ? { uuid: subspace.uuid } : undefined,
|
||||||
tag: {
|
tag: subspace.productAllocations
|
||||||
uuid: Not(
|
? {
|
||||||
In(
|
uuid: Not(
|
||||||
subspace.tags.filter((tag) => tag.uuid).map((tag) => tag.uuid),
|
In(
|
||||||
),
|
subspace.productAllocations
|
||||||
),
|
.filter((allocation) => allocation.tagUuid)
|
||||||
},
|
.map((allocation) => allocation.tagUuid),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
}
|
||||||
|
: undefined,
|
||||||
|
product: subspace.productAllocations
|
||||||
|
? {
|
||||||
|
uuid: Not(
|
||||||
|
In(
|
||||||
|
subspace.productAllocations
|
||||||
|
.filter((allocation) => allocation.productUuid)
|
||||||
|
.map((allocation) => allocation.productUuid),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
}
|
||||||
|
: undefined,
|
||||||
});
|
});
|
||||||
|
|
||||||
const subspaceEntity = await queryRunner.manager.findOne(
|
const subspaceEntity = await queryRunner.manager.findOne(
|
||||||
SubspaceEntity,
|
SubspaceEntity,
|
||||||
{
|
{
|
||||||
where: { uuid: subspace.uuid },
|
where: { uuid: subspace.uuid },
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
const processedTags = await this.tagService.upsertTags(
|
||||||
const processedTags = await this.tagService.processTags(
|
subspace.productAllocations,
|
||||||
subspace.tags,
|
|
||||||
projectUuid,
|
projectUuid,
|
||||||
queryRunner,
|
queryRunner,
|
||||||
);
|
);
|
||||||
@ -97,11 +112,11 @@ export class SubspaceProductAllocationService {
|
|||||||
);
|
);
|
||||||
|
|
||||||
// Create the product-tag mapping based on the processed tags
|
// Create the product-tag mapping based on the processed tags
|
||||||
const productTagMapping = subspace.tags.map(
|
const productTagMapping = subspace.productAllocations.map(
|
||||||
({ uuid, name, productUuid }) => {
|
({ tagUuid, tagName, productUuid }) => {
|
||||||
const inputTag = uuid
|
const inputTag = tagUuid
|
||||||
? createdTagsByUUID.get(uuid)
|
? createdTagsByUUID.get(tagUuid)
|
||||||
: createdTagsByName.get(name);
|
: createdTagsByName.get(tagName);
|
||||||
return {
|
return {
|
||||||
tag: inputTag?.uuid,
|
tag: inputTag?.uuid,
|
||||||
product: productUuid,
|
product: productUuid,
|
||||||
@ -118,71 +133,6 @@ export class SubspaceProductAllocationService {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// async processDeleteActions(dtos: ModifyTagDto[], queryRunner: QueryRunner) {
|
|
||||||
// // : Promise<SubspaceProductAllocationEntity[]>
|
|
||||||
// try {
|
|
||||||
// // if (!dtos || dtos.length === 0) {
|
|
||||||
// // throw new Error('No DTOs provided for deletion.');
|
|
||||||
// // }
|
|
||||||
// // const tagUuidsToDelete = dtos
|
|
||||||
// // .filter((dto) => dto.action === ModifyAction.DELETE && dto.tagUuid)
|
|
||||||
// // .map((dto) => dto.tagUuid);
|
|
||||||
// // if (tagUuidsToDelete.length === 0) return [];
|
|
||||||
// // const allocationsToUpdate = await queryRunner.manager.find(
|
|
||||||
// // SubspaceProductAllocationEntity,
|
|
||||||
// // {
|
|
||||||
// // where: { tag: In(tagUuidsToDelete) },
|
|
||||||
// // },
|
|
||||||
// // );
|
|
||||||
// // if (!allocationsToUpdate || allocationsToUpdate.length === 0) return [];
|
|
||||||
// // const deletedAllocations: SubspaceProductAllocationEntity[] = [];
|
|
||||||
// // const allocationUpdates: SubspaceProductAllocationEntity[] = [];
|
|
||||||
// // for (const allocation of allocationsToUpdate) {
|
|
||||||
// // const updatedTags = allocation.tags.filter(
|
|
||||||
// // (tag) => !tagUuidsToDelete.includes(tag.uuid),
|
|
||||||
// // );
|
|
||||||
// // if (updatedTags.length === allocation.tags.length) {
|
|
||||||
// // continue;
|
|
||||||
// // }
|
|
||||||
// // if (updatedTags.length === 0) {
|
|
||||||
// // deletedAllocations.push(allocation);
|
|
||||||
// // } else {
|
|
||||||
// // allocation.tags = updatedTags;
|
|
||||||
// // allocationUpdates.push(allocation);
|
|
||||||
// // }
|
|
||||||
// // }
|
|
||||||
// // if (allocationUpdates.length > 0) {
|
|
||||||
// // await queryRunner.manager.save(
|
|
||||||
// // SubspaceProductAllocationEntity,
|
|
||||||
// // allocationUpdates,
|
|
||||||
// // );
|
|
||||||
// // }
|
|
||||||
// // if (deletedAllocations.length > 0) {
|
|
||||||
// // await queryRunner.manager.remove(
|
|
||||||
// // SubspaceProductAllocationEntity,
|
|
||||||
// // deletedAllocations,
|
|
||||||
// // );
|
|
||||||
// // }
|
|
||||||
// // await queryRunner.manager
|
|
||||||
// // .createQueryBuilder()
|
|
||||||
// // .delete()
|
|
||||||
// // .from('subspace_product_tags')
|
|
||||||
// // .where(
|
|
||||||
// // 'subspace_product_allocation_uuid NOT IN ' +
|
|
||||||
// // queryRunner.manager
|
|
||||||
// // .createQueryBuilder()
|
|
||||||
// // .select('allocation.uuid')
|
|
||||||
// // .from(SubspaceProductAllocationEntity, 'allocation')
|
|
||||||
// // .getQuery() +
|
|
||||||
// // ')',
|
|
||||||
// // )
|
|
||||||
// // .execute();
|
|
||||||
// // return deletedAllocations;
|
|
||||||
// } catch (error) {
|
|
||||||
// throw this.handleError(error, `Failed to delete tags in subspace`);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
async unlinkModels(
|
async unlinkModels(
|
||||||
allocations: SubspaceProductAllocationEntity[],
|
allocations: SubspaceProductAllocationEntity[],
|
||||||
queryRunner: QueryRunner,
|
queryRunner: QueryRunner,
|
||||||
@ -205,67 +155,6 @@ export class SubspaceProductAllocationService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// private async validateTagWithinSubspace(
|
|
||||||
// queryRunner: QueryRunner | undefined,
|
|
||||||
// tag: NewTagEntity & { product: string },
|
|
||||||
// subspace: SubspaceEntity,
|
|
||||||
// spaceAllocationsToExclude?: SpaceProductAllocationEntity[],
|
|
||||||
// ): Promise<void> {
|
|
||||||
// // const existingTagInSpace = await (queryRunner
|
|
||||||
// // ? queryRunner.manager.findOne(SpaceProductAllocationEntity, {
|
|
||||||
// // where: {
|
|
||||||
// // product: { uuid: tag.product },
|
|
||||||
// // space: { uuid: subspace.space.uuid },
|
|
||||||
// // tag: { uuid: tag.uuid },
|
|
||||||
// // },
|
|
||||||
// // })
|
|
||||||
// // : this.spaceProductAllocationRepository.findOne({
|
|
||||||
// // where: {
|
|
||||||
// // product: { uuid: tag.product },
|
|
||||||
// // space: { uuid: subspace.space.uuid },
|
|
||||||
// // tag: { uuid: tag.uuid },
|
|
||||||
// // },
|
|
||||||
// // }));
|
|
||||||
// // const isExcluded = spaceAllocationsToExclude?.some(
|
|
||||||
// // (excludedAllocation) =>
|
|
||||||
// // excludedAllocation.product.uuid === tag.product &&
|
|
||||||
// // excludedAllocation.tags.some((t) => t.uuid === tag.uuid),
|
|
||||||
// // );
|
|
||||||
// // if (!isExcluded && existingTagInSpace) {
|
|
||||||
// // throw new HttpException(
|
|
||||||
// // `Tag ${tag.uuid} (Product: ${tag.product}) is already allocated at the space level (${subspace.space.uuid}). Cannot allocate the same tag in a subspace.`,
|
|
||||||
// // HttpStatus.BAD_REQUEST,
|
|
||||||
// // );
|
|
||||||
// // }
|
|
||||||
// // // ?: Check if the tag is already allocated in another "subspace" within the same space
|
|
||||||
// // const existingTagInSameSpace = await (queryRunner
|
|
||||||
// // ? queryRunner.manager.findOne(SubspaceProductAllocationEntity, {
|
|
||||||
// // where: {
|
|
||||||
// // product: { uuid: tag.product },
|
|
||||||
// // subspace: { space: subspace.space },
|
|
||||||
// // tag: { uuid: tag.uuid },
|
|
||||||
// // },
|
|
||||||
// // relations: ['subspace'],
|
|
||||||
// // })
|
|
||||||
// // : this.subspaceProductAllocationRepository.findOne({
|
|
||||||
// // where: {
|
|
||||||
// // product: { uuid: tag.product },
|
|
||||||
// // subspace: { space: subspace.space },
|
|
||||||
// // tag: { uuid: tag.uuid },
|
|
||||||
// // },
|
|
||||||
// // relations: ['subspace'],
|
|
||||||
// // }));
|
|
||||||
// // if (
|
|
||||||
// // existingTagInSameSpace &&
|
|
||||||
// // existingTagInSameSpace.subspace.uuid !== subspace.uuid
|
|
||||||
// // ) {
|
|
||||||
// // throw new HttpException(
|
|
||||||
// // `Tag ${tag.uuid} (Product: ${tag.product}) is already allocated in another subspace (${existingTagInSameSpace.subspace.uuid}) within the same space (${subspace.space.uuid}).`,
|
|
||||||
// // HttpStatus.BAD_REQUEST,
|
|
||||||
// // );
|
|
||||||
// // }
|
|
||||||
// }
|
|
||||||
|
|
||||||
private createNewSubspaceAllocation(
|
private createNewSubspaceAllocation(
|
||||||
subspace: SubspaceEntity,
|
subspace: SubspaceEntity,
|
||||||
allocationData: { product: string; tag: string },
|
allocationData: { product: string; tag: string },
|
||||||
|
@ -12,7 +12,7 @@ import {
|
|||||||
AddSubspaceDto,
|
AddSubspaceDto,
|
||||||
GetSpaceParam,
|
GetSpaceParam,
|
||||||
GetSubSpaceParam,
|
GetSubSpaceParam,
|
||||||
ModifySubspaceDto,
|
UpdateSubspaceDto,
|
||||||
} from '../../dtos';
|
} from '../../dtos';
|
||||||
|
|
||||||
import { SubspaceModelEntity } from '@app/common/modules/space-model';
|
import { SubspaceModelEntity } from '@app/common/modules/space-model';
|
||||||
@ -103,13 +103,13 @@ export class SubSpaceService {
|
|||||||
queryRunner,
|
queryRunner,
|
||||||
);
|
);
|
||||||
await Promise.all(
|
await Promise.all(
|
||||||
addSubspaceDtos.map(async ({ tags }, index) => {
|
addSubspaceDtos.map(async ({ productAllocations }, index) => {
|
||||||
// map the dto to the corresponding subspace
|
// map the dto to the corresponding subspace
|
||||||
const subspace = createdSubspaces[index];
|
const subspace = createdSubspaces[index];
|
||||||
await this.createAllocations({
|
await this.createAllocations({
|
||||||
projectUuid,
|
projectUuid,
|
||||||
queryRunner,
|
queryRunner,
|
||||||
tags,
|
productAllocations,
|
||||||
type: AllocationsOwnerType.SUBSPACE,
|
type: AllocationsOwnerType.SUBSPACE,
|
||||||
subspace,
|
subspace,
|
||||||
});
|
});
|
||||||
@ -145,7 +145,7 @@ export class SubSpaceService {
|
|||||||
space,
|
space,
|
||||||
);
|
);
|
||||||
const newSubspace = this.subspaceRepository.create({
|
const newSubspace = this.subspaceRepository.create({
|
||||||
...addSubspaceDto,
|
subspaceName: addSubspaceDto.subspaceName,
|
||||||
space,
|
space,
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -305,7 +305,7 @@ export class SubSpaceService {
|
|||||||
} */
|
} */
|
||||||
|
|
||||||
async updateSubspaceInSpace(
|
async updateSubspaceInSpace(
|
||||||
subspaceDtos: ModifySubspaceDto[],
|
subspaceDtos: UpdateSubspaceDto[],
|
||||||
queryRunner: QueryRunner,
|
queryRunner: QueryRunner,
|
||||||
space: SpaceEntity,
|
space: SpaceEntity,
|
||||||
projectUuid: string,
|
projectUuid: string,
|
||||||
@ -324,42 +324,52 @@ export class SubSpaceService {
|
|||||||
disabled: true,
|
disabled: true,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
await queryRunner.manager.delete(SubspaceProductAllocationEntity, {
|
await queryRunner.manager.delete(SubspaceProductAllocationEntity, {
|
||||||
subspace: { uuid: Not(In(subspaceDtos.map((dto) => dto.uuid))) },
|
subspace: {
|
||||||
|
uuid: Not(
|
||||||
|
In(subspaceDtos.filter(({ uuid }) => uuid).map(({ uuid }) => uuid)),
|
||||||
|
),
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
// create or update subspaces provided in the list
|
// create or update subspaces provided in the list
|
||||||
const newSubspaces = this.subspaceRepository.create(
|
const newSubspaces = this.subspaceRepository.create(
|
||||||
subspaceDtos.filter((dto) => !dto.uuid),
|
subspaceDtos
|
||||||
|
.filter((dto) => !dto.uuid)
|
||||||
|
.map((dto) => ({
|
||||||
|
subspaceName: dto.subspaceName,
|
||||||
|
space,
|
||||||
|
})),
|
||||||
);
|
);
|
||||||
|
|
||||||
const updatedSubspaces: SubspaceEntity[] = await queryRunner.manager.save(
|
const updatedSubspaces: SubspaceEntity[] = await queryRunner.manager.save(
|
||||||
SubspaceEntity,
|
SubspaceEntity,
|
||||||
[...newSubspaces, ...subspaceDtos.filter((dto) => dto.uuid)].map(
|
[
|
||||||
(subspace) => ({ ...subspace, space }),
|
...newSubspaces,
|
||||||
),
|
...subspaceDtos
|
||||||
|
.filter((dto) => dto.uuid)
|
||||||
|
.map((dto) => ({
|
||||||
|
subspaceName: dto.subspaceName,
|
||||||
|
space,
|
||||||
|
})),
|
||||||
|
],
|
||||||
);
|
);
|
||||||
|
|
||||||
// create or update allocations for the subspaces
|
// create or update allocations for the subspaces
|
||||||
if (updatedSubspaces.length > 0) {
|
if (updatedSubspaces.length > 0) {
|
||||||
await this.subspaceProductAllocationService.updateSubspaceProductAllocationsV2(
|
await this.subspaceProductAllocationService.updateSubspaceProductAllocationsV2(
|
||||||
subspaceDtos.map((dto) => {
|
subspaceDtos.map((dto) => ({
|
||||||
if (!dto.uuid) {
|
...dto,
|
||||||
dto.uuid = updatedSubspaces.find(
|
uuid:
|
||||||
(subspace) => subspace.subspaceName === dto.subspaceName,
|
dto.uuid ||
|
||||||
)?.uuid;
|
updatedSubspaces.find((s) => s.subspaceName === dto.subspaceName)
|
||||||
}
|
?.uuid,
|
||||||
return {
|
})),
|
||||||
tags: dto.tags || [],
|
|
||||||
uuid: dto.uuid,
|
|
||||||
};
|
|
||||||
}),
|
|
||||||
projectUuid,
|
projectUuid,
|
||||||
queryRunner,
|
queryRunner,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.log(error);
|
||||||
throw new HttpException(
|
throw new HttpException(
|
||||||
`An error occurred while modifying subspaces: ${error.message}`,
|
`An error occurred while modifying subspaces: ${error.message}`,
|
||||||
HttpStatus.INTERNAL_SERVER_ERROR,
|
HttpStatus.INTERNAL_SERVER_ERROR,
|
||||||
@ -478,10 +488,10 @@ export class SubSpaceService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async createAllocations(dto: CreateAllocationsDto): Promise<void> {
|
async createAllocations(dto: CreateAllocationsDto): Promise<void> {
|
||||||
const { projectUuid, queryRunner, tags, type } = dto;
|
const { projectUuid, queryRunner, productAllocations, type } = dto;
|
||||||
|
if (!productAllocations) return;
|
||||||
const allocationsData = await this.newTagService.processTags(
|
const allocationsData = await this.newTagService.upsertTags(
|
||||||
tags,
|
productAllocations,
|
||||||
projectUuid,
|
projectUuid,
|
||||||
queryRunner,
|
queryRunner,
|
||||||
);
|
);
|
||||||
@ -491,15 +501,17 @@ export class SubSpaceService {
|
|||||||
const createdTagsByName = new Map(allocationsData.map((t) => [t.name, t]));
|
const createdTagsByName = new Map(allocationsData.map((t) => [t.name, t]));
|
||||||
|
|
||||||
// Create the product-tag mapping based on the processed tags
|
// Create the product-tag mapping based on the processed tags
|
||||||
const productTagMapping = tags.map(({ uuid, name, productUuid }) => {
|
const productTagMapping = productAllocations.map(
|
||||||
const inputTag = uuid
|
({ tagUuid, tagName, productUuid }) => {
|
||||||
? createdTagsByUUID.get(uuid)
|
const inputTag = tagUuid
|
||||||
: createdTagsByName.get(name);
|
? createdTagsByUUID.get(tagUuid)
|
||||||
return {
|
: createdTagsByName.get(tagName);
|
||||||
tag: inputTag?.uuid,
|
return {
|
||||||
product: productUuid,
|
tag: inputTag?.uuid,
|
||||||
};
|
product: productUuid,
|
||||||
});
|
};
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case AllocationsOwnerType.SUBSPACE: {
|
case AllocationsOwnerType.SUBSPACE: {
|
||||||
|
@ -79,7 +79,6 @@ import { SpaceValidationController } from './controllers/space-validation.contro
|
|||||||
import { DisableSpaceHandler } from './handlers';
|
import { DisableSpaceHandler } from './handlers';
|
||||||
import {
|
import {
|
||||||
SpaceDeviceService,
|
SpaceDeviceService,
|
||||||
SpaceLinkService,
|
|
||||||
SpaceSceneService,
|
SpaceSceneService,
|
||||||
SpaceService,
|
SpaceService,
|
||||||
SpaceUserService,
|
SpaceUserService,
|
||||||
@ -110,7 +109,6 @@ export const CommandHandlers = [DisableSpaceHandler];
|
|||||||
ProductRepository,
|
ProductRepository,
|
||||||
SubSpaceService,
|
SubSpaceService,
|
||||||
SpaceDeviceService,
|
SpaceDeviceService,
|
||||||
SpaceLinkService,
|
|
||||||
SubspaceDeviceService,
|
SubspaceDeviceService,
|
||||||
SpaceRepository,
|
SpaceRepository,
|
||||||
SubspaceRepository,
|
SubspaceRepository,
|
||||||
|
@ -14,8 +14,8 @@ import {
|
|||||||
Injectable,
|
Injectable,
|
||||||
NotFoundException,
|
NotFoundException,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
|
import { CreateProductAllocationDto } from 'src/space/dtos';
|
||||||
import { In, QueryRunner } from 'typeorm';
|
import { In, QueryRunner } from 'typeorm';
|
||||||
import { ProcessTagDto } from '../dtos';
|
|
||||||
import { CreateTagDto } from '../dtos/tags.dto';
|
import { CreateTagDto } from '../dtos/tags.dto';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
@ -68,13 +68,13 @@ export class TagService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Processes an array of tag DTOs, creating or updating tags in the database.
|
* Processes an array of tag DTOs, creating or updating tags in the database.
|
||||||
* @param tagDtos - The array of tag DTOs to process.
|
* @param allocationDtos - The array of allocations DTOs to process.
|
||||||
* @param projectUuid - The UUID of the project to associate the tags with.
|
* @param projectUuid - The UUID of the project to associate the tags with.
|
||||||
* @param queryRunner - Optional TypeORM query runner for transaction management.
|
* @param queryRunner - Optional TypeORM query runner for transaction management.
|
||||||
* @returns An array of the processed tag entities.
|
* @returns An array of the processed tag entities.
|
||||||
*/
|
*/
|
||||||
async processTags(
|
async upsertTags(
|
||||||
tagDtos: ProcessTagDto[],
|
allocationDtos: CreateProductAllocationDto[],
|
||||||
projectUuid: string,
|
projectUuid: string,
|
||||||
queryRunner?: QueryRunner,
|
queryRunner?: QueryRunner,
|
||||||
): Promise<NewTagEntity[]> {
|
): Promise<NewTagEntity[]> {
|
||||||
@ -82,20 +82,22 @@ export class TagService {
|
|||||||
const dbManager = queryRunner
|
const dbManager = queryRunner
|
||||||
? queryRunner.manager
|
? queryRunner.manager
|
||||||
: this.tagRepository.manager;
|
: this.tagRepository.manager;
|
||||||
if (!tagDtos || tagDtos.length === 0) {
|
if (!allocationDtos || allocationDtos.length === 0) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
const [tagsWithUuid, tagsWithoutUuid]: [
|
const [allocationsWithTagUuid, allocationsWithoutTagUuid]: [
|
||||||
Pick<ProcessTagDto, 'uuid' | 'productUuid'>[],
|
Pick<CreateProductAllocationDto, 'tagUuid' | 'productUuid'>[],
|
||||||
Omit<ProcessTagDto, 'uuid'>[],
|
Omit<CreateProductAllocationDto, 'tagUuid'>[],
|
||||||
] = this.splitTagsByUuid(tagDtos);
|
] = this.splitTagsByUuid(allocationDtos);
|
||||||
|
|
||||||
// create a set of unique existing tag names for the project
|
// create a set of unique existing tag names for the project
|
||||||
const upsertedTagsByNameResult = await dbManager.upsert(
|
const upsertedTagsByNameResult = await dbManager.upsert(
|
||||||
NewTagEntity,
|
NewTagEntity,
|
||||||
Array.from(
|
Array.from(
|
||||||
new Set<string>(tagsWithoutUuid.map((tag) => tag.name)).values(),
|
new Set<string>(
|
||||||
|
allocationsWithoutTagUuid.map((allocation) => allocation.tagName),
|
||||||
|
).values(),
|
||||||
).map((name) => ({
|
).map((name) => ({
|
||||||
name,
|
name,
|
||||||
project: { uuid: projectUuid },
|
project: { uuid: projectUuid },
|
||||||
@ -111,20 +113,22 @@ export class TagService {
|
|||||||
|
|
||||||
let foundByUuidTags: NewTagEntity[] = [];
|
let foundByUuidTags: NewTagEntity[] = [];
|
||||||
// Fetch existing tags using UUIDs
|
// Fetch existing tags using UUIDs
|
||||||
if (tagsWithUuid.length) {
|
if (allocationsWithTagUuid.length) {
|
||||||
foundByUuidTags = await dbManager.find(NewTagEntity, {
|
foundByUuidTags = await dbManager.find(NewTagEntity, {
|
||||||
where: {
|
where: {
|
||||||
uuid: In([...tagsWithUuid.map((tag) => tag.uuid)]),
|
uuid: In([
|
||||||
|
...allocationsWithTagUuid.map((allocation) => allocation.tagUuid),
|
||||||
|
]),
|
||||||
project: { uuid: projectUuid },
|
project: { uuid: projectUuid },
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ensure all provided UUIDs exist in the database
|
// Ensure all provided UUIDs exist in the database
|
||||||
if (foundByUuidTags.length !== tagsWithUuid.length) {
|
if (foundByUuidTags.length !== allocationsWithTagUuid.length) {
|
||||||
const foundUuids = new Set(foundByUuidTags.map((tag) => tag.uuid));
|
const foundUuids = new Set(foundByUuidTags.map((tag) => tag.uuid));
|
||||||
const missingUuids = tagsWithUuid.filter(
|
const missingUuids = allocationsWithTagUuid.filter(
|
||||||
({ uuid }) => !foundUuids.has(uuid),
|
({ tagUuid }) => !foundUuids.has(tagUuid),
|
||||||
);
|
);
|
||||||
|
|
||||||
throw new HttpException(
|
throw new HttpException(
|
||||||
@ -179,20 +183,22 @@ export class TagService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private splitTagsByUuid(
|
private splitTagsByUuid(
|
||||||
tagDtos: ProcessTagDto[],
|
allocationsDtos: CreateProductAllocationDto[],
|
||||||
): [ProcessTagDto[], ProcessTagDto[]] {
|
): [CreateProductAllocationDto[], CreateProductAllocationDto[]] {
|
||||||
return tagDtos.reduce<[ProcessTagDto[], ProcessTagDto[]]>(
|
return allocationsDtos.reduce<
|
||||||
([withUuid, withoutUuid], tag) => {
|
[CreateProductAllocationDto[], CreateProductAllocationDto[]]
|
||||||
if (tag.uuid) {
|
>(
|
||||||
withUuid.push(tag);
|
([withUuid, withoutUuid], allocation) => {
|
||||||
|
if (allocation.tagUuid) {
|
||||||
|
withUuid.push(allocation);
|
||||||
} else {
|
} else {
|
||||||
if (!tag.name || !tag.productUuid) {
|
if (!allocation.tagName || !allocation.productUuid) {
|
||||||
throw new HttpException(
|
throw new HttpException(
|
||||||
`Tag name or product UUID is missing`,
|
`Tag name or product UUID is missing`,
|
||||||
HttpStatus.BAD_REQUEST,
|
HttpStatus.BAD_REQUEST,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
withoutUuid.push(tag);
|
withoutUuid.push(allocation);
|
||||||
}
|
}
|
||||||
return [withUuid, withoutUuid];
|
return [withUuid, withoutUuid];
|
||||||
},
|
},
|
||||||
|
@ -1,38 +1,5 @@
|
|||||||
import { ApiProperty } from '@nestjs/swagger';
|
import { ApiProperty } from '@nestjs/swagger';
|
||||||
import {
|
import { IsNotEmpty, IsString } from 'class-validator';
|
||||||
IsBoolean,
|
|
||||||
IsNotEmpty,
|
|
||||||
IsOptional,
|
|
||||||
IsString,
|
|
||||||
IsUUID,
|
|
||||||
} from 'class-validator';
|
|
||||||
|
|
||||||
export class AddSpaceDto {
|
|
||||||
@ApiProperty({
|
|
||||||
description: 'Name of the space (e.g., Floor 1, Unit 101)',
|
|
||||||
example: 'Unit 101',
|
|
||||||
})
|
|
||||||
@IsString()
|
|
||||||
@IsNotEmpty()
|
|
||||||
spaceName: string;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
description: 'UUID of the parent space (if any, for hierarchical spaces)',
|
|
||||||
example: 'f5d7e9c3-44bc-4b12-88f1-1b3cda84752e',
|
|
||||||
required: false,
|
|
||||||
})
|
|
||||||
@IsUUID()
|
|
||||||
@IsOptional()
|
|
||||||
parentUuid?: string;
|
|
||||||
|
|
||||||
@ApiProperty({
|
|
||||||
description: 'Indicates whether the space is private or public',
|
|
||||||
example: false,
|
|
||||||
default: false,
|
|
||||||
})
|
|
||||||
@IsBoolean()
|
|
||||||
isPrivate: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class AddUserSpaceDto {
|
export class AddUserSpaceDto {
|
||||||
@ApiProperty({
|
@ApiProperty({
|
||||||
|
Reference in New Issue
Block a user