Merge pull request #57 from AlessGarau/develop

MariaPetersen · web-flow · commit d002991ef6ed · 2025-09-02T11:31:00.000+02:00
PR develop to Main
diff --git a/packages/client/index.html b/packages/client/index.html
@@ -3,7 +3,7 @@
 
 <head>
   <meta charset="UTF-8" />
-  <link rel="icon" type="image/svg+xml" href="/logo_leaf.jpg" />
+  <link rel="icon" type="image/svg+xml" href="/logo_leaf.png" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <link href="/src/style.css" rel="stylesheet">
   <title>SmartClass - Adaptez votre environnement à vous</title>
diff --git a/packages/client/public/logo_leaf.jpg b/packages/client/public/logo_leaf.jpg
diff --git a/packages/client/public/logo_leaf.png b/packages/client/public/logo_leaf.png
diff --git a/packages/client/src/api/endpoints/room.ts b/packages/client/src/api/endpoints/room.ts
@@ -1,29 +1,6 @@
-import type { RoomFilterOptions } from "../../types/Room";
+import type { Room, RoomFilterOptions, RoomFilters } from "../../types/Room";
 import { apiClient } from "../client";
 
-interface RoomFilters {
-    building?: string;
-    floor?: number;
-    isEnabled?: boolean;
-    search?: string;
-    limit?: number;
-    offset?: number;
-}
-
-interface Room {
-    id: string;
-    name: string;
-    building: string;
-    floor: number;
-    capacity: number;
-    isEnabled: boolean;
-    temperature: string | null;
-    humidity: string | null;
-    pressure: string | null;
-    movement: string | null;
-    occupancy?: number;
-}
-
 export const roomApi = {
     getRoomsCount: async (
         filters: RoomFilters = {}
diff --git a/packages/client/src/types/Room.d.ts b/packages/client/src/types/Room.d.ts
@@ -3,6 +3,8 @@ export interface RoomFilters {
     search?: string;
     building?: string;
     floor?: number;
+    limit?: number;
+    offset?: number;
 }
 
 export interface RoomFilterOptions {
diff --git a/packages/server/database/seed.ts b/packages/server/database/seed.ts
@@ -275,6 +275,7 @@ async function main() {
   const sensors = await database
     .insert(schema.sensorTable)
     .values([
+      { id: "c4ff9159-eced-4bd9-9f71-527b3bd44fa9", room_id: "c5a3a18c-69ac-4c24-b170-a47613d51435", physical_id: "641896457" },
       { room_id: rooms[0].id, physical_id: "TEMP_001" },
       { room_id: rooms[0].id, physical_id: "HUM_001" },
       { room_id: rooms[0].id, physical_id: "PRESS_001" },
@@ -297,8 +298,8 @@ async function main() {
   const temperatures = await database
     .insert(schema.temperatureTable)
     .values([
-      { room_id: rooms[0].id, data: "22.5", sensor_id: sensors[0].id },
-      { room_id: rooms[0].id, data: "23.1", sensor_id: sensors[0].id },
+      { room_id: rooms[0].id, data: "22.5", sensor_id: sensors[1].id },
+      { room_id: rooms[0].id, data: "23.1", sensor_id: sensors[1].id },
       { room_id: rooms[1].id, data: "21.8", sensor_id: sensors[4].id },
       { room_id: rooms[1].id, data: "22.2", sensor_id: sensors[4].id },
       { room_id: rooms[3].id, data: "24.0", sensor_id: sensors[8].id },
diff --git a/packages/server/src/services/SensorDataCollector.ts b/packages/server/src/services/SensorDataCollector.ts
@@ -37,7 +37,7 @@ interface MovementData {
 }
 
 interface PressureData {
-  pressure: number;
+  atmospheric_pressure: number;
 }
 
 @Service()
@@ -151,6 +151,7 @@ export class SensorDataCollector {
         try {
           switch (config.type) {
           case "temperature":
+          {
             const tempData = mqttMessage.data as TemperatureData;
             console.log(`Température: ${tempData.temperature}°C`);
             const tempSensorData = {
@@ -159,7 +160,8 @@ export class SensorDataCollector {
             };
             await this.repository.insertTemperature(tempSensorData);
             break;
-          case "humidity":
+          }
+          case "humidity": {
             const humidityData = mqttMessage.data as HumidityData;
             console.log(`Humidité: ${humidityData.humidity}%`);
             const humiditySensorData = {
@@ -168,16 +170,18 @@ export class SensorDataCollector {
             };
             await this.repository.insertHumidity(humiditySensorData);
             break;
-          case "pressure":
+          }
+          case "pressure": {
             const pressureData = mqttMessage.data as PressureData;
-            console.log(`Pression: ${pressureData.pressure || "N/A"}`);
+            console.log(`Pression: ${pressureData.atmospheric_pressure || "N/A"}`);
             const pressureSensorData = {
               ...sensorData,
-              data: pressureData.pressure?.toString() || "N/A",
+              data: pressureData.atmospheric_pressure?.toString() || "N/A",
             };
             await this.repository.insertPressure(pressureSensorData);
             break;
-          case "movement":
+          }
+          case "movement": {
             const movementData = mqttMessage.data as MovementData;
             console.log(`Mouvement: ${movementData.state} (x:${movementData.x_axis}, y:${movementData.y_axis}, z:${movementData.z_axis})`);
             const movementSensorData = {
@@ -187,6 +191,7 @@ export class SensorDataCollector {
             await this.repository.insertMovement(movementSensorData);
             break;
           }
+          }
           savedCount++;
         } catch (error) {
           MqttError.dataInsertionFailed(config.type, error as Error);

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@ export interface RoomFilters {`
`3`	`3`	`search?: string;`
`4`	`4`	`building?: string;`
`5`	`5`	`floor?: number;`
	`6`	`+ limit?: number;`
	`7`	`+ offset?: number;`
`6`	`8`	`}`
`7`	`9`
`8`	`10`	`export interface RoomFilterOptions {`