Commit fa3d2b43c28cacf50183fcfffa14a75547cc0abb
1 parent
0b094aac
Exists in
master
Conflate the database model to accept the output data.
Showing
1 changed file
with
12 additions
and
3 deletions
Show diff stats
flaskr/models.py
1 | +from flaskr.core import generate_unique_id | ||
1 | from flask_sqlalchemy import SQLAlchemy | 2 | from flask_sqlalchemy import SQLAlchemy |
2 | from flask_login import UserMixin, AnonymousUserMixin | 3 | from flask_login import UserMixin, AnonymousUserMixin |
3 | from werkzeug.security import generate_password_hash, check_password_hash | 4 | from werkzeug.security import generate_password_hash, check_password_hash |
4 | import enum | 5 | import enum |
5 | 6 | ||
6 | - | ||
7 | # These are not the emission "models" in the scientific meaning of the word. | 7 | # These are not the emission "models" in the scientific meaning of the word. |
8 | # They are the SQL Database Models. | 8 | # They are the SQL Database Models. |
9 | # These are also named Entities, in other conventions (we're following flasks") | 9 | # These are also named Entities, in other conventions (we're following flasks") |
@@ -22,10 +22,15 @@ class StatusEnum(enum.Enum): | @@ -22,10 +22,15 @@ class StatusEnum(enum.Enum): | ||
22 | 22 | ||
23 | class Estimation(db.Model): | 23 | class Estimation(db.Model): |
24 | id = db.Column(db.Integer(), primary_key=True) | 24 | id = db.Column(db.Integer(), primary_key=True) |
25 | + public_id = db.Column( | ||
26 | + db.Unicode(), | ||
27 | + default=lambda: generate_unique_id(), | ||
28 | + unique=True | ||
29 | + ) | ||
25 | email = db.Column(db.Unicode(1024)) | 30 | email = db.Column(db.Unicode(1024)) |
26 | first_name = db.Column(db.Unicode(1024)) # Antoine | 31 | first_name = db.Column(db.Unicode(1024)) # Antoine |
27 | last_name = db.Column(db.Unicode(1024)) # Goutenoir | 32 | last_name = db.Column(db.Unicode(1024)) # Goutenoir |
28 | - status = db.Column(db.Enum(StatusEnum)) | 33 | + status = db.Column(db.Enum(StatusEnum), default=StatusEnum.pending) |
29 | 34 | ||
30 | # City, Country | 35 | # City, Country |
31 | # One address per line | 36 | # One address per line |
@@ -34,6 +39,10 @@ class Estimation(db.Model): | @@ -34,6 +39,10 @@ class Estimation(db.Model): | ||
34 | 39 | ||
35 | compute_optimal_destination = db.Column(db.Boolean()) | 40 | compute_optimal_destination = db.Column(db.Boolean()) |
36 | 41 | ||
42 | + output_as_yaml = db.Column(db.UnicodeText()) | ||
43 | + warnings = db.Column(db.UnicodeText()) | ||
44 | + errors = db.Column(db.UnicodeText()) | ||
45 | + | ||
37 | 46 | ||
38 | # USERS ####################################################################### | 47 | # USERS ####################################################################### |
39 | 48 | ||
@@ -72,4 +81,4 @@ class User(db.Model, UserMixin): | @@ -72,4 +81,4 @@ class User(db.Model, UserMixin): | ||
72 | return self.id | 81 | return self.id |
73 | 82 | ||
74 | def __repr__(self): | 83 | def __repr__(self): |
75 | - return '<User %r>' % self.username | ||
76 | \ No newline at end of file | 84 | \ No newline at end of file |
85 | + return '<User %r>' % self.username |