Browse Source

server: Add Aardbei fields to Person

Maarten van den Berg 5 years ago
parent
commit
141a177112

+ 5 - 2
piket_server/__init__.py

@@ -29,7 +29,9 @@ class Person(db.Model):
29 29
     __tablename__ = "people"
30 30
 
31 31
     person_id = db.Column(db.Integer, primary_key=True)
32
-    name = db.Column(db.String, nullable=False)
32
+    full_name = db.Column(db.String, nullable=False)
33
+    display_name = db.Column(db.String, nullable=True)
34
+    aardbei_id = db.Column(db.Integer, nullable=True)
33 35
     active = db.Column(db.Boolean, nullable=False, default=False)
34 36
 
35 37
     consumptions = db.relationship("Consumption", backref="person", lazy=True)
@@ -42,7 +44,8 @@ class Person(db.Model):
42 44
         return {
43 45
             "person_id": self.person_id,
44 46
             "active": self.active,
45
-            "name": self.name,
47
+            "full_name": self.full_name,
48
+            "display_name": self.display_name,
46 49
             "consumptions": {
47 50
                 ct.consumption_type_id: Consumption.query.filter_by(person=self)
48 51
                 .filter_by(settlement=None)

+ 30 - 0
piket_server/alembic/versions/cca57457a0a6_add_aardbei_fields.py

@@ -0,0 +1,30 @@
1
+"""Add Aardbei fields
2
+
3
+Revision ID: cca57457a0a6
4
+Revises: 2f3a49058a67
5
+Create Date: 2019-09-05 21:38:28.489281
6
+
7
+"""
8
+from alembic import op
9
+import sqlalchemy as sa
10
+
11
+
12
+# revision identifiers, used by Alembic.
13
+revision = "cca57457a0a6"
14
+down_revision = "2f3a49058a67"
15
+branch_labels = None
16
+depends_on = None
17
+
18
+
19
+def upgrade():
20
+    with op.batch_alter_table("people") as batch_op:
21
+        batch_op.alter_column("name", new_name="full_name")
22
+        batch_op.add_column(sa.Column("aardbei_id", sa.Integer(), nullable=True))
23
+        batch_op.add_column(sa.Column("display_name", sa.String(), nullable=True))
24
+
25
+
26
+def downgrade():
27
+    with op.batch_alter_table("people") as batch_op:
28
+        batch_op.alter_column("full_name", new_name="name")
29
+        batch_op.drop_column("aardbei_id")
30
+        batch_op.drop_column("display_name")