From 6e8deea3247f605ea7dcdaba394971b6e3effcc9 Mon Sep 17 00:00:00 2001 From: mseng10 Date: Sat, 13 Jul 2024 18:52:51 -0500 Subject: [PATCH] BUG: Fix lint --- server/app.py | 8 ++++---- server/models/alert.py | 10 +++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/server/app.py b/server/app.py index 612acce..696bef6 100644 --- a/server/app.py +++ b/server/app.py @@ -15,7 +15,7 @@ from sqlalchemy.engine import URL # Local application imports -from models.plant import Plant, Genus, Type, Base +from models.plant import Plant, Genus, Type from models.system import System, Light from models.alert import PlantAlert, Todo @@ -366,8 +366,8 @@ def alert_check(): # Return JSON response return jsonify(alerts_json) -@app.route("/todo//resolve", methods=["POST"]) -def todo_resolve(id): +@app.route("/todo//resolve", methods=["POST"]) +def todo_resolve(todo_id): """ Resolves the plant alert. """ @@ -375,7 +375,7 @@ def todo_resolve(id): logger.info("Received request to resolve plant alert") session = Session() - todo = session.query(Todo).get(id) + todo = session.query(Todo).get(todo_id) todo.resolved = True todo.resolved_on = datetime.now() diff --git a/server/models/alert.py b/server/models/alert.py index 49d746e..72c76d1 100644 --- a/server/models/alert.py +++ b/server/models/alert.py @@ -4,12 +4,10 @@ # Standard library imports from datetime import datetime -from typing import List # Third-party imports from sqlalchemy import Column, Integer, String, DateTime, Boolean, ForeignKey -from sqlalchemy.orm import Mapped, relationship, mapped_column -from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import Mapped, mapped_column from models.plant import Base class Todo(Base): @@ -26,6 +24,9 @@ class Todo(Base): name = Column(String(100), nullable=False) description = Column(String(400), nullable=True) + def __repr__(self): + return f"{self.name}" + def to_json(self): """Convert to json.""" return { @@ -58,6 +59,9 @@ class PlantAlert(Base): ) # System this light belongs to alert_type = Column(String(400), nullable=False) + def __repr__(self): + return f"{self.alert_type}" + def to_json(self): """Convert to json.""" return {