From 7521e7434d666840815e75d9eade0dda8911b9a7 Mon Sep 17 00:00:00 2001
From: etomas <etomas@gmail.com>
Date: Tue, 14 Feb 2017 16:17:30 +0100
Subject: [PATCH] Fixing a nullreference exception Also util files to start
 only "external containers"

---
 docker-compose-external.override.yml            | 17 +++++++++++++++++
 docker-compose-external.yml                     | 16 ++++++++++++++++
 .../AggregatesModel/BuyerAggregate/Buyer.cs     | 10 ++++++----
 start-external.ps1                              |  1 +
 4 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 docker-compose-external.override.yml
 create mode 100644 docker-compose-external.yml
 create mode 100644 start-external.ps1

diff --git a/docker-compose-external.override.yml b/docker-compose-external.override.yml
new file mode 100644
index 000000000..e1a37a501
--- /dev/null
+++ b/docker-compose-external.override.yml
@@ -0,0 +1,17 @@
+#
+# docker-compose.override.yml is used to set up local configuration environment
+# Things like the external ports to use or secrets/passwords depend on the 
+# specific deployment environment you might be using.
+# Further details and docs: https://docs.docker.com/compose/extends/ 
+#
+
+version: '2'
+
+services:
+
+  sql.data:
+    environment:
+      - SA_PASSWORD=Pass@word
+      - ACCEPT_EULA=Y
+    ports:
+      - "5433:1433"
diff --git a/docker-compose-external.yml b/docker-compose-external.yml
new file mode 100644
index 000000000..1772cff3a
--- /dev/null
+++ b/docker-compose-external.yml
@@ -0,0 +1,16 @@
+#
+# docker-compose.yml is used to set up the base config per container to be deployed
+# Take into account that when deploying, this base configuration is merged with the 
+# configuration-per-environment specified at the docker-compose.override.yml
+# Further details and docs: https://docs.docker.com/compose/extends/ 
+#
+version: '2'
+
+services:
+  sql.data:
+    image: microsoft/mssql-server-linux
+
+  basket.data:
+    image: redis
+    ports:
+      - "6379:6379"
diff --git a/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs
index f0aba8b9c..253532b71 100644
--- a/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs
+++ b/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs
@@ -1,5 +1,6 @@
 using Microsoft.eShopOnContainers.Services.Ordering.Domain.Seedwork;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -12,11 +13,13 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.B
 
         private List<PaymentMethod> _paymentMethods;
 
-        public IEnumerable<PaymentMethod> PaymentMethods => _paymentMethods?.AsReadOnly();
+        public IEnumerable<PaymentMethod> PaymentMethods => _paymentMethods.AsReadOnly();
 
-        protected Buyer() { }
+        protected Buyer() {
+            _paymentMethods = new List<PaymentMethod>();
+        }
 
-        public Buyer(string identity)
+        public Buyer(string identity) : this()
         {
             if (String.IsNullOrWhiteSpace(identity))
             {
@@ -25,7 +28,6 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.B
 
             IdentityGuid = identity;
 
-            _paymentMethods = new List<PaymentMethod>();
         }
 
         public PaymentMethod AddPaymentMethod(int cardTypeId, string alias, string cardNumber, string securityNumber, string cardHolderName, DateTime expiration)
diff --git a/start-external.ps1 b/start-external.ps1
new file mode 100644
index 000000000..cefb5247e
--- /dev/null
+++ b/start-external.ps1
@@ -0,0 +1 @@
+docker-compose -f docker-compose-external.yml -f docker-compose-external.override.yml up