sensor-backend endpoint tested

Author: Tinzzs

backend/controller/moisture_controller.py

@@ -20,7 +20,7 @@ def add_moisture_entry(
 ):
     try:
         # Call the service layer to add sensor moisture data
-        response = service.receive_moisture_data(sensors.data)
+        response = service.receive_moisture_data(sensors.sensor_data)
 
         # Check if the response contains an error
         if "error" in response:

backend/dal/sensor_dal.py

@@ -12,9 +12,29 @@ def __init__(self):
 
     def receive_moisture_data(self, sensors: List[MoistureDataSchema]):
         try:
+            # Ensure the table exists
+            self.cursor.execute("""
+                CREATE TABLE IF NOT EXISTS raw_sensors (
+                    id INTEGER NOT NULL,
+                    timestamp TIMESTAMP NOT NULL,
+                    sensor_id INTEGER NOT NULL,
+                    adc_value FLOAT NOT NULL,
+                    moisture_level FLOAT NOT NULL,
+                    digital_status VARCHAR(255) NOT NULL,
+                    weather_temp FLOAT,
+                    weather_humidity FLOAT,
+                    weather_sunlight FLOAT,
+                    weather_wind_speed FLOAT,
+                    location VARCHAR(255),
+                    weather_fetched TEXT,
+                    device_id VARCHAR(255) NOT NULL
+                );
+            """)
+            self.conn.commit()
+
             # Bulk insert query
             insert_query = """
-                INSERT INTO sensors (
+                INSERT INTO raw_sensors(
                     id, timestamp, sensor_id, adc_value, moisture_level, digital_status,
                     weather_temp, weather_humidity, weather_sunlight, weather_wind_speed, location, weather_fetched, device_id
                 ) VALUES %s RETURNING id;
@@ -28,11 +48,11 @@ def receive_moisture_data(self, sensors: List[MoistureDataSchema]):
                 )
                 for sensor in sensors
             ]
-            # Execute bulk insert
+            # Execute bulk insert for sensors table
             psycopg2.extras.execute_values(self.cursor, insert_query, values)
             self.conn.commit()
 
-            # Get the returned sensor_id
+            # Get the returned id
             inserted_ids = [row[0] for row in self.cursor.fetchall()]
             return {"status": "success", "inserted_ids": inserted_ids}
 

backend/models/models.py

@@ -12,16 +12,16 @@ class Plant(Base):
 class Sensor(Base):
     __tablename__ = "sensors"
 
-    id = Column(Integer, primary_key=True, index=True)
+    id = Column(Integer, nullable=False)
     timestamp = Column(DateTime, nullable=False)
     sensor_id = Column(Integer, nullable=False)
-    adc_value = Column(Integer, nullable=False)
+    adc_value = Column(Float, nullable=False)
     moisture_level = Column(Float, nullable=False)
     digital_status = Column(String, nullable=False)
     weather_temp = Column(Float, nullable=False)
-    weather_humidity = Column(Integer, nullable=False)
+    weather_humidity = Column(Float, nullable=False)
     weather_sunlight = Column(Float, nullable=False)
     weather_wind_speed = Column(Float, nullable=False)
     location = Column(String, nullable=False)
-    weather_fetched = Column(DateTime, nullable=False)
+    weather_fetched = Column(String, nullable=False)
     device_id = Column(String, nullable=False)

backend/repository/plant_repository.py

@@ -12,4 +12,4 @@ def get_plants(self):
         return self.dal.get_plants()
 
     def update_plant_image(self, plant_id: int, new_image_filename: str, file_content: bytes):
-        return self.dal.update_plant_image(plant_id, new_image_filename)
+        return self.dal.update_plant_image(plant_id, new_image_filename, file_content)

backend/schemas/sensor_schema.py

@@ -6,21 +6,19 @@ class MoistureDataSchema(BaseModel):
     id: int 
     timestamp: datetime
     sensor_id: int
-    adc_value: int
+    adc_value: float
     moisture_level: float
     digital_status: str
     weather_temp: float
     weather_humidity: float
     weather_sunlight: float
     weather_wind_speed: float
     location: str # city, state, country
-    weather_fetched: datetime
+    weather_fetched: str
     device_id: str
- 
-
 
 class MoistureDataListSchema(BaseModel):
-    data: List[MoistureDataSchema]  # Accept array of sensor data
+    sensor_data: List[MoistureDataSchema]  # Accept array of sensor data
 
 
 class SensorDataSchema(BaseModel):

backend/services/plant_service.py

@@ -14,7 +14,6 @@ def get_plants(self):
         return self.repository.get_plants()
 
     def update_plant_image(self, plant_id: int, new_image_filename: str, file_content: bytes):
-        # Pass the file content to the repository
         return self.repository.update_plant_image(plant_id, new_image_filename, file_content)
 
 def get_service():