Merge pull request #115 from SyncrowIOT/SP-700-error-message-on-device-factory-reset-process

finished soft delete devices
This commit is contained in:
faris Aljohari
2024-10-07 23:12:08 -05:00
committed by GitHub
10 changed files with 39 additions and 7 deletions

View File

@ -85,6 +85,7 @@ export class DeviceStatusFirebaseService {
return await this.deviceRepository.findOne({
where: {
deviceTuyaUuid,
isActive: true,
},
relations: ['productDevice'],
});
@ -139,6 +140,7 @@ export class DeviceStatusFirebaseService {
return await this.deviceRepository.findOne({
where: {
uuid: deviceUuid,
isActive: true,
},
...(withProductDevice && { relations: ['productDevice'] }),
});

View File

@ -18,8 +18,9 @@ export class DeviceEntity extends AbstractEntity<DeviceDto> {
@Column({
nullable: true,
default: true,
type: 'boolean',
})
isActive: true;
isActive: boolean;
@ManyToOne(() => UserEntity, (user) => user.userSpaces, { nullable: false })
user: UserEntity;