Reformatted the code using the BLACK reformatter

writeson · writeson · commit 3ae7cceb3468 · 2019-01-22T10:57:28.000-05:00
diff --git a/flask-connexion-rest-part-3/build_database.py b/flask-connexion-rest-part-3/build_database.py
@@ -12,25 +12,29 @@
             ("Cool, a mini-blogging application!", "2019-01-06 22:17:54"),
             ("This could be useful", "2019-01-08 22:17:54"),
             ("Well, sort of useful", "2019-03-06 22:17:54"),
-        ]
+        ],
     },
     {
         "fname": "Kent",
         "lname": "Brockman",
         "notes": [
-            ("I'm going to make really profound observations",
-             "2019-01-07 22:17:54"),
-            ("Maybe they'll be more obvious than I thought",
-             "2019-02-06 22:17:54"),
-        ]
+            (
+                "I'm going to make really profound observations",
+                "2019-01-07 22:17:54",
+            ),
+            (
+                "Maybe they'll be more obvious than I thought",
+                "2019-02-06 22:17:54",
+            ),
+        ],
     },
     {
         "fname": "Bunny",
         "lname": "Easter",
         "notes": [
             ("Has anyone seen my Easter eggs?", "2019-01-07 22:47:54"),
             ("I'm really late delivering these!", "2019-04-06 22:17:54"),
-        ]
+        ],
     },
 ]
 
@@ -48,9 +52,11 @@
     # Add the notes for the person
     for note in person.get("notes"):
         content, timestamp = note
