move exceptions out into their own module

hjwp · hjwp · commit 81ce75299540 · 2019-07-18T22:12:32.000+01:00
diff --git a/src/allocation/exceptions.py b/src/allocation/exceptions.py
@@ -0,0 +1,6 @@
+class OutOfStock(Exception):
+    pass
+
+class InvalidSku(Exception):
+    pass
+
diff --git a/src/allocation/flask_app.py b/src/allocation/flask_app.py
@@ -1,10 +1,6 @@
 from datetime import datetime
 from flask import Flask, jsonify, request
-
-from allocation import unit_of_work
-from allocation import model
-from allocation import services
-from allocation import orm
+from allocation import exceptions, orm, services, unit_of_work
 
 app = Flask(__name__)
 orm.start_mappers()
@@ -31,7 +27,7 @@ def allocate_endpoint():
             request.json['qty'],
             unit_of_work.SqlAlchemyUnitOfWork(),
         )
-    except (model.OutOfStock, services.InvalidSku) as e:
+    except (exceptions.OutOfStock, exceptions.InvalidSku) as e:
         return jsonify({'message': str(e)}), 400
 
     return jsonify({'batchref': batchref}), 201
diff --git a/src/allocation/model.py b/src/allocation/model.py
@@ -2,10 +2,7 @@
 from dataclasses import dataclass
 from datetime import date
 from typing import Optional, List, Set
-
-
-class OutOfStock(Exception):
-    pass
+from allocation import exceptions
 
 
 class Product:
@@ -24,7 +21,7 @@ def allocate(self, line: OrderLine) -> str:
             self.version_number += 1
             return batch.reference
         except StopIteration:
-            raise OutOfStock(f'Out of stock for sku {line.sku}')
+            raise exceptions.OutOfStock(f'Out of stock for sku {line.sku}')
 
 
 @dataclass(unsafe_hash=True)
diff --git a/src/allocation/services.py b/src/allocation/services.py
@@ -2,13 +2,8 @@
 from typing import Optional
 from datetime import date
 
+from allocation import exceptions, model, unit_of_work
 from allocation.model import OrderLine
-from allocation import model, unit_of_work
-
-
-
-class InvalidSku(Exception):
-    pass
 
 
 def add_batch(
@@ -32,7 +27,7 @@ def allocate(
     with uow:
         product = uow.products.get(sku=line.sku)
         if product is None:
-            raise InvalidSku(f'Invalid sku {line.sku}')
+            raise exceptions.InvalidSku(f'Invalid sku {line.sku}')
         batchref = product.allocate(line)
         uow.commit()
     return batchref
diff --git a/tests/unit/test_product.py b/tests/unit/test_product.py
@@ -1,6 +1,7 @@
 from datetime import date, timedelta
 import pytest
-from allocation.model import Product, OrderLine, Batch, OutOfStock
+from allocation import exceptions
+from allocation.model import Product, OrderLine, Batch
 
 today = date.today()
 tomorrow = today + timedelta(days=1)
@@ -46,7 +47,7 @@ def test_raises_out_of_stock_exception_if_cannot_allocate():
     different_sku_line = OrderLine('oref', 'SMALL-FORK', 10)
     product = Product(sku="HIGHBROW-POSTER", batches=[batch])
 
-    with pytest.raises(OutOfStock, match='SMALL-FORK'):
+    with pytest.raises(exceptions.OutOfStock, match='SMALL-FORK'):
         product.allocate(different_sku_line)
 
 
diff --git a/tests/unit/test_services.py b/tests/unit/test_services.py
@@ -1,5 +1,5 @@
 import pytest
-from allocation import repository, services, unit_of_work
+from allocation import services, exceptions, repository, unit_of_work
 
 
 class FakeRepository(repository.AbstractRepository):
@@ -53,7 +53,7 @@ def test_allocate_errors_for_invalid_sku():
     uow = FakeUnitOfWork()
     services.add_batch("b1", "AREALSKU", 100, None, uow)
 
-    with pytest.raises(services.InvalidSku, match="Invalid sku NONEXISTENTSKU"):
+    with pytest.raises(exceptions.InvalidSku, match="Invalid sku NONEXISTENTSKU"):
         services.allocate("o1", "NONEXISTENTSKU", 10, uow)
 
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +class OutOfStock(Exception):
 +    pass
++
 +class InvalidSku(Exception):
 +    pass
++