Fix embedded-backend API route

Author: Tinzzs

backend/controller/moisture_controller.py

@@ -13,7 +13,7 @@
 add_moisture_data = APIRouter()
 
 
-@add_moisture_data.post("/api/send-data", response_model=dict)
+@add_moisture_data.post("/api/sensor/data", response_model=dict)
 def add_moisture_entry(
     sensors: MoistureDataListSchema, 
     service: SensorService = Depends(get_service)
@@ -34,29 +34,7 @@ def add_moisture_entry(
     except Exception as e:
         return JSONResponse(status_code=500, content={"status": "error", "message": f"Unexpected error: {str(e)}"})
 
-@add_moisture_data.post("/api/send-current", response_model=dict)
-async def send_current_data(
-    sensors: MoistureDataSchema, 
-    service: SensorService = Depends(get_service)
-):
-    try:
-        sensors = [sensors]
-        # Call the service layer to add sensor moisture data
-        response = service.receive_moisture_data(sensors)
-
-        # Check if the response contains an error
-        if "error" in response:
-            status_code = 400 if "Invalid Request" in response["error"] else 500
-            return JSONResponse(status_code=status_code, content={"status": "error", "error": response["error"]})
-
-        return JSONResponse(status_code=200, content=response)
-
-    except HTTPException as he:
-        raise he
-    except Exception as e:
-        return JSONResponse(status_code=500, content={"status": "error", "message": f"Unexpected error: {str(e)}"})
-
-@add_moisture_data.get("/api/send-current", response_model=dict)
+@add_moisture_data.get("/api/sensor/data", response_model=dict)
 async def get_current_data(
     service: SensorService = Depends(get_service)
 ):

backend/dal/sensor_dal.py

@@ -14,17 +14,17 @@ def receive_moisture_data(self, sensors: List[MoistureDataSchema]):
         try:
             # Bulk insert query
             insert_query = """
-                INSERT INTO sensorsdata (
-                    readingid, timestamp, deviceid, sensorid, adcvalue, moisturelevel, digitalstatus,
-                    weathertemp, weatherhumidity, weathersunlight, weatherwindspeed, location, weatherfetched
-                ) VALUES %s RETURNING readingid;
+                INSERT INTO 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;
             """
             # Convert list of objects to list of tuples
             values = [
                 (
-                    sensor.id, sensor.timestamp, sensor.device_id, sensor.sensor_id, sensor.adc_value,
+                    sensor.id, sensor.timestamp, sensor.sensor_id, sensor.adc_value,
                     sensor.moisture_level, sensor.digital_status, sensor.weather_temp, sensor.weather_humidity,
-                    sensor.weather_sunlight, sensor.weather_wind_speed, sensor.location, sensor.weather_fetched
+                    sensor.weather_sunlight, sensor.weather_wind_speed, sensor.location, sensor.weather_fetched, sensor.device_id
                 )
                 for sensor in sensors
             ]

backend/models/models.py

@@ -14,7 +14,6 @@ class Sensor(Base):
 
     id = Column(Integer, primary_key=True, index=True)
     timestamp = Column(DateTime, nullable=False)
-    device_id = Column(String, nullable=False)
     sensor_id = Column(Integer, nullable=False)
     adc_value = Column(Integer, nullable=False)
     moisture_level = Column(Float, nullable=False)
@@ -24,4 +23,5 @@ class Sensor(Base):
     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(DateTime, nullable=False)
+    device_id = Column(String, nullable=False)

backend/schemas/sensor_schema.py

@@ -5,17 +5,18 @@
 class MoistureDataSchema(BaseModel):
     id: int 
     timestamp: datetime
-    device_id: str
     sensor_id: int
     adc_value: int
     moisture_level: float
     digital_status: str
     weather_temp: float
+    weather_humidity: float
     weather_sunlight: float
     weather_wind_speed: float
-    weather_humidity: float
     location: str # city, state, country
     weather_fetched: datetime
+    device_id: str
+ 
 
 
 class MoistureDataListSchema(BaseModel):