From 560f454c9beb2f691730b126fc6b3e23d68d6681 Mon Sep 17 00:00:00 2001 From: TrueDoctor Date: Sun, 30 Sep 2018 02:06:02 +0200 Subject: added mot of the database infrastructure --- DSACore/Hubs/ChatHub.cs | 57 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 12 deletions(-) (limited to 'DSACore/Hubs/ChatHub.cs') diff --git a/DSACore/Hubs/ChatHub.cs b/DSACore/Hubs/ChatHub.cs index e489b2e..46fde08 100644 --- a/DSACore/Hubs/ChatHub.cs +++ b/DSACore/Hubs/ChatHub.cs @@ -1,7 +1,10 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; +using System.Text; using System.Threading.Tasks; +using DSACore.DSA_Game.Characters; using DSACore.FireBase; using DSACore.Models; using DSACore.Models.Network; @@ -18,11 +21,15 @@ namespace DSACore.Hubs static ChatHub() { DSAGroups = Database.GetGroups().Result; - DSAGroups.Add(new Group("TheCrew", "valid")); - DSAGroups.Add(new Group("HalloWelt", "valid")); - DSAGroups.Add(new Group("DieKrassenGamer", "valid")); - DSAGroups.Add(new Group("DSA", "valid")); - DSAGroups.Add(new Group("DieÜberhelden", "valid")); + //AddGroups(); + } + + private static async void AddGroups() + { + await Database.AddGroup(new Models.Database.Group { Name = "HalloWelt", Password = "valid" }); + await Database.AddGroup(new Models.Database.Group { Name = "Die Krassen Gamer", Password = "valid" }); + await Database.AddGroup(new Models.Database.Group { Name = "DSA", Password = "valid" }); + await Database.AddGroup(new Models.Database.Group { Name = "Die Überhelden", Password = "valid" }); } public async Task SendMessage(string user, string message) @@ -34,7 +41,7 @@ namespace DSACore.Hubs try { string group = getGroup(Context.ConnectionId).Name; - await SendToGroup(group, user, Commands.CommandHandler.ExecuteCommand(new Command { CharId = 0, CmdIdentifier = ident, CmdTexts = args, Name = user })); + await SendToGroup(Commands.CommandHandler.ExecuteCommand(new Command { CharId = 0, CmdIdentifier = ident, CmdTexts = args, Name = user })); } catch(InvalidOperationException e) { @@ -43,9 +50,10 @@ namespace DSACore.Hubs } - private Task SendToGroup(string group, string user, string message) + private Task SendToGroup(string message) { - return Clients.Group(group).SendCoreAsync("ReceiveMessage", new object[] { user, message }); + string group = getGroup(Context.ConnectionId).Name; + return Clients.Group(group).SendCoreAsync("ReceiveMessage", new object[] { getUser(Context.ConnectionId), message }); } private Models.Network.Group getGroup(string id) @@ -53,8 +61,23 @@ namespace DSACore.Hubs return DSAGroups.First(x => x.Users.Exists(y => y.ConnectionId.Equals(id))); } + private User getUser(string id) + { + return DSAGroups.First(x => x.Users.Exists(y => y.ConnectionId.Equals(id))).Users.First(z => z.ConnectionId.Equals(id)); + } + public async Task GetGroups() { + var test = Database.GetGroups(); + test.Wait(); + foreach (var group in test.Result) + { + if (!DSAGroups.Exists(x => x.Name.Equals(group.Name))) + { + DSAGroups.Add(group); + } + } + await Clients.Caller.SendCoreAsync("ListGroups", new object[] { DSAGroups }); //throw new NotImplementedException("add database call to get groups"); } @@ -63,11 +86,19 @@ namespace DSACore.Hubs { DSAGroups.Add(new Group(group, password)); var Dgroup = new DSACore.Models.Database.Group{Name = group, Id = DSAGroups.Count-1}; - Database.CreateGroup(Dgroup); + //Database.AddGroup(Dgroup); await Clients.Caller.SendCoreAsync("ReceiveMessage", new[] {$"group {@group} sucessfully added"}); //throw new NotImplementedException("add database call to add groups"); } + public async Task UploadChar(string xml) + { + var group = getGroup(Context.ConnectionId); + + Database.AddChar(new Character(new MemoryStream(Encoding.UTF8.GetBytes(xml))), group); + //throw new NotImplementedException("add database call to add groups"); + } + public async Task Login(string group, string user, string password) { if (password == DSAGroups.First(x=>x.Name == group).Password) @@ -76,17 +107,19 @@ namespace DSACore.Hubs await Groups.AddToGroupAsync(Context.ConnectionId, group); } - await SendToGroup(group, user, "Ein neuer Nutzer hat die Gruppe betreten"); + await SendToGroup("Ein neuer Nutzer hat die Gruppe betreten"); } public async Task Disconnect() { var group = getGroup(Context.ConnectionId); - var user = group.Users.First(x => x.ConnectionId.Equals(Context.ConnectionId)); + + await SendToGroup("Connection lost"); + + var user = getUser(Context.ConnectionId); group.Users.Remove(user); await Groups.RemoveFromGroupAsync(Context.ConnectionId, group.Name); - await SendToGroup(group.Name, user.Name, "Connection lost"); } } -- cgit v1.2.3-54-g00ecf