diff --git a/api/exceptions.py b/api/exceptions.py index 74a5949..a3de8bf 100644 --- a/api/exceptions.py +++ b/api/exceptions.py @@ -1,5 +1,6 @@ # coding=UTF-8 + class ValidationError(Exception): def __init__(self, message): diff --git a/api/models/__init__.py b/api/models/__init__.py index 19d7b4a..0552a64 100644 --- a/api/models/__init__.py +++ b/api/models/__init__.py @@ -1,4 +1,4 @@ from .designer import Designer from .category import Category from .contract_customer import ContractCustomer -from .inquiry import Inquiry \ No newline at end of file +from .inquiry import Inquiry diff --git a/api/models/product.py b/api/models/product.py index 9a6e2a5..0f8e08a 100644 --- a/api/models/product.py +++ b/api/models/product.py @@ -27,11 +27,12 @@ class Material(db.Model): query_class = MaterialQuery - WALLPAPER_MATERIALS = ['standard-wallpaper', 'self-adhesive-wallpaper', 'premium-wallpaper'] + WALLPAPER_MATERIALS = ['standard-wallpaper', + 'self-adhesive-wallpaper', 'premium-wallpaper'] CANVAS_MATERIALS = ['standard-canvas'] id = db.Column('materialid', db.Integer, primary_key=True) - name = db.Column('material', db.String(255), nullable=False) + name = db.Column('material', db.String(255), nullable=False) material_price = db.relationship('MaterialPrice', uselist=False) @property @@ -53,11 +54,11 @@ class Material(db.Model): class MaterialPrice(db.Model): - __tablename__ = 'v_materialprice'; - + __tablename__ = 'v_materialprice' groupid = db.Column(db.Integer) - materialid = db.Column(db.Integer, db.ForeignKey('product-materials.materialid')) + materialid = db.Column(db.Integer, db.ForeignKey( + 'product-materials.materialid')) price = db.Column(db.Numeric) __table_args__ = (db.PrimaryKeyConstraint(groupid, materialid),)