photowall/api2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reformat code with black

Browse Source
This commit is contained in:
Martin
2019-10-30 13:44:04 +01:00
parent 354e959cc5
commit 0dd8d619b4
28 changed files with 1236 additions and 689 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/models/category.py
+26 -28
View File
@@ -5,35 +5,34 @@ from api.models.locale import Locale
class Category(db.Model):
__tablename__ = 'categories'
__tablename__ = "categories"
id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String(255), nullable=False)
texts = db.relationship(
'CategoryTexts', backref='category', lazy='dynamic')
texts = db.relationship("CategoryTexts", backref="category", lazy="dynamic")
def to_json(self):
return {
'id': self.id,
'name': self.name,
'texts': [t.to_json() for t in self.texts]
"id": self.id,
"name": self.name,
"texts": [t.to_json() for t in self.texts],
}
class CategoryTexts(db.Model):
__tablename__ = 'category_texts'
__tablename__ = "category_texts"
id = db.Column(db.Integer, primary_key=True)
category_id = db.Column(db.Integer, db.ForeignKey('categories.id'))
category_id = db.Column(db.Integer, db.ForeignKey("categories.id"))
locale = db.relationship("Locale")
locale_id = db.Column(db.Integer, db.ForeignKey('locales.id'))
locale_id = db.Column(db.Integer, db.ForeignKey("locales.id"))
wallpaper_name = db.Column(db.String(250))
wallpaper_h1 = db.Column(db.String(250))
wallpaper_description = db.Column(db.Text)
canvas_name = db.Column(db.String(250))
canvas_h1 = db.Column(db.String(250))
canvas_description = db.Column(db.Text)
design_wallpaper_name = db.Column('name', db.String(250))
design_wallpaper_name = db.Column("name", db.String(250))
design_wallpaper_h1 = db.Column(db.String(250))
design_wallpaper_description = db.Column(db.Text)
poster_name = db.Column(db.String(250))
@@ -43,24 +42,23 @@ class CategoryTexts(db.Model):
framed_print_h1 = db.Column(db.String(250))
framed_print_description = db.Column(db.Text)
def to_json(self):
return {
'id': self.id,
'locale': self.locale.value,
'wallpaper_name': self.wallpaper_name,
'wallpaper_h1': self.wallpaper_h1,
'wallpaper_description': self.wallpaper_description,
'canvas_name': self.canvas_name,
'canvas_h1': self.canvas_h1,
'canvas_description': self.canvas_description,
'design_wallpaper_name': self.design_wallpaper_name,
'design_wallpaper_h1': self.design_wallpaper_h1,
'design_wallpaper_description': self.design_wallpaper_description,
'poster_name': self.poster_name,
'poster_h1': self.poster_h1,
'poster_description': self.poster_description,
'framed_print_name': self.framed_print_name,
'framed_print_h1': self.framed_print_h1,
'framed_print_description': self.framed_print_description,
"id": self.id,
"locale": self.locale.value,
"wallpaper_name": self.wallpaper_name,
"wallpaper_h1": self.wallpaper_h1,
"wallpaper_description": self.wallpaper_description,
"canvas_name": self.canvas_name,
"canvas_h1": self.canvas_h1,
"canvas_description": self.canvas_description,
"design_wallpaper_name": self.design_wallpaper_name,
"design_wallpaper_h1": self.design_wallpaper_h1,
"design_wallpaper_description": self.design_wallpaper_description,
"poster_name": self.poster_name,
"poster_h1": self.poster_h1,
"poster_description": self.poster_description,
"framed_print_name": self.framed_print_name,
"framed_print_h1": self.framed_print_h1,
"framed_print_description": self.framed_print_description,
}
api/models/contract_customer.py
+8 -8
View File
@@ -5,21 +5,21 @@ from flask_sqlalchemy import BaseQuery
class ContractCustomerQuery(BaseQuery):
def reseller_store(self, url, territory):
return self.filter(
ContractCustomer.dealerstore == True,
ContractCustomer.dealerurl == url,
ContractCustomer.country == territory).first()
ContractCustomer.country == territory,
).first()
class ContractCustomer(db.Model):
__tablename__ = 'contract_customers'
__tablename__ = "contract_customers"
query_class = ContractCustomerQuery
id = db.Column('contractcustomerid', db.Integer, primary_key=True)
id = db.Column("contractcustomerid", db.Integer, primary_key=True)
country = db.Column(db.String(2))
pricepremium = db.Column(db.Numeric, nullable=False, default=0)
dealerstore = db.Column(db.Boolean, nullable=False, default=False)
@@ -27,8 +27,8 @@ class ContractCustomer(db.Model):
def to_json(self):
return {
'id': self.id,
'pricepremium': self.pricepremium,
'dealerstore': self.dealerstore,
'dealerurl': self.dealerurl
"id": self.id,
"pricepremium": self.pricepremium,
"dealerstore": self.dealerstore,
"dealerurl": self.dealerurl,
}
api/models/designer.py
+16 -16
View File
@@ -5,9 +5,9 @@ from api.lib.slugify import slugify
class Designer(db.Model):
__tablename__ = 'designers'
__tablename__ = "designers"
id = db.Column('designerid', db.Integer, primary_key=True)
id = db.Column("designerid", db.Integer, primary_key=True)
commission = db.Column(db.Integer(), nullable=False)
commission_resale = db.Column(db.Integer(), nullable=False)
currency = db.Column(db.String(3), nullable=False)
@@ -47,18 +47,18 @@ class Designer(db.Model):
def to_json(self):
return {
'id': self.id,
'commission': self.commission,
'commission_resale': self.commission_resale,
'currency': self.currency,
'name': self.name,
'no_follow': self.no_follow,
'path': self.path,
'sort_desc': 1 if self.sort_desc else 0,
'territory': self.territory,
'username': self.username,
'visible_designerpage': self.visible_designerpage,
'visible_list': self.visible_list,
'visible_productpage': self.visible_productpage,
'visible_search': self.visible_search,
"id": self.id,
"commission": self.commission,
"commission_resale": self.commission_resale,
"currency": self.currency,
"name": self.name,
"no_follow": self.no_follow,
"path": self.path,
"sort_desc": 1 if self.sort_desc else 0,
"territory": self.territory,
"username": self.username,
"visible_designerpage": self.visible_designerpage,
"visible_list": self.visible_list,
"visible_productpage": self.visible_productpage,
"visible_search": self.visible_search,
}
api/models/i18n.py
+5 -5
View File
@@ -6,23 +6,23 @@ from datetime import datetime
class Text(db.Model):
__tablename__ = 'i18n-texts'
__tablename__ = "i18n-texts"
id = db.Column('textid', db.Integer, primary_key=True)
id = db.Column("textid", db.Integer, primary_key=True)
name = db.Column(db.String(100), nullable=False)
category = db.Column(db.String(255))
inserted = db.Column(db.DateTime, default=datetime.utcnow)
updated = db.Column(db.DateTime)
data = db.relationship('TextData', lazy='dynamic')
data = db.relationship("TextData", lazy="dynamic")
__table_args__ = (db.UniqueConstraint(name, category),)
class TextData(db.Model):
__tablename__ = 'i18n-texts_data'
__tablename__ = "i18n-texts_data"
textid = db.Column(db.Integer, db.ForeignKey('i18n-texts.textid'))
textid = db.Column(db.Integer, db.ForeignKey("i18n-texts.textid"))
language = db.Column(db.String(3), nullable=False)
territory = db.Column(db.String(2), nullable=False)
text = db.Column(db.Text)
api/models/inquiry.py
+18 -12
View File
@@ -6,9 +6,9 @@ from api.lib.utils import round_half_up
class Inquiry(db.Model):
__tablename__ = 'inquiries'
__tablename__ = "inquiries"
id = db.Column('inquiryid', db.Integer, primary_key=True)
id = db.Column("inquiryid", db.Integer, primary_key=True)
territory = db.Column(db.String(2))
product_group = db.Column(db.String(100))
price_m2 = db.Column(db.Numeric)
@@ -17,24 +17,30 @@ class Inquiry(db.Model):
width = db.Column(db.Integer)
height = db.Column(db.Integer)
framed = db.Column(db.Integer, nullable=False, default=0)
dealer_store_id = db.Column('dealer_store', db.Integer, db.ForeignKey(
'contract_customers.contractcustomerid'))
dealer_store = db.relationship('ContractCustomer', uselist=False)
dealer_store_id = db.Column(
"dealer_store",
db.Integer,
db.ForeignKey("contract_customers.contractcustomerid"),
)
dealer_store = db.relationship("ContractCustomer", uselist=False)
hanger = db.Column(db.String)
materialid = db.Column(db.Integer, db.ForeignKey(
'product-materials.materialid'), default=1, nullable=False)
material = db.relationship('Material', uselist=False)
materialid = db.Column(
db.Integer,
db.ForeignKey("product-materials.materialid"),
default=1,
nullable=False,
)
material = db.relationship("Material", uselist=False)
pricepremium = db.Column(db.Numeric, nullable=False, default=0)
productId = db.Column(db.Integer, db.ForeignKey(
'product-products.productid'))
product = db.relationship('Product', uselist=False)
productId = db.Column(db.Integer, db.ForeignKey("product-products.productid"))
product = db.relationship("Product", uselist=False)
automated = db.Column(db.Integer, nullable=False, default=0)
@property
def market(self):
market = market_model.from_territory(self.territory)
if not market:
raise ValueError('Invalid territory: {}'.format(self.territory))
raise ValueError("Invalid territory: {}".format(self.territory))
return market
def local_price_retouch(self, rounded=True, inc_vat=False):
api/models/locale.py
+1 -1
View File
@@ -4,7 +4,7 @@ from api.extensions import db
class Locale(db.Model):
__tablename__ = 'locales'
__tablename__ = "locales"
id = db.Column(db.Integer, primary_key=True)
value = db.Column(db.String(5))
api/models/market.py
+27 -29
View File
@@ -6,22 +6,21 @@ from .product import Currencies
class PriceAdjustments(db.Model):
__tablename__ = 'price_adjustments'
__tablename__ = "price_adjustments"
territory = db.Column(db.String(2), primary_key=True)
adjustment = db.Column(db.Numeric)
class Market(object):
def __init__(self, name, locale, currency, vat, iso3):
self.name = name
self.locale = locale
self.currency = currency
self.vat = vat
self.iso3 = iso3
self.language = locale.split('_')[0]
self.territory = locale.split('_')[1]
self.language = locale.split("_")[0]
self.territory = locale.split("_")[1]
self._price_adjustments = None
self._exchange_rate = None
self._price_adjustments = None
@@ -29,8 +28,7 @@ class Market(object):
@property
def price_adjustments(self):
if self._price_adjustments is None:
row = PriceAdjustments.query.filter_by(
territory=self.territory).first()
row = PriceAdjustments.query.filter_by(territory=self.territory).first()
if row:
self._price_adjustments = float(row.adjustment)
else:
@@ -58,15 +56,15 @@ class Market(object):
def to_json(self):
return {
'name': self.name,
'locale': self.locale,
'currency': self.currency,
'vat': self.vat,
'iso3': self.iso3,
'language': self.language,
'territory': self.territory,
'price_adjustments': self.price_adjustments,
'exchange_rate': self.exchange_rate
"name": self.name,
"locale": self.locale,
"currency": self.currency,
"vat": self.vat,
"iso3": self.iso3,
"language": self.language,
"territory": self.territory,
"price_adjustments": self.price_adjustments,
"exchange_rate": self.exchange_rate,
}
def __repr__(self):
@@ -74,20 +72,20 @@ class Market(object):
_markets = [
('Sweden', 'sv_SE', 'SEK', 1.25, 'SWE'),
('Norway', 'nn_NO', 'NOK', 1.25, 'NOR'),
('United kingdom', 'en_GB', 'GBP', 1.20, 'GBR'),
('Denmark', 'da_DK', 'DKK', 1.25, 'DNK'),
('Finland', 'fi_FI', 'EUR', 1.24, 'FIN'),
('Russia', 'ru_RU', 'EUR', 1, 'RUS'),
('Germany', 'de_DE', 'EUR', 1.19, 'DEU'),
('Netherlands', 'nl_NL', 'EUR', 1.21, 'NLD'),
('Austria', 'de_AT', 'EUR', 1.20, 'AUT'),
('USA', 'en_US', 'USD', 1, 'USA'),
('Spain', 'es_ES', 'EUR', 1.21, 'ESP'),
('France', 'fr_FR', 'EUR', 1.20, 'FRA'),
('Poland', 'pl_PL', 'EUR', 1.23, 'POL'),
('International', 'en_EU', 'EUR', 1.25, None),
("Sweden", "sv_SE", "SEK", 1.25, "SWE"),
("Norway", "nn_NO", "NOK", 1.25, "NOR"),
("United kingdom", "en_GB", "GBP", 1.20, "GBR"),
("Denmark", "da_DK", "DKK", 1.25, "DNK"),
("Finland", "fi_FI", "EUR", 1.24, "FIN"),
("Russia", "ru_RU", "EUR", 1, "RUS"),
("Germany", "de_DE", "EUR", 1.19, "DEU"),
("Netherlands", "nl_NL", "EUR", 1.21, "NLD"),
("Austria", "de_AT", "EUR", 1.20, "AUT"),
("USA", "en_US", "USD", 1, "USA"),
("Spain", "es_ES", "EUR", 1.21, "ESP"),
("France", "fr_FR", "EUR", 1.20, "FRA"),
("Poland", "pl_PL", "EUR", 1.23, "POL"),
("International", "en_EU", "EUR", 1.25, None),
]
api/models/product.py
+16 -19
View File
@@ -6,23 +6,22 @@ from flask_sqlalchemy import BaseQuery
class Product(db.Model):
__tablename__ = 'product-products'
__tablename__ = "product-products"
id = db.Column('productid', db.Integer, primary_key=True)
designerid = db.Column(db.Integer, db.ForeignKey('designers.designerid'))
designer = db.relationship('Designer', backref='products')
id = db.Column("productid", db.Integer, primary_key=True)
designerid = db.Column(db.Integer, db.ForeignKey("designers.designerid"))
designer = db.relationship("Designer", backref="products")
class Currencies(db.Model):
__tablename__ = 'product-currencies'
__tablename__ = "product-currencies"
iso3char = db.Column(db.String(3), primary_key=True)
exchange_rate = db.Column(db.Numeric, default=1)
class MaterialQuery(BaseQuery):
def wallpapers(self):
return self.filter(Material.name.in_(Material.WALLPAPER_MATERIALS))
@@ -32,25 +31,23 @@ class MaterialQuery(BaseQuery):
class Material(db.Model):
__tablename__ = 'product-materials'
__tablename__ = "product-materials"
query_class = MaterialQuery
WALLPAPER_MATERIALS = ['standard-wallpaper',
# 'self-adhesive-wallpaper', // isn't sold now
'premium-wallpaper']
CANVAS_MATERIALS = ['standard-canvas']
WALLPAPER_MATERIALS = [
"standard-wallpaper",
# 'self-adhesive-wallpaper', // isn't sold now
"premium-wallpaper",
]
CANVAS_MATERIALS = ["standard-canvas"]
id = db.Column('materialid', db.Integer, primary_key=True)
name = db.Column('material', db.String(255), nullable=False)
price = db.Column('price', db.Integer)
id = db.Column("materialid", db.Integer, primary_key=True)
name = db.Column("material", db.String(255), nullable=False)
price = db.Column("price", db.Integer)
def to_json(self):
return {
'id': self.id,
'name': self.name,
'price': float(self.price)
}
return {"id": self.id, "name": self.name, "price": float(self.price)}
def __repr__(self):
return self.name