ammar/backend
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/backend.git synced 2025-07-17 03:05:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into SP-232-consume-the-tuya-messaging-service-for-device-logs

Browse Source
This commit is contained in:
faris Aljohari
2024-06-02 19:09:58 +03:00
parent 0a830ddf05 36ea87ec86
commit 948d133e4f
20 changed files with 460 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/common/src/modules/device/dtos/device.dto.ts
View File

@ -9,6 +9,10 @@ export class DeviceDto {
@IsNotEmpty()
spaceUuid: string;
@IsString()
@IsNotEmpty()
userUuid: string;
@IsString()
@IsNotEmpty()
deviceTuyaUuid: string;

8
libs/common/src/modules/device/entities/device.entity.ts
View File

@ -6,9 +6,10 @@ import { SpaceEntity } from '../../space/entities';
import { ProductEntity } from '../../product/entities';
import { DeviceUserPermissionEntity } from '../../device-user-permission/entities';
import { DeviceNotificationEntity } from '../../device-notification/entities';
import { UserEntity } from '../../user/entities';
@Entity({ name: 'device' })
@Unique(['spaceDevice', 'deviceTuyaUuid'])
@Unique(['deviceTuyaUuid'])
export class DeviceEntity extends AbstractEntity<DeviceDto> {
@Column({
nullable: false,
@ -21,6 +22,9 @@ export class DeviceEntity extends AbstractEntity<DeviceDto> {
})
isActive: true;
@ManyToOne(() => UserEntity, (user) => user.userSpaces, { nullable: false })
user: UserEntity;
@OneToMany(
() => DeviceUserPermissionEntity,
(permission) => permission.device,
@ -44,7 +48,7 @@ export class DeviceEntity extends AbstractEntity<DeviceDto> {
userGroupDevices: GroupDeviceEntity[];
@ManyToOne(() => SpaceEntity, (space) => space.devicesSpaceEntity, {
nullable: false,
nullable: true,
})
spaceDevice: SpaceEntity;

4
libs/common/src/modules/space/dtos/space.dto.ts
View File

@ -16,4 +16,8 @@ export class SpaceDto {
@IsString()
@IsNotEmpty()
public spaceTypeUuid: string;
@IsString()
@IsNotEmpty()
public invitationCode: string;
}

8
libs/common/src/modules/space/entities/space.entity.ts
View File

@ -1,4 +1,4 @@
import { Column, Entity, ManyToOne, OneToMany } from 'typeorm';
import { Column, Entity, ManyToOne, OneToMany, Unique } from 'typeorm';
import { SpaceDto } from '../dtos';
import { AbstractEntity } from '../../abstract/entities/abstract.entity';
import { SpaceTypeEntity } from '../../space-type/entities';
@ -6,6 +6,7 @@ import { UserSpaceEntity } from '../../user-space/entities';
import { DeviceEntity } from '../../device/entities';
@Entity({ name: 'space' })
@Unique(['invitationCode'])
export class SpaceEntity extends AbstractEntity<SpaceDto> {
@Column({
type: 'uuid',
@ -18,6 +19,11 @@ export class SpaceEntity extends AbstractEntity<SpaceDto> {
nullable: false,
})
public spaceName: string;
@Column({
nullable: true,
})
public invitationCode: string;
@ManyToOne(() => SpaceEntity, (space) => space.children, { nullable: true })
parent: SpaceEntity;

10
libs/common/src/modules/user/entities/user.entity.ts
View File

@ -6,6 +6,7 @@ import { UserSpaceEntity } from '../../user-space/entities';
import { UserRoleEntity } from '../../user-role/entities';
import { DeviceNotificationEntity } from '../../device-notification/entities';
import { UserNotificationEntity } from '../../user-notification/entities';
import { DeviceEntity } from '../../device/entities';
@Entity({ name: 'user' })
export class UserEntity extends AbstractEntity<UserDto> {
@ -55,6 +56,15 @@ export class UserEntity extends AbstractEntity<UserDto> {
@OneToMany(() => UserSpaceEntity, (userSpace) => userSpace.user)
userSpaces: UserSpaceEntity[];
@OneToMany(() => DeviceEntity, (userDevice) => userDevice.user)
userDevice: DeviceEntity[];
@OneToMany(() => DeviceEntity, (userDevice) => userDevice.user)
userDevice: DeviceEntity[];
@OneToMany(() => DeviceEntity, (userDevice) => userDevice.user)
userDevice: DeviceEntity[];
@OneToMany(
() => UserNotificationEntity,
(userNotification) => userNotification.user,