Merge branch 'dev' into SP-1754-be-implement-configure-space

libs/common/src/database/database.module.ts

@@ -25,6 +25,7 @@ import {
   InviteUserEntity,
   InviteUserSpaceEntity,
 } from '../modules/Invite-user/entities';
+import { SpaceDailyOccupancyDurationEntity } from '../modules/occupancy/entities';
 import {
   PowerClampDailyEntity,
   PowerClampHourlyEntity,
@@ -46,7 +47,6 @@ import {
   SubspaceModelProductAllocationEntity,
 } from '../modules/space-model/entities';
 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 { SpaceEntity } from '../modules/space/entities/space.entity';
 import { SubspaceProductAllocationEntity } from '../modules/space/entities/subspace/subspace-product-allocation.entity';
@@ -58,7 +58,6 @@ import {
   UserSpaceEntity,
 } from '../modules/user/entities';
 import { VisitorPasswordEntity } from '../modules/visitor-password/entities';
-import { SpaceDailyOccupancyDurationEntity } from '../modules/occupancy/entities';
 import { BookableSpaceEntity } from '../modules/booking/entities';
 @Module({
   imports: [
@@ -88,7 +87,6 @@ import { BookableSpaceEntity } from '../modules/booking/entities';
             PermissionTypeEntity,
             CommunityEntity,
             SpaceEntity,
-            SpaceLinkEntity,
             SubspaceEntity,
             UserSpaceEntity,
             DeviceUserPermissionEntity,

libs/common/src/dto/pagination.request.dto.ts

@@ -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 { IsSizeRequestParam } from '../validators/is-size-request-param.validator';
 import { Transform } from 'class-transformer';
-import { parseToDate } from '../util/parseToDate';
+import { IsBoolean, IsOptional } from 'class-validator';
 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 {
   @ApiProperty({
@@ -19,6 +18,7 @@ export class PaginationRequestGetListDto {
     return value.obj.includeSpaces === BooleanValues.TRUE;
   })
   public includeSpaces?: boolean = false;
+
   @IsOptional()
   @IsPageRequestParam({
     message: 'Page must be bigger than 0',
@@ -40,40 +40,4 @@ export class PaginationRequestGetListDto {
     description: 'Size request',
   })
   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;
 }

libs/common/src/modules/space/entities/space-link.entity.ts

@@ -1,32 +1,3 @@
-import { Column, Entity, JoinColumn, ManyToOne } from 'typeorm';
 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 {
-  @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);
-  }
-}
+export class SpaceLinkEntity extends AbstractEntity {}

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

@@ -8,13 +8,16 @@ import {
 } from 'typeorm';
 import { SpaceDto } from '../dtos';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
-import { UserSpaceEntity } from '../../user/entities';
-import { DeviceEntity } from '../../device/entities';
+import { AqiSpaceDailyPollutantStatsEntity } from '../../aqi/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 { 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 { SubspaceEntity } from './subspace/subspace.entity';
 import { PresenceSensorDailySpaceEntity } from '../../presence-sensor/entities';
@@ -83,16 +86,6 @@ export class SpaceEntity extends AbstractEntity<SpaceDto> {
   )
   devices: DeviceEntity[];
 
-  @OneToMany(() => SpaceLinkEntity, (connection) => connection.startSpace, {
-    nullable: true,
-  })
-  public outgoingConnections: SpaceLinkEntity[];
-
-  @OneToMany(() => SpaceLinkEntity, (connection) => connection.endSpace, {
-    nullable: true,
-  })
-  public incomingConnections: SpaceLinkEntity[];
-
   @Column({
     nullable: true,
     type: 'text',

libs/common/src/modules/space/repositories/space.repository.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { DataSource, Repository } from 'typeorm';
 import { InviteSpaceEntity } from '../entities/invite-space.entity';
-import { SpaceLinkEntity } from '../entities/space-link.entity';
 import { SpaceProductAllocationEntity } from '../entities/space-product-allocation.entity';
 import { SpaceEntity } from '../entities/space.entity';
 
@@ -13,11 +12,7 @@ export class SpaceRepository extends Repository<SpaceEntity> {
 }
 
 @Injectable()
-export class SpaceLinkRepository extends Repository<SpaceLinkEntity> {
-  constructor(private dataSource: DataSource) {
-    super(SpaceLinkEntity, dataSource.createEntityManager());
-  }
-}
+export class SpaceLinkRepository {}
 
 @Injectable()
 export class InviteSpaceRepository extends Repository<InviteSpaceEntity> {