mirror of
https://github.com/SyncrowIOT/backend.git
synced 2025-07-17 03:05:13 +00:00
Compare commits
1 Commits
dev
...
DATA-energ
Author | SHA1 | Date | |
---|---|---|---|
ddb205658c |
64
.github/workflows/pr-description.yml
vendored
64
.github/workflows/pr-description.yml
vendored
@ -1,64 +0,0 @@
|
||||
name: 🤖 AI PR Description Commenter (100% Safe with jq)
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types: [opened, edited]
|
||||
|
||||
jobs:
|
||||
generate-description:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout Repo
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install GitHub CLI and jq
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install gh jq -y
|
||||
|
||||
- name: Fetch PR Commits
|
||||
id: fetch_commits
|
||||
run: |
|
||||
COMMITS=$(gh pr view ${{ github.event.pull_request.number }} --json commits --jq '.commits[].message' | sed 's/^/- /')
|
||||
echo "commits<<EOF" >> $GITHUB_ENV
|
||||
echo "$COMMITS" >> $GITHUB_ENV
|
||||
echo "EOF" >> $GITHUB_ENV
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GH_PERSONAL_TOKEN }}
|
||||
|
||||
- name: Generate PR Description with OpenAI (Safe JSON with jq)
|
||||
run: |
|
||||
REQUEST_BODY=$(jq -n \
|
||||
--arg model "gpt-4o" \
|
||||
--arg content "Given the following commit messages:\n\n${commits}\n\nGenerate a clear and professional pull request description." \
|
||||
'{
|
||||
model: $model,
|
||||
messages: [{ role: "user", content: $content }]
|
||||
}'
|
||||
)
|
||||
|
||||
RESPONSE=$(curl -s https://api.openai.com/v1/chat/completions \
|
||||
-H "Authorization: Bearer $OPENAI_API_KEY" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "$REQUEST_BODY")
|
||||
|
||||
DESCRIPTION=$(echo "$RESPONSE" | jq -r '.choices[0].message.content')
|
||||
|
||||
echo "---------- OpenAI Raw Response ----------"
|
||||
echo "$RESPONSE"
|
||||
echo "---------- Extracted Description ----------"
|
||||
echo "$DESCRIPTION"
|
||||
|
||||
echo "description<<EOF" >> $GITHUB_ENV
|
||||
echo "$DESCRIPTION" >> $GITHUB_ENV
|
||||
echo "EOF" >> $GITHUB_ENV
|
||||
env:
|
||||
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
|
||||
commits: ${{ env.commits }}
|
||||
|
||||
- name: Post AI Generated Description as Comment
|
||||
run: |
|
||||
gh pr comment ${{ github.event.pull_request.number }} --body "${{ env.description }}"
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GH_PERSONAL_TOKEN }}
|
@ -1,13 +1,15 @@
|
||||
import { DeviceStatusLogRepository } from '@app/common/modules/device-status-log/repositories';
|
||||
import { DeviceRepository } from '@app/common/modules/device/repositories';
|
||||
import {
|
||||
HttpException,
|
||||
HttpStatus,
|
||||
Injectable,
|
||||
NotFoundException,
|
||||
} from '@nestjs/common';
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import { AddDeviceStatusDto } from '../dtos/add.devices-status.dto';
|
||||
import { DeviceRepository } from '@app/common/modules/device/repositories';
|
||||
import { GetDeviceDetailsFunctionsStatusInterface } from 'src/device/interfaces/get.device.interface';
|
||||
import { TuyaContext } from '@tuya/tuya-connector-nodejs';
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import { firebaseDataBase } from '../../firebase.config';
|
||||
import {
|
||||
Database,
|
||||
DataSnapshot,
|
||||
@ -15,9 +17,7 @@ import {
|
||||
ref,
|
||||
runTransaction,
|
||||
} from 'firebase/database';
|
||||
import { GetDeviceDetailsFunctionsStatusInterface } from 'src/device/interfaces/get.device.interface';
|
||||
import { firebaseDataBase } from '../../firebase.config';
|
||||
import { AddDeviceStatusDto } from '../dtos/add.devices-status.dto';
|
||||
import { DeviceStatusLogRepository } from '@app/common/modules/device-status-log/repositories';
|
||||
@Injectable()
|
||||
export class DeviceStatusFirebaseService {
|
||||
private tuya: TuyaContext;
|
||||
@ -79,53 +79,35 @@ export class DeviceStatusFirebaseService {
|
||||
device: any;
|
||||
}[],
|
||||
): Promise<void> {
|
||||
console.log(`🔁 Preparing logs from batch of ${batch.length} items...`);
|
||||
|
||||
const allLogs = [];
|
||||
|
||||
console.log(`🔁 Preparing logs from batch of ${batch.length} items...`);
|
||||
|
||||
for (const item of batch) {
|
||||
const device = item.device;
|
||||
|
||||
if (!device?.uuid) {
|
||||
console.log(`⛔ Skipped unknown device: ${item.deviceTuyaUuid}`);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Determine properties based on environment
|
||||
const properties =
|
||||
this.isDevEnv && Array.isArray(item.log?.properties)
|
||||
? item.log.properties
|
||||
: Array.isArray(item.status)
|
||||
? item.status
|
||||
: null;
|
||||
|
||||
if (!properties) {
|
||||
console.log(
|
||||
`⛔ Skipped invalid status/properties for device: ${item.deviceTuyaUuid}`,
|
||||
);
|
||||
continue;
|
||||
}
|
||||
|
||||
const logs = properties.map((property) =>
|
||||
const logs = item.log.properties.map((property) =>
|
||||
this.deviceStatusLogRepository.create({
|
||||
deviceId: device.uuid,
|
||||
deviceTuyaId: item.deviceTuyaUuid,
|
||||
productId: device.productDevice?.uuid,
|
||||
productId: item.log.productId,
|
||||
log: item.log,
|
||||
code: property.code,
|
||||
value: property.value,
|
||||
eventId: item.log?.dataId,
|
||||
eventTime: new Date(
|
||||
this.isDevEnv ? property.time : property.t,
|
||||
).toISOString(),
|
||||
eventId: item.log.dataId,
|
||||
eventTime: new Date(property.time).toISOString(),
|
||||
}),
|
||||
);
|
||||
|
||||
allLogs.push(...logs);
|
||||
}
|
||||
|
||||
console.log(`📝 Total logs to insert: ${allLogs.length}`);
|
||||
|
||||
const insertLogsPromise = (async () => {
|
||||
const chunkSize = 300;
|
||||
let insertedCount = 0;
|
||||
|
||||
@ -135,9 +117,9 @@ export class DeviceStatusFirebaseService {
|
||||
const result = await this.deviceStatusLogRepository
|
||||
.createQueryBuilder()
|
||||
.insert()
|
||||
.into('device-status-log')
|
||||
.into('device-status-log') // or use DeviceStatusLogEntity
|
||||
.values(chunk)
|
||||
.orIgnore()
|
||||
.orIgnore() // skip duplicates
|
||||
.execute();
|
||||
|
||||
insertedCount += result.identifiers.length;
|
||||
@ -149,7 +131,12 @@ export class DeviceStatusFirebaseService {
|
||||
}
|
||||
}
|
||||
|
||||
console.log(`✅ Total logs inserted: ${insertedCount} / ${allLogs.length}`);
|
||||
console.log(
|
||||
`✅ Total logs inserted: ${insertedCount} / ${allLogs.length}`,
|
||||
);
|
||||
})();
|
||||
|
||||
await insertLogsPromise;
|
||||
}
|
||||
|
||||
async addDeviceStatusToFirebase(
|
||||
|
@ -1,9 +1,9 @@
|
||||
import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
|
||||
import { Injectable, OnModuleInit } from '@nestjs/common';
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import * as NodeCache from 'node-cache';
|
||||
import TuyaWebsocket from '../../config/tuya-web-socket-config';
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
|
||||
import { SosHandlerService } from './sos.handler.service';
|
||||
import * as NodeCache from 'node-cache';
|
||||
|
||||
@Injectable()
|
||||
export class TuyaWebSocketService implements OnModuleInit {
|
||||
@ -74,12 +74,7 @@ export class TuyaWebSocketService implements OnModuleInit {
|
||||
this.client.message(async (ws: WebSocket, message: any) => {
|
||||
try {
|
||||
const { devId, status, logData } = this.extractMessageData(message);
|
||||
// console.log(
|
||||
// `📬 Received message for device: ${devId}, status:`,
|
||||
// status,
|
||||
// logData,
|
||||
// );
|
||||
if (!Array.isArray(status)) {
|
||||
if (!Array.isArray(logData?.properties)) {
|
||||
this.client.ackMessage(message.messageId);
|
||||
return;
|
||||
}
|
||||
@ -167,8 +162,6 @@ export class TuyaWebSocketService implements OnModuleInit {
|
||||
status: any;
|
||||
logData: any;
|
||||
} {
|
||||
// console.log('Received message:', message);
|
||||
|
||||
const payloadData = message.payload.data;
|
||||
|
||||
if (this.isDevEnv) {
|
||||
|
@ -9,8 +9,8 @@ total_energy AS (
|
||||
EXTRACT(HOUR FROM log.event_time) AS hour,
|
||||
TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
|
||||
EXTRACT(YEAR FROM log.event_time)::int AS event_year,
|
||||
MIN(log.value)::integer AS min_value,
|
||||
MAX(log.value)::integer AS max_value
|
||||
MIN(log.value)::integer/100 AS min_value,
|
||||
MAX(log.value)::integer/100 AS max_value
|
||||
FROM "device-status-log" log, params
|
||||
WHERE log.code = 'EnergyConsumed'
|
||||
AND log.event_time::date = params.target_date
|
||||
@ -23,8 +23,8 @@ energy_phase_A AS (
|
||||
EXTRACT(HOUR FROM log.event_time) AS hour,
|
||||
TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
|
||||
EXTRACT(YEAR FROM log.event_time)::int AS event_year,
|
||||
MIN(log.value)::integer AS min_value,
|
||||
MAX(log.value)::integer AS max_value
|
||||
MIN(log.value)::integer/100 AS min_value,
|
||||
MAX(log.value)::integer/100 AS max_value
|
||||
FROM "device-status-log" log, params
|
||||
WHERE log.code = 'EnergyConsumedA'
|
||||
AND log.event_time::date = params.target_date
|
||||
@ -37,8 +37,8 @@ energy_phase_B AS (
|
||||
EXTRACT(HOUR FROM log.event_time) AS hour,
|
||||
TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
|
||||
EXTRACT(YEAR FROM log.event_time)::int AS event_year,
|
||||
MIN(log.value)::integer AS min_value,
|
||||
MAX(log.value)::integer AS max_value
|
||||
MIN(log.value)::integer/100 AS min_value,
|
||||
MAX(log.value)::integer/100 AS max_value
|
||||
FROM "device-status-log" log, params
|
||||
WHERE log.code = 'EnergyConsumedB'
|
||||
AND log.event_time::date = params.target_date
|
||||
@ -51,8 +51,8 @@ energy_phase_C AS (
|
||||
EXTRACT(HOUR FROM log.event_time) AS hour,
|
||||
TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
|
||||
EXTRACT(YEAR FROM log.event_time)::int AS event_year,
|
||||
MIN(log.value)::integer AS min_value,
|
||||
MAX(log.value)::integer AS max_value
|
||||
MIN(log.value)::integer/100 AS min_value,
|
||||
MAX(log.value)::integer/100 AS max_value
|
||||
FROM "device-status-log" log, params
|
||||
WHERE log.code = 'EnergyConsumedC'
|
||||
AND log.event_time::date = params.target_date
|
||||
|
@ -9,8 +9,8 @@ total_energy AS (
|
||||
EXTRACT(HOUR FROM log.event_time)::text AS hour,
|
||||
TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
|
||||
EXTRACT(YEAR FROM log.event_time)::int AS event_year,
|
||||
MIN(log.value)::integer AS min_value,
|
||||
MAX(log.value)::integer AS max_value
|
||||
MIN(log.value)::integer/100 AS min_value,
|
||||
MAX(log.value)::integer/100 AS max_value
|
||||
FROM "device-status-log" log, params
|
||||
WHERE log.code = 'EnergyConsumed'
|
||||
AND log.event_time::date = params.target_date
|
||||
@ -23,8 +23,8 @@ energy_phase_A AS (
|
||||
EXTRACT(HOUR FROM log.event_time)::text AS hour,
|
||||
TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
|
||||
EXTRACT(YEAR FROM log.event_time)::int AS event_year,
|
||||
MIN(log.value)::integer AS min_value,
|
||||
MAX(log.value)::integer AS max_value
|
||||
MIN(log.value)::integer/100 AS min_value,
|
||||
MAX(log.value)::integer/100 AS max_value
|
||||
FROM "device-status-log" log, params
|
||||
WHERE log.code = 'EnergyConsumedA'
|
||||
AND log.event_time::date = params.target_date
|
||||
@ -37,8 +37,8 @@ energy_phase_B AS (
|
||||
EXTRACT(HOUR FROM log.event_time)::text AS hour,
|
||||
TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
|
||||
EXTRACT(YEAR FROM log.event_time)::int AS event_year,
|
||||
MIN(log.value)::integer AS min_value,
|
||||
MAX(log.value)::integer AS max_value
|
||||
MIN(log.value)::integer/100 AS min_value,
|
||||
MAX(log.value)::integer/100 AS max_value
|
||||
FROM "device-status-log" log, params
|
||||
WHERE log.code = 'EnergyConsumedB'
|
||||
AND log.event_time::date = params.target_date
|
||||
@ -51,8 +51,8 @@ energy_phase_C AS (
|
||||
EXTRACT(HOUR FROM log.event_time)::text AS hour,
|
||||
TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
|
||||
EXTRACT(YEAR FROM log.event_time)::int AS event_year,
|
||||
MIN(log.value)::integer AS min_value,
|
||||
MAX(log.value)::integer AS max_value
|
||||
MIN(log.value)::integer/100 AS min_value,
|
||||
MAX(log.value)::integer/100 AS max_value
|
||||
FROM "device-status-log" log, params
|
||||
WHERE log.code = 'EnergyConsumedC'
|
||||
AND log.event_time::date = params.target_date
|
||||
|
@ -9,8 +9,8 @@ total_energy AS (
|
||||
EXTRACT(HOUR FROM log.event_time) AS hour,
|
||||
TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
|
||||
EXTRACT(YEAR FROM log.event_time)::int AS event_year,
|
||||
MIN(log.value)::integer AS min_value,
|
||||
MAX(log.value)::integer AS max_value
|
||||
MIN(log.value)::integer/100 AS min_value,
|
||||
MAX(log.value)::integer/100 AS max_value
|
||||
FROM "device-status-log" log, params
|
||||
WHERE log.code = 'EnergyConsumed'
|
||||
AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month
|
||||
@ -23,8 +23,8 @@ energy_phase_A AS (
|
||||
EXTRACT(HOUR FROM log.event_time) AS hour,
|
||||
TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
|
||||
EXTRACT(YEAR FROM log.event_time)::int AS event_year,
|
||||
MIN(log.value)::integer AS min_value,
|
||||
MAX(log.value)::integer AS max_value
|
||||
MIN(log.value)::integer/100 AS min_value,
|
||||
MAX(log.value)::integer/100 AS max_value
|
||||
FROM "device-status-log" log, params
|
||||
WHERE log.code = 'EnergyConsumedA'
|
||||
AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month
|
||||
@ -37,8 +37,8 @@ energy_phase_B AS (
|
||||
EXTRACT(HOUR FROM log.event_time) AS hour,
|
||||
TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
|
||||
EXTRACT(YEAR FROM log.event_time)::int AS event_year,
|
||||
MIN(log.value)::integer AS min_value,
|
||||
MAX(log.value)::integer AS max_value
|
||||
MIN(log.value)::integer/100 AS min_value,
|
||||
MAX(log.value)::integer/100 AS max_value
|
||||
FROM "device-status-log" log, params
|
||||
WHERE log.code = 'EnergyConsumedB'
|
||||
AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month
|
||||
@ -51,8 +51,8 @@ energy_phase_C AS (
|
||||
EXTRACT(HOUR FROM log.event_time) AS hour,
|
||||
TO_CHAR(log.event_time, 'MM-YYYY') AS event_month,
|
||||
EXTRACT(YEAR FROM log.event_time)::int AS event_year,
|
||||
MIN(log.value)::integer AS min_value,
|
||||
MAX(log.value)::integer AS max_value
|
||||
MIN(log.value)::integer/100 AS min_value,
|
||||
MAX(log.value)::integer/100 AS max_value
|
||||
FROM "device-status-log" log, params
|
||||
WHERE log.code = 'EnergyConsumedC'
|
||||
AND TO_CHAR(log.event_time, 'MM-YYYY') = params.target_month
|
||||
|
@ -4,8 +4,8 @@ WITH total_energy AS (
|
||||
SELECT
|
||||
device_id,
|
||||
event_time::date AS date,
|
||||
MIN(value)::integer AS min_value,
|
||||
MAX(value)::integer AS max_value
|
||||
MIN(value)::integer/100 AS min_value,
|
||||
MAX(value)::integer/100 AS max_value
|
||||
FROM "device-status-log"
|
||||
where code='EnergyConsumed'
|
||||
GROUP BY device_id, date
|
||||
@ -15,8 +15,8 @@ WITH total_energy AS (
|
||||
SELECT
|
||||
device_id,
|
||||
event_time::date AS date,
|
||||
MIN(value)::integer AS min_value,
|
||||
MAX(value)::integer AS max_value
|
||||
MIN(value)::integer/100 AS min_value,
|
||||
MAX(value)::integer/100 AS max_value
|
||||
FROM "device-status-log"
|
||||
where code='EnergyConsumedA'
|
||||
GROUP BY device_id, date
|
||||
@ -26,8 +26,8 @@ WITH total_energy AS (
|
||||
SELECT
|
||||
device_id,
|
||||
event_time::date AS date,
|
||||
MIN(value)::integer AS min_value,
|
||||
MAX(value)::integer AS max_value
|
||||
MIN(value)::integer/100 AS min_value,
|
||||
MAX(value)::integer/100 AS max_value
|
||||
FROM "device-status-log"
|
||||
where code='EnergyConsumedB'
|
||||
GROUP BY device_id, date
|
||||
@ -37,8 +37,8 @@ WITH total_energy AS (
|
||||
SELECT
|
||||
device_id,
|
||||
event_time::date AS date,
|
||||
MIN(value)::integer AS min_value,
|
||||
MAX(value)::integer AS max_value
|
||||
MIN(value)::integer/100 AS min_value,
|
||||
MAX(value)::integer/100 AS max_value
|
||||
FROM "device-status-log"
|
||||
where code='EnergyConsumedC'
|
||||
GROUP BY device_id, date
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import axios from 'axios';
|
||||
import * as nodemailer from 'nodemailer';
|
||||
import nodemailer from 'nodemailer';
|
||||
import Mail from 'nodemailer/lib/mailer';
|
||||
import { BatchEmailData } from './batch-email.interface';
|
||||
import { SingleEmailData } from './single-email.interface';
|
||||
|
Reference in New Issue
Block a user