Merge branch 'WebApi' of https://github.com/TrueDoctor/DiscoBot into WebApi

2 files changed, 46 insertions, 10 deletions

diff --git a/DSACore/Models/Network/CommandResponse.cs b/DSACore/Models/Network/CommandResponse.cs
new file mode 100644
index 0000000..ed4b7d0
--- /dev/null
+++ b/DSACore/Models/Network/CommandResponse.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace DSACore.Models.Network
+{
+    public class CommandResponse
+    {
+        public CommandResponse(string message, ResponseType responseType= ResponseType.Broadcast)
+        {
+            this.message = message ?? throw new ArgumentNullException(nameof(message));
+            ResponseType = responseType;
+        }
+
+        public string message { get; private set; }
+        public ResponseType ResponseType { get; private set;}
+
+        public override string ToString()
+        {
+            return message;
+        }
+    }
+
+    public enum ResponseType
+    {
+        Broadcast,
+        Caller,
+        Error
+    }
+}
diff --git a/DSACore/Models/Network/Group.cs b/DSACore/Models/Network/Group.cs
index 6e62dc8..76c3efb 100644
--- a/DSACore/Models/Network/Group.cs
+++ b/DSACore/Models/Network/Group.cs
@@ -7,18 +7,15 @@ namespace DSACore.Models.Network
 {
     public class Group
     {
-        private int _online;
-
         public Group(string name, string password)
         {
             Name = name;
             Password = password;
         }
 
-        public Group(string name, int userCount)
+        public Group(string name, int userOnline)
         {
             Name = name ?? throw new ArgumentNullException(nameof(name));
-            UserCount = userCount;
         }
 
         public string Name { get; set; }
@@ -27,18 +24,26 @@ namespace DSACore.Models.Network
 
         public int UserCount
         {
-            get { return _online; RefreshOnline();}
-            set { _online = value; RefreshOnline();}
+            get { return Users.Count; }
         }
 
-        private void RefreshOnline()
+        public SendGroup SendGroup()
         {
-            _online = Users.Count;
+            return new SendGroup( Name, UserCount);
         }
+    }
 
-        public Group SendGroup()
+    public class SendGroup
+    {
+        public SendGroup(string name, int userCount)
         {
-            return new Group( Name, UserCount);
+            Name = name ?? throw new ArgumentNullException(nameof(name));
+            UserCount = userCount;
         }
+
+        public string Name { get; set; }
+
+        public int UserCount { get; set; }
+        
     }
 }