From a7c76f97a250f4fe54febbb8bac4ddc7c893aa16 Mon Sep 17 00:00:00 2001
From: Miguel Veloso <mvelosop@gmail.com>
Date: Thu, 28 Mar 2019 16:43:59 +0000
Subject: [PATCH] Simplify Enumeration and CardType classes as proposed in PR
 #704

---
 .../BuyerAggregate/CardType.cs                | 24 +++----------------
 .../OrderAggregate/OrderStatus.cs             |  4 ----
 .../Ordering.Domain/SeedWork/Enumeration.cs   |  3 ---
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs
index d6a92892c..3053cb678 100644
--- a/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs
+++ b/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs
@@ -9,31 +9,13 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.B
     public class CardType
         : Enumeration
     {
-        public static CardType Amex = new AmexCardType();
-        public static CardType Visa = new VisaCardType();
-        public static CardType MasterCard = new MasterCardType();
+        public static CardType Amex = new CardType(1, "Amex");
+        public static CardType Visa = new CardType(2, "Visa");
+        public static CardType MasterCard = new CardType(3, "MasterCard");
 
         public CardType(int id, string name)
             : base(id, name)
         {
         }
-
-        private class AmexCardType : CardType
-        {
-            public AmexCardType() : base(1, "Amex")
-            { }
-        }
-
-        private class VisaCardType : CardType
-        {
-            public VisaCardType() : base(2, "Visa")
-            { }
-        }
-
-        private class MasterCardType : CardType
-        {
-            public MasterCardType() : base(3, "MasterCard")
-            { }
-        }
     }
 }
diff --git a/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/OrderStatus.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/OrderStatus.cs
index 1716cc32d..19e62311a 100644
--- a/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/OrderStatus.cs
+++ b/src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/OrderStatus.cs
@@ -16,10 +16,6 @@
         public static OrderStatus Shipped = new OrderStatus(5, nameof(Shipped).ToLowerInvariant());
         public static OrderStatus Cancelled = new OrderStatus(6, nameof(Cancelled).ToLowerInvariant());
 
-        protected OrderStatus()
-        {
-        }
-
         public OrderStatus(int id, string name)
             : base(id, name)
         {
diff --git a/src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs b/src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs
index a1e4c4c7e..d3e415df2 100644
--- a/src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs
+++ b/src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs
@@ -11,9 +11,6 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork
 
         public int Id { get; private set; }
 
-        protected Enumeration()
-        { }
-
         protected Enumeration(int id, string name)
         {
             Id = id;