modify flask and redis to use messagebus [chapter_07_external_events_ends]

hjwp · hjwp · commit ab8c084295b0 · 2019-08-13T07:30:16.000+01:00
diff --git a/src/allocation/flask_app.py b/src/allocation/flask_app.py
@@ -1,6 +1,6 @@
 from datetime import datetime
 from flask import Flask, jsonify, request
-from allocation import exceptions, orm, handlers, unit_of_work
+from allocation import events, exceptions, messagebus, orm, unit_of_work
 
 app = Flask(__name__)
 orm.start_mappers()
@@ -11,22 +11,21 @@ def add_batch():
     eta = request.json['eta']
     if eta is not None:
         eta = datetime.fromisoformat(eta).date()
-    handlers.add_batch(
+    event = events.BatchCreated(
         request.json['ref'], request.json['sku'], request.json['qty'], eta,
-        unit_of_work.SqlAlchemyUnitOfWork(),
     )
+    messagebus.handle([event], unit_of_work.SqlAlchemyUnitOfWork())
     return 'OK', 201
 
 
 @app.route("/allocate", methods=['POST'])
 def allocate_endpoint():
     try:
-        batchref = handlers.allocate(
-            request.json['orderid'],
-            request.json['sku'],
-            request.json['qty'],
-            unit_of_work.SqlAlchemyUnitOfWork(),
+        event = events.AllocationRequest(
+            request.json['orderid'], request.json['sku'], request.json['qty'],
         )
+        results = messagebus.handle([event], unit_of_work.SqlAlchemyUnitOfWork())
+        batchref = results.pop()
     except exceptions.InvalidSku as e:
         return jsonify({'message': str(e)}), 400
 
diff --git a/src/allocation/redis_pubsub.py b/src/allocation/redis_pubsub.py
@@ -3,7 +3,7 @@
 from dataclasses import asdict
 import redis
 
-from allocation import config, orm
+from allocation import config, events, orm, messagebus, unit_of_work
 
 logger = logging.getLogger(__name__)
 
@@ -22,10 +22,8 @@ def main():
 def handle_change_batch_quantity(m):
     logging.debug('handling %s', m)
     data = json.loads(m['data'])
-    handlers.change_batch_quantity(
-        ref=data['batchref'], qty=data['qty'],
-        uow=unit_of_work.SqlAlchemyUnitOfWork(),
-    )
+    event = events.BatchQuantityChanged(ref=data['batchref'], qty=data['qty'])
+    messagebus.handle([event], uow=unit_of_work.SqlAlchemyUnitOfWork())
 
 
 def publish(channel, event):
