Merge pull request #11 from Hanagotchi/HAN-25

HAN-25: Obtener la ultima medición realizada por un sensor

Author: fjpacheco

app/controller/measurement_controller.py

@@ -0,0 +1,11 @@
+from controller.device_plant_controller import withSQLExceptionsHandle
+from fastapi import Request
+
+
+@withSQLExceptionsHandle
+def last_measurement_made_by_plant(req: Request, id_plant: int):
+    try:
+        return req.app.database.get_last_measurement(id_plant)
+    except Exception as err:
+        req.app.database.rollback()
+        raise err

app/router/__init__.py

@@ -1,6 +1,8 @@
 from fastapi import APIRouter
 from router.device_plant_router import device_plant
+from router.measurement_router import measurement
 
 api_router = APIRouter()
 
 api_router.include_router(device_plant, tags=["DevicePlant"], prefix="/device-plant")
+api_router.include_router(measurement, tags=["Measurement"], prefix="/measurement")

app/router/measurement_router.py

@@ -0,0 +1,17 @@
+from fastapi import APIRouter, Request, status
+from schemas.measurement import (
+    MeasurementSavedSchema
+)
+from controller import measurement_controller as controller
+
+
+measurement = APIRouter()
+
+
+@measurement.get(
+        "/{id_plant}/last",
+        status_code=status.HTTP_200_OK,
+        response_model=MeasurementSavedSchema
+        )
+async def last_measurement_made_by_plant(id_plant: int, req: Request):
+    return controller.last_measurement_made_by_plant(req, id_plant)

app/schemas/measurement_reading.py renamed to app/schemas/measurement.py

@@ -2,6 +2,17 @@
 from typing import Optional
 
 
+class MeasurementSavedSchema(BaseModel):
+    id: int
+    id_plant: int
+    plant_type: int
+    time_stamp: str
+    temperature: Optional[int]
+    humidity: Optional[int]
+    light: Optional[int]
+    watering: Optional[int]
+
+
 class MeasurementReadingSchema(BaseModel):
     """
         Schema used to parse the data from measurements obtained via RabbitMQ.

app/service/rabbitmq/consumer.py

@@ -8,7 +8,7 @@
 from exceptions.empty_package import EmptyPackageError
 from exceptions.row_not_found import RowNotFoundError
 from pydantic import ValidationError
-from schemas.measurement_reading import MeasurementReadingSchema
+from schemas.measurement import MeasurementReadingSchema
 from sqlalchemy import MetaData
 from sqlalchemy.orm import Session
 from sqlalchemy import create_engine