diff --git a/api/sql_app/crud.py b/api/sql_app/crud.py index 9c4045b..e2293f5 100644 --- a/api/sql_app/crud.py +++ b/api/sql_app/crud.py @@ -1,17 +1,19 @@ from sqlalchemy.orm import Session +from sqlalchemy import desc from . import models, schemas def get_records(db: Session): - records = db.query(models.Record).all() + records = db.query(models.Record).order_by(desc(models.Record.time)).all() return records -def create_record(db: Session, record: schemas.Record): +def create_record(db: Session, record: schemas.RecordCreate): db_record = models.Record( time=record.time, temperature=record.temperature, humidity=record.humidity, room=record.room ) + db.add(db_record) db.commit() db.refresh(db_record) diff --git a/api/sql_app/models.py b/api/sql_app/models.py index 5f5a08b..3f661dd 100644 --- a/api/sql_app/models.py +++ b/api/sql_app/models.py @@ -1,4 +1,5 @@ from sqlalchemy import Column, Integer, Float, DateTime, String + from .database import Base diff --git a/api/sql_app/schemas.py b/api/sql_app/schemas.py index 8ab5da2..b3ba72f 100644 --- a/api/sql_app/schemas.py +++ b/api/sql_app/schemas.py @@ -3,7 +3,6 @@ from datetime import datetime from pydantic import BaseModel - class RecordBase(BaseModel): time: Optional[datetime] = datetime.now() temperature: float @@ -17,7 +16,4 @@ class RecordCreate(RecordBase): pass class Record(RecordBase): - id: int - - class Config: - from_attributes = True + pass