From 0633f6315d1faa5143eee79b9c1ac089cd25b142 Mon Sep 17 00:00:00 2001 From: Anders Gustafsson <34234789+anders-photowall@users.noreply.github.com> Date: Wed, 11 Jan 2023 10:44:08 +0100 Subject: [PATCH] Delete no longer existing "framed" from inquiry model (#64) --- api/models/inquiry.py | 1 - tests/lib/test_prices.py | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/api/models/inquiry.py b/api/models/inquiry.py index c4c4c34..2d4d6b9 100644 --- a/api/models/inquiry.py +++ b/api/models/inquiry.py @@ -17,7 +17,6 @@ class Inquiry(db.Model): price_retouch = db.Column(db.Numeric) 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, diff --git a/tests/lib/test_prices.py b/tests/lib/test_prices.py index 158e3c8..8a792f7 100644 --- a/tests/lib/test_prices.py +++ b/tests/lib/test_prices.py @@ -263,10 +263,10 @@ class TestPrice(unittest2.TestCase): ) def test_wallpaper_kit_price(self): - self.assertEqual(143.2, wallpaper_kit_price(market=sweden, rounded=False, inc_vat=False)) - self.assertEqual(179.0, wallpaper_kit_price(market=sweden, rounded=False, inc_vat=True)) - self.assertEqual(18.0, wallpaper_kit_price(market=us)) - self.assertEqual(169.0, wallpaper_kit_price(market=denmark)) + self.assertEqual(159.2, wallpaper_kit_price(market=sweden, rounded=False, inc_vat=False)) + self.assertEqual(199.0, wallpaper_kit_price(market=sweden, rounded=False, inc_vat=True)) + self.assertEqual(21.0, wallpaper_kit_price(market=us)) + self.assertEqual(197.0, wallpaper_kit_price(market=denmark)) class TestPriceWithPriceAdjustment(unittest2.TestCase):