Improved __str__ functions in models

TaaviE · Dec 17, 2020 · 1293743 · 1293743
1 parent d79160d
commit 1293743
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/models/events_model.py b/models/events_model.py
@@ -34,7 +34,8 @@ class ShufflingEvent(db.Model):
                                       backref="events_administered")
 
     def __str__(self):
-        return f"""{{"id": {self.id},""" \
+        return f"""{{""" \
+               f""" "id": {self.id}, """ \
                f""" "created_at": "{self.created_at}", """ \
                f""" "name": "{self.name}", """ \
                f""" "event_at": "{self.year}", """ \

diff --git a/models/names_model.py b/models/names_model.py
@@ -19,7 +19,7 @@ class Name(db.Model):
     genitive: str = Column(VARCHAR(255), nullable=False)
 
     def __repr__(self):
-        return "<id {}>".format(self.id)
+        return f"<id {self.name}>"
 
     def __str__(self):
-        return "{\"name\": \"{name}\", \"genitive\": \"{genitive}\"}".format(name=self.name, genitive=self.genitive)
+        return f"{{\"name\": \"{self.name}\", \"genitive\": \"{self.genitive}\"}}"