From c448d54c4a1e685deb448979e12123f295975fd8 Mon Sep 17 00:00:00 2001
From: mseng10 <mathewseng@gmail.com>
Date: Tue, 28 May 2024 20:06:56 -0500
Subject: [PATCH] BUG: Pylinting

---
 server/app.py             |  6 +++---
 server/models/__init__.py |  2 --
 server/models/mix.py      |  2 --
 server/models/plant.py    | 28 ++++++++++++++++++++++++++++
 server/models/system.py   |  3 ---
 server/util/util.py       |  7 -------
 6 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/server/app.py b/server/app.py
index 141de6a..0951552 100644
--- a/server/app.py
+++ b/server/app.py
@@ -77,7 +77,7 @@ def get_plants():
     plants = session.query(Plant).all()
     session.close()
     # Transform plants to JSON format
-    plants_json = [{"id": plant.id, "cost": plant.cost, "size": plant.size, "watering": plant.watering} for plant in plants]
+    plants_json = [plant.to_json for plant in plants]
     # Return JSON response
     return jsonify(plants_json)
 
@@ -115,7 +115,7 @@ def get_species():
     species = session.query(Species).all()
     session.close()
     # Transform species to JSON format
-    species_json = [{"id": _species.id, "name": _species.name} for _species in species]
+    species_json = [_species.to_json for _species in species]
     # Return JSON response
     return jsonify(species_json)
 
@@ -130,7 +130,7 @@ def get_genuses():
     genuses = session.query(Genus).all()
     session.close()
     # Transform genuses to JSON format
-    genuses_json = [{"id": genus.id, "name": genus.name, "watering": genus.watering} for genus in genuses]
+    genuses_json = [genus.to_json for genus in genuses]
     # Return JSON response
     return jsonify(genuses_json)
 
diff --git a/server/models/__init__.py b/server/models/__init__.py
index 70d120f..bf3b618 100644
--- a/server/models/__init__.py
+++ b/server/models/__init__.py
@@ -1,7 +1,5 @@
 # from app import engine
 # from models.base import Base
 
-# # TODO: Implement way to make this configurable
-
 # Base.metadata.drop_all(engine)
 # Base.metadata.create_all(engine)
diff --git a/server/models/mix.py b/server/models/mix.py
index 23a710c..d956674 100644
--- a/server/models/mix.py
+++ b/server/models/mix.py
@@ -10,7 +10,6 @@
 
 #     __tablename__ = "mix"
 
-#     # TODO: Base Merge
 #     id = Column(Integer(), primary_key=True)
 #     name = Column(String(100), nullable=False)
 #     created_on = Column(DateTime(), default=datetime.now)
@@ -27,7 +26,6 @@
 
 #     __tablename__ = "soil"
 
-#     # TODO: Base Merge
 #     # Created at stuff
 #     id = Column(Integer(), primary_key=True)
 #     name = Column(String(100), nullable=False)
diff --git a/server/models/plant.py b/server/models/plant.py
index 6ede2bf..978760b 100644
--- a/server/models/plant.py
+++ b/server/models/plant.py
@@ -29,6 +29,18 @@ class Plant(Base):
     dead = Column(Boolean, default=False, nullable=False)  # Death Info
     dead_on = Column(DateTime(), default=None, nullable=True)
 
+    def __repr__(self) -> str:
+        return f"{self.id}"
+
+    def to_json(self):
+        """Convert to json for front end."""
+        return {
+            "id": self.id,
+            "cost": self.cost,
+            "size": self.size,
+            "watering": self.watering,
+            "created_on": self.created_on
+        }
 
 class Species(Base):
     """Species of genus."""
@@ -49,6 +61,14 @@ class Species(Base):
     def __repr__(self) -> str:
         return f"{self.name}"
 
+    def to_json(self):
+        """Convert to json for front end."""
+        return {
+            "id": self.id,
+            "name": self.name,
+            "genus_id": self.genus_id
+        }
+
 
 class Genus(Base):
     """Genus of plant."""
@@ -67,3 +87,11 @@ class Genus(Base):
 
     def __repr__(self) -> str:
         return f"{self.name}"
+
+    def to_json(self):
+        """Convert to json for front end."""
+        return {
+            "id": self.id,
+            "name": self.name,
+            "watering": self.watering
+        }
diff --git a/server/models/system.py b/server/models/system.py
index 28ebadb..fd99607 100644
--- a/server/models/system.py
+++ b/server/models/system.py
@@ -10,7 +10,6 @@
 
 #     __tablename__ = "batch"
 
-#     # TODO: Base Merge
 #     id = Column(Integer(), primary_key=True)
 #     name = Column(String(100), nullable=False)
 #     created_on = Column(DateTime(), default=datetime.now)
@@ -36,7 +35,6 @@
 
 #     __tablename__ = "batch"
 
-#     # TODO: Base Merge
 #     # Creation Info
 #     id = Column(Integer(), primary_key=True)
 #     name = Column(String(100), nullable=False)
@@ -58,7 +56,6 @@
 
 #     __tablename__ = "light"
 
-#     # TODO: Base Merge
 #     id = Column(Integer(), primary_key=True)
 #     name = Column(String(100), nullable=False)
 #     created_on = Column(DateTime(), default=datetime.now)
diff --git a/server/util/util.py b/server/util/util.py
index 69f2eb6..cc63bad 100644
--- a/server/util/util.py
+++ b/server/util/util.py
@@ -9,13 +9,6 @@ def confirm(message: str) -> bool:
         val = input(f"{message} y/n? ")
         return val == "y" or val == "yes"
 
-    @staticmethod
-    def input(message: str) -> str:
-        result: str = input(message)
-        if result == "QUIT":
-            Util.system_exit()
-        return result
-
     @staticmethod
     def system_exit():
         print("")