reformat code with black

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
+3 -3
View File
@@ -1,8 +1,8 @@
SERVER_NAME = 'localhost'
SQLALCHEMY_DATABASE_URI = 'sqlite://'
SERVER_NAME = "localhost"
SQLALCHEMY_DATABASE_URI = "sqlite://"
SQLALCHEMY_TRACK_MODIFICATIONS = True
PRESERVE_CONTEXT_ON_EXCEPTION = False
ESALES_URL = ''
ESALES_URL = ""
TESTING = True
DEBUG = True
SQLALCHEMY_ECHO = False
+4 -7
View File
@@ -3,18 +3,16 @@ from api import models
class DesignerFactory(factory.Factory):
class Meta:
model = models.Designer
name = 'Spiderman'
username = 'spiderman'
territory = 'US'
currency = 'USD'
name = "Spiderman"
username = "spiderman"
territory = "US"
currency = "USD"
class ContractCustomerFactory(factory.Factory):
class Meta:
model = models.ContractCustomer
@@ -22,7 +20,6 @@ class ContractCustomerFactory(factory.Factory):
class InquiryFactory(factory.Factory):
class Meta:
model = models.Inquiry
+6 -5
View File
@@ -5,19 +5,20 @@ from api.lib.limits import calculate_canvas_limits, calculate_canvas_frame_limit
class TestCalculate(unittest2.TestCase):
def test_calculate_canvas_limits(self):
self.assertEqual((100, 100), calculate_canvas_limits(100, 100))
self.assertEqual((500, 100), calculate_canvas_limits(800, 100))
self.assertEqual((100, 500), calculate_canvas_limits(100, 800))
self.assertEqual((20, 20), calculate_canvas_limits(10, 10))
self.assertEqual((150, 50), calculate_canvas_limits(
400, 50, True), "Framed canvas")
self.assertEqual(
(150, 50), calculate_canvas_limits(400, 50, True), "Framed canvas"
)
def test_calculate_canvas_frame_limits(self):
self.assertEqual((100, 100), calculate_canvas_frame_limits(100, 100))
self.assertEqual((40, 40), calculate_canvas_frame_limits(1, 1))
self.assertEqual((150, 150), calculate_canvas_frame_limits(200, 200))
self.assertEqual((150, 40), calculate_canvas_frame_limits(200, 10))
self.assertEqual((110, 120), calculate_canvas_frame_limits(
112, 117), "round to nearest 10")
self.assertEqual(
(110, 120), calculate_canvas_frame_limits(112, 117), "round to nearest 10"
)
+411 -160
View File
@@ -10,27 +10,27 @@ from api.models import Product
from api.models.product import Material
sweden = market.from_territory('SE')
sweden = market.from_territory("SE")
sweden.price_adjustments = 1
sweden.exchange_rate = 1
denmark = market.from_territory('DK')
denmark = market.from_territory("DK")
denmark.price_adjustments = 1.185
denmark.exchange_rate = 0.799000
us = market.from_territory('US')
us = market.from_territory("US")
us.price_adjustments = 1.06
us.exchange_rate = 0.119800
nl = market.from_territory('NL')
nl = market.from_territory("NL")
nl.price_adjustments = 1.15
nl.exchange_rate = 0.100000
eu = market.from_territory('EU')
eu = market.from_territory("EU")
eu.price_adjustments = 1.13
eu.exchange_rate = 0.100000
russia = market.from_territory('RU')
russia = market.from_territory("RU")
russia.price_adjustments = 1
russia.exchange_rate = 0.100000 # russia uses EUR
@@ -42,63 +42,172 @@ piterra = ContractCustomerFactory(pricepremium=36.029411)
designer_moomin = DesignerFactory()
designer_moomin.pricepremium = 2
standard_wallpaper = Material(name='standard-wallpaper', price=23600)
premium_wallpaper = Material(name='premium-wallpaper', price=26000)
standard_canvas = Material(name='standard-canvas', price=79920)
standard_wallpaper = Material(name="standard-wallpaper", price=23600)
premium_wallpaper = Material(name="premium-wallpaper", price=26000)
standard_canvas = Material(name="standard-canvas", price=79920)
class TestPrice(unittest2.TestCase):
def test_m2_price(self):
self.assertEqual(236, m2_price(
material=standard_wallpaper, market=sweden, inc_vat=False))
self.assertEqual(260, m2_price(
material=premium_wallpaper, market=sweden, inc_vat=False))
self.assertEqual(295, m2_price(
material=standard_wallpaper, market=sweden, inc_vat=True))
self.assertEqual(223, m2_price(
material=standard_wallpaper, market=denmark, inc_vat=False))
self.assertAlmostEqual(79.92, m2_price(
material=standard_canvas, market=russia, rounded=False, inc_vat=False), places=2)
self.assertAlmostEqual(81.5184, m2_price(
material=standard_canvas, market=russia, designer=designer_moomin, rounded=False, inc_vat=False), places=4)
self.assertAlmostEqual(110.88899937662403, m2_price(material=standard_canvas, market=russia,
designer=designer_moomin, reseller=piterra, rounded=False, inc_vat=False), places=4)
self.assertEqual(
236, m2_price(material=standard_wallpaper, market=sweden, inc_vat=False)
)
self.assertEqual(
260, m2_price(material=premium_wallpaper, market=sweden, inc_vat=False)
)
self.assertEqual(
295, m2_price(material=standard_wallpaper, market=sweden, inc_vat=True)
)
self.assertEqual(
223, m2_price(material=standard_wallpaper, market=denmark, inc_vat=False)
)
self.assertAlmostEqual(
79.92,
m2_price(
material=standard_canvas, market=russia, rounded=False, inc_vat=False
),
places=2,
)
self.assertAlmostEqual(
81.5184,
m2_price(
material=standard_canvas,
market=russia,
designer=designer_moomin,
rounded=False,
inc_vat=False,
),
places=4,
)
self.assertAlmostEqual(
110.88899937662403,
m2_price(
material=standard_canvas,
market=russia,
designer=designer_moomin,
reseller=piterra,
rounded=False,
inc_vat=False,
),
places=4,
)
inquiry = Inquiry(pricepremium=36.029411)
self.assertEqual(44, m2_price(material=standard_wallpaper,
market=russia, reseller=piterra, inquiry=inquiry, inc_vat=False))
self.assertEqual(
44,
m2_price(
material=standard_wallpaper,
market=russia,
reseller=piterra,
inquiry=inquiry,
inc_vat=False,
),
)
def test_wallpaper_price(self):
self.assertEqual(295, wallpaper_price(
width=1, height=1, material=standard_wallpaper, market=sweden))
self.assertEqual(295, wallpaper_price(
width=100, height=100, material=standard_wallpaper, market=sweden))
self.assertEqual(1180, wallpaper_price(
width=200, height=200, material=standard_wallpaper, market=sweden))
self.assertEqual(325, wallpaper_price(
width=100, height=100, material=premium_wallpaper, market=sweden))
self.assertEqual(279, wallpaper_price(
width=100, height=100, material=standard_wallpaper, market=denmark))
self.assertEqual(236, wallpaper_price(
width=100, height=100, material=standard_wallpaper, market=sweden, inc_vat=False))
self.assertEqual(
295,
wallpaper_price(
width=1, height=1, material=standard_wallpaper, market=sweden
),
)
self.assertEqual(
295,
wallpaper_price(
width=100, height=100, material=standard_wallpaper, market=sweden
),
)
self.assertEqual(
1180,
wallpaper_price(
width=200, height=200, material=standard_wallpaper, market=sweden
),
)
self.assertEqual(
325,
wallpaper_price(
width=100, height=100, material=premium_wallpaper, market=sweden
),
)
self.assertEqual(
279,
wallpaper_price(
width=100, height=100, material=standard_wallpaper, market=denmark
),
)
self.assertEqual(
236,
wallpaper_price(
width=100,
height=100,
material=standard_wallpaper,
market=sweden,
inc_vat=False,
),
)
# designer
self.assertEqual(348, wallpaper_price(width=100, height=100,
material=standard_wallpaper, market=sweden, designer=designer))
self.assertEqual(329, wallpaper_price(width=100, height=100,
material=standard_wallpaper, market=denmark, designer=designer))
self.assertEqual(
348,
wallpaper_price(
width=100,
height=100,
material=standard_wallpaper,
market=sweden,
designer=designer,
),
)
self.assertEqual(
329,
wallpaper_price(
width=100,
height=100,
material=standard_wallpaper,
market=denmark,
designer=designer,
),
)
# reseller stores
self.assertEqual(339, wallpaper_price(width=100, height=100,
material=standard_wallpaper, market=sweden, reseller=reseller))
self.assertEqual(399, wallpaper_price(width=100, height=100,
material=standard_wallpaper, market=sweden, designer=designer, reseller=reseller))
self.assertEqual(154, wallpaper_price(width=100, height=100, material=standard_wallpaper,
market=sweden, reseller=ContractCustomerFactory(pricepremium=-47.74)))
self.assertEqual(
339,
wallpaper_price(
width=100,
height=100,
material=standard_wallpaper,
market=sweden,
reseller=reseller,
),
)
self.assertEqual(
399,
wallpaper_price(
width=100,
height=100,
material=standard_wallpaper,
market=sweden,
designer=designer,
reseller=reseller,
),
)
self.assertEqual(
154,
wallpaper_price(
width=100,
height=100,
material=standard_wallpaper,
market=sweden,
reseller=ContractCustomerFactory(pricepremium=-47.74),
),
)
def test_wallpaper_price_us(self):
self.assertEqual(60, wallpaper_price(width=100, height=100,
material=standard_wallpaper, market=us), "Minium price for US is 2 sqm")
self.assertEqual(
60,
wallpaper_price(
width=100, height=100, material=standard_wallpaper, market=us
),
"Minium price for US is 2 sqm",
)
def test_canvas_cm2_price(self):
self.assertEqual(0.24099500000000001, canvas_cm2_price(250))
@@ -106,151 +215,270 @@ class TestPrice(unittest2.TestCase):
self.assertEqual(0.22568000000000002, canvas_cm2_price(1000))
def test_canvas_price(self):
self.assertEqual(488, canvas_price(width=50, height=50,
market=sweden, framed=True, inc_vat=False))
self.assertEqual(
488,
canvas_price(
width=50, height=50, market=sweden, framed=True, inc_vat=False
),
)
self.assertEqual(960, canvas_price(
width=100, height=100, market=sweden, framed=True, inc_vat=False))
self.assertEqual(
960,
canvas_price(
width=100, height=100, market=sweden, framed=True, inc_vat=False
),
)
self.assertEqual(1359, canvas_price(
width=150, height=120, market=sweden, framed=True, inc_vat=False))
self.assertEqual(
1359,
canvas_price(
width=150, height=120, market=sweden, framed=True, inc_vat=False
),
)
self.assertEqual(256000, canvas_price(
width=2000, height=2000, market=sweden, framed=True, inc_vat=False))
self.assertEqual(
256000,
canvas_price(
width=2000, height=2000, market=sweden, framed=True, inc_vat=False
),
)
self.assertEqual(341, canvas_price(width=10, height=10,
market=sweden, framed=True, inc_vat=False))
self.assertEqual(
341,
canvas_price(
width=10, height=10, market=sweden, framed=True, inc_vat=False
),
)
self.assertEqual(427, canvas_price(width=40, height=40,
market=sweden, framed=True, inc_vat=True))
self.assertEqual(
427,
canvas_price(width=40, height=40, market=sweden, framed=True, inc_vat=True),
)
self.assertEqual(299, canvas_price(width=40, height=40,
market=sweden, framed=False, inc_vat=True))
self.assertEqual(
299,
canvas_price(
width=40, height=40, market=sweden, framed=False, inc_vat=True
),
)
self.assertEqual(731, canvas_price(width=80, height=80,
market=sweden, framed=False, inc_vat=True))
self.assertEqual(
731,
canvas_price(
width=80, height=80, market=sweden, framed=False, inc_vat=True
),
)
self.assertEqual(1044, canvas_price(width=80, height=80,
market=sweden, framed=True, inc_vat=True))
self.assertEqual(
1044,
canvas_price(width=80, height=80, market=sweden, framed=True, inc_vat=True),
)
self.assertEqual(1260, canvas_price(width=150, height=150,
market=sweden, framed=False, inc_vat=True))
self.assertEqual(
1260,
canvas_price(
width=150, height=150, market=sweden, framed=False, inc_vat=True
),
)
self.assertEqual(1800, canvas_price(width=150, height=150,
market=sweden, framed=True, inc_vat=True))
self.assertEqual(
1800,
canvas_price(
width=150, height=150, market=sweden, framed=True, inc_vat=True
),
)
self.assertEqual(201, canvas_price(width=150, height=150,
market=us, framed=True, inc_vat=True))
self.assertEqual(
201,
canvas_price(width=150, height=150, market=us, framed=True, inc_vat=True),
)
self.assertEqual(672, canvas_price(
width=100, height=100, market=sweden, framed=False, inc_vat=False))
self.assertEqual(
672,
canvas_price(
width=100, height=100, market=sweden, framed=False, inc_vat=False
),
)
self.assertEqual(840, canvas_price(
width=100, height=100, market=sweden, framed=False, inc_vat=True))
self.assertEqual(
840,
canvas_price(
width=100, height=100, market=sweden, framed=False, inc_vat=True
),
)
self.assertEqual(462, canvas_price(width=50, height=50,
market=denmark, framed=True, inc_vat=False))
self.assertEqual(
462,
canvas_price(
width=50, height=50, market=denmark, framed=True, inc_vat=False
),
)
self.assertEqual(180, canvas_price(width=150, height=100, market=us, designer=designer_moomin, inc_vat=False))
self.assertEqual(180, canvas_price(width=150, height=100, market=us, designer=designer_moomin, inc_vat=True))
self.assertEqual(
180,
canvas_price(
width=150,
height=100,
market=us,
designer=designer_moomin,
inc_vat=False,
),
)
self.assertEqual(
180,
canvas_price(
width=150, height=100, market=us, designer=designer_moomin, inc_vat=True
),
)
def test_canvas_frame_price(self):
self.assertEqual(624, canvas_frame_price(
width=100, height=100, market=sweden, inc_vat=False))
self.assertEqual(780, canvas_frame_price(
width=100, height=100, market=sweden, inc_vat=True))
self.assertEqual(62, canvas_frame_price(
width=100, height=100, market=russia))
self.assertEqual(936, canvas_frame_price(
500, 500, market=sweden, inc_vat=False))
self.assertEqual(222, canvas_frame_price(
1, 1, market=sweden, inc_vat=False))
self.assertEqual(277, canvas_frame_price(
width=40, height=40, market=sweden, inc_vat=True))
self.assertEqual(71, canvas_frame_price(
width=40, height=120, market=us))
self.assertEqual(66, canvas_frame_price(
width=40, height=100, market=us))
self.assertEqual(578, canvas_frame_price(
width=40, height=120, market=sweden))
self.assertEqual(
624, canvas_frame_price(width=100, height=100, market=sweden, inc_vat=False)
)
self.assertEqual(
780, canvas_frame_price(width=100, height=100, market=sweden, inc_vat=True)
)
self.assertEqual(62, canvas_frame_price(width=100, height=100, market=russia))
self.assertEqual(
936, canvas_frame_price(500, 500, market=sweden, inc_vat=False)
)
self.assertEqual(222, canvas_frame_price(1, 1, market=sweden, inc_vat=False))
self.assertEqual(
277, canvas_frame_price(width=40, height=40, market=sweden, inc_vat=True)
)
self.assertEqual(71, canvas_frame_price(width=40, height=120, market=us))
self.assertEqual(66, canvas_frame_price(width=40, height=100, market=us))
self.assertEqual(578, canvas_frame_price(width=40, height=120, market=sweden))
def test_wallpaper_custom_inquiry_price(self):
with mock.patch.object(Inquiry, 'market', nl):
inquiry = Inquiry(product_group="photo-wallpaper", territory="NL", pricepremium=0,
width=350, height=270, price_effect=0, price_retouch=160.00, material=standard_wallpaper)
with mock.patch.object(Inquiry, "market", nl):
inquiry = Inquiry(
product_group="photo-wallpaper",
territory="NL",
pricepremium=0,
width=350,
height=270,
price_effect=0,
price_retouch=160.00,
material=standard_wallpaper,
)
self.assertEqual(333, inquiry_price(inquiry))
self.assertEqual(310, inquiry_price(
inquiry, inc_price_retouch=False))
self.assertEqual(310, inquiry_price(inquiry, inc_price_retouch=False))
self.assertEqual(160, inquiry.price_retouch)
self.assertEqual(18.4, inquiry.local_price_retouch(rounded=False))
self.assertEqual(22, inquiry.local_price_retouch(
rounded=True, inc_vat=True))
self.assertEqual(
22, inquiry.local_price_retouch(rounded=True, inc_vat=True)
)
# test with different material
self.assertEqual(342, inquiry_price(
inquiry, inc_price_retouch=False, material=premium_wallpaper))
self.assertEqual(364, inquiry_price(
inquiry, material=premium_wallpaper))
self.assertEqual(
342,
inquiry_price(
inquiry, inc_price_retouch=False, material=premium_wallpaper
),
)
self.assertEqual(364, inquiry_price(inquiry, material=premium_wallpaper))
def test_wallpaper_product_inquiry_price(self):
designer = DesignerFactory()
designer.pricepremium = 4
product = Product(designer=designer)
with mock.patch.object(Inquiry, 'market', sweden):
inquiry = Inquiry(product_group="photo-wallpaper", territory="SE", pricepremium=0,
width=350, height=280, price_retouch=0, material=standard_wallpaper, product=product)
with mock.patch.object(Inquiry, "market", sweden):
inquiry = Inquiry(
product_group="photo-wallpaper",
territory="SE",
pricepremium=0,
width=350,
height=280,
price_retouch=0,
material=standard_wallpaper,
product=product,
)
self.assertEqual(3007, inquiry_price(inquiry))
self.assertEqual(3007, inquiry_price(
inquiry, inc_price_retouch=False))
self.assertEqual(3312, inquiry_price(
inquiry, material=premium_wallpaper))
self.assertEqual(3007, inquiry_price(inquiry, inc_price_retouch=False))
self.assertEqual(3312, inquiry_price(inquiry, material=premium_wallpaper))
def test_wallpaper_product2_inquiry_price(self):
designer = DesignerFactory()
designer.pricepremium = 4
product = Product(designer=designer)
with mock.patch.object(Inquiry, 'market', sweden):
inquiry = Inquiry(product_group="photo-wallpaper", territory="SE", pricepremium=25,
width=250, height=400, price_retouch=200, material=standard_wallpaper, product=product)
with mock.patch.object(Inquiry, "market", sweden):
inquiry = Inquiry(
product_group="photo-wallpaper",
territory="SE",
pricepremium=25,
width=250,
height=400,
price_retouch=200,
material=standard_wallpaper,
product=product,
)
self.assertEqual(3835, inquiry_price(
inquiry, inc_price_retouch=False))
self.assertEqual(3835, inquiry_price(inquiry, inc_price_retouch=False))
self.assertEqual(200, inquiry.price_retouch)
self.assertEqual(250, inquiry.local_price_retouch(
rounded=True, inc_vat=True))
self.assertEqual(
250, inquiry.local_price_retouch(rounded=True, inc_vat=True)
)
def test_wallpaper_piterra_inquiry_price(self):
product = Product(designer=None)
with mock.patch.object(Inquiry, 'market', russia):
inquiry = Inquiry(product_group="photo-wallpaper", territory="RU", width=150, height=211, dealer_store=piterra, pricepremium=36.029411,
material=standard_wallpaper, product=product)
with mock.patch.object(Inquiry, "market", russia):
inquiry = Inquiry(
product_group="photo-wallpaper",
territory="RU",
width=150,
height=211,
dealer_store=piterra,
pricepremium=36.029411,
material=standard_wallpaper,
product=product,
)
self.assertEqual(138, inquiry_price(
inquiry, inc_price_retouch=False))
self.assertEqual(152, inquiry_price(
inquiry, inc_price_retouch=False, material=premium_wallpaper))
self.assertEqual(138, inquiry_price(inquiry, inc_price_retouch=False))
self.assertEqual(
152,
inquiry_price(
inquiry, inc_price_retouch=False, material=premium_wallpaper
),
)
# test set reseller store to None to calculate inquiry price without reseller price premium
self.assertEqual(102, inquiry_price(
inquiry, inc_price_retouch=False, reseller=None))
self.assertEqual(
102, inquiry_price(inquiry, inc_price_retouch=False, reseller=None)
)
def test_canvas_custom_inquiry_price(self):
with mock.patch.object(Inquiry, 'market', sweden):
inquiry = Inquiry(product_group='canvas', territory='SE', width=100, height=100,
framed=True, price_retouch=200, pricepremium=0, material=standard_canvas)
with mock.patch.object(Inquiry, "market", sweden):
inquiry = Inquiry(
product_group="canvas",
territory="SE",
width=100,
height=100,
framed=True,
price_retouch=200,
pricepremium=0,
material=standard_canvas,
)
self.assertEqual(1200, inquiry_price(
inquiry, inc_price_retouch=False))
self.assertEqual(1450, inquiry_price(
inquiry, inc_price_retouch=True))
self.assertEqual(840, inquiry_price(
inquiry, inc_price_retouch=False, framed=False))
self.assertEqual(1200, inquiry_price(inquiry, inc_price_retouch=False))
self.assertEqual(1450, inquiry_price(inquiry, inc_price_retouch=True))
self.assertEqual(
840, inquiry_price(inquiry, inc_price_retouch=False, framed=False)
)
def test_canvas_piterra_inquiry_price(self):
with mock.patch.object(Inquiry, 'market', russia):
inquiry = Inquiry(product_group='canvas', territory='RU', width=100, height=100,
framed=True, dealer_store=piterra, pricepremium=0, material=standard_canvas)
with mock.patch.object(Inquiry, "market", russia):
inquiry = Inquiry(
product_group="canvas",
territory="RU",
width=100,
height=100,
framed=True,
dealer_store=piterra,
pricepremium=0,
material=standard_canvas,
)
# note: site currently calculates this as €150 which is wrong because
# it does not add dealer_store.pricepremium to the frame price
@@ -258,11 +486,11 @@ class TestPrice(unittest2.TestCase):
self.assertEqual(91, inquiry_price(inquiry, framed=False))
def test_package_price(self):
self.assertEqual(150, package_price('canvas', 150, 40, market=us))
self.assertEqual(0, package_price('canvas', 150, 40, market=sweden))
self.assertEqual(150, package_price('poster', 150, 40, market=us))
self.assertEqual(100, package_price('poster', 40, 40, market=us))
self.assertEqual(0, package_price('poster', 150, 40, market=sweden))
self.assertEqual(150, package_price("canvas", 150, 40, market=us))
self.assertEqual(0, package_price("canvas", 150, 40, market=sweden))
self.assertEqual(150, package_price("poster", 150, 40, market=us))
self.assertEqual(100, package_price("poster", 40, 40, market=us))
self.assertEqual(0, package_price("poster", 150, 40, market=sweden))
def test_poster_cm2_price(self):
self.assertEqual(0.100789248, poster_cm2_price(1))
@@ -272,11 +500,25 @@ class TestPrice(unittest2.TestCase):
self.assertEqual(0.028, poster_cm2_price(100000))
def test_poster_price(self):
self.assertEqual(354, poster_price(width=30, height=40, hanger=True, market=sweden))
self.assertEqual(250, poster_price(width=30, height=40, hanger=False, market=sweden))
self.assertEqual(48, poster_price(width=30, height=40, hanger=True, market=us), 'extra cost for us market')
self.assertEqual(76, poster_price(width=120, height=40, market=us), 'high extra cost for us market wide posters')
self.assertEqual(77, poster_price(width=120, height=40, market=us, designer=designer_moomin))
self.assertEqual(
354, poster_price(width=30, height=40, hanger=True, market=sweden)
)
self.assertEqual(
250, poster_price(width=30, height=40, hanger=False, market=sweden)
)
self.assertEqual(
48,
poster_price(width=30, height=40, hanger=True, market=us),
"extra cost for us market",
)
self.assertEqual(
76,
poster_price(width=120, height=40, market=us),
"high extra cost for us market wide posters",
)
self.assertEqual(
77, poster_price(width=120, height=40, market=us, designer=designer_moomin)
)
def test_poster_hanger_price(self):
self.assertEqual(166, poster_hanger_price(30, market=sweden))
@@ -285,10 +527,19 @@ class TestPrice(unittest2.TestCase):
self.assertEqual(58, poster_hanger_price(150, market=us))
def test_poster_custom_inquiry_price(self):
with mock.patch.object(Inquiry, 'market', sweden):
inquiry = Inquiry(product_group='poster', territory='SE', width=30, height=40,
hanger=True, price_retouch=200, pricepremium=0)
with mock.patch.object(Inquiry, "market", sweden):
inquiry = Inquiry(
product_group="poster",
territory="SE",
width=30,
height=40,
hanger=True,
price_retouch=200,
pricepremium=0,
)
self.assertEqual(354, inquiry_price(inquiry, inc_price_retouch=False))
self.assertEqual(604, inquiry_price(inquiry, inc_price_retouch=True))
self.assertEqual(250, inquiry_price(inquiry, inc_price_retouch=False, hanger=False))
self.assertEqual(
250, inquiry_price(inquiry, inc_price_retouch=False, hanger=False)
)
+10 -12
View File
@@ -5,16 +5,14 @@ from api.lib.slugify import slugify
class TestSlugification(unittest2.TestCase):
def test_basic(self):
self.assertEqual(slugify('HELLO'), 'hello')
self.assertEqual(slugify('this is a test'), 'this_is_a_test')
self.assertEqual(slugify('___This is a test___'), 'this_is_a_test')
self.assertEqual(slugify('this-is-a-test'), 'this_is_a_test')
self.assertEqual(slugify('this_is_a__test'), 'this_is_a_test')
self.assertEqual(slugify('404'), '404')
self.assertEqual(slugify('1,000 reasons you are #1'),
'1000_reasons_you_are_1')
self.assertEqual(slugify('Nín hǎo'), 'nin_hao')
self.assertEqual(slugify('räksmörgås'), 'raksmorgas')
self.assertEqual(slugify('RÄKSMÖRGÅS'), 'raksmorgas')
self.assertEqual(slugify("HELLO"), "hello")
self.assertEqual(slugify("this is a test"), "this_is_a_test")
self.assertEqual(slugify("___This is a test___"), "this_is_a_test")
self.assertEqual(slugify("this-is-a-test"), "this_is_a_test")
self.assertEqual(slugify("this_is_a__test"), "this_is_a_test")
self.assertEqual(slugify("404"), "404")
self.assertEqual(slugify("1,000 reasons you are #1"), "1000_reasons_you_are_1")
self.assertEqual(slugify("Nín hǎo"), "nin_hao")
self.assertEqual(slugify("räksmörgås"), "raksmorgas")
self.assertEqual(slugify("RÄKSMÖRGÅS"), "raksmorgas")
+3 -4
View File
@@ -5,8 +5,7 @@ from api.models import market
class TestMarket(unittest2.TestCase):
def test_sweden(self):
sweden = market.from_territory('SE')
self.assertEqual('sv', sweden.language)
self.assertEqual('SE', sweden.territory)
sweden = market.from_territory("SE")
self.assertEqual("sv", sweden.language)
self.assertEqual("SE", sweden.territory)
+27 -21
View File
@@ -6,9 +6,8 @@ from unittest.mock import patch
class TestEndpoints(flask_testing.TestCase):
def create_app(self):
return create_app('tests.config')
return create_app("tests.config")
def setUp(self):
db.create_all()
@@ -17,7 +16,7 @@ class TestEndpoints(flask_testing.TestCase):
db.session.remove()
db.drop_all()
def _add_designer(self, name, username=None, territory='SE', currency='SEK'):
def _add_designer(self, name, username=None, territory="SE", currency="SEK"):
if not username:
username = name.lower()
designer = Designer(name, username, territory, currency)
@@ -26,38 +25,45 @@ class TestEndpoints(flask_testing.TestCase):
return designer
def test_list_designers(self):
self._add_designer('designer1')
self._add_designer('designer2')
self._add_designer("designer1")
self._add_designer("designer2")
response = self.client.get("/designers/")
self.assertEqual(2, len(response.json.get('data')))
self.assertEqual(2, len(response.json.get("data")))
def test_get_designer(self):
designer = self._add_designer('designer1')
response = self.client.get('/designers/1')
designer = self._add_designer("designer1")
response = self.client.get("/designers/1")
self.assert200(response)
def test_create_designer(self):
data = {'name': 'Spider-Man', 'username': 'spiderman',
'territory': 'US', 'currency': 'USD'}
data = {
"name": "Spider-Man",
"username": "spiderman",
"territory": "US",
"currency": "USD",
}
response = self.client.post(
'/designers/', data=json.dumps(data), content_type='application/json')
"/designers/", data=json.dumps(data), content_type="application/json"
)
self.assertEqual(201, response.status_code)
designer = response.json
self.assertEqual('Spider-Man', designer['name'])
self.assertEqual('spider_man', designer['path'])
self.assertEqual("Spider-Man", designer["name"])
self.assertEqual("spider_man", designer["path"])
def test_create_designer_missing_data(self):
data = {'name': 'Only name'}
data = {"name": "Only name"}
response = self.client.post(
'/designers/', data=json.dumps(data), content_type='application/json')
"/designers/", data=json.dumps(data), content_type="application/json"
)
self.assert400(response)
@patch('api.tasks.esales.update_designer')
@patch("api.tasks.esales.update_designer")
def test_update_designer(self, esales_update_designer):
designer = self._add_designer('designer1')
data = {'name': 'test'}
designer = self._add_designer("designer1")
data = {"name": "test"}
response = self.client.put(
'/designers/1', data=json.dumps(data), content_type='application/json')
"/designers/1", data=json.dumps(data), content_type="application/json"
)
self.assertTrue(esales_update_designer.called)
self.assertEqual('test', response.json['name'])
self.assertEqual('test', Designer.query.get(1).name)
self.assertEqual("test", response.json["name"])
self.assertEqual("test", Designer.query.get(1).name)
+87 -87
View File
@@ -7,9 +7,8 @@ from api.models.designer import Designer
class TestEndpoints(flask_testing.TestCase):
def create_app(self):
return create_app('tests.config')
return create_app("tests.config")
def setUp(self):
db.create_all()
@@ -26,14 +25,16 @@ class TestEndpoints(flask_testing.TestCase):
def _add_inquiry(self, territory, product_group, price_retouch=100):
inquiry = Inquiry(
territory=territory, product_group=product_group, price_retouch=price_retouch)
territory=territory,
product_group=product_group,
price_retouch=price_retouch,
)
db.session.add(inquiry)
db.session.commit()
return inquiry
def _add_designer(self, pricepremium):
designer = Designer('Disney', 'disney', 'US',
'USD', pricepremium=pricepremium)
designer = Designer("Disney", "disney", "US", "USD", pricepremium=pricepremium)
db.session.add(designer)
db.session.commit()
return designer
@@ -45,61 +46,60 @@ class TestEndpoints(flask_testing.TestCase):
return product
def test_wallpaper(self):
self._add_material('standard-wallpaper', 1, 23600)
self._add_material('premium-wallpaper', 1, 26000)
response = self.client.get(
'/prices/wallpaper?width=200&height=10&territory=SE')
self._add_material("standard-wallpaper", 1, 23600)
self._add_material("premium-wallpaper", 1, 26000)
response = self.client.get("/prices/wallpaper?width=200&height=10&territory=SE")
self.assert200(response)
expected = [
{
'm2_price': 295.0,
'm2_price_excl_vat': 236.0,
'price_excl_vat': 236.0,
'price': 295.0,
'material': 'standard-wallpaper',
'material_id': 1
"m2_price": 295.0,
"m2_price_excl_vat": 236.0,
"price_excl_vat": 236.0,
"price": 295.0,
"material": "standard-wallpaper",
"material_id": 1,
},
{
'm2_price': 325.0,
'm2_price_excl_vat': 260.0,
'price_excl_vat': 260.0,
'price': 325.0,
'material': 'premium-wallpaper',
'material_id': 2
}
"m2_price": 325.0,
"m2_price_excl_vat": 260.0,
"price_excl_vat": 260.0,
"price": 325.0,
"material": "premium-wallpaper",
"material_id": 2,
},
]
self.assertEqual(expected, response.json['data'])
self.assertEqual(expected, response.json["data"])
def test_wallpaper_with_product(self):
self._add_material('standard-wallpaper', 1, 23600)
self._add_material('premium-wallpaper', 1, 26000)
self._add_material("standard-wallpaper", 1, 23600)
self._add_material("premium-wallpaper", 1, 26000)
designer = self._add_designer(4)
product = self._add_product(designer)
response = self.client.get(
'/prices/wallpaper?width=200&height=200&territory=SE&product=1')
"/prices/wallpaper?width=200&height=200&territory=SE&product=1"
)
expected = [
{
'price': 1227.2,
'price_excl_vat': 981.76,
'material_id': 1,
'm2_price': 306.8,
'm2_price_excl_vat': 245.44,
'material': 'standard-wallpaper'
"price": 1227.2,
"price_excl_vat": 981.76,
"material_id": 1,
"m2_price": 306.8,
"m2_price_excl_vat": 245.44,
"material": "standard-wallpaper",
},
{
'price': 1352.0000000000002,
'price_excl_vat': 1081.6000000000001,
'material_id': 2,
'm2_price': 338.00000000000006,
'm2_price_excl_vat': 270.40000000000003,
'material': 'premium-wallpaper'
}
"price": 1352.0000000000002,
"price_excl_vat": 1081.6000000000001,
"material_id": 2,
"m2_price": 338.00000000000006,
"m2_price_excl_vat": 270.40000000000003,
"material": "premium-wallpaper",
},
]
self.assertEqual(expected, response.json['data'])
self.assertEqual(expected, response.json["data"])
def test_canvas(self):
response = self.client.get(
'/prices/canvas?width=200&height=10&territory=SE')
response = self.client.get("/prices/canvas?width=200&height=10&territory=SE")
self.assert200(response)
expected = [
{
@@ -107,23 +107,24 @@ class TestEndpoints(flask_testing.TestCase):
"height": 40,
"price": 1008.0,
"price_excl_vat": 806.4,
"width": 150
"width": 150,
},
{
"framed": False,
"height": 20,
"price": 575.47,
"price_excl_vat": 460.37600000000003,
"width": 200
}
"width": 200,
},
]
self.assertEqual(expected, response.json['data'])
self.assertEqual(expected, response.json["data"])
def test_canvas_with_product(self):
designer = self._add_designer(4)
product = self._add_product(designer)
response = self.client.get(
'/prices/canvas?width=200&height=10&territory=SE&product=1')
"/prices/canvas?width=200&height=10&territory=SE&product=1"
)
self.assert200(response)
expected = [
{
@@ -131,73 +132,72 @@ class TestEndpoints(flask_testing.TestCase):
"height": 40,
"price": 1048.32,
"price_excl_vat": 838.656,
"width": 150
"width": 150,
},
{
"framed": False,
"height": 20,
"price": 598.4888000000001,
"price_excl_vat": 478.79104000000007,
"width": 200
}
"width": 200,
},
]
self.assertEqual(expected, response.json['data'])
self.assertEqual(expected, response.json["data"])
def test_diy_frame(self):
response = self.client.get(
'/prices/diy-frame?width=200&height=50&territory=SE')
response = self.client.get("/prices/diy-frame?width=200&height=50&territory=SE")
self.assert200(response)
product = response.json['data'][0]
self.assertEqual(150, product['width'], "it adjusts measurements")
self.assertEqual(50, product['height'])
self.assertAlmostEqual(731.25, product['price'], places=2)
product = response.json["data"][0]
self.assertEqual(150, product["width"], "it adjusts measurements")
self.assertEqual(50, product["height"])
self.assertAlmostEqual(731.25, product["price"], places=2)
def test_poster(self):
response = self.client.get('/prices/poster?width=50&height=30&territory=SE')
response = self.client.get("/prices/poster?width=50&height=30&territory=SE")
self.assert200(response)
expected = [
{
'hanger': True,
'height': 30,
'price': 397.5,
'price_excl_vat': 318,
'width': 50
"hanger": True,
"height": 30,
"price": 397.5,
"price_excl_vat": 318,
"width": 50,
},
{
'hanger': False,
'height': 30,
'price': 250.0,
'price_excl_vat': 200,
'width': 50
}
"hanger": False,
"height": 30,
"price": 250.0,
"price_excl_vat": 200,
"width": 50,
},
]
self.assertEqual(expected, response.json['data'])
self.assertEqual(expected, response.json["data"])
def test_poster_hanger(self):
response = self.client.get('/prices/poster-hanger?width=50&territory=SE')
response = self.client.get("/prices/poster-hanger?width=50&territory=SE")
self.assert200(response)
product = response.json['data'][0]
self.assertEqual(210.0, product['price'])
self.assertEqual(168, product['price_excl_vat'])
self.assertEqual(50, product['width'])
product = response.json["data"][0]
self.assertEqual(210.0, product["price"])
self.assertEqual(168, product["price_excl_vat"])
self.assertEqual(50, product["width"])
def test_inquiry_wallpaper(self):
self._add_material('standard-wallpaper', 1, 236)
self._add_material('premium-wallpaper', 1, 260)
self._add_inquiry(territory='SE', product_group='photo-wallpaper')
response = self.client.get('/prices/inquiry/1?width=100&height=100')
self._add_material("standard-wallpaper", 1, 236)
self._add_material("premium-wallpaper", 1, 260)
self._add_inquiry(territory="SE", product_group="photo-wallpaper")
response = self.client.get("/prices/inquiry/1?width=100&height=100")
self.assert200(response)
self.assertEqual('wallpaper', response.json['group'])
self.assertEqual("wallpaper", response.json["group"])
def test_inquiry_canvas(self):
self._add_material('standard-canvas', 2, 799.2)
self._add_inquiry(territory='SE', product_group='canvas')
response = self.client.get('/prices/inquiry/1?width=100&height=100')
self._add_material("standard-canvas", 2, 799.2)
self._add_inquiry(territory="SE", product_group="canvas")
response = self.client.get("/prices/inquiry/1?width=100&height=100")
self.assert200(response)
self.assertEqual('canvas', response.json['group'])
self.assertEqual("canvas", response.json["group"])
def test_inquiry_poster(self):
self._add_inquiry(territory='SE', product_group='poster')
response = self.client.get('/prices/inquiry/1?width=100&height=100')
self._add_inquiry(territory="SE", product_group="poster")
response = self.client.get("/prices/inquiry/1?width=100&height=100")
self.assert200(response)
self.assertEqual('poster', response.json['group'])
self.assertEqual("poster", response.json["group"])
+66 -48
View File
@@ -6,117 +6,135 @@ import base64
from api import create_app
from flask import Flask
from api.helpers import check_api_key
from api.validators import ValidationError, validate_exists, validate_number, validate_territory, validate_jsonschema
from api.validators import (
ValidationError,
validate_exists,
validate_number,
validate_territory,
validate_jsonschema,
)
class TestHttpBasicAuth(flask_testing.TestCase):
api_key = 'secret'
api_key = "secret"
def create_app(self):
app = Flask(__name__)
app.before_request(check_api_key)
@app.route('/', methods=['GET'])
@app.route("/", methods=["GET"])
def index():
return 'ok'
return "ok"
return app
def _enable_basic_auth(self):
self.app.config['API_KEYS'] = [self.api_key]
self.app.config["API_KEYS"] = [self.api_key]
def _create_auth_headers(self, username, password=''):
data = base64.b64encode(
bytes(':'.join([username, password]), 'ascii')).decode('ascii')
headers = [('Authorization', 'Basic %s' % data)]
def _create_auth_headers(self, username, password=""):
data = base64.b64encode(bytes(":".join([username, password]), "ascii")).decode(
"ascii"
)
headers = [("Authorization", "Basic %s" % data)]
return headers
def test_missing_credentials(self):
self._enable_basic_auth()
response = self.client.get('/')
response = self.client.get("/")
self.assert401(response)
def test_correct_credentials(self):
self._enable_basic_auth()
headers = self._create_auth_headers(self.api_key)
response = self.client.get('/', headers=headers)
response = self.client.get("/", headers=headers)
self.assert200(response)
def test_basic_auth_disabled(self):
response = self.client.get('/')
response = self.client.get("/")
self.assert200(response)
class TestValidators(flask_testing.TestCase):
def create_app(self):
app = Flask(__name__)
@app.errorhandler(ValidationError)
def on_error(error):
return error.message, 400
return app
def test_validate_exists(self):
app = self.app
@app.route('/', methods=['GET'])
@validate_exists('a', 'b')
@app.route("/", methods=["GET"])
@validate_exists("a", "b")
def index():
return 'ok'
return "ok"
self.assertEqual(b'No b is specified', self.client.get('/?a=1').data)
self.assertEqual(b'ok', self.client.get('/?a=1&b=2').data)
self.assertEqual(b"No b is specified", self.client.get("/?a=1").data)
self.assertEqual(b"ok", self.client.get("/?a=1&b=2").data)
def test_validate_number(self):
app = self.app
@app.route('/', methods=['GET'])
@validate_number('age')
@app.route("/", methods=["GET"])
@validate_number("age")
def index():
return 'ok'
return "ok"
self.assertEqual(b'No age is specified', self.client.get('/').data)
self.assertEqual(b'age is not a number',
self.client.get('/?age=aaa').data)
self.assertEqual(b'ok', self.client.get('/?age=1').data)
self.assertEqual(b"No age is specified", self.client.get("/").data)
self.assertEqual(b"age is not a number", self.client.get("/?age=aaa").data)
self.assertEqual(b"ok", self.client.get("/?age=1").data)
def test_validate_territory(self):
app = self.app
@app.route('/', methods=['GET'])
@validate_territory('territory')
@app.route("/", methods=["GET"])
@validate_territory("territory")
def index():
return 'ok'
return "ok"
self.assertEqual(b'No territory is specified',
self.client.get('/').data)
self.assertEqual(b'abc is not a valid territory',
self.client.get('/?territory=abc').data)
self.assertEqual(b'ok', self.client.get('/?territory=SE').data)
self.assertEqual(b"No territory is specified", self.client.get("/").data)
self.assertEqual(
b"abc is not a valid territory", self.client.get("/?territory=abc").data
)
self.assertEqual(b"ok", self.client.get("/?territory=SE").data)
def test_validate_jsonschema(self):
app = self.app
schema = {
"type": "object",
"properties": {
"name": {"type": "string"},
"age": {"type": "number"}
},
"required": ["name", "age"]
"properties": {"name": {"type": "string"}, "age": {"type": "number"}},
"required": ["name", "age"],
}
@app.route('/', methods=['POST'])
@app.route("/", methods=["POST"])
@validate_jsonschema(schema)
def index():
return 'ok'
return "ok"
self.assertEqual(b'Payload is not valid json',
self.client.post('/').data)
self.assertEqual(b"'name' is a required property", self.client.post(
'/', data=json.dumps({'foo': 'bar'}), content_type='application/json').data)
self.assertEqual(b"'abc' is not of type 'number'", self.client.post(
'/', data=json.dumps({'name': 'bar', 'age': 'abc'}), content_type='application/json').data)
self.assertEqual(b'ok', self.client.post(
'/', data=json.dumps({'name': 'bar', 'age': 55}), content_type='application/json').data)
self.assertEqual(b"Payload is not valid json", self.client.post("/").data)
self.assertEqual(
b"'name' is a required property",
self.client.post(
"/", data=json.dumps({"foo": "bar"}), content_type="application/json"
).data,
)
self.assertEqual(
b"'abc' is not of type 'number'",
self.client.post(
"/",
data=json.dumps({"name": "bar", "age": "abc"}),
content_type="application/json",
).data,
)
self.assertEqual(
b"ok",
self.client.post(
"/",
data=json.dumps({"name": "bar", "age": 55}),
content_type="application/json",
).data,
)