diff --git a/src/logic/database/Crud.py b/src/logic/database/Crud.py
index d3842200515498a02c4d1f6c386668e2e4bdd1d2..2256b166aec36dabd517300bccbb3a530e4a9ea3 100644
--- a/src/logic/database/Crud.py
+++ b/src/logic/database/Crud.py
@@ -76,7 +76,7 @@ def get_sensor(db: Session, sensorId: int) -> Models.Sensor:
def get_sensor_by_name_and_device_id(db: Session, sensorName: str, deviceId: int) -> Models.Sensor:
return db.query(Models.Sensor).filter(and_(Models.Sensor.name == sensorName,
- Models.Sensor.deviceId == deviceId)).first()
+ Models.Sensor.device_id == deviceId)).first()
@notify_backup_service(BACKUP_SERVICE)
@@ -119,14 +119,14 @@ def get_measurements_for_sensor(db: Session, startDateTime: str,
if startDateTime and endDateTime:
return db.query(Models.Measurement).filter(and_(startDateTime <= Models.Measurement.timestamp,
endDateTime >= Models.Measurement.timestamp,
- Models.Measurement.sensorId == sensorId)).all()
+ Models.Measurement.sensor_id == sensorId)).all()
- return db.query(Models.Measurement).filter(Models.Measurement.sensorId == sensorId).all()
+ return db.query(Models.Measurement).filter(Models.Measurement.sensor_id == sensorId).all()
def get_latest_measurement_for_sensor(db: Session, sensorId: int) -> Models.Measurement:
return db.query(Models.Measurement) \
- .filter(Models.Measurement.sensorId == sensorId) \
+ .filter(Models.Measurement.sensor_id == sensorId) \
.order_by(Models.Measurement.timestamp.desc()) \
.first()
diff --git a/src/logic/database/Models.py b/src/logic/database/Models.py
index a58deb7e46c43ab50b341c29687b40b68b91c9e7..22b24e5fe897196daf5303af62e57414d6d93807 100644
--- a/src/logic/database/Models.py
+++ b/src/logic/database/Models.py
@@ -19,7 +19,7 @@ class Sensor(Base):
id = Column(Integer, primary_key=True, index=True, autoincrement=True)
name = Column(String, index=True, nullable=False)
type = Column(String, index=True, nullable=False)
- deviceId = Column(Integer, ForeignKey('device.id'))
+ device_id = Column(Integer, ForeignKey('device.id'))
device = relationship('Device', back_populates='sensors')
measurements = relationship('Measurement', back_populates='sensor', cascade='all,delete')
@@ -31,6 +31,6 @@ class Measurement(Base):
id = Column(Integer, primary_key=True, index=True, autoincrement=True)
timestamp = Column(String, index=True, nullable=False)
value = Column(String, index=True, nullable=False)
- sensorId = Column(Integer, ForeignKey('sensor.id'))
+ sensor_id = Column(Integer, ForeignKey('sensor.id'))
sensor = relationship('Sensor', back_populates='measurements')
diff --git a/src/logic/database/Schemas.py b/src/logic/database/Schemas.py
index f152268e3bcb72e1e4d0dfba75c741594c7a029d..f6b6fec9f54e2f40f0dd89074bda2905484c11ac 100644
--- a/src/logic/database/Schemas.py
+++ b/src/logic/database/Schemas.py
@@ -34,7 +34,7 @@ class Measurement(BaseModel):
id: int
value: str
timestamp: str
- sensorId: int
+ sensor_id: int
class Config:
orm_mode = True
@@ -42,7 +42,7 @@ class Measurement(BaseModel):
class MeasurementCreate(BaseModel):
value: str = Field(..., min_length=1)
- sensorId: int
+ sensor_id: int
# ===== sensor =====
@@ -58,7 +58,7 @@ class SensorBase(BaseModel):
class SensorCreate(BaseModel):
name: str = Field(..., min_length=1)
type: str = Field(..., min_length=1)
- deviceId: int
+ device_id: int
class SensorUpdate(BaseModel):
@@ -70,7 +70,7 @@ class Sensor(SensorBase):
id: int
name: str
type: str
- deviceId: int
+ device_id: int
class Config:
orm_mode = True
diff --git a/src/logic/routers/MeasurementRouter.py b/src/logic/routers/MeasurementRouter.py
index 895cae21c69763dd11e34c826081aaef192e2d07..d865258e73c968e0b3c18e7b44856b9a47089b62 100644
--- a/src/logic/routers/MeasurementRouter.py
+++ b/src/logic/routers/MeasurementRouter.py
@@ -31,12 +31,12 @@ async def read_measurement(measurementId: int, db: Session = Depends(get_databas
@router.post('/measurement/', response_model=Schemas.Measurement,
summary='Adds a new measurement',
- responses={404: {'description': 'No sensor with id "{measurement.sensorId}" existing'}},
+ responses={404: {'description': 'No sensor with id "{measurement.sensor_id}" existing'}},
dependencies=[Depends(check_api_key)])
async def create_measurement(measurement: Schemas.MeasurementCreate, db: Session = Depends(get_database)):
- existingSensor = Crud.get_sensor(db, measurement.sensorId)
+ existingSensor = Crud.get_sensor(db, measurement.sensor_id)
if not existingSensor:
- raise HTTPException(status_code=404, detail=f'No sensor with id "{measurement.sensorId}" existing')
+ raise HTTPException(status_code=404, detail=f'No sensor with id "{measurement.sensor_id}" existing')
return Crud.create_measurement(db=db, measurement=measurement)
diff --git a/src/logic/routers/SensorRouter.py b/src/logic/routers/SensorRouter.py
index e408d374d20f084c153c0f33e3c839dff54935b2..03fd2d3d05d75911378de27cd703cf7ddb1f5fd3 100644
--- a/src/logic/routers/SensorRouter.py
+++ b/src/logic/routers/SensorRouter.py
@@ -32,19 +32,19 @@ async def read_sensor(sensorId: int, db: Session = Depends(get_database)):
@router.post('/', response_model=Schemas.Sensor,
summary='Adds a new sensor',
responses={400: {'description': 'A sensor called "{sensor.name}" already exists '
- '(ID: {existingSensor.id}) for device {sensor.deviceId}'},
- 404: {'description': 'No device with id "{sensor.deviceId}" existing'}},
+ '(ID: {existingSensor.id}) for device {sensor.device_id}'},
+ 404: {'description': 'No device with id "{sensor.device_id}" existing'}},
dependencies=[Depends(check_api_key)])
async def create_sensor(sensor: Schemas.SensorCreate, db: Session = Depends(get_database)):
- existingDevice = Crud.get_device(db, sensor.deviceId)
+ existingDevice = Crud.get_device(db, sensor.device_id)
if not existingDevice:
- raise HTTPException(status_code=404, detail=f'No device with id "{sensor.deviceId}" existing')
+ raise HTTPException(status_code=404, detail=f'No device with id "{sensor.device_id}" existing')
- existingSensor = Crud.get_sensor_by_name_and_device_id(db, sensor.name, sensor.deviceId)
+ existingSensor = Crud.get_sensor_by_name_and_device_id(db, sensor.name, sensor.device_id)
if existingSensor:
raise HTTPException(status_code=400,
detail=f'A sensor called "{sensor.name}" already exists '
- f'(ID: {existingSensor.id}) for device {sensor.deviceId}')
+ f'(ID: {existingSensor.id}) for device {sensor.device_id}')
return Crud.create_sensor(db=db, sensor=sensor)
@@ -59,11 +59,11 @@ async def update_device(sensorId: int, sensor: Schemas.SensorUpdate, db: Session
raise HTTPException(status_code=404, detail='Sensor not found')
if sensorToUpdate.name != sensor.name:
- existingSensor = Crud.get_sensor_by_name_and_device_id(db, sensor.name, sensorToUpdate.deviceId)
+ existingSensor = Crud.get_sensor_by_name_and_device_id(db, sensor.name, sensorToUpdate.device_id)
if existingSensor:
raise HTTPException(status_code=400,
detail=f'A sensor called "{sensor.name}" already exists '
- f'(ID: {existingSensor.id}) for device {sensorToUpdate.deviceId}')
+ f'(ID: {existingSensor.id}) for device {sensorToUpdate.device_id}')
return Crud.update_sensor(db=db, sensorId=sensorId, sensor=sensor)