-        p.notes.append(Note(
-            content=content,
-            timestamp=datetime.strptime(timestamp, "%Y-%m-%d %H:%M:%S"))
+        p.notes.append(
+            Note(
+                content=content,
+                timestamp=datetime.strptime(timestamp, "%Y-%m-%d %H:%M:%S"),
+            )
         )
     db.session.add(p)
 
diff --git a/flask-connexion-rest-part-3/models.py b/flask-connexion-rest-part-3/models.py
@@ -4,27 +4,27 @@
 
 
 class Person(db.Model):
-    __tablename__ = 'person'
+    __tablename__ = "person"
     person_id = db.Column(db.Integer, primary_key=True)
     lname = db.Column(db.String(32))
     fname = db.Column(db.String(32))
     timestamp = db.Column(
         db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow
     )
     notes = db.relationship(
-        'Note',
-        backref='person',
-        lazy='joined',
-        cascade='all, delete, delete-orphan',
+        "Note",
+        backref="person",
+        lazy="joined",
+        cascade="all, delete, delete-orphan",
         single_parent=True,
-        order_by='desc(Note.timestamp)'
+        order_by="desc(Note.timestamp)",
     )
 
 
 class Note(db.Model):
-    __tablename__ = 'note'
+    __tablename__ = "note"
     note_id = db.Column(db.Integer, primary_key=True)
-    person_id = db.Column(db.Integer, db.ForeignKey('person.person_id'))
+    person_id = db.Column(db.Integer, db.ForeignKey("person.person_id"))
     content = db.Column(db.String, nullable=False)
     timestamp = db.Column(
         db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow
@@ -35,13 +35,15 @@ class PersonSchema(ma.ModelSchema):
     class Meta:
         model = Person
         sqla_session = db.session
-    notes = fields.Nested('PersonNoteSchema', default=[], many=True)
+
+    notes = fields.Nested("PersonNoteSchema", default=[], many=True)
 
 
 class PersonNoteSchema(ma.ModelSchema):
     """
     This class exists to get around a recursion issue
     """
+
     note_id = fields.Int()
     person_id = fields.Int()
     content = fields.Str()
@@ -52,13 +54,15 @@ class NoteSchema(ma.ModelSchema):
     class Meta:
         model = Note
         sqla_session = db.session
-    person = fields.Nested('NotePersonSchema', default=None)
+
+    person = fields.Nested("NotePersonSchema", default=None)
 
 
 class NotePersonSchema(ma.ModelSchema):
     """
     This class exists to get around a recursion issue
     """
+
     person_id = fields.Int()
     lname = fields.Str()
     fname = fields.Str()
diff --git a/flask-connexion-rest-part-3/notes.py b/flask-connexion-rest-part-3/notes.py
@@ -19,7 +19,7 @@ def read_all():
     notes = Note.query.order_by(db.desc(Note.timestamp)).all()
 
     # Serialize the list of notes from our data
-    note_schema = NoteSchema(many=True, exclude=['person.notes'])
+    note_schema = NoteSchema(many=True, exclude=["person.notes"])
     data = note_schema.dump(notes).data
     return data
 
@@ -35,11 +35,12 @@ def read_one(person_id, note_id):
     :return:                json string of note contents
     """
     # Query the database for the note
-    note = Note.query \
-        .join(Person, Person.person_id == Note.person_id) \
-        .filter(Person.person_id == person_id) \
-        .filter(Note.note_id == note_id) \
+    note = (
+        Note.query.join(Person, Person.person_id == Note.person_id)
+        .filter(Person.person_id == person_id)
+        .filter(Note.note_id == note_id)
         .one_or_none()
+    )
 
     # Was a note found?
     if note is not None:
@@ -49,10 +50,7 @@ def read_one(person_id, note_id):
 
     # Otherwise, nope, didn't find that note
     else:
-        abort(
-            404,
-            "Note not found for Id: {note_id}".format(note_id=note_id),
-        )
+        abort(404, "Note not found for Id: {note_id}".format(note_id=note_id))
 
 
 def create(person_id, note):
@@ -97,10 +95,11 @@ def update(person_id, note_id, note):
     :param content:            The JSON containing the note data
     :return:                200 on success
     """
-    update_note = Note.query \
-        .filter(Person.person_id == person_id) \
-        .filter(Note.note_id == note_id) \
+    update_note = (
+        Note.query.filter(Person.person_id == person_id)
+        .filter(Note.note_id == note_id)
         .one_or_none()
+    )
 
     # Did we find an existing note?
     if update_note is not None:
@@ -124,10 +123,7 @@ def update(person_id, note_id, note):
 
     # Otherwise, nope, didn't find that note
     else:
-        abort(
-            404,
-            "Note not found for Id: {note_id}".format(note_id=note_id),
-        )
+        abort(404, "Note not found for Id: {note_id}".format(note_id=note_id))
 
 
 def delete(person_id, note_id):
@@ -139,10 +135,11 @@ def delete(person_id, note_id):
     :return:            200 on successful delete, 404 if not found
     """
     # Get the note requested
-    note = Note.query \
-        .filter(Person.person_id == person_id) \
-        .filter(Note.note_id == note_id) \
+    note = (
+        Note.query.filter(Person.person_id == person_id)
+        .filter(Note.note_id == note_id)
         .one_or_none()
+    )
 
     # did we find a note?
     if note is not None:
@@ -154,7 +151,4 @@ def delete(person_id, note_id):
 
     # Otherwise, nope, didn't find that note
     else:
-        abort(
-            404,
-            "Note not found for Id: {note_id}".format(note_id=note_id),
-        )
+        abort(404, "Note not found for Id: {note_id}".format(note_id=note_id))
diff --git a/flask-connexion-rest-part-3/people.py b/flask-connexion-rest-part-3/people.py
@@ -33,10 +33,11 @@ def read_one(person_id):
     :return:            person matching id
     """
     # Build the initial query
-    person = Person.query \
-        .filter(Person.person_id == person_id) \
-        .outerjoin(Note) \
+    person = (
+        Person.query.filter(Person.person_id == person_id)
+        .outerjoin(Note)
         .one_or_none()
+    )
 
     # Did we find a person?
     if person is not None:
