server: Add Aardbei fields to Person

piket_server/__init__.py

@@ -29,20 +29,23 @@ class Person(db.Model):
     __tablename__ = "people"
 
     person_id = db.Column(db.Integer, primary_key=True)
-    name = db.Column(db.String, nullable=False)
+    full_name = db.Column(db.String, nullable=False)
+    display_name = db.Column(db.String, nullable=True)
+    aardbei_id = db.Column(db.Integer, nullable=True)
     active = db.Column(db.Boolean, nullable=False, default=False)
 
     consumptions = db.relationship("Consumption", backref="person", lazy=True)
 
     def __repr__(self) -> str:
-        return f"<Person {self.person_id}: {self.name}>"
+        return f"<Person {self.person_id}: {self.full_name}>"
 
     @property
     def as_dict(self) -> dict:
         return {
             "person_id": self.person_id,
             "active": self.active,
-            "name": self.name,
+            "full_name": self.full_name,
+            "display_name": self.display_name,
             "consumptions": {
                 ct.consumption_type_id: Consumption.query.filter_by(person=self)
                 .filter_by(settlement=None)
@@ -141,11 +144,11 @@ class Settlement(db.Model):
                 .filter_by(reversed=False)
                 .filter_by(consumption_type=c_type)
                 .group_by(Consumption.person_id)
-                .order_by(Person.name)
+                .order_by(Person.full_name)
                 .outerjoin(Person)
                 .with_entities(
                     Person.person_id,
-                    Person.name,
+                    Person.full_name,
                     func.count(Consumption.consumption_id),
                 )
                 .all()
@@ -202,7 +205,7 @@ class Consumption(db.Model):
     reversed = db.Column(db.Boolean, default=False, nullable=False)
 
     def __repr__(self) -> str:
-        return f"<Consumption: {self.consumption_type.name} for {self.person.name}>"
+        return f"<Consumption: {self.consumption_type.name} for {self.person.full_name}>"
 
     @property
     def as_dict(self) -> dict:
@@ -253,8 +256,8 @@ def status() -> None:
 @app.route("/people", methods=["GET"])
 def get_people():
     """ Return a list of currently known people. """
-    people = Person.query.order_by(Person.name).all()
-    q = Person.query.order_by(Person.name)
+    people = Person.query.order_by(Person.full_name).all()
+    q = Person.query.order_by(Person.full_name)
     if request.args.get("active"):
         active_status = request.args.get("active", type=int)
         q = q.filter_by(active=active_status)

piket_server/alembic/versions/cca57457a0a6_add_aardbei_fields.py

@@ -0,0 +1,30 @@
+"""Add Aardbei fields
+
+Revision ID: cca57457a0a6
+Revises: 2f3a49058a67
+Create Date: 2019-09-05 21:38:28.489281
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "cca57457a0a6"
+down_revision = "2f3a49058a67"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    with op.batch_alter_table("people") as batch_op:
+        batch_op.alter_column("name", new_column_name="full_name")
+        batch_op.add_column(sa.Column("aardbei_id", sa.Integer(), nullable=True))
+        batch_op.add_column(sa.Column("display_name", sa.String(), nullable=True))
+
+
+def downgrade():
+    with op.batch_alter_table("people") as batch_op:
+        batch_op.alter_column("full_name", new_column_name="name")
+        batch_op.drop_column("aardbei_id")
+        batch_op.drop_column("display_name")