From 7e7b7ef751836eeefda9d3421ccfe6dd35444461 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 9 Sep 2024 19:28:15 +0200
Subject: [PATCH] v2.18.0
---
pyproject.toml | 2 +-
src/logic/database/Crud.py | 4 ++--
src/version.json | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index a9c67b3..dce0795 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "StorageLeaf"
-version = "2.17.0"
+version = "2.18.0"
description = "Accepts sensor data and saves them into a database. The saved data can be accessed via api."
authors = ["TheCodeLabsDevs"]
diff --git a/src/logic/database/Crud.py b/src/logic/database/Crud.py
index f991693..8a9cb72 100644
--- a/src/logic/database/Crud.py
+++ b/src/logic/database/Crud.py
@@ -118,9 +118,9 @@ 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(Models.Measurement.sensor_id == sensorId) \
.filter(and_(startDateTime <= Models.Measurement.timestamp,
- endDateTime >= Models.Measurement.timestamp,
- Models.Measurement.sensor_id == sensorId)) \
+ endDateTime >= Models.Measurement.timestamp)) \
.order_by(Models.Measurement.timestamp.desc()) \
.all()
diff --git a/src/version.json b/src/version.json
index d1cae61..3c1c785 100644
--- a/src/version.json
+++ b/src/version.json
@@ -1,7 +1,7 @@
{
"version": {
- "name": "v2.17.0",
- "code": 33,
- "date": "17.06.24"
+ "name": "v2.18.0",
+ "code": 34,
+ "date": "09.09.24"
}
}
\ No newline at end of file
--
GitLab