From a351025c91c08d97969d657076c1b22b8b469a88 Mon Sep 17 00:00:00 2001
From: Steve Waterworth <s@steveww.org>
Date: Tue, 30 Jan 2018 09:16:51 +0000
Subject: [PATCH] added user to order

---
 dispatch/src/main.go        | 4 +---
 payment/payment.py          | 4 ++--
 web/static/js/controller.js | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dispatch/src/main.go b/dispatch/src/main.go
index df72c0d..83ed35b 100644
--- a/dispatch/src/main.go
+++ b/dispatch/src/main.go
@@ -11,7 +11,6 @@ import (
 var amqpUri string = "amqp://guest:guest@rabbitmq:5672/"
 
 var (
-    rabbitConn *amqp.Connection
     rabbitChan *amqp.Channel
     rabbitCloseError chan *amqp.Error
     rabbitReady chan bool
@@ -37,8 +36,7 @@ func rabbitConnector(uri string) {
         rabbitErr = <-rabbitCloseError
         if rabbitErr != nil {
             log.Printf("Connecting to %s\n", amqpUri)
-            rabbitConn = connectToRabbitMQ(uri)
-            rabbitCloseError = make(chan *amqp.Error)
+            rabbitConn := connectToRabbitMQ(uri)
             rabbitConn.NotifyClose(rabbitCloseError)
 
             var err error
diff --git a/payment/payment.py b/payment/payment.py
index 1944fa5..c2aa073 100644
--- a/payment/payment.py
+++ b/payment/payment.py
@@ -27,11 +27,11 @@ def pay(id):
 
     # Generate order id
     orderid = str(uuid.uuid4())
-    queueOrder({ 'order': orderid, 'cart': cart })
+    queueOrder({ 'orderid': orderid, 'user': id, 'cart': cart })
 
     # TDOD - order history
 
-    return jsonify({ 'order': orderid })
+    return jsonify({ 'orderid': orderid })
 
 
 def queueOrder(order):
diff --git a/web/static/js/controller.js b/web/static/js/controller.js
index c8fd5bb..0c93521 100644
--- a/web/static/js/controller.js
+++ b/web/static/js/controller.js
@@ -344,7 +344,7 @@
                 data: $scope.data.cart
             }).then((res) => {
                 console.log('order', res.data);
-                $scope.data.message = 'Order placed ' + res.data.order;
+                $scope.data.message = 'Order placed ' + res.data.orderid;
                 // clear down cart
                 $scope.data.cart = {
                     total: 0,