Hotfix #3

Fixes #3
WorkAccountCollection no longer shows duplicate work accounts.

Author: Yevrag35

DsReg/DsReg.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Mike Garvey
 #
-# Generated on: 8/6/2020
+# Generated on: 10/24/2020
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'MG.DsReg.dll'
 
 # Version number of this module.
-ModuleVersion = '1.3.0'
+ModuleVersion = '1.3.1'
 
 # Supported PSEditions
 CompatiblePSEditions = @('Desktop')
@@ -115,7 +115,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = 'Changes the output to make more information more readable and readiably available.'
+        ReleaseNotes = 'Fix for Issue #3 - Duplicate work accounts in results.'
 
     } # End of PSData hashtable
 

DsReg/MG.DsReg.dll

@@ -44,7 +44,13 @@ public class DsRegResult : BaseDetail
         #region CONSTRUCTORS
         public DsRegResult(IEnumerable<string> allLines)
         {
-            if (allLines is string[] strArr)
+            if (allLines is ICollection<string> lineCol)
+            {
+                _dsRegLines = new string[lineCol.Count];
+                lineCol.CopyTo(_dsRegLines, 0);
+            }
+
+            else if (allLines is string[] strArr)
                 _dsRegLines = strArr;
 
             else

MG.DsReg/DsRegResult.cs

@@ -4,27 +4,57 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 
 namespace MG.DsReg
 {
     [Serializable]
-    public class WorkAccountCollection : IEnumerable<WorkAccount>, IJsonOutputter
+    public class WorkAccountCollection : IReadOnlyList<WorkAccount>, IJsonOutputter
     {
-        private List<WorkAccount> _list;
+        private SortedList<string, WorkAccount> _list;
 
-        public WorkAccount this[int index] => _list[index];
+        public WorkAccount this[string tenantName] => _list[tenantName];
+        public WorkAccount this[int index]
+        {
+            get
+            {
+                if (index >= 0)
+                    return _list.Values[index];
+
+                else
+                {
+                    int goHere = _list.Count + index;
+                    return goHere >= 0 ? _list.Values[goHere] : null;
+                }
+            }
+        }
 
         public int Count => _list.Count;
 
-        public WorkAccountCollection() => _list = new List<WorkAccount>();
-        public WorkAccountCollection(int capacity) => _list = new List<WorkAccount>(capacity);
+        public WorkAccountCollection()
+        {
+            _list = new SortedList<string, WorkAccount>(StringComparer.CurrentCultureIgnoreCase);
+        }
+        public WorkAccountCollection(int capacity)
+        {
+            _list = new SortedList<string, WorkAccount>(capacity, StringComparer.CurrentCultureIgnoreCase);
+        }
+
+        internal void Add(WorkAccount wa)
+        {
+            if (_list.ContainsKey(wa.WorkplaceTenantName))
+                return;
 
-        internal void Add(WorkAccount wa) => _list.Add(wa);
+            _list.Add(wa.WorkplaceTenantName, wa);
+        }
 
-        public IEnumerator<WorkAccount> GetEnumerator() => ((IEnumerable<WorkAccount>)_list).GetEnumerator();
-        IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable<WorkAccount>)_list).GetEnumerator();
+        public IEnumerator<WorkAccount> GetEnumerator()
+        {
+            return _list.Values.GetEnumerator();
+        }
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
 
         public string ToJson()
         {
@@ -40,10 +70,9 @@ public string ToJson()
             serializer.Converters.Add(new StringEnumConverter(new CamelCaseNamingStrategy()));
             return this.ToJson(serializer);
         }
-
         public string ToJson(JsonSerializerSettings serializerSettings)
         {
-            return JsonConvert.SerializeObject(this, serializerSettings);
+            return JsonConvert.SerializeObject(_list.Values, serializerSettings);
         }
     }
 }

MG.DsReg/Objects/WorkAccountCollection.cs

@@ -8,9 +8,9 @@
 [assembly: AssemblyTitle("MG.DsReg")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Yevrag35, LLC.")]
 [assembly: AssemblyProduct("MG.DsReg")]
-[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyCopyright("Copyright © 2019-2020 Yevrag35, LLC.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0")]
-[assembly: AssemblyFileVersion("1.3.0")]
+[assembly: AssemblyVersion("1.3.1")]
+[assembly: AssemblyFileVersion("1.3.1")]