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

refactor material prices

Browse Source
This commit is contained in:
Martin
2016-11-01 14:39:59 +01:00
parent bf9fc3ae5a
commit 0663bedc80
7 changed files with 79 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/lib/test_limits.py
+2 -1
View File
@@ -19,4 +19,5 @@ class TestCalculate(unittest2.TestCase):
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")
tests/lib/test_prices.py
+38 -31
View File
@@ -4,6 +4,7 @@ import unittest2
from api.lib.prices import *
from tests.factories import DesignerFactory, ContractCustomerFactory, InquiryFactory
from api.models import market
from api.models.product import Material, MaterialPrice
sweden = market.from_territory('SE')
@@ -22,40 +23,49 @@ designer = DesignerFactory()
designer.pricepremium = 17.647
reseller = ContractCustomerFactory(pricepremium=15)
standard_wallpaper = Material(name='standard-wallpaper')
standard_wallpaper.material_price = MaterialPrice(price=236)
premium_wallpaper = Material(name='premium-wallpaper')
premium_wallpaper.material_price = MaterialPrice(price=260)
standard_canvas = Material(name='standard-canvas')
standard_canvas.material_price = MaterialPrice(price=799.2)
class TestPrice(unittest2.TestCase):
def test_wallpaper_price(self):
self.assertEqual(295, wallpaper_price(
width=1, height=1, material_price=236, market=sweden))
width=1, height=1, material=standard_wallpaper, market=sweden))
self.assertEqual(295, wallpaper_price(
width=100, height=100, material_price=236, market=sweden))
width=100, height=100, material=standard_wallpaper, market=sweden))
self.assertEqual(1180, wallpaper_price(
width=200, height=200, material_price=236, market=sweden))
width=200, height=200, material=standard_wallpaper, market=sweden))
self.assertEqual(325, wallpaper_price(
width=100, height=100, material_price=260, market=sweden))
width=100, height=100, material=premium_wallpaper, market=sweden))
self.assertEqual(279, wallpaper_price(
width=100, height=100, material_price=236, market=denmark))
width=100, height=100, material=standard_wallpaper, market=denmark))
self.assertEqual(236, wallpaper_price(
width=100, height=100, material_price=236, market=sweden, inc_vat=False))
width=100, height=100, material=standard_wallpaper, market=sweden, inc_vat=False))
# designer
self.assertEqual(347, wallpaper_price(
width=100, height=100, material_price=236, market=sweden, designer=designer))
self.assertEqual(329, wallpaper_price(
width=100, height=100, material_price=236, market=denmark, designer=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_price=236, market=sweden, reseller=reseller))
# # 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_price=236, market=sweden, designer=designer, reseller=reseller))
self.assertEqual(154, wallpaper_price(width=100, height=100, material_price=236,
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(59, wallpaper_price(width=100, height=100,
material_price=236, 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.22, canvas_cm2_price(250))
@@ -101,25 +111,22 @@ class TestPrice(unittest2.TestCase):
def test_old_canvas_price(self):
self.assertEqual(250, old_canvas_price(
width=50, height=50, material_price=799.2, market=sweden, framed=False))
width=50, height=50, material=standard_canvas, market=sweden, framed=False))
self.assertEqual(200, old_canvas_price(
width=1, height=1, material_price=799.2, market=sweden, framed=False))
width=1, height=1, material=standard_canvas, market=sweden, framed=False))
self.assertEqual(7493, old_canvas_price(
width=500, height=500, material_price=799.2, market=sweden, framed=False))
width=500, height=500, material=standard_canvas, market=sweden, framed=False))
self.assertEqual(5994, old_canvas_price(width=500, height=500,
material_price=799.2, market=sweden, framed=False, inc_vat=False))
material=standard_canvas, market=sweden, framed=False, inc_vat=False))
self.assertEqual(7493, old_canvas_price(
width=500, height=500, material_price=799.2, market=sweden, framed=False))
width=500, height=500, material=standard_canvas, market=sweden, framed=False))
self.assertEqual(236, old_canvas_price(
width=50, height=50, material_price=799.2, market=denmark, framed=False))
width=50, height=50, material=standard_canvas, market=denmark, framed=False))
self.assertEqual(294, old_canvas_price(
width=50, height=50, material_price=799.2, market=sweden, designer=designer, framed=False))
width=50, height=50, material=standard_canvas, market=sweden, designer=designer, framed=False))
self.assertEqual(510, old_canvas_price(
width=50, height=50, material_price=799.2, market=sweden, framed=True))
width=50, height=50, material=standard_canvas, market=sweden, framed=True))
self.assertEqual(2972, old_canvas_price(
width=150, height=140, material_price=799.2, market=sweden, framed=True))
width=150, height=140, material=standard_canvas, market=sweden, framed=True))
self.assertEqual(287, old_canvas_price(
width=50, height=50, material_price=799.2, market=sweden, framed=False, reseller=reseller))
width=50, height=50, material=standard_canvas, market=sweden, framed=False, reseller=reseller))
tests/resources/test_prices.py
+10
View File
@@ -23,12 +23,22 @@ class TestEndpoints(flask_testing.TestCase):
db.session.commit()
return material
def test_wallpaper(self):
self._add_material('standard-wallpaper', 1, 236)
self._add_material('premium-wallpaper', 1, 260)
response = self.client.get(
'/prices/wallpaper?width=200&height=10&territory=SE')
self.assert200(response)
products = response.json['data']
self.assertEqual(2, len(products))
def test_canvas(self):
self._add_material('standard-canvas', 2, 799.9)
response = self.client.get(
'/prices/canvas?width=200&height=10&territory=SE')
self.assert200(response)
products = response.json['data']
self.assertEqual(2, len(products))
for product in products:
if product['framed']:
self.assertEqual(150, product['width'])