From a71b0048970cab3e95b1f01297b3ded703a0a6d6 Mon Sep 17 00:00:00 2001 From: Matt Callahan Date: Wed, 7 Apr 2021 23:16:11 -0700 Subject: [PATCH] updated CardType and Enumeration classes (#1528) * updated CardType and Enumeration classes * Update per IEvangelist's suggestion * Update src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs Co-authored-by: David Pine Co-authored-by: Sumit Ghosh Co-authored-by: David Pine --- .../BuyerAggregate/CardType.cs | 6 ++-- .../Ordering.Domain/SeedWork/Enumeration.cs | 28 ++++++++----------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs index 3053cb678..872a8f65d 100644 --- a/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs +++ b/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/CardType.cs @@ -9,9 +9,9 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.B public class CardType : Enumeration { - 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 static CardType Amex = new CardType(1, nameof(Amex)); + public static CardType Visa = new CardType(2, nameof(Visa)); + public static CardType MasterCard = new CardType(3, nameof(MasterCard)); public CardType(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 d3e415df2..731dd8c86 100644 --- a/src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs +++ b/src/Services/Ordering/Ordering.Domain/SeedWork/Enumeration.cs @@ -11,27 +11,23 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.SeedWork public int Id { get; private set; } - protected Enumeration(int id, string name) - { - Id = id; - Name = name; - } + protected Enumeration(int id, string name) => (Id, Name) = (id, name); public override string ToString() => Name; - - public static IEnumerable GetAll() where T : Enumeration - { - var fields = typeof(T).GetFields(BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly); - - return fields.Select(f => f.GetValue(null)).Cast(); - } - + + public static IEnumerable GetAll() where T : Enumeration => + typeof(T).GetFields(BindingFlags.Public | + BindingFlags.Static | + BindingFlags.DeclaredOnly) + .Select(f => f.GetValue(null)) + .Cast(); + public override bool Equals(object obj) { - var otherValue = obj as Enumeration; - - if (otherValue == null) + if (obj is not Enumeration otherValue) + { return false; + } var typeMatches = GetType().Equals(obj.GetType()); var valueMatches = Id.Equals(otherValue.Id);