From 93cc8d7378cbc8427bb177fe69f9b9abcd08b887 Mon Sep 17 00:00:00 2001
From: Toolf <nazar.smirnov.2001@gmail.com>
Date: Fri, 16 Feb 2024 15:34:20 +0200
Subject: [PATCH] fix: aggregated_data model

---
 agent/src/config.py                        | 1 +
 agent/src/domain/aggregated_data.py        | 3 ++-
 agent/src/file_datasource.py               | 9 +++++++++
 agent/src/schema/aggregated_data_schema.py | 3 ++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/agent/src/config.py b/agent/src/config.py
index c7576ed..f507c71 100644
--- a/agent/src/config.py
+++ b/agent/src/config.py
@@ -8,6 +8,7 @@ def try_parse(type, value: str):
         return None
 
 
+USER_ID = 1
 # MQTT config
 MQTT_BROKER_HOST = os.environ.get("MQTT_BROKER_HOST") or "mqtt"
 MQTT_BROKER_PORT = try_parse(int, os.environ.get("MQTT_BROKER_PORT")) or 1883
diff --git a/agent/src/domain/aggregated_data.py b/agent/src/domain/aggregated_data.py
index d05a183..0387ee2 100644
--- a/agent/src/domain/aggregated_data.py
+++ b/agent/src/domain/aggregated_data.py
@@ -9,4 +9,5 @@ from domain.gps import Gps
 class AggregatedData:
     accelerometer: Accelerometer
     gps: Gps
-    time: datetime
+    timestamp: datetime
+    user_id: int
diff --git a/agent/src/file_datasource.py b/agent/src/file_datasource.py
index b2194f8..54aec29 100644
--- a/agent/src/file_datasource.py
+++ b/agent/src/file_datasource.py
@@ -1,6 +1,9 @@
 from csv import reader
 from datetime import datetime
+from domain.accelerometer import Accelerometer
+from domain.gps import Gps
 from domain.aggregated_data import AggregatedData
+import config
 
 
 class FileDatasource:
@@ -13,6 +16,12 @@ class FileDatasource:
 
     def read(self) -> AggregatedData:
         """Метод повертає дані отримані з датчиків"""
+        return AggregatedData(
+            Accelerometer(1, 2, 3),
+            Gps(4, 5),
+            datetime.now(),
+            config.USER_ID,
+        )
 
     def startReading(self, *args, **kwargs):
         """Метод повинен викликатись перед початком читання даних"""
diff --git a/agent/src/schema/aggregated_data_schema.py b/agent/src/schema/aggregated_data_schema.py
index eca4069..e6fa482 100644
--- a/agent/src/schema/aggregated_data_schema.py
+++ b/agent/src/schema/aggregated_data_schema.py
@@ -6,4 +6,5 @@ from schema.gps_schema import GpsSchema
 class AggregatedDataSchema(Schema):
     accelerometer = fields.Nested(AccelerometerSchema)
     gps = fields.Nested(GpsSchema)
-    time = fields.DateTime("iso")
+    timestamp = fields.DateTime("iso")
+    user_id = fields.Int()