merged with dev

This commit is contained in:
unknown
2024-08-11 14:19:02 +03:00
102 changed files with 1898 additions and 641 deletions

View File

@ -7,8 +7,9 @@ import { TuyaWebSocketService } from './services/tuya.web.socket.service';
import { OneSignalService } from './services/onesignal.service';
import { DeviceMessagesService } from './services/device.messages.service';
import { DeviceNotificationRepositoryModule } from '../modules/device-notification/device.notification.module';
import { DeviceNotificationRepository } from '../modules/device-notification/repositories';
import { DeviceRepositoryModule } from '../modules/device/device.repository.module';
import { DeviceNotificationRepository } from '../modules/device/repositories';
import { DeviceStatusFirebaseModule } from '../firebase/devices-status/devices-status.module';
@Global()
@Module({
@ -23,6 +24,10 @@ import { DeviceNotificationRepository } from '../modules/device-notification/rep
],
exports: [HelperHashService, SpacePermissionService],
controllers: [],
imports: [SpaceRepositoryModule, DeviceNotificationRepositoryModule],
imports: [
SpaceRepositoryModule,
DeviceRepositoryModule,
DeviceStatusFirebaseModule,
],
})
export class HelperModule {}

View File

@ -1,5 +1,5 @@
import { Injectable } from '@nestjs/common';
import { DeviceNotificationRepository } from '@app/common/modules/device-notification/repositories';
import { DeviceNotificationRepository } from '@app/common/modules/device/repositories';
import { OneSignalService } from './onesignal.service';
@Injectable()

View File

@ -1,8 +1,7 @@
import { Injectable } from '@nestjs/common';
import TuyaWebsocket from '../../config/tuya-web-socket-config';
import { ConfigService } from '@nestjs/config';
import { OneSignalService } from './onesignal.service';
import { DeviceMessagesService } from './device.messages.service';
import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
@Injectable()
export class TuyaWebSocketService {
@ -10,8 +9,7 @@ export class TuyaWebSocketService {
constructor(
private readonly configService: ConfigService,
private readonly oneSignalService: OneSignalService,
private readonly deviceMessagesService: DeviceMessagesService,
private readonly deviceStatusFirebaseService: DeviceStatusFirebaseService,
) {
// Initialize the TuyaWebsocket client
this.client = new TuyaWebsocket({
@ -39,10 +37,11 @@ export class TuyaWebSocketService {
this.client.message(async (ws: WebSocket, message: any) => {
try {
await this.deviceMessagesService.getDevicesUserNotifications(
message.payload.data.bizData.devId,
message.payload.data.bizData,
);
await this.deviceStatusFirebaseService.addDeviceStatusToFirebase({
deviceTuyaUuid: message.payload.data.bizData.devId,
status: message.payload.data.bizData.properties,
});
this.client.ackMessage(message.messageId);
} catch (error) {
console.error('Error processing message:', error);