Skip to content
Snippets Groups Projects
Commit 8333029c authored by Robert Goldmann's avatar Robert Goldmann
Browse files

v2.0.3; order measurements by timestamp descending

parent 1dc6938e
Branches
Tags v2.0.3
No related merge requests found
......@@ -117,11 +117,17 @@ def get_measurements(db: Session, startDateTime: str, endDateTime: str) -> List[
def get_measurements_for_sensor(db: Session, startDateTime: str,
endDateTime: str, sensorId: int) -> List[Models.Measurement]:
if startDateTime and endDateTime:
return db.query(Models.Measurement).filter(and_(startDateTime <= Models.Measurement.timestamp,
return db.query(Models.Measurement) \
.filter(and_(startDateTime <= Models.Measurement.timestamp,
endDateTime >= Models.Measurement.timestamp,
Models.Measurement.sensor_id == sensorId)).all()
Models.Measurement.sensor_id == sensorId)) \
.order_by(Models.Measurement.timestamp.desc()) \
.all()
return db.query(Models.Measurement).filter(Models.Measurement.sensor_id == sensorId).all()
return db.query(Models.Measurement) \
.filter(Models.Measurement.sensor_id == sensorId) \
.order_by(Models.Measurement.timestamp.desc()) \
.all()
def get_latest_measurement_for_sensor(db: Session, sensorId: int) -> Models.Measurement:
......
......@@ -25,8 +25,8 @@ class Version(BaseModel):
class MinMax(BaseModel):
min: float or None
max: float or None
min: float = None
max: float = None
# ===== measurement =====
......
......@@ -70,7 +70,7 @@ async def get_min_and_max_for_sensor_ids(sensorIds: List[int] = Query(None),
if values:
return MinMax(min=min(values), max=max(values))
return MinMax(min=None, max=None)
return MinMax()
@router.post('/measurements/', response_model=Schemas.Status,
......
{
"version": {
"name": "v2.0.3",
"code": 11,
"name": "v2.0.4",
"code": 12,
"date": "17.01.21"
}
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